mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 04:02:37 +03:00
Fix stringtable typo
This commit is contained in:
@@ -7,21 +7,13 @@ _bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "dis
|
|||||||
_tin1text = getText (configFile >> "CfgMagazines" >> "TrashTinCan" >> "displayName");
|
_tin1text = getText (configFile >> "CfgMagazines" >> "TrashTinCan" >> "displayName");
|
||||||
_tin2text = getText (configFile >> "CfgMagazines" >> "ItemSodaEmpty" >> "displayName");
|
_tin2text = getText (configFile >> "CfgMagazines" >> "ItemSodaEmpty" >> "displayName");
|
||||||
_tintext = format["%1 / %2",_tin1text,_tin2text];
|
_tintext = format["%1 / %2",_tin1text,_tin2text];
|
||||||
//_hasbottleitem = (("ItemWaterBottle" in magazines player) || {"ItemWaterBottleInfected" in magazines player} || {"ItemWaterBottleSafe" in magazines player});
|
|
||||||
_qty = {_x in ["ItemWaterBottleInfected","ItemWaterBottle","ItemWaterBottleSafe","ItemWaterbottle1oz","ItemWaterbottle2oz","ItemWaterbottle3oz","ItemWaterbottle4oz","ItemWaterbottle5oz","ItemWaterbottle6oz","ItemWaterbottle7oz","ItemWaterbottle8oz","ItemWaterbottle9oz"]} count magazines player;
|
_qty = {_x in ["ItemWaterBottleInfected","ItemWaterBottle","ItemWaterBottleSafe","ItemWaterbottle1oz","ItemWaterbottle2oz","ItemWaterbottle3oz","ItemWaterbottle4oz","ItemWaterbottle5oz","ItemWaterbottle6oz","ItemWaterbottle7oz","ItemWaterbottle8oz","ItemWaterbottle9oz"]} count magazines player;
|
||||||
a_player_boil = true;
|
a_player_boil = true;
|
||||||
player removeAction s_player_boil;
|
player removeAction s_player_boil;
|
||||||
//s_player_boil = -1;
|
//s_player_boil = -1;
|
||||||
|
|
||||||
//_bottleInfected = ("ItemWaterBottleInfected" in magazines player);
|
|
||||||
|
|
||||||
/* //canteens are metal, we only use canteens in Epoch
|
/* //canteens are metal, we only use canteens in Epoch
|
||||||
_hastinitem = false;
|
_hastinitem = {_x in magazines player} count boil_tin_cans > 0;
|
||||||
|
|
||||||
{
|
|
||||||
if (_x in magazines player) exitWith {_hastinitem = true;};
|
|
||||||
} count boil_tin_cans;
|
|
||||||
|
|
||||||
if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false; dayz_actionInProgress = false;};
|
if (!_hastinitem) exitWith {format[localize "str_player_31",_tintext,localize "str_player_31_fill"] call dayz_rollingMessages; a_player_boil = false; dayz_actionInProgress = false;};
|
||||||
*/
|
*/
|
||||||
if (_qty > 0) then {
|
if (_qty > 0) then {
|
||||||
@@ -41,7 +33,7 @@ if (_qty > 0) then {
|
|||||||
_WB2Add = "ItemWaterBottleBoiled";
|
_WB2Add = "ItemWaterBottleBoiled";
|
||||||
switch (true) do {
|
switch (true) do {
|
||||||
case ("ItemWaterBottleInfected" in magazines player): { player removeMagazine "ItemWaterBottleInfected"; };
|
case ("ItemWaterBottleInfected" in magazines player): { player removeMagazine "ItemWaterBottleInfected"; };
|
||||||
case ("ItemWaterBottleSafe" in magazines player): { player removeMagazine "ItemWaterBottleSafe"; };
|
case ("ItemWaterBottleSafe" in magazines player): { player removeMagazine "ItemWaterBottleSafe"; };
|
||||||
case ("ItemWaterBottle" in magazines player): { player removeMagazine "ItemWaterBottle"; };
|
case ("ItemWaterBottle" in magazines player): { player removeMagazine "ItemWaterBottle"; };
|
||||||
case ("ItemWaterbottle1oz" in magazines player): { player removeMagazine "ItemWaterbottle1oz"; _WB2Add = "ItemWaterbottle1ozBoiled"; };
|
case ("ItemWaterbottle1oz" in magazines player): { player removeMagazine "ItemWaterbottle1oz"; _WB2Add = "ItemWaterbottle1ozBoiled"; };
|
||||||
case ("ItemWaterbottle2oz" in magazines player): { player removeMagazine "ItemWaterbottle2oz"; _WB2Add = "ItemWaterbottle2ozBoiled"; };
|
case ("ItemWaterbottle2oz" in magazines player): { player removeMagazine "ItemWaterbottle2oz"; _WB2Add = "ItemWaterbottle2ozBoiled"; };
|
||||||
@@ -55,7 +47,6 @@ if (_qty > 0) then {
|
|||||||
};
|
};
|
||||||
if (dayz_waterBottleBreaking && {[0.1] call fn_chance}) then {
|
if (dayz_waterBottleBreaking && {[0.1] call fn_chance}) then {
|
||||||
player addMagazine "ItemWaterBottleDmg";
|
player addMagazine "ItemWaterBottleDmg";
|
||||||
//systemChat (localize ("str_waterbottle_broke"));
|
|
||||||
localize "str_waterbottle_broke" call dayz_rollingMessages;
|
localize "str_waterbottle_broke" call dayz_rollingMessages;
|
||||||
} else {
|
} else {
|
||||||
player addMagazine _WB2Add;
|
player addMagazine _WB2Add;
|
||||||
@@ -63,7 +54,6 @@ if (_qty > 0) then {
|
|||||||
};
|
};
|
||||||
format [localize "str_player_boiledwater",_qty] call dayz_rollingMessages;
|
format [localize "str_player_boiledwater",_qty] call dayz_rollingMessages;
|
||||||
} else {
|
} else {
|
||||||
//localize "str_player_02" call dayz_rollingMessages;
|
|
||||||
format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages;
|
format[localize "str_player_31",_bottletext,localize "str_player_31_fill"] call dayz_rollingMessages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -34,16 +34,14 @@ if (!isNull _tree) then {
|
|||||||
|
|
||||||
//play action
|
//play action
|
||||||
_finished = ["Medic",1] call fn_loopAction;
|
_finished = ["Medic",1] call fn_loopAction;
|
||||||
|
|
||||||
// Working-Factor for chopping wood.
|
|
||||||
["Working",0,[50,10,5,0]] call dayz_NutritionSystem;
|
|
||||||
|
|
||||||
if(!_finished) exitWith {
|
if(!_finished) exitWith {
|
||||||
_isOk = false;
|
_isOk = false;
|
||||||
_proceed = false;
|
_proceed = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
if(_finished) then {
|
if (_finished) then {
|
||||||
|
["Working",0,[50,10,5,0]] call dayz_NutritionSystem;
|
||||||
_breaking = false;
|
_breaking = false;
|
||||||
if (dayz_toolBreaking && {[0.09] call fn_chance}) then {
|
if (dayz_toolBreaking && {[0.09] call fn_chance}) then {
|
||||||
_breaking = true;
|
_breaking = true;
|
||||||
|
|||||||
@@ -2363,7 +2363,7 @@
|
|||||||
<Key ID="STR_ITEM_NAME_equip_metal_sheet_rusted">
|
<Key ID="STR_ITEM_NAME_equip_metal_sheet_rusted">
|
||||||
<English>Rusty Sheet Metal</English>
|
<English>Rusty Sheet Metal</English>
|
||||||
<German>Rostige Metallplatte</German>
|
<German>Rostige Metallplatte</German>
|
||||||
<Russian>Ржавый лист металла.</Russian>
|
<Russian>Ржавый лист металла</Russian>
|
||||||
<Spanish>Lámina de Metal</Spanish>
|
<Spanish>Lámina de Metal</Spanish>
|
||||||
<French>Plaque de métal rouillée</French>
|
<French>Plaque de métal rouillée</French>
|
||||||
<Czech>Zrezlý plech</Czech>
|
<Czech>Zrezlý plech</Czech>
|
||||||
|
|||||||
Reference in New Issue
Block a user