W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move fix bottle to epoch crafting

Browse Source
This commit is contained in:
A Man
2019-11-04 10:59:06 +01:00
parent ba31c67bcb
commit 52c20fd512
5 changed files with 15 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SQF/dayz_code/Configs/CfgMagazines/DZE/PlasticWaterbottle.hpp
View File

@@ -33,13 +33,17 @@ class ItemPlasticWaterbottleDmg : CA_Magazine
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleDamaged.paa";
displayName = $STR_EQUIP_NAME_WBPET_02;
descriptionShort = $STR_EQUIP_DESC_WBPET_02;
sfx = "bandage";
class ItemActions
{
class Repair
{
text = $STR_ACTIONS_FIX_W;
script = "spawn player_fixBottle;";
class Crafting {
text = $STR_ACTIONS_FIX_W;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemPlasticWaterbottleUnfilled",1}};
input[] = {{"ItemPlasticWaterbottleDmg",1},{"equip_duct_tape",1}};
};
};
};

10
SQF/dayz_code/Configs/CfgMagazines/Items/WaterBottle.hpp
View File

@@ -33,13 +33,17 @@ class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/m
picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME;
descriptionShort = $STR_ITEMWATERBOTTLEDMG_CODE_DESC;
sfx = "bandage";
class ItemActions
{
class Repair
{
class Crafting {
text = $STR_ACTIONS_FIX_W;
script = "spawn player_fixBottle;";
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemWaterbottleUnfilled",1}};
input[] = {{"ItemWaterBottleDmg",1},{"equip_duct_tape",1}};
};
};
};

30
SQF/dayz_code/actions/player_fixBottle.sqf
View File

@@ -1,30 +0,0 @@
if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
dayz_actionInProgress = true;
private ["_bottle","_tape","_fixedBottle","_finished"];
_bottle = _this;
_tape = "equip_duct_tape";
_fixedBottle = ["ItemPlasticWaterbottleUnfilled", "ItemWaterBottleUnfilled"] select (_bottle == "ItemWaterbottleDmg");
call gear_ui_init;
closeDialog 0;
// Check if the player has the tape
if (_tape in magazines player) then {
[player,"bandage",0,false] call dayz_zombieSpeak;
_finished = ["Medic",1] call fn_loopAction;
if (!_finished) exitWith {};
// Check again to make sure player didn't drop item
if (_tape in magazines player) then {
player removeMagazine _bottle;
player removeMagazine _tape;
player addMagazine _fixedBottle;
localize "str_fix_water_bottle" call dayz_rollingMessages;
};
} else { //If the player doesn't have the tape
localize "str_fix_water_bottle_fail" call dayz_rollingMessages;
};
dayz_actionInProgress = false;

1
SQF/dayz_code/init/compiles.sqf
View File

@@ -116,7 +116,6 @@ if (!isDedicated) then {
call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf";
//player_goFishing = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_goFishing.sqf";
player_gather = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_gather.sqf";
player_fixBottle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fixBottle.sqf";
player_tearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_tearClothes.sqf";
//object_remove = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf";
player_fixHatchet = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_fixTools.sqf";

16
SQF/dayz_code/stringtable.xml
View File

@@ -1311,22 +1311,6 @@
<French>Vous avez bu quelque chose.</French>
<German>Du hast etwas getrunken.</German>
</Key>
<Key ID="str_fix_water_bottle">
<English>You have successfully fixed a water bottle!</English>
<Russian>Вы успешно починили бутылку с водой!</Russian>
<Spanish>Usted ha resuelto con éxito una botella de agua!</Spanish>
<Czech>Úspěšně jste spravili láhev na vodu!</Czech>
<French>Vous avez bien réparé la bouteille d&apos;eau!</French>
<German>Du hast die Wasserflasche erfolgreich repariert!</German>
</Key>
<Key ID="str_fix_water_bottle_fail">
<English>You think you need Duct Tape to fix the bottle.</English>
<Russian>Похоже, нужен скотч, чтобы починить бутылку.</Russian>
<Spanish>Usted cree que necesita cinta para conductos para fijar la botella.</Spanish>
<Czech>Ke spravení láhve bude zřejmě třeba lepící páska.</Czech>
<French>Vous pensez que vous avez besoin de ruban adhésif pour réparer la bouteille.</French>
<German>Du könntest Klebeband gebrauchen, um die Flasche zu reparieren.</German>
</Key>
<Key ID="STR_TEAR_CLOTHES">
<English>Tear Clothes</English>
<German>Kleidung zerreißen</German>