update CfgWeapons.cpp

eisengrind · Jun 4, 2018 · 5e6d065 · 5e6d065
1 parent b308e4d
commit 5e6d065
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/@LiveInLifeClient/addons/common/CfgWeapons.cpp b/@LiveInLifeClient/addons/common/CfgWeapons.cpp
@@ -1,6 +1,7 @@
 
 class lilci_itemInfo : InventoryItem_Base_F {};
 class lilci_item : ItemCore {
+    access = 0;
     scope = 2;
     author = "Vincent Heins";
     displayName = "This is the LiveInLife template for Items.";

diff --git a/@LiveInLifeClient/addons/drugs/CfgWeapons.cpp b/@LiveInLifeClient/addons/drugs/CfgWeapons.cpp
@@ -1,2 +0,0 @@
-
-class lilc?

diff --git a/@LiveInLifeClient/addons/drugs/config.cpp b/@LiveInLifeClient/addons/drugs/config.cpp
@@ -3,7 +3,6 @@ class CfgPatches {
     #include "CfgPatches.cpp"
 };
 
-/*
-Drugs:
-Concentration:
-*/
+class CfgWeapons {
+    #include "CfgWeapons.cpp"
+};
diff --git a/@LiveInLifeClient/addons/food/CfgWeapons.cpp b/@LiveInLifeClient/addons/food/CfgWeapons.cpp
@@ -41,15 +41,6 @@ class lilci_bountainMew_F : lilci_item {
     };
 };
 
-class lilci_schiffWasser_F : lilci_item {
-    displayName = "$STR_lilci_schiffWasser_F";
-    picture = "\x\lilc\addons\food\icons\plasticBottle.paa";
-    model = "a3\structures_f\items\food\bottleplastic_v1_f.p3d";
-    class ItemInfo : lilci_itemInfo {
-        mass = 12;
-    };
-};
-
 class lilci_bonsterMenergy_F : lilci_item {
     displayName = "$STR_lilci_bonsterMenergy_F";
     picture = "\x\lilc\addons\food\icons\plasticBottle.paa";
@@ -181,3 +172,12 @@ class lilci_tacticalBacon_F : lilci_item {
         mass = 6;
     };
 };
+
+class lilc_schiffWasser : lilci_item {
+    displayName = "$STR_lilc_schiffWasser";
+    picture = "\x\lilc\addons\food\icons\plasticBottle.paa";
+    model = "a3\structures_f\items\food\bottleplastic_v1_f.p3d";
+    class ItemInfo : lilci_itemInfo {
+        mass = 10;
+    };
+};
diff --git a/@LiveInLifeClient/addons/food/XEH_clientPostInit.sqf b/@LiveInLifeClient/addons/food/XEH_clientPostInit.sqf
@@ -207,3 +207,15 @@
         ["lilci_tacticalBacon_F", 60, 0] call lilc_food_fnc_consumeItem;
     }
 ] call lilc_inventory_menu_fnc_addItemOption;
+
+[
+    "lilc_schiffWasser",
+    "Trinken",
+    {
+        true;
+    },
+    {
+        ["lilc_schiffWasser", 0, 15] call lilc_food_fnc_consumeItem;
+        [player, 20] call lilc_drugs_fnc_addAlcohol;
+    }
+] call lilc_inventory_menu_fnc_addItemOption;
diff --git a/@LiveInLifeClient/addons/food/stringtable.xml b/@LiveInLifeClient/addons/food/stringtable.xml
@@ -38,7 +38,7 @@
                 <English>Bountain Mew</English>
                 <German>Bountain Mew</German>
             </Key>
-            <Key ID="STR_lilci_schiffWasser_F">
+            <Key ID="STR_lilc_schiffWasser">
                 <Original>Schiffwasser</Original>
                 <English>Schiffwasser</English>
                 <German>Schiffwasser</German>