Epoch Survival 0.4 b639

return empty can on drinking gas, added option to empty out gas can
2024-08-30 18:22:13 +00:00 · 2016-11-02 15:12:49 -05:00 · 2016-11-02 15:12:49 -05:00 · 3f3dd22f83
commit 3f3dd22f83
parent 95cfc4be58
36 changed files with 11 additions and 7 deletions
--- a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo
+++ b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo
--- a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
+++ b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
--- a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
+++ b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Altis.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Altis.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Australia.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Australia.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Napf.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Napf.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Porto.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Porto.pbo
--- a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Sara.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Sara.pbo
--- a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
--- a/Server_Install_Pack/mpmissions/epoch.VR.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.VR.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
--- a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
--- a/Server_Install_Pack/mpmissions/epoch.utes.pbo
+++ b/Server_Install_Pack/mpmissions/epoch.utes.pbo
--- a/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo
+++ b/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo
--- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp
+++ b/Sources/epoch_config/Configs/CfgItemInteractions.hpp
@ -201,7 +201,7 @@ class CfgItemInteractions
        interactText = "FILL";
        interactReturnOnUse = "jerrycanE_epoch";
        interactAttributes[] = {10};
-        interactActions[] = {{"DRINK","[2,[['Toxicity',100],['Alcohol',50]],''] call EPOCH_consumeItem;"}};
+        interactActions[] = {{"DRINK","[2,[['Toxicity',100],['Alcohol',50]],'jerrycanE_epoch'] call EPOCH_consumeItem;"},{"EMPTY","[2,[],'jerrycanE_epoch'] call EPOCH_consumeItem;"}};
    };
    class jerrycanE_epoch : Default
    {
--- a/Sources/epoch_config/Configs/CfgItemInteractions.json
+++ b/Sources/epoch_config/Configs/CfgItemInteractions.json
@ -430,7 +430,11 @@
            "interactActions": [
                [
                    "DRINK",
-                    "[2,[['Toxicity',100],['Alcohol',50]],''] call EPOCH_consumeItem;"
+                    "[2,[['Toxicity',100],['Alcohol',50]],'jerrycanE_epoch'] call EPOCH_consumeItem;"
+                ],
+                [
+                    "EMPTY",
+                    "[2,[],'jerrycanE_epoch'] call EPOCH_consumeItem;"
                ]
            ],
            "_inherit": "Default"
--- a/Sources/epoch_config/build.hpp
+++ b/Sources/epoch_config/build.hpp
@ -1 +1 @@
-build=638;
+build=639;
--- a/Sources/epoch_server/build.hpp
+++ b/Sources/epoch_server/build.hpp
@ -1 +1 @@
-build=638;
+build=639;
--- a/Sources/epoch_server_core/build.hpp
+++ b/Sources/epoch_server_core/build.hpp
@ -1 +1 @@
-build=638;
+build=639;
--- a/Sources/epoch_server_settings/build.hpp
+++ b/Sources/epoch_server_settings/build.hpp
@ -1 +1 @@
-build=638;
+build=639;
--- a/Sources/mpmissions/epoch.Altis/treeView.txt
+++ b/Sources/mpmissions/epoch.Altis/treeView.txt
--- a/Sources/mpmissions/epoch.Chernarus/treeView.txt
+++ b/Sources/mpmissions/epoch.Chernarus/treeView.txt
--- a/build.txt
+++ b/build.txt
@ -1 +1 @@
-638
+639