From 0b357e10c60b4975cfcadf20456ec67aa86f8b86 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Jan 2016 20:53:57 -0600 Subject: [PATCH] 0.3.7.021 --- Changelogs/0.3.7.0.txt | 5 ++ .../@epochhive/addons/a3_epoch_server.pbo | Bin 367087 -> 368261 bytes .../addons/a3_epoch_server_settings.pbo | Bin 279472 -> 279816 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 13446 -> 13790 bytes Server_Install_Pack/sc/battleye/scripts.txt | 2 +- .../epoch_code/compile/EPOCH_consumeItem.sqf | 17 +++- Sources/epoch_code/license.txt | 9 ++ Sources/epoch_config/Configs/CfgMagazines.hpp | 78 +++++++++--------- Sources/epoch_config/Configs/cfgCrafting.hpp | 17 ++-- Sources/epoch_config/license.txt | 9 ++ Sources/epoch_language/license.txt | 9 ++ .../EPOCH_server_loadBuildings.sqf | 2 +- .../epoch_bases/EPOCH_server_maintBUILD.sqf | 29 +++++-- .../epoch_player/EPOCH_server_loadPlayer.sqf | 11 ++- .../epoch_player/EPOCH_server_savePlayer.sqf | 4 +- .../EPOCH_server_unpackBackpack.sqf | 11 ++- Sources/epoch_server/init/server_compiles.sqf | 11 +-- Sources/epoch_server/license.txt | 9 ++ Sources/epoch_server_core/license.txt | 9 ++ Sources/epoch_server_settings/license.txt | 9 ++ 20 files changed, 175 insertions(+), 66 deletions(-) create mode 100644 Sources/epoch_code/license.txt create mode 100644 Sources/epoch_config/license.txt create mode 100644 Sources/epoch_language/license.txt create mode 100644 Sources/epoch_server/license.txt create mode 100644 Sources/epoch_server_core/license.txt create mode 100644 Sources/epoch_server_settings/license.txt diff --git a/Changelogs/0.3.7.0.txt b/Changelogs/0.3.7.0.txt index 1dfcf489..c45d2f7b 100644 --- a/Changelogs/0.3.7.0.txt +++ b/Changelogs/0.3.7.0.txt @@ -2,6 +2,7 @@ [Added] Repack magazines feature. Simply select a magazine and press the "Repack" button. [Added] 55 Gallon (210 liters) Fuel Barrel that can be used to refill/siphon vehicles. (Full - ItemBarrelF,Empty - ItemBarrelE). [Added] Ability to siphon fuel from other fuel sources like gas stations and gas tanks. +[Added] Crafting Burlap from Hemp. [ADDED-WIP] Pack/unpack empty backpacks into carryable magazine items. [ADDED-WIP] Hotwire Kit (ItemHotwire). [ADDED-WIP] Key Makers Kit (ItemKeyKit). @@ -15,6 +16,9 @@ [ADDED-WIP] Copper Bars (ItemCopperBar). [ADDED-WIP] Tin Bars (ItemTinBar). [ADDED-WIP] Plywood sheets in small and large stacks (ItemPlywood,ItemPlywoodPack). +[Changed] Drinking Alcohol increases the new "Alcohol" stat instead of directly effecting blood pressure. +[Changed] Crafting Hesco barrier now require 3x Burlap. +[Changed] Crafting wood and meta spike traps now require 2x Sticks. [Changed] Change all publicVariableServer calls to use remoteExec calls for better performance. [Fixed] Prevented death just after revive due still having high blood pressure. [Fixed] Incorrectly being able to sell/buy items from a dead trader. @@ -29,5 +33,6 @@ [Changed] Driver or passengers of a driverless can now control vehicle locks. Also only the owner can control locks from outside of a occupied vehicle. [Changed] Commented out Halloween masks from loot tables. [Updated] New Battleye remoteExec.txt for added remoteExec calls. +[Fixed] Player positions in database now use Epoch precision position functions this fixes loading issues noticed in testing. [Fixed] When killed instead of saving blank array delete (object,trader,vehicle) data from database. [Info] Removed old .bikey and added new one for 0370. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index b733851856bdf3cb2a5ecf9e8eb11b90d2fb23bd..8c8b4e3c7a1add4b67b8aa7c58bf65bb40081df2 100644 GIT binary patch delta 1372 zcmZWpT}&KB9B1a1!@Kh+9|s5(JB32PUinmm*BIMUQlZcyoEJ^KuEX7Mw{&-ByE|7v ztu!VLZD5Bg@4i!O=y@lq1?1^Zx9A4rYCq=`Z_245QM>>gj*NhUM%`~T+u zIse%x)L#9v_SRp(|NV-cI8tr@>}%%wGAy?b!?6DYft7?kEO{FS`MujvDo}W(%>Uri zd}1|f{}4RHzxW$g*@uH`{$VGd=qndki+wbd_OHtM1d_zDuCNq(J>ZKi=I#A8GyZq2 zeByeS{b9`#Qk4|ZEz-eeSjpZY-?0;YprnLf_xb7zdhJK$AvAsgn^eb)njBAoNa0}1 zk5&A00{R{iRi4NxYFg1VXap-d6O&g?f=&C`)@m;_B^(R~kr)FrSTj@-E1m+Kov2?` zh|bX1KsXo(oRe8rv7*RO@hmZ;NY=L0_0ycrqG-UNsjO@e(-MBEae9I1Nn{d@GBPkj zQs`V0$IGy8t|{7+Ji2Xj6q{HhjF@d!yD%IGct(&#RFYz-D~8UV7#ir0qa$btYZ@^T zotP4mqKmH6|KWGX(0F`o@XRT}ANAZsXSet}nqMxe?%6}#&I?Mpkv!r>?;ffbBpTfc z5_wVb4iz*G8>VszGa|y2i#|3*n`A?sHQm)qm6xY&^p(Mr?$)zNJdU_Eu2SZr_8+Yg zKKB6Bb`0uiGUGy*uxYugB`Us6D^{Z4oHZC7Ry2j#=f8^bxr?yAa4qJ1>nuoM5%6On z*vwagu-pD8+Q1jylS=u45G>`V{a~KIB!Sig)6`VcmVr|Qi43-MH;LlzVoCehp++uC zprV1MFjJ_$%Tl+Hr1PC0JRRYi9iYyo?rYbnsbO^lXYiYfPORN4{}Uvg-y6We-io#i zVFtC1$A^)ZwfDzhJ#Rb%qRz+}&|F`gR&YjEX$D!$Z1alV?r0g{2mE3dB<#pW4ZnOJ zRPo=k;7NbrvUp$t{&Qe+kxUcJ6Bldoc|TB zLg$71a9Jt~2Sv58$#2w1Pt2orD5lRr>r&qLV(}S`&@`H)COR%sg?dpqm}Sg}b#@ZB zlQf#{NKq{uoR}@P7INuvf(2yXYia3sTPU6-;?e3%bg6~tByu|x850y?lc1bH>rZSQ9%J2Rn yqB~vJ4U>wFM>+9p@f#;gb*K4HY4PJo`!AoovGMTgPgB+JT>Gr@sgiDa)BYDL1I?ZQ delta 841 zcmYk2ZAep57{@th^R`{v(mCh5o;DR~xoI!v3qhoXqC%Ms!D!rVCwJX;uioAHf=Gmh z)CY|YbnsL3C4%}84!T5YQeU#5C_;$B3KB9EGs5sobljvo@Nk~zcmB`+Jm*}Qwyni& z4}Jme;ioQ-J%fDFIcU)wG!rK@aS?u>=V@w!nV&;G9)csgxTYT$JTIK&4PQ(<-a-p; z@{8P9d!ff}W~_wNrUtm5tK%N1XJuA=D)qckH*(}U$;<5LB;xjbb(4wADZ0k#a^hpQ zTV`sB0BgLtWZqJM*g6pt!vRt1L@k0SsVq$V7WNI$GeO{RwFSi}>XVfaVtZKhV=0OQ zC?*B4f&^5jU_ljoF{+az5m}1T^bK9jCDfeMxsp~vRqd{EyZzf*e^Tm_l}`7zVbtv# zD3knUQow!KRqi(N$;QS=w<7oA2$s|+5~Ki<737O`UKIQBcC7~47=Bq&710+{MK%Ev zlnjjeaF|_#QLiW<60gKte{+j#=s2OOQq1wSzQbnJy;dUR(Tktu{wb z{Q*{byb5r1%nr4vjZq<4U zK<*)W@0p$_Pd*w_OuW%(q!q(3e>Z!oga#A9sC_;S962dok=c`;M^@q-$)hb@;597_ zfi?=N^j7Lx0qJxi1o90-wXDnA*FbK+%AjN!WYEPBXw@?mq?e0eF6~+c{HPEHnh=J= zt=z%N>Z;0e?fVQIw9%n?n5voPVWx#%-Gr4lXP}vezQMMC73nbSp;=4tqmuk$U>(H>-tHZ*0iB7y=#Szp`Nnk8}BDukJe}F$b`PMcHu8; CoFljZ diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index cefca4ffdcc8a7e81bdda652b4505eec95028709..4380a5bc7acf9b7d35848e870ef02a6cd2bbcfea 100644 GIT binary patch delta 349 zcmdncF4)l}I3YyIddJi-7X}7~^z~Cgvbp&wddc~@yj)3@3JB#Psfj?L=?j%uRGoRb zc)3C{QWb#CElJHQDOSi&Qz*&EELJE;%2!A%N>wP$OGzyP3Z(*V$;rtt&&*3#fI8j^ zV%hZlPno=8yi-#PAUe}Bb5a!&^MK9*F)~sUfd&*SlxLP?C?uAY6lErrmSpDVDP-oA qBqo=D-Cj_XUjVeE6c`>1!IwjC)va&7{aj39+s2e7@t;2}IR^mc_jPjs delta 105 zcmeC^65P-(I3Yx-$#g=P3j+f~a(-S~X1ZQ-K>?7106^)DWirf@H#3V&KE`a$W@Kh* wVQSIL%+k)x!U)7nK+L?InT2JCy(q&?{VNr*4z+jWZ-`v|rnt)ebl;p~0K-Wh_y7O^ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index 5ef9093ddbe7d8b8648a472bc554f15f7e372388..125fb19ae81e95f5c260d2ed66118a3497da47ab 100644 GIT binary patch delta 300 zcmZq6yqCRUHty{f$hGOihi< z81jJXLBO>jKRH9eH$O!oEx$;?u_!lD!B~NpE2E^Oz)D{~6(pORpQ4wXpUcaYRH=Ya z9+H{}6q?+qt?JCn#mg0vk*biKpI4HaS5mBypQccfky)%zkd&{GSd^+znwOGV1QbdI zT9T8KU!Iwlt^jqc6~wN|f*f8k-l?et5RGY>IjIVXc|b>j7#XRFK>fuE<(VZJ3W+5p zMVU#ZC7Jno3YmE&iOD5kmlqV}7Xa-j1$v+1%HB33*DcFZ3u9*AJs9+d=TyC969DJA BV^9D9 delta 57 zcmcbY-IlpwHxt{@wN+t7Oq(AvEihCyurRf-Fg0e#V`6{+le#K#fr2Wnd72k?U-y%4 JX5clS0{}ej5-$J% diff --git a/Server_Install_Pack/sc/battleye/scripts.txt b/Server_Install_Pack/sc/battleye/scripts.txt index d74820c9..05481760 100644 --- a/Server_Install_Pack/sc/battleye/scripts.txt +++ b/Server_Install_Pack/sc/battleye/scripts.txt @@ -51,7 +51,7 @@ 7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\"" 7 addMPEventHandler 7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !"[\"FiredNear"\" !"[\"EpeContactStart"\" !"[\"GetOut"\" !"[\"local"\" !"[\"PostReset"\" !"[\"TaskSetAsCurrent"\" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" -7 displayAddEventHandler !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" +7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" 7 ctrlAddEventHandler !"rCfg >> \"refreshDelay\");" !" [\n\"draw\"," !" [\"buttonclick\"," !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" 7 removeAllEventHandlers !="ctrlRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="_display46 displayRemoveAllEventHandlers 'KeyDown';" 7 removeAllMissionEventHandlers diff --git a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf b/Sources/epoch_code/compile/EPOCH_consumeItem.sqf index 7cfd4ef7..0b09e28e 100644 --- a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf +++ b/Sources/epoch_code/compile/EPOCH_consumeItem.sqf @@ -61,8 +61,6 @@ _giveAttributes = { _return = format["Immunity: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerImmunity, 100]; }; case 6: { - // EPOCH_playerToxicity = ((EPOCH_playerToxicity + _data) min 100) max 0; - // new random tox _randomData = round(random _data); EPOCH_playerToxicity = ((EPOCH_playerToxicity + _randomData) min 100) max 0; _return = format["Toxicity: %1%2 (%3/%4)
", _addPlus, _randomData, EPOCH_playerToxicity, 100]; @@ -72,6 +70,7 @@ _giveAttributes = { _return = format["Stamina: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerStamina, EPOCH_playerStaminaMax]; }; case 8: { + // this is handled server side //EPOCH_playerCrypto = ((EPOCH_playerCrypto + _data) min 25000) max 0; //_return = format["Krypto: %1%2 (%3)
", _addPlus, _data, EPOCH_playerCrypto]; }; @@ -79,6 +78,20 @@ _giveAttributes = { EPOCH_playerBloodP = ((EPOCH_playerBloodP + _data) min 190) max 0; _return = format["Blood Pressure: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerBloodP, 100]; }; + case 10: { + EPOCH_playerKarma = ((EPOCH_playerKarma + _data) min 50000) max -50000; + _return = format["Karma: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerKarma, 50000]; + }; + case 11: { + EPOCH_playerAlcohol = ((EPOCH_playerAlcohol + _data) min 100) max 0; + _return = format["Alcohol: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerAlcohol, 100]; + }; + case 12: { + EPOCH_playerRadiation = ((EPOCH_playerRadiation + _data) min 100) max 0; + _return = format["Radiation: %1%2 (%3/%4)
", _addPlus, _data, EPOCH_playerRadiation, 100]; + }; + + }; }; _return diff --git a/Sources/epoch_code/license.txt b/Sources/epoch_code/license.txt new file mode 100644 index 00000000..35440e4b --- /dev/null +++ b/Sources/epoch_code/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. \ No newline at end of file diff --git a/Sources/epoch_config/Configs/CfgMagazines.hpp b/Sources/epoch_config/Configs/CfgMagazines.hpp index 318f3e68..7418327e 100644 --- a/Sources/epoch_config/Configs/CfgMagazines.hpp +++ b/Sources/epoch_config/Configs/CfgMagazines.hpp @@ -31,7 +31,7 @@ class CfgMagazines mass = 1; interactAction = 2; interactText = "DRINK"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,500,0,0,0,0,0,0,0}; }; class 1Rnd_Food: CA_Magazine @@ -44,7 +44,7 @@ class CfgMagazines mass = 1; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,600,0,0,0,0,0,0,0,0}; }; @@ -145,7 +145,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\soda_redbull.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_soda_rbull_CA.paa"; mass = 1; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,1000,0,0,0,0,100,0,0}; }; class ItemSodaOrangeSherbet : 1Rnd_Soda{ @@ -154,7 +154,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\soda_sherbet.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\soda_orangesherbet_ca.paa"; mass = 1; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,800,0,0,0,0,75,0,0}; }; @@ -164,7 +164,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\soda_purple.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\soda_purple_equip_ca.paa"; mass = 1; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 0, 800, 0, 0, 0, 0, 75, 0, 0 }; }; class ItemSodaMocha : 1Rnd_Soda{ @@ -173,7 +173,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\soda_mocha.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\soda_mocha_equip_ca.paa"; mass = 1; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 0, 650, 0, 0, 0, 0, 150, 0, 0 }; }; class ItemSodaBurst : 1Rnd_Soda{ @@ -182,7 +182,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\soda_burst.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\soda_burst_equip_ca.paa"; mass = 1; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 0, 800, 0, 0, 0, 0, 75, 0, 0 }; }; @@ -194,7 +194,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\trout.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_rainbowtrout_CA.paa"; mass = 5; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 300, 0, 0, 0, 0, 5, 0, 0, 0 }; }; class ItemSeaBass : 1Rnd_Food{ @@ -204,7 +204,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\seabass.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_seabass_CA.paa"; mass = 10; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 500, 0, 0, 0, 0, 10, 0, 0, 0 }; }; class ItemTuna : 1Rnd_Food{ @@ -214,7 +214,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\tuna.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_tuna_CA.paa"; mass = 50; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 2500, 0, 0, 0, 0, 0, 0, 0, 0 }; }; class ItemTroutCooked : 1Rnd_Food{ @@ -224,7 +224,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\trout_cooked.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_trout_cooked_CA.paa"; mass = 5; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 600, 0, 0, 0, 0, 0, 0, 0, 0 }; }; class ItemSeaBassCooked : 1Rnd_Food{ @@ -234,7 +234,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\seabass_cooked.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_seabass_cooked_CA.paa"; mass = 10; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 1200, 0, 0, 0, 0, 0, 0, 0, 0 }; }; class ItemTunaCooked : 1Rnd_Food{ @@ -244,7 +244,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\tuna_cooked.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_tuna_cooked_CA.paa"; mass = 50; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0 }; }; @@ -254,7 +254,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets_1\models\biomeat_can.p3d"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_biomeat_CA.paa"; descriptionShort = "Bio Meat: A very good source of nutrition, and a very high chance of infection. Eat at own risk."; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,1000,0,0,0,0,7,0,0,0}; }; @@ -264,7 +264,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets\models\meeps.p3d"; picture = "\x\addons\a3_epoch_assets\textures\candy\equip_meeps_ca.paa"; descriptionShort = "Pumpkin marshmallow candy"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,500,0,0,0,0,0,0,0,0}; }; class FoodSnooter : 1Rnd_Food{ @@ -273,7 +273,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets\models\snooter.p3d"; picture = "\x\addons\a3_epoch_assets\textures\candy\equip_snooters_ca.paa"; descriptionShort = "Not hungry? grab a Snooters"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,500,0,0,0,0,0,50,0,0}; }; class FoodWalkNSons : 1Rnd_Soda{ @@ -282,7 +282,7 @@ class CfgMagazines model = "\x\addons\a3_epoch_assets\models\walkinson.p3d"; picture = "\x\addons\a3_epoch_assets\textures\candy\equip_walkinson_ca.paa"; descriptionShort = "Stuck walkin' grab a Walk N' Sons Soda"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,1200,0,0,0,0,150,0,0}; }; @@ -493,7 +493,7 @@ class CfgMagazines interactReturnOnUse = "ItemCoolerE"; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0 }; }; @@ -811,7 +811,7 @@ class CfgMagazines mass = 4; interactAction = 9; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,0,100,0,0,0,0,0,0}; }; class EnergyPackLg : CA_Magazine @@ -828,7 +828,7 @@ class CfgMagazines mass = 40; interactAction = 9; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,0,1000,0,0,0,0,0,0}; }; @@ -853,8 +853,8 @@ class CfgMagazines mass = 1; interactAction = 2; interactText = "DRINK"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP - interactAttributes[] = {0,0,800,0,0,0,-5,50,0,20}; + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation + interactAttributes[] = {0,0,800,0,0,0,-5,50,0,0,0,10,0}; }; class CircuitParts : CA_Magazine @@ -914,7 +914,7 @@ class CfgMagazines mass = 1; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,0,0,0,0,20,0,0,0}; }; class SnakeCarcass_EPOCH : CA_Magazine @@ -928,7 +928,7 @@ class CfgMagazines mass = 5; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 300, 0, 0, 0, 0, 10, 0, 0, 0 }; }; /* @@ -954,7 +954,7 @@ class CfgMagazines mass = 5; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,1200,0,0,0,0,0,0,0,0}; }; class RabbitCarcass_EPOCH : CA_Magazine @@ -968,7 +968,7 @@ class CfgMagazines mass = 5; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 300, 0, 0, 0, 0, 10, 0, 0, 0 }; }; class CookedRabbit_EPOCH : CA_Magazine @@ -982,7 +982,7 @@ class CfgMagazines mass = 5; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,1200,0,0,0,0,0,0,0,0}; }; class ChickenCarcass_EPOCH : CA_Magazine @@ -996,7 +996,7 @@ class CfgMagazines mass = 10; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 500, 0, 0, 0, 0, 25, 0, 0, 0 }; }; class CookedChicken_EPOCH : CA_Magazine @@ -1010,7 +1010,7 @@ class CfgMagazines mass = 10; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,2000,0,0,0,0,0,0,0,0}; }; class GoatCarcass_EPOCH : CA_Magazine @@ -1024,7 +1024,7 @@ class CfgMagazines mass = 20; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 500, 0, 0, 0, 0, 15, 0, 0, 0 }; }; class CookedGoat_EPOCH : CA_Magazine @@ -1038,7 +1038,7 @@ class CfgMagazines mass = 20; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,3000,0,0,0,0,0,0,0,0}; }; class SheepCarcass_EPOCH : CA_Magazine @@ -1052,7 +1052,7 @@ class CfgMagazines mass = 20; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 500, 0, 0, 0, 0, 15, 0, 0, 0 }; }; class CookedSheep_EPOCH : CA_Magazine @@ -1066,7 +1066,7 @@ class CfgMagazines mass = 20; interactAction = 1; interactText = "EAT"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,3000,0,0,0,0,0,0,0,0}; }; @@ -1438,7 +1438,7 @@ class CfgMagazines mass = 1; interactAction = 6; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 0, 0, 0, 0, 10, 0, -100, 0, -10 }; }; @@ -1453,7 +1453,7 @@ class CfgMagazines mass = 1; interactAction = 6; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 0, 0, 0, 0, 0, -50, 0, 0, 0 }; }; @@ -1468,7 +1468,7 @@ class CfgMagazines mass = 1; interactAction = 6; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = { 0, 500, 0, 0, 0, 0, 0, 50, 0, 0 }; }; @@ -1483,7 +1483,7 @@ class CfgMagazines mass = 1; interactAction = 6; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {0,0,0,0,-25,0,0,0,0,0}; }; class HeatPack: CA_Magazine @@ -1497,7 +1497,7 @@ class CfgMagazines mass = 1; interactAction = 7; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {1,0,0,0,0,0,0,0,0,0}; }; class ColdPack : CA_Magazine @@ -1511,7 +1511,7 @@ class CfgMagazines mass = 1; interactAction = 8; interactText = "USE"; - //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP + //Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation interactAttributes[] = {-1,0,0,0,0,0,0,0,0,0}; }; }; diff --git a/Sources/epoch_config/Configs/cfgCrafting.hpp b/Sources/epoch_config/Configs/cfgCrafting.hpp index df1c2604..1bc633f2 100644 --- a/Sources/epoch_config/Configs/cfgCrafting.hpp +++ b/Sources/epoch_config/Configs/cfgCrafting.hpp @@ -228,7 +228,7 @@ class CfgCrafting }; class ItemStick : Item { - usedIn[] = { "WoodClub","MeleeMaul", "CrudeHatchet", "KitFirePlace" }; + usedIn[] = { "WoodClub", "MeleeMaul", "CrudeHatchet", "KitFirePlace" , "KitSpikeTrap" , "KitMetalTrap" }; recipe[] = { { "WoodLog_EPOCH", 1 } }; previewPosition[] = {0.8,1,0.25}; previewScale = 0.4; @@ -236,7 +236,7 @@ class CfgCrafting }; class ItemKiloHemp : Part { - usedIn[] = { "ItemRope" }; + usedIn[] = { "ItemRope", "ItemBurlap" }; previewPosition[] = {0.796267,1,0.322762}; previewScale = 0.9; previewVector = 1.4; @@ -248,6 +248,13 @@ class CfgCrafting previewPosition[] = {0.8,1,0.35}; previewScale = 4; }; + class ItemBurlap : Item + { + usedIn[] = { "KitHesco3" }; + recipe[] = { { "ItemKiloHemp", 1 } }; + previewPosition[] = {0.8,1,0.35}; + previewScale = 4; + }; class MeleeMaul : Item { recipe[] = { { "ItemRock", 1 }, { "ItemStick", 2 }, { "ItemRope", 1 } }; @@ -681,7 +688,7 @@ class CfgCrafting class KitSpikeTrap : Kit { - recipe[] = {{"PartPlankPack",4}}; + recipe[] = {{"PartPlankPack",4},{"ItemStick",2}}; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; previewPosition[] = {0.797675,1,0.398882}; @@ -690,7 +697,7 @@ class CfgCrafting }; class KitMetalTrap : Kit { - recipe[] = {{"PartPlankPack",4}, {"ItemScraps",2}}; + recipe[] = {{"PartPlankPack",4}, {"ItemStick",2}, {"ItemScraps",2}}; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; previewPosition[] = {0.797675,1,0.398882}; @@ -747,7 +754,7 @@ class CfgCrafting }; class KitHesco3 : Kit { - recipe[] = { { "MortarBucket", 2 }, { "ItemCorrugatedLg", 2 } }; + recipe[] = { { "ItemBurlap", 3 }, { "MortarBucket", 2 }, { "ItemCorrugatedLg", 2 } }; nearby[] = { { "Workbench", "", "workbench", { 1, { "WorkBench_EPOCH" } }, 3, 1, 0, 1 } }; model = "\x\addons\a3_epoch_assets_3\CfgVehicles\Defense\hesco.p3d"; previewPosition[] = { 0.803749, 1, 0.448515 }; diff --git a/Sources/epoch_config/license.txt b/Sources/epoch_config/license.txt new file mode 100644 index 00000000..35440e4b --- /dev/null +++ b/Sources/epoch_config/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. \ No newline at end of file diff --git a/Sources/epoch_language/license.txt b/Sources/epoch_language/license.txt new file mode 100644 index 00000000..cd657ed1 --- /dev/null +++ b/Sources/epoch_language/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf index eb44fa65..0e022988 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf @@ -1,7 +1,7 @@ /* Author: Aaron Clark - EpochMod.com - Contributors: + Contributors: Skaronator Description: Load Buildings from Epoch Hive diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf index e9a31ff4..c8ded032 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf @@ -1,14 +1,31 @@ /* - Building Maintain - by Aaron Clark - EpochMod.com + Author: Aaron Clark - EpochMod.com - This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. - http://creativecommons.org/licenses/by-nc-nd/4.0/ + Contributors: Skaronator - Improvements and or bugfixes and other contributions are welcome via the github: + Description: + Building Maintain + + Licence: + Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike + + Github: https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf + + Example: + // Client RE + [_this, player, _maintainCount, Epoch_personalToken] remoteExec ["EPOCH_server_maintBUILD",2]; + + Parameter(s): + _this select 0: OBJECT - Jammer object + _this select 1: STRING - Player Object + _this select 2: STRING - Maintain count + _this select 3: STRING - Epoch Personal Token + + Returns: + NOTHING */ -private["_object", "_plyr", "_maintCount", "_plyrUID", "_counter", "_objSlot", "_objHiveKey", "_buildingJammerRange", "_current_crypto", "_cIndex", "_vars"]; +private ["_object","_plyr","_maintCount","_plyrUID","_counter","_objSlot","_buildingJammerRange","_current_crypto","_cIndex","_vars","_storSlot","_playerCryptoLimit","_config"]; _object = _this select 0; _plyr = _this select 1; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 9216b479..4aafd883 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -68,7 +68,7 @@ if (typename _this == "ARRAY") then { _normalMagazines = [_serverSettingsConfig, "normalMagazines", []] call EPOCH_fnc_returnConfigEntry; _weaponsAndItems = [_serverSettingsConfig, "weaponsAndItems", ["", []]] call EPOCH_fnc_returnConfigEntry; - diag_log format["DEBUG (Load Player) _linkedItems 1: %1", _linkedItems]; + if (count _arr < 11) then { // invaild format attempt to override _arr = [[0, [], _instanceID], [0, 0, 1, 0, []], [_goggles, _headgear, _vest, _backpack, _uniform, _class], [""], [] + EPOCH_defaultVars_SEPXVar, _weaponsAndItems, _linkedItems, _normalMagazines, _itemsInContainers, _weaponsInContainers, "", true]; @@ -77,11 +77,19 @@ if (typename _this == "ARRAY") then { _worldspace = _arr select 0; _dir = _worldspace select 0; _location = _worldspace select 1; + + if (count _location == 2) then{ + _location = (_location select 0) vectorAdd (_location select 1); + }; + _prevInstance = _worldspace select 2; _medical = _arr select 1; _server_vars = _arr select 3; _vars = _arr select 4; + diag_log format["DEBUG (Load Player) _worldspace 1: %1", _worldspace]; + diag_log format["DEBUG (Load Player) _location 1: %1", _location]; + _plyrGroup = _arr select 10; _canBeRevived = _arr select 11; @@ -257,6 +265,7 @@ if (typename _this == "ARRAY") then { // Add magazines {_newPlyr addMagazine _x} forEach _normalMagazines; + diag_log format["DEBUG (Load Player) _normalMagazines 1: %1", _normalMagazines]; // Load inventory + defaults END // Final Push diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf index c8e1e0b4..875a7f36 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf @@ -60,10 +60,10 @@ if (typeName _vars == "ARRAY") then { _group = _plyr getVariable ["GROUP", ""]; _revive = _plyr getVariable ["REVIVE", true]; - _pos = getPosATL _plyr; + _pos = (getposATL _plyr call EPOCH_precisionPos); if (vehicle _plyr != _plyr) then { - + _staticTraderLocationsDistances = []; { _staticTraderLocationsDistances pushBack [_x distance player, _x] diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf index 311465df..bedf06c6 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf @@ -13,20 +13,23 @@ https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf */ private ["_wHPos","_wH","_nearByHolder","_item","_player"]; +diag_log str(_this); _item = _this select 0; _player = _this select 1; if !([_player,_this select 2] call EPOCH_server_getPToken) exitWith {}; if (_item isKindOf "Bag_Base") then { _wH = objNull; _nearByHolder = nearestObjects [position _player,["groundWeaponHolder"],3]; + if (_nearByHolder isEqualTo []) then { _wHPos = _player modelToWorld [0,1,0]; - if (surfaceIsWater _wHPos) then { - _wHPos = ASLToATL _wHPos; - }; - _wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"]; + if (surfaceIsWater _wHPos) then { + _wHPos = ASLToATL _wHPos; + }; + _wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"]; } else { _wH = _nearByHolder select 0; }; + _wh addBackpackCargoGlobal [_item,1]; }; diff --git a/Sources/epoch_server/init/server_compiles.sqf b/Sources/epoch_server/init/server_compiles.sqf index c5b4926f..f42d60cd 100644 --- a/Sources/epoch_server/init/server_compiles.sqf +++ b/Sources/epoch_server/init/server_compiles.sqf @@ -32,6 +32,7 @@ EPOCH_server_deadPlayer = compileFinal preprocessFileLineNumbers "\x\ad EPOCH_server_revivePlayer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_revivePlayer.sqf"; EPOCH_server_storeCrypto = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_storeCrypto.sqf"; EPOCH_server_equippedItem = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_equippedItem.sqf"; +EPOCH_server_unpackBackpack = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_unpackBackpack.sqf"; EPOCH_server_loadTraders = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_traders\EPOCH_server_loadTraders.sqf"; EPOCH_server_spawnTraders = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_traders\EPOCH_server_spawnTraders.sqf"; EPOCH_server_makeTrade = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_trading\EPOCH_server_makeTrade.sqf"; @@ -62,9 +63,9 @@ EPOCH_server_traderKilled = compileFinal preprocessFileLineNumbers "\x\ad EPOCH_localCleanup = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_localCleanup.sqf"; EPOCH_server_createTeleport = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_server_createTeleport.sqf"; EPOCH_server_teleportPlayer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_server_teleportPlayer.sqf"; -EPOCH_Server_createObject = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createObject.sqf"; -EPOCH_server_airDropCrate = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_server_airDropCrate.sqf"; -EPOCH_server_fillContainer = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_fillContainer.sqf"; +EPOCH_Server_createObject = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createObject.sqf"; +EPOCH_server_airDropCrate = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_server_airDropCrate.sqf"; +EPOCH_server_fillContainer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_fillContainer.sqf"; EPOCH_server_handle_sapperObjs = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_antagonists\EPOCH_server_handle_sapperObjs.sqf"; EPOCH_Server_createAirDrop = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createAirDrop.sqf"; @@ -74,7 +75,7 @@ EPOCH_weightedArray = compileFinal ' _configName = _this select 1; _arrayName = _this select 2; _return = missionNamespace getVariable[format["EPOCH_LT_%1_%2_%3",_configName,_keyName,_arrayName],[]]; - if(_return isEqualTo[]) then { + if(_return isEqualTo[]) then { _lootTableArray = []; _weightedArray = []; { @@ -113,4 +114,4 @@ EPOCH_precisionPos = compileFinal ' ]; _high = _this vectorDiff _low; [_low, _high] -'; \ No newline at end of file +'; diff --git a/Sources/epoch_server/license.txt b/Sources/epoch_server/license.txt new file mode 100644 index 00000000..35440e4b --- /dev/null +++ b/Sources/epoch_server/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. \ No newline at end of file diff --git a/Sources/epoch_server_core/license.txt b/Sources/epoch_server_core/license.txt new file mode 100644 index 00000000..35440e4b --- /dev/null +++ b/Sources/epoch_server_core/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. \ No newline at end of file diff --git a/Sources/epoch_server_settings/license.txt b/Sources/epoch_server_settings/license.txt new file mode 100644 index 00000000..35440e4b --- /dev/null +++ b/Sources/epoch_server_settings/license.txt @@ -0,0 +1,9 @@ +Epoch Mod for Arma 3 +http://epochmod.com +by Epoch Mod Team +https://github.com/EpochModTeam/Epoch + +The contents of this pbo are under the following license: +http://www.bistudio.com/community/licenses/arma-public-license-share-alike + +Keep this file and file headers with attribution intact for proper use. \ No newline at end of file