From 03d54097e0b51329f76453cb9de8b42050f8c4a2 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 15:45:08 -0500 Subject: [PATCH 01/12] Update editMe.sqf Added new items to build. --- editMe.sqf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/editMe.sqf b/editMe.sqf index a3083bd3..8ef970ff 100644 --- a/editMe.sqf +++ b/editMe.sqf @@ -134,12 +134,23 @@ BULWARK_BUILDITEMS = [ [1000, "Hallogen Lamp", "Land_LampHalogen_F", 90, 1], [1000, "Double H Barrier", "Land_HBarrierWall4_F", 0, 4], [1000, "Concrete Platform", "BlockConcrete_F", 0, 3.5], + [1000, "Dragons Tooth", "Land_DragonsTeeth_01_1x1_new_F", 0, 4], + [1000, "Metal Hedgehog", "Land_CzechHedgehog_01_new_F", 0, 1.5], + [1000, "Concrete Hedgehog", "Land_ConcreteHedgehog_01_F", 180, 1.5], [1200, "Storage box large", "Box_NATO_AmmoVeh_F", 0, 1], [2500, "Static HMG", "B_HMG_01_high_F", 0, 1], [3000, "Small Bunker", "Land_BagBunker_Small_F", 180, 3], + [4000, "Small Dome", "Land_Dome_Small_F", 0, 1.5], [4500, "Pillbox", "Land_PillboxBunker_01_hex_F", 90, 2.5], + [4500, "Rectangle Pillbox", "Land_PillboxBunker_01_rectangle_F", 0, 1], + [5000, "Airstrip Platform", "Land_AirstripPlatform_01_F", 0, 3], [6000, "Guard Tower", "Land_Cargo_Patrol_V3_F", 0, 3.5], - [9500, "Modular Bunker", "Land_Bunker_01_Small_F", 180, 3.5] + [6000, "Large Dome", "Land_Dome_Big_F", 180, 1.5], + [8000, "Big Pillbox", "Land_PillboxBunker_01_big_F", 0, 1.5], + [9500, "Modular Bunker", "Land_Bunker_01_Small_F", 180, 3.5], + [9500, "HQ Mod. Bunker", "Land_Bunker_01_HQ_F", 0, 2], + [10000,"Tall Mod. Bunker", "Land_Bunker_01_tall_F", 180, 1], + [10000,"Big Mod. Bunker", "Land_Bunker_01_big_F", 0, 3.5] ]; /* Time of Day*/ From c0cb647c64b85f9f704782719903605ffc544cf5 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 15:46:59 -0500 Subject: [PATCH 02/12] New Parameter for medkit to ticket --- description.ext | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/description.ext b/description.ext index 2a6f5bb6..7fbe8ad5 100644 --- a/description.ext +++ b/description.ext @@ -515,5 +515,13 @@ class Params texts[] = {"Off", "On"}; default = 1; }; + + class Medikit_per_Ticket + { + title = "Medikits per 5 Tickets"; + values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 99}; + texts[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "99"}; + default = 1; + }; }; From 6f7794c293605b082007893d9a779a3af7cd5675 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 15:48:02 -0500 Subject: [PATCH 03/12] Update createBase.sqf --- bulwark/createBase.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/bulwark/createBase.sqf b/bulwark/createBase.sqf index 8d7de9de..d0712225 100644 --- a/bulwark/createBase.sqf +++ b/bulwark/createBase.sqf @@ -50,6 +50,7 @@ if(BULWARK_MEDIKITS > 0) then { //Add actions to Bulwark Box [bulwarkBox, ["" + "Pickup", "bulwark\moveBox.sqf","",1,false,false,"true","true",2.5]] remoteExec ["addAction", 0, true]; [bulwarkBox, ["" + "Shop", "[] spawn bulwark_fnc_purchaseGui; ShopCaller = _this select 1","",1.5,false,false,"true","true",2.5]] remoteExec ["addAction", 0, true]; +[bulwarkBox, ["" + "Medkit2Ticket", "bulwark\MKitToTicket.sqf"]] remoteExec ["addAction", 0, true]; [bulwarkBox, ["" + "Heal Yourself: 500p", " _player = _this select 1; _points = _player getVariable 'killPoints'; From 529ffccf1cc510923553d9635215e2c0c5f316db Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 15:49:14 -0500 Subject: [PATCH 04/12] Add files via upload Add script to trade medkits for tickets. --- bulwark/MKitToTicket.sqf | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 bulwark/MKitToTicket.sqf diff --git a/bulwark/MKitToTicket.sqf b/bulwark/MKitToTicket.sqf new file mode 100644 index 00000000..5ddc962f --- /dev/null +++ b/bulwark/MKitToTicket.sqf @@ -0,0 +1,37 @@ +/** +* dropBox +* +* converts Medikits into tickets +* +* Domain: Client +**/ +call killPoints_fnc_updateHud; +systemChat "Version3"; +_Medikit_per_Ticket = ("Medikit_per_Ticket" call BIS_fnc_getParamValue); +systemChat (format ["%1",_Medikit_per_Ticket]); + +_bulwarkContents = itemCargo bulwarkBox; + +_countMediKits = {_x == "Medikit"} count _bulwarkContents; +systemChat (format ["%1",_countMediKits]); + +if (_countMediKits >= _Medikit_per_Ticket ) then { + _bulwarkContents = _bulwarkContents - ["Medikit"]; + clearItemCargoGlobal bulwarkBox; + + _Remaining_Medikits = _countMediKits - _Medikit_per_Ticket ; + systemChat (format ["%1",_Remaining_Medikits]); + bulwarkBox addItemCargoGlobal ["Medikit", _Remaining_Medikits]; + + [west, 5] call BIS_fnc_respawnTickets; + + { + bulwarkBox addItemCargoGlobal [_x, 1]; + } forEach _bulwarkContents; + hint "Medikits traded for Tickets"; +}; + +call killPoints_fnc_updateHud; + + + From 6715b9d1b2d0ee64b4fa6be457854fead27bad5e Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 15:50:28 -0500 Subject: [PATCH 05/12] Update revivePlayers.sqf --- revivePlayers.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/revivePlayers.sqf b/revivePlayers.sqf index 4392d102..27ed1a7a 100644 --- a/revivePlayers.sqf +++ b/revivePlayers.sqf @@ -11,6 +11,7 @@ while {true} do { [ "#rev", 1, _playerInvToCheck ] remoteExecCall ["BIS_fnc_reviveOnState", _playerInvToCheck]; _playerInvToCheck switchMove "PlayerStand"; _playerInvToCheck removeItem "Medikit"; + systemChat "Player Revived, Medikit removed"; [_playerInvToCheck] remoteExec ["bulwark_fnc_revivePlayer", 2]; }; }; From 70a4ce6843facdfebebfff8c181fd39c0c0b545e Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 16:11:14 -0500 Subject: [PATCH 06/12] Update description.ext --- description.ext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/description.ext b/description.ext index 7fbe8ad5..67e9276b 100644 --- a/description.ext +++ b/description.ext @@ -521,7 +521,7 @@ class Params title = "Medikits per 5 Tickets"; values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 99}; texts[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "99"}; - default = 1; + default = 5; }; }; From f9f5fd54c06cd24ab857167678997f293d66cae4 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 16:43:43 -0500 Subject: [PATCH 07/12] Update MKitToTicket.sqf --- bulwark/MKitToTicket.sqf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bulwark/MKitToTicket.sqf b/bulwark/MKitToTicket.sqf index 5ddc962f..385f67f7 100644 --- a/bulwark/MKitToTicket.sqf +++ b/bulwark/MKitToTicket.sqf @@ -6,21 +6,17 @@ * Domain: Client **/ call killPoints_fnc_updateHud; -systemChat "Version3"; _Medikit_per_Ticket = ("Medikit_per_Ticket" call BIS_fnc_getParamValue); -systemChat (format ["%1",_Medikit_per_Ticket]); _bulwarkContents = itemCargo bulwarkBox; _countMediKits = {_x == "Medikit"} count _bulwarkContents; -systemChat (format ["%1",_countMediKits]); if (_countMediKits >= _Medikit_per_Ticket ) then { _bulwarkContents = _bulwarkContents - ["Medikit"]; clearItemCargoGlobal bulwarkBox; _Remaining_Medikits = _countMediKits - _Medikit_per_Ticket ; - systemChat (format ["%1",_Remaining_Medikits]); bulwarkBox addItemCargoGlobal ["Medikit", _Remaining_Medikits]; [west, 5] call BIS_fnc_respawnTickets; From 04527bd2c9c3ce753c3597a82813898fd0ba86ad Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 17:54:12 -0500 Subject: [PATCH 08/12] Update editMe.sqf --- editMe.sqf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/editMe.sqf b/editMe.sqf index 8ef970ff..a67ce32f 100644 --- a/editMe.sqf +++ b/editMe.sqf @@ -134,23 +134,23 @@ BULWARK_BUILDITEMS = [ [1000, "Hallogen Lamp", "Land_LampHalogen_F", 90, 1], [1000, "Double H Barrier", "Land_HBarrierWall4_F", 0, 4], [1000, "Concrete Platform", "BlockConcrete_F", 0, 3.5], - [1000, "Dragons Tooth", "Land_DragonsTeeth_01_1x1_new_F", 0, 4], + [1000, "Dragons Tooth", "Land_DragonsTeeth_01_1x1_new_F", 0, 1.5], [1000, "Metal Hedgehog", "Land_CzechHedgehog_01_new_F", 0, 1.5], [1000, "Concrete Hedgehog", "Land_ConcreteHedgehog_01_F", 180, 1.5], [1200, "Storage box large", "Box_NATO_AmmoVeh_F", 0, 1], [2500, "Static HMG", "B_HMG_01_high_F", 0, 1], [3000, "Small Bunker", "Land_BagBunker_Small_F", 180, 3], - [4000, "Small Dome", "Land_Dome_Small_F", 0, 1.5], - [4500, "Pillbox", "Land_PillboxBunker_01_hex_F", 90, 2.5], - [4500, "Rectangle Pillbox", "Land_PillboxBunker_01_rectangle_F", 0, 1], - [5000, "Airstrip Platform", "Land_AirstripPlatform_01_F", 0, 3], - [6000, "Guard Tower", "Land_Cargo_Patrol_V3_F", 0, 3.5], - [6000, "Large Dome", "Land_Dome_Big_F", 180, 1.5], - [8000, "Big Pillbox", "Land_PillboxBunker_01_big_F", 0, 1.5], - [9500, "Modular Bunker", "Land_Bunker_01_Small_F", 180, 3.5], - [9500, "HQ Mod. Bunker", "Land_Bunker_01_HQ_F", 0, 2], - [10000,"Tall Mod. Bunker", "Land_Bunker_01_tall_F", 180, 1], - [10000,"Big Mod. Bunker", "Land_Bunker_01_big_F", 0, 3.5] + [4000, "Small Dome", "Land_Dome_Small_F", 0, 10], + [4500, "Pillbox", "Land_PillboxBunker_01_hex_F", 90, 5], + [4500, "Rectangle Pillbox", "Land_PillboxBunker_01_rectangle_F",90, 5], + [5000, "Airstrip Platform", "Land_AirstripPlatform_01_F", 0, 10], + [6000, "Guard Tower", "Land_Cargo_Patrol_V3_F", 0, 5], + [6000, "Large Dome", "Land_Dome_Big_F", 180, 20], + [8000, "Big Pillbox", "Land_PillboxBunker_01_big_F", 180, 10], + [9500, "Modular Bunker", "Land_Bunker_01_Small_F", 180, 10], + [9500, "HQ Mod. Bunker", "Land_Bunker_01_HQ_F", 180, 10], + [10000,"Tall Mod. Bunker", "Land_Bunker_01_tall_F", 180, 10], + [10000,"Big Mod. Bunker", "Land_Bunker_01_big_F", 180, 10] ]; /* Time of Day*/ From fd85bb2d1e5f739f82d84630a4072c681a96ddb1 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 19:06:38 -0500 Subject: [PATCH 09/12] Create MaintainerTraining.sqf Allows player to trade 1 toolkit for unitTrait "Engineer" --- MaintainerTraining.sqf | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 MaintainerTraining.sqf diff --git a/MaintainerTraining.sqf b/MaintainerTraining.sqf new file mode 100644 index 00000000..d985171a --- /dev/null +++ b/MaintainerTraining.sqf @@ -0,0 +1,27 @@ +/** +* dropBox +* +* train player as maintainer +* +* Domain: Client +**/ +_bulwarkContents = itemCargo bulwarkBox; +_countToolKit = {_x == "ToolKit"} count _bulwarkContents; + + +if ( _countToolKit >= 1 ) then { + _bulwarkContents = _bulwarkContents - ["ToolKit"]; + clearItemCargoGlobal bulwarkBox; + + _Remaining_ToolKit = _countToolKit - 1 ; + bulwarkBox addItemCargoGlobal ["ToolKit", _Remaining_ToolKit]; + + player setUnitTrait ["Engineer", True]; + + { + bulwarkBox addItemCargoGlobal [_x, 1]; + } forEach _bulwarkContents; + hint "Player trained as Maintainer"; +}; + +call killPoints_fnc_updateHud; From aeced7345db85d2bf2c071111e3f1a8d2e7d2a30 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 19:07:35 -0500 Subject: [PATCH 10/12] Delete MaintainerTraining.sqf --- MaintainerTraining.sqf | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 MaintainerTraining.sqf diff --git a/MaintainerTraining.sqf b/MaintainerTraining.sqf deleted file mode 100644 index d985171a..00000000 --- a/MaintainerTraining.sqf +++ /dev/null @@ -1,27 +0,0 @@ -/** -* dropBox -* -* train player as maintainer -* -* Domain: Client -**/ -_bulwarkContents = itemCargo bulwarkBox; -_countToolKit = {_x == "ToolKit"} count _bulwarkContents; - - -if ( _countToolKit >= 1 ) then { - _bulwarkContents = _bulwarkContents - ["ToolKit"]; - clearItemCargoGlobal bulwarkBox; - - _Remaining_ToolKit = _countToolKit - 1 ; - bulwarkBox addItemCargoGlobal ["ToolKit", _Remaining_ToolKit]; - - player setUnitTrait ["Engineer", True]; - - { - bulwarkBox addItemCargoGlobal [_x, 1]; - } forEach _bulwarkContents; - hint "Player trained as Maintainer"; -}; - -call killPoints_fnc_updateHud; From 0ba9089023fde2684c2919dd316da22249662de0 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 19:08:13 -0500 Subject: [PATCH 11/12] Create MaintainerTraining.sqf allow player to trade 1 toolkit for unit trait engineer --- bulwark/MaintainerTraining.sqf | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 bulwark/MaintainerTraining.sqf diff --git a/bulwark/MaintainerTraining.sqf b/bulwark/MaintainerTraining.sqf new file mode 100644 index 00000000..d985171a --- /dev/null +++ b/bulwark/MaintainerTraining.sqf @@ -0,0 +1,27 @@ +/** +* dropBox +* +* train player as maintainer +* +* Domain: Client +**/ +_bulwarkContents = itemCargo bulwarkBox; +_countToolKit = {_x == "ToolKit"} count _bulwarkContents; + + +if ( _countToolKit >= 1 ) then { + _bulwarkContents = _bulwarkContents - ["ToolKit"]; + clearItemCargoGlobal bulwarkBox; + + _Remaining_ToolKit = _countToolKit - 1 ; + bulwarkBox addItemCargoGlobal ["ToolKit", _Remaining_ToolKit]; + + player setUnitTrait ["Engineer", True]; + + { + bulwarkBox addItemCargoGlobal [_x, 1]; + } forEach _bulwarkContents; + hint "Player trained as Maintainer"; +}; + +call killPoints_fnc_updateHud; From 00d077829e6ccab9d3cf5a8d3490078fd68d9561 Mon Sep 17 00:00:00 2001 From: Kern3LP4niK <42155863+Kern3LP4niK@users.noreply.github.com> Date: Fri, 2 Aug 2019 19:14:50 -0500 Subject: [PATCH 12/12] Update createBase.sqf Added MedKit to Ticket and Toolkit to engineer training --- bulwark/createBase.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bulwark/createBase.sqf b/bulwark/createBase.sqf index d0712225..e2ce7690 100644 --- a/bulwark/createBase.sqf +++ b/bulwark/createBase.sqf @@ -50,7 +50,8 @@ if(BULWARK_MEDIKITS > 0) then { //Add actions to Bulwark Box [bulwarkBox, ["" + "Pickup", "bulwark\moveBox.sqf","",1,false,false,"true","true",2.5]] remoteExec ["addAction", 0, true]; [bulwarkBox, ["" + "Shop", "[] spawn bulwark_fnc_purchaseGui; ShopCaller = _this select 1","",1.5,false,false,"true","true",2.5]] remoteExec ["addAction", 0, true]; -[bulwarkBox, ["" + "Medkit2Ticket", "bulwark\MKitToTicket.sqf"]] remoteExec ["addAction", 0, true]; +[bulwarkBox, ["" + "X Medkits for 5 Tickets", "bulwark\MKitToTicket.sqf"]] remoteExec ["addAction", 0, true]; +[bulwarkBox, ["" + "Maintainer Training", "bulwark\MaintainerTraining.sqf"]] remoteExec ["addAction", 0, true]; [bulwarkBox, ["" + "Heal Yourself: 500p", " _player = _this select 1; _points = _player getVariable 'killPoints';