From d277d6cd57f89e2956aafdb819c02a6f3cb317cd Mon Sep 17 00:00:00 2001 From: He-Man Date: Mon, 11 Nov 2019 19:03:21 +0100 Subject: [PATCH 1/3] Multiple same loot entries + typo --- README.md | 2 +- Sources/epoch_server_settings/configs/CfgLootTable.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6c074155..c4b2c637 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Starting a FAQ here. Can get expanded later - GroundSpawnChance - MinGroundContainers - MaxGroundContainers - - @epochhove\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype + - @epochhive\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype - lootMin - lootMax - I have added an item to the loot, but it will not spawn (rpt log say "have no price") diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index abfbf701..ac15c317 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -1773,10 +1773,7 @@ class CfgLootTable items[] = { { { "V_TacChestrig_grn_F", "item" }, 1 }, { { "V_TacChestrig_oli_F", "item" }, 1 }, - { { "V_TacChestrig_cbr_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 } + { { "V_TacChestrig_cbr_F", "item" }, 1 } }; }; class Backpacks_Low_Base From 297b2c04734b872b8769c3f972cf29c4b80c000e Mon Sep 17 00:00:00 2001 From: He-Man Date: Thu, 14 Nov 2019 19:41:57 +0100 Subject: [PATCH 2/3] Small fix for 3rd part scripts that use CargoSave on destroyed Vehicles --- .../epoch_vehicle/EPOCH_server_CargoFill.sqf | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf index 4d711b85..a468f52b 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf @@ -80,10 +80,22 @@ params [["_vehicle",objnull],["_items",[]]]; case 4: { _type = _x select 0; _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; - if !(_subContainers isequalto []) - then { + if !(_subContainers isequalto []) then { _subContainer = _subContainers select 0 select 1; [_subContainer,_x select 1] call EPOCH_server_CargoFill; + } + else { + if (_type isKindOf "Bag_Base") then { + _vehicle addBackpackCargoGlobal [_type, 1]; + } + else { + _vehicle addItemCargoGlobal [_type, 1]; + }; + _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; + if !(_subContainers isequalto []) then { + _subContainer = _subContainers select 0 select 1; + [_subContainer,_x select 1] call EPOCH_server_CargoFill; + }; }; }; }; From 7e07bebd20927cf12458bd52a433f7a5e6e3ef82 Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 24 Nov 2019 21:51:59 +0100 Subject: [PATCH 3/3] readd precise positions + Install Packs By a failure, precise positioning was missing. So Buildings / Storages / Vehicles can move a bit after first restart after build --- .../@epochhive/addons/epoch_server.pbo | Bin 538410 -> 539032 bytes .../addons/epoch_server_settings.pbo | Bin 763771 -> 763630 bytes .../epoch_bases/EPOCH_saveBuilding.sqf | 2 +- .../EPOCH_server_save_storage.sqf | 2 +- .../EPOCH_server_save_vehicle.sqf | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index aea9189db7f9ac21297111f9a2a04ecb1e22c511..8de105c24689437c067a738d816c57de8ecc11b2 100644 GIT binary patch delta 380 zcmZ4WPGQDpg$*4{e2Q!gV4(EwR;(i1uuNe-x>h7GP@bF7?nxVS=cVor{NYk)T)?a{eS#1R=X8Bl7D;xHn2v(s z^aa8pM{49$xX%E8)vbsXTub4H(1C5#H>Kfw%uSM`?IMc;->>k0#^iY R;o8o!WkZEgg8t?Gasc%pf8_uG delta 228 zcmbR7Sz*;Xg$*4{e4K0yVDLz{HI|cY@_T0G%{!TjxR@2BS8vwiwP0a8rSu~vkbCk* zA=%BHf>Sv7`nVt(Lbry-_Hj+#D5JVLK&p+IkCz=He&44xmX{qUt~HrYPJk~3YCg!A z6gH?Z`{r0V>G0+WrR@_+8G)E-`-D>Fgad56T%15K{i7*M%k+~bEIiZC`LVD~_wQ!r z+P=qvg*j#W^*Jo-+1lqVW&vVWAZFV>Z!!C`sUiv|a~@BwI2YIUdtue}=5VR?9KS>W DJcLW3 diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index aa093797de1e88a91c0f2fef9094fdc46cf6d43b..87dd52b1f5ae9f0d13576bb2d8175747007c89ce 100644 GIT binary patch delta 111 zcmex;PVe1Wy$yg@(In6#L;M{i^9m2H1Kml24W zfS4JGS%8=oh}nRc9f&!Am=lP(wm+WB-NGpn-#KQni=L+0RWar BE@S`z delta 116 zcmaENR`2&Yy$yoGDGR!={0hDB<-!E~m%%-hdxW$u-2 z51Y#f#7scU48$xz%nHP8K+F!r96-zo#9Z6M=5n`iij*ygKfWjQh&O6#MUb HiJk-iRy8fw diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf index 8c15b001..a79b10df 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf @@ -22,7 +22,7 @@ if !(isNull _this) then { _cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig; _this setDamage 0; _class = typeOf _this; - _worldspace = [getposworld _this, vectordir _this, vectorup _this, true]; + _worldspace = [getposworld _this call EPOCH_precisionPos, vectordir _this, vectorup _this, true]; _objHiveKey = format["%1:%2", (call EPOCH_fn_InstanceID), _objSlot]; _animPhases = []; { diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf index 39b5adb1..a86045b4 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf @@ -32,7 +32,7 @@ if (!isNull _vehicle) then { _colorSlot = _vehicle getVariable ["STORAGE_TEXTURE",0]; _storageOwners = _vehicle getVariable["STORAGE_OWNERS",[]]; _locked = if (_vehicle getVariable["EPOCH_Locked", true]) then {1} else {-1}; - _worldspace = [getposworld _vehicle, vectordir _vehicle, vectorup _vehicle, true]; + _worldspace = [getposworld _vehicle call EPOCH_precisionPos, vectordir _vehicle, vectorup _vehicle, true]; _VAL = [_class, _worldspace, _damage, _inventory, _colorSlot, _storageOwners, _locked]; ["Storage", _vehHiveKey, EPOCH_expiresBuilding, _VAL] call EPOCH_fnc_server_hiveSETEX; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf index 58613361..976aad06 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf @@ -37,7 +37,7 @@ if (!isNull _vehicle) then { _Textures = getObjectTextures _vehicle; }; - _VAL = [typeOf _vehicle,[getposworld _vehicle,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures]; + _VAL = [typeOf _vehicle,[getposworld _vehicle call EPOCH_precisionPos,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures]; ["Vehicle", _vehHiveKey, EPOCH_expiresVehicle, _VAL] call EPOCH_fnc_server_hiveSETEX; }; };