From 36196661eab4946f6b1fb464c3ebfa410272cd4c Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 12 Aug 2016 14:00:32 -0400 Subject: [PATCH] Update arrow and quiver classnames Vanilla development commit: https://github.com/DayZMod/DayZ/commit/1561c3cfd85db4eee2688d76a6e5a6fdb8faddda --- .../CfgCrafting/Recipes/Ammo/WoodenArrow.hpp | 2 +- .../Configs/CfgMagazines/Magazines/Arrows.hpp | 12 +++++++----- .../Configs/CfgVehicles/WeaponHolder.hpp | 2 +- SQF/dayz_code/actions/object_pickup.sqf | 4 +--- SQF/dayz_code/actions/player_createQuiver.sqf | 10 +++++----- SQF/dayz_code/actions/player_fillQuiver.sqf | 10 +++++----- SQF/dayz_code/actions/player_takeArrow.sqf | 16 ++++++++-------- SQF/dayz_code/compile/player_gearSet.sqf | 2 +- SQF/dayz_code/init/object_pickupAction.sqf | 2 +- SQF/dayz_code/system/player_monitor.fsm | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp b/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp index 397c7bd1a..ca3ff33a1 100644 --- a/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp +++ b/SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp @@ -7,7 +7,7 @@ class Wooden_Arrow : Recipe { }; output[] = { - {"WoodenArrow","CfgMagazines",4} + {"1Rnd_Arrow_Wood","CfgMagazines",4} }; required[] = { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp index 9367d4691..886e0fdbc 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp @@ -72,8 +72,10 @@ class 1Rnd_Bolt_Explosive : CA_Magazine ammo = "explosive_bolt"; }; -//TODO: Remove legacy -class WoodenArrow : 1Rnd_Arrow_Wood {}; -class Quiver : 12Rnd_Quiver_Wood {}; -class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {}; -class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {}; \ No newline at end of file +/* + //TODO: Remove legacy + class WoodenArrow : 1Rnd_Arrow_Wood {}; + class Quiver : 12Rnd_Quiver_Wood {}; + class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {}; + class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {}; +*/ \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index 3cb45b4bc..148bf2c87 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -6,7 +6,7 @@ class WoodenArrowF : WeaponHolderBase { class eventHandlers { - init = "[(_this select 0),'cfgMagazines','WoodenArrow'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + init = "[(_this select 0),'cfgMagazines','1Rnd_Arrow_Wood'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; class WeaponHolder_ItemCrowbar: WeaponHolderBase diff --git a/SQF/dayz_code/actions/object_pickup.sqf b/SQF/dayz_code/actions/object_pickup.sqf index cadd38936..c30f57fdd 100644 --- a/SQF/dayz_code/actions/object_pickup.sqf +++ b/SQF/dayz_code/actions/object_pickup.sqf @@ -34,11 +34,9 @@ if (_classname isKindOf "TrapBear") exitWith { deleteVehicle _holder; }; player playActionNow "PutDown"; //Adding random chance of arrow is re-usable on pickup -_broken = if ((_classname == "WoodenArrow") && {[0.15] call fn_chance}) then {true} else {false}; +_broken = if ((_classname == "1Rnd_Arrow_Wood") && {[0.15] call fn_chance}) then {true} else {false}; if (_broken) exitWith { deleteVehicle _holder; localize "str_broken_arrow" call dayz_rollingMessages; }; -uiSleep 0.25; //Why are we waiting? Animation - _claimedBy = _holder getVariable["claimed","0"]; if (_claimedBy != _playerID) exitWith { format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/actions/player_createQuiver.sqf b/SQF/dayz_code/actions/player_createQuiver.sqf index 44f1048ec..2c405a3f8 100644 --- a/SQF/dayz_code/actions/player_createQuiver.sqf +++ b/SQF/dayz_code/actions/player_createQuiver.sqf @@ -1,16 +1,16 @@ private ["_qty_arrows","_qty_quivers","_qty_quiverarrows"]; call gear_ui_init; -_qty_arrows = {_x == "WoodenArrow"} count magazines player; -_qty_quivers = {_x == "Quiver"} count magazines player; +_qty_arrows = {_x == "1Rnd_Arrow_Wood"} count magazines player; +_qty_quivers = {_x == "12Rnd_Quiver_Wood"} count magazines player; //if (_qty_quivers > 0) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; -if (_qty_arrows < 2) exitWith { localize "str_quiver_notenougharrows" call dayz_rollingMessages;}; //Not enough arrows to create quiver +if (_qty_arrows < 2) exitWith { localize "str_quiver_notenougharrows" call dayz_rollingMessages;}; //Not enough arrows to create 12Rnd_Quiver_Wood _qty_quiverarrows = _qty_arrows min 6; for "_x" from 1 to _qty_quiverarrows do { - player removeMagazine "WoodenArrow"; + player removeMagazine "1Rnd_Arrow_Wood"; }; -player addMagazine ["Quiver",_qty_quiverarrows]; +player addMagazine ["12Rnd_Quiver_Wood",_qty_quiverarrows]; format[localize "str_quiver_createsuccess",_qty_quiverarrows] call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/player_fillQuiver.sqf b/SQF/dayz_code/actions/player_fillQuiver.sqf index ee0a5fcd2..bd881735f 100644 --- a/SQF/dayz_code/actions/player_fillQuiver.sqf +++ b/SQF/dayz_code/actions/player_fillQuiver.sqf @@ -3,8 +3,8 @@ private ["_qty_arrows","_qty_quivers","_control","_qty_quiverarrows","_qty_quive disableSerialization; call gear_ui_init; -_qty_arrows = {_x == "WoodenArrow"} count magazines player; -_qty_quivers = {_x == "Quiver"} count magazines player; +_qty_arrows = {_x == "1Rnd_Arrow_Wood"} count magazines player; +_qty_quivers = {_x == "12Rnd_Quiver_Wood"} count magazines player; _control = uiNamespace getVariable 'uiControl'; _qty_quiverarrows = gearSlotAmmoCount _control; @@ -13,11 +13,11 @@ _qty_quiverfreeslots = 12-_qty_quiverarrows; //if (_qty_quivers > 1) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; if (_qty_quiverfreeslots > 0) then { _qty_arrows2add = _qty_quiverfreeslots min _qty_arrows; - player removeMagazine "Quiver"; + player removeMagazine "12Rnd_Quiver_Wood"; for "_x" from 1 to _qty_arrows2add do { - player removeMagazine "WoodenArrow"; + player removeMagazine "1Rnd_Arrow_Wood"; }; - player addMagazine ["Quiver",_qty_quiverarrows+_qty_arrows2add]; + player addMagazine ["12Rnd_Quiver_Wood",_qty_quiverarrows+_qty_arrows2add]; format[localize "str_quiver_addarrows",_qty_arrows2add] call dayz_rollingMessages; } else { localize "str_quiver_full" call dayz_rollingMessages; diff --git a/SQF/dayz_code/actions/player_takeArrow.sqf b/SQF/dayz_code/actions/player_takeArrow.sqf index 93f420df8..1fb030048 100644 --- a/SQF/dayz_code/actions/player_takeArrow.sqf +++ b/SQF/dayz_code/actions/player_takeArrow.sqf @@ -3,7 +3,7 @@ private ["_qty_quivers","_control","_qty_quiverarrows","_empty","_emptymagslotco disableSerialization; call gear_ui_init; -_qty_quivers = {_x == "Quiver"} count magazines player; +_qty_quivers = {_x == "12Rnd_Quiver_Wood"} count magazines player; _control = uiNamespace getVariable 'uiControl'; _qty_quiverarrows = gearSlotAmmoCount _control; @@ -14,19 +14,19 @@ _empty = [player] call BIS_fnc_invSlotsEmpty; _emptymagslotcount = _empty select 4; //empty magazines slots if (_qty_quivers > 1) exitWith { localize "str_quiver_reachlimit" call dayz_rollingMessages;}; -if (_qty_quiverarrows == 2) then { //remove quiver - add 2 arrows +if (_qty_quiverarrows == 2) then { //remove 12Rnd_Quiver_Wood - add 2 arrows if (_emptymagslotcount > 0) then { - player removeMagazine "Quiver"; - player addMagazine "WoodenArrow"; - player addMagazine "WoodenArrow"; + player removeMagazine "12Rnd_Quiver_Wood"; + player addMagazine "1Rnd_Arrow_Wood"; + player addMagazine "1Rnd_Arrow_Wood"; } else { localize "str_player_24" call dayz_rollingMessages; //Error }; } else { if (_emptymagslotcount > 0) then { - player removeMagazine "Quiver"; - player addMagazine "WoodenArrow"; - player addMagazine ["Quiver",_qty_quiverarrows-1]; + player removeMagazine "12Rnd_Quiver_Wood"; + player addMagazine "1Rnd_Arrow_Wood"; + player addMagazine ["12Rnd_Quiver_Wood",_qty_quiverarrows-1]; } else { localize "str_player_24" call dayz_rollingMessages; //Error }; diff --git a/SQF/dayz_code/compile/player_gearSet.sqf b/SQF/dayz_code/compile/player_gearSet.sqf index f042172a0..89e4f9254 100644 --- a/SQF/dayz_code/compile/player_gearSet.sqf +++ b/SQF/dayz_code/compile/player_gearSet.sqf @@ -19,7 +19,7 @@ if (count _inventory > 0) then { _val = -1; }; - if (_item == "BoltSteel") then { _item = "WoodenArrow" }; // Convert BoltSteel to WoodenArrow + if (_item == "BoltSteel") then { _item = "1Rnd_Arrow_Wood" }; // Convert BoltSteel to WoodenArrow if (dayz_classicBloodBagSystem) then { if (_item in dayz_typedBags) then { _item = "ItemBloodbag" }; } else { diff --git a/SQF/dayz_code/init/object_pickupAction.sqf b/SQF/dayz_code/init/object_pickupAction.sqf index 874bc9956..2fa8bd5e0 100644 --- a/SQF/dayz_code/init/object_pickupAction.sqf +++ b/SQF/dayz_code/init/object_pickupAction.sqf @@ -62,7 +62,7 @@ actionMonitor = { }; }; -if (_classname == "WoodenArrow") then { +if (_classname == "1Rnd_Arrow_Wood") then { [_holder,_type,_classname,_name] spawn actionMonitor; } else { s_player_holderPickup = _holder addAction [format[(localize "str_init_take"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true]; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 196eb1e10..c958f0b1f 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -680,7 +680,7 @@ class FSM " //Magazines" \n " _countr = 0;" \n " {" \n - " if (_x == ""BoltSteel"") then { _x = ""WoodenArrow"" }; // Convert BoltSteel to WoodenArrow" \n + " if (_x == ""BoltSteel"") then { _x = ""1Rnd_Arrow_Wood"" }; // Convert BoltSteel to WoodenArrow" \n " if (dayz_classicBloodBagSystem) then {" \n " if (_x in dayz_typedBags) then {_x = ""ItemBloodbag""};" \n " } else {" \n