diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 9bb918b2d..e2a826787 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -1286,6 +1286,10 @@ class CfgWeight { weight = 1; }; + class Skin_Bandit2_DZ + { + weight = 1; + }; class Skin_BanditW1_DZ { weight = 1; @@ -1427,6 +1431,10 @@ class CfgWeight { weight = 5; }; + class ItemTentDomed + { + weight = 5; + }; class TrapBear { weight = 1; diff --git a/MPMissions/TEMPLATE/dynamic_vehicle.sqf b/MPMissions/TEMPLATE/dynamic_vehicle.sqf index a59409a60..81695b161 100644 --- a/MPMissions/TEMPLATE/dynamic_vehicle.sqf +++ b/MPMissions/TEMPLATE/dynamic_vehicle.sqf @@ -64,5 +64,10 @@ AllowedVehiclesList = [ ["AH6X_DZ",2], ["MTVR_DES_EP1",1], ["LandRover_MG_TK_EP1",1], - ["M1030_US_DES_EP1",1] + ["M1030_US_DES_EP1",1], + ["HMMWV_M1151_M2_CZ_DES_EP1",2], + ["HMMWV_M998A2_SOV_DES_EP1",2], + ["HMMWV_M1035_DES_EP1",2], + ["HMMWV_DZ",2], + ["HMMWV_Ambulance_CZ_DES_EP1",2] ]; \ No newline at end of file diff --git a/Server Files/Battleye/BEServer.dll b/Server Files/Battleye/BEServer.dll new file mode 100644 index 000000000..e1d74dbf8 Binary files /dev/null and b/Server Files/Battleye/BEServer.dll differ diff --git a/Server Files/Battleye/addbackpackcargo.txt b/Server Files/Battleye/addbackpackcargo.txt new file mode 100644 index 000000000..f5efa40a4 --- /dev/null +++ b/Server Files/Battleye/addbackpackcargo.txt @@ -0,0 +1 @@ +1 "" \ No newline at end of file diff --git a/Server Files/Battleye/addmagazinecargo.txt b/Server Files/Battleye/addmagazinecargo.txt new file mode 100644 index 000000000..acf3ec299 --- /dev/null +++ b/Server Files/Battleye/addmagazinecargo.txt @@ -0,0 +1,12 @@ +1 "" !="BoltSteel" !="WoodenArrow" !="5x_22_LR_17_HMR" !="10x_303" !="Binocular" !"item" !"trash" !"food" !"hand" !"part" !"rnd_" !"swing" !"skin" !"smoke" +1 "Item" !="ItemSodaEmpty" !="ItemSodaPepsi" !="ItemBandage" !="ItemHeatPack" !="ItemMorphine" !="ItemWaterbottle" !="ItemWaterbottleUnfilled" !="ItemWaterbottleBoiled" !="ItemToolbox" !="ItemKnife" !="ItemWatch" !="ItemCompass" !="ItemJerrycan" !="ItemSodaCoke" !="ItemEpinephrine" !="ItemPainkiller" !="ItemBloodbag" !="ItemWire" !="ItemMatchbox" !="ItemMap" !="ItemAntibiotic" !="ItemFlashlightRed" !="ItemFlashlight" !="ItemJerrycanEmpty" !="ItemSodaMdew" +1 "trash" !="TrashTinCan" !="TrashJackDaniels" !="ItemTrashToiletpaper" !="ItemTrashRazor" +1 "food" !="FoodCanSardines" !="FoodSteakCooked" !="FoodCanFrankBeans" !="FoodSteakRaw" !="FoodCanPasta" !="FoodCanBakedBeans" !="FoodmeatRaw" !="FoodbeefRaw" !="FoodmuttonRaw" !="FoodchickenRaw" !="FoodrabbitRaw" !="FoodbaconRaw" !="FoodSteakCooked" !="FoodmeatCooked" !="FoodbeefCooked" !="FoodmuttonCooked" !="FoodchickenCooked" !="FoodrabbitCooked" !="FoodbaconCooked" !="FoodBioMeat" !="FoodCanUnlabeled" !="FoodPistachio" !="FoodNutmix" !="FoodMRE" +1 "hand" !="HandChemBlue" !="HandChemRed" !="HandChemGreen" !="HandRoadFlare" +1 "part" !="PartFueltank" !="PartWoodPile" !="PartWheel" !="PartEngine" !="PartGeneric" !="PartGlass" +1 "swing" !="Hatchet_Swing" !="Crowbar_Swing" !="Machete_Swing" +1 "Skin" +1 "smoke" !="SmokeShell" !="SmokeShellGreen" !="SmokeShellRed" +1 "rnd" !="8Rnd_9x18_Makarov" !="30Rnd_545x39_AK" !="30Rnd_556x45_Stanag" !="30Rnd_762x39_AK47" !="7Rnd_45ACP_1911" !="6Rnd_45ACP" !="2Rnd_shotgun_74Slug" !="2Rnd_shotgun_74Pellets" !="8Rnd_B_Beneli_74Slug" !="8Rnd_B_Beneli_Pellets" !="15Rnd_9x19_M9" !="15Rnd_W1866_Slug" !="30Rnd_9x19_MP5" !="17Rnd_9x19_glock17" +//1 "ItemSodaMdew" +//1 "ItemBloodbag" diff --git a/Server Files/Battleye/addweaponcargo.txt b/Server Files/Battleye/addweaponcargo.txt new file mode 100644 index 000000000..4cbd4cb88 --- /dev/null +++ b/Server Files/Battleye/addweaponcargo.txt @@ -0,0 +1,2 @@ +1 "" !="Makarov" !="revolver_EP1" !="Colt1911"!="Winchester1866" !=LeeEnfield" !="AK_74" !="Crossbow" !"item" +1 "Item" !="ItemKnife" !="ItemGps" !="ItemEtool" !="ItemMap" !="ItemCompass" !="ItemWatch !="ItemFlashlightRed" !="ItemFlashlight" diff --git a/Server Files/Battleye/attachto.txt b/Server Files/Battleye/attachto.txt new file mode 100644 index 000000000..f5351162e --- /dev/null +++ b/Server Files/Battleye/attachto.txt @@ -0,0 +1,78 @@ +1 "" !="VaultStorageLocked" !="Hedgehog_DZ" !="Sandbag1_DZ" !="Fort_RazorWire" !="WoodGate_DZ" !="Land_HBarrier1_DZ" +5 "Offroad_DSHKM_Gue" +5 "Old_moto_TK_Civ_EP1" +5 "MMT_Civ" +5 "Old_bike_TK_INS_EP1" +5 "Old_bike_TK_CIV_EP1" +5 "TT650_Ins" +5 "TT650_Civ" +5 "TT650_TK_CIV_EP1" +5 "ATV_US_EP1" +5 "hilux1_civil_3_open_EP1" +5 "hilux1_civil_2_covered" +5 "datsun1_civil_3_open" +5 "Pickup_PK_TK_GUE_EP1" +5 "VWGolf" +5 "Lada1" +5 "Lada2" +5 "LadaLM" +5 "Lada2_TK_CIV_EP1" +5 "Skoda" +5 "SkodaGreen" +5 "SkodaRed" +5 "SkodaBlue" +5 "car_sedan" +5 "car_hatchback" +5 "policecar" +5 "GLT_M300_LT" +5 "GLT_M300_ST" +5 "Volha_1_TK_CIV_EP1" +5 "Volha_2_TK_CIV_EP1" +5 "VolhaLimo_TK_CIV_EP1" +5 "UAZ_Unarmed_TK_EP1" +5 "UAZ_RU" +5 "UAZ_INS" +5 "UAZ_CDF" +5 "Ikarus" +5 "SUV_TK_CIV_EP1" +5 "SUV_Green" +5 "SUV_Yellow" +5 "SUV_White" +5 "SUV_Silver" +5 "SUV_Red" +5 "SUV_Pink" +5 "SUV_Orange" +5 "SUV_Charcoal" +5 "SUV_Blue" +5 "UH1H_DZ" +5 "Mi17_Civilian_DZ" +5 "Mi17_DZ" +5 "LandRover_CZ_EP1" +5 "HMMWV_Ambulance" +5 "HMMWV_DES_EP1" +5 "HMMWV_Ambulance_CZ_DES_EP1" +5 "PBX" +5 "Zodiac" +5 "RHIB" +5 "Fishing_Boat" +5 "Smallboat_1" +5 "Smallboat_2" +5 "KamazRefuel" +5 "UralRefuel_TK_EP1" +5 "MtvrRefuel_DES_EP1" +5 "Ural_UN_EP1" +5 "Ural_TK_CIV_EP1" +5 "Ural_CDF" +5 "Kamaz" +5 "tractor" +5 "CSJ_GyroP" +5 "S1203_ambulance_EP1" +5 "S1203_TK_CIV_EP1" +5 "MH6J_DZ" +5 "AH6X_DZ" +5 "MTVR_DES_EP1" +5 "LandRover_MG_TK_EP1" +5 "M1030_US_DES_EP1" +5 "V3S_Civ" +5 "Parachute" +5 "VaultStorage" !"VaultStorageLocked" \ No newline at end of file diff --git a/Server Files/Battleye/bans.txt b/Server Files/Battleye/bans.txt new file mode 100644 index 000000000..430046822 --- /dev/null +++ b/Server Files/Battleye/bans.txt @@ -0,0 +1,262 @@ +b57cb4973da76f4588936416aae2de05 -1 Script Detection: Gerk +8ac69e7189ecd2ff4235142feff0bd26 -1 Script Detection: setVehicleInit DoThis; +1c8aa5e919c37da5f3a2b13a2cf69aff -1 Script Detection: Really? tupidmistake.sqf? Don't come back. +deb593123be01dbde1c7edea7faabd32 -1 Cheats +4e99bd0d34e40ed468b0f77d35e3f618 -1 Cheats +55a38ff775b4042e33b01c2c66bb18a7 -1 Cheats +1d1a1d581fa6727c3640f12ca5672154 -1 Teleport +cd50fd48f878b9c15472204836f6108a -1 Teleport +7370eda2cdb1ed2d4d01c73c70c0b1ab -1 Teleport +9537ef4af92ef79991215e244a0daf03 -1 Way to many detections to count +f0db022e291f756199bf6dea4e91a152 -1 Setting of markers... +04978068af921920cdff09a995ce0007 -1 Teleporting is lame +957bb08c4d1a85e35f712375683eddc6 -1 Script Detections +b3a63ced51adc8b4c24d2d243f685796 -1 Script Detections +4aa19ffbf656e6f94a618bfcfe2219e7 -1 Teleporting +531f730c87aaa40b75564b7813f67a41 -1 Birds up to you as well. +9d68913c949b9773e202d6bd8d30cfaf -1 Script Detections +3c7c89290e244eafc17a0ec7153d3606 -1 Loki's is bad for you. +342e03ec351f8e2664698e48dccdb388 -1 Loki's is bad for you. +7583fbacc8e4309ac83052e85556e2e0 -1 Loki's is bad for you. +af63f3e7add71f951e9526a7d97cc79b -1 Alex and gerk don't mix. Try again. +695c315c58bde550c6847af10c065607 -1 Loki's is bad for you. +7583fbacc8e4309ac83052e85556e2e0 -1 Loki's bad, but jesus is good. +f6226e9b7f31b5982e6d92e9b1c5359e -1 Seriously fuck off +dd0eff0cb64efbd6b67f33fdd1d19c0f -1 Loki's +f01db0c943869c0816126ebfd9eb654b -1 Setting of markers +b46a987d0dc2e38ec986db493ff3d573 -1 Executing commands not in DayZ +76adee3079fb1303f210666e7dee98ea -1 Loki's +e12d13c38d5dd8ab5372d13cf848576c -1 Loki's +e12d13c38d5dd8ab5372d13cf848576c -1 Setting of markers +95444d83792ad402e7dfe7dff6317694 -1 Questional Code contact DayZ +9f3370c39061e203729fca670fe5413f -1 Lol adding AA12 +535e4bf8d28caf27d8bdead88c07412d -1 Execution of Code +0989b356813259607b669f7b752a2619 -1 Alex/Gerk +eb2cd1b519d38afc4e2d5fb76a91bd25 -1 Birds up to you as well. +4ffe46696948ff335540d6da08923efa -1 Jesus doesn't use Loki's +4f3b9c4c1a8815b4ef96c5fd66eeaa1a -1 Denied. +de3af396d11adb4e1b72758c1e8f2a58 -1 Adding weapons to everyone. +1a5969de65add8f9e4fb7c2a3deafa4a -1 Adding of markers and other stuff. +d53007dbeb48d6f595b8d5c4259e64c6 -1 Setting markers +d9d8bfa34e7c4d904de920e8cb061bbc -1 Go away. +f9d82f22a1155c74680c5d57b3d68c8d -1 No cheat for you! +c983952a088c046383ba3d9b613b260f -1 No cheat for you! +d9d8bfa34e7c4d904de920e8cb061bbc -1 Teleporting can make you sick. +4a2386b96300aef49dd1b33a447c9cab -1 Cheating makes you sick. Should get it checked out. +d0001829a1ebcb2897549858c411ecba -1 Cheating makes you sick. Should get it checked out. +f9d82f22a1155c74680c5d57b3d68c8d -1 Cheats are bad mmmmkkkkk. +382578c33306e1615f645a537194edbf -1 cheating is wrong +e926dde0288f284eac7c0398211469c8 -1 Cheating, shame on you. +086aca59819ba7cbe1cd8f259ee0a9bc -1 Cheating +90a36b532c195466388b36958f187c5b -1 You mad bro? +e93ec7c0b5c89080f751c003a8ed2788 -1 You mad bro? +6386f3636c438bee10384e00c59cb362 -1 You mad bro? +9ce6db3136265b858964d07d22619a95 -1 You mad bro? +90d5d07366c53ea3f6f98b54be24d8a6 -1 You mad bro? +6d3f0676cb33419a8c523b52014bef6b -1 You mad bro? +b97161c2fb7235a20517a7f8da70d4e2 -1 spawning ammo crates +b53c09df43954b00b04c96bf2d1af366 -1 same shit different GUID. +1a5eed054e5f843522b00d09814ead4c -1 Such a failure to life. +70cf145f47f499d743d49b079bda9284 -1 TKC is for skiddies. +9f3370c39061e203729fca670fe5413f -1 Same stuff new GUID. +115f39a32dc86cc981b4babbf418f120 -1 No ammo for you! +882fb01ed3b766a33a78c5442f305b8d -1 TKC Blows bro +6121fe7b1ba57d6cc75c6afd22493c7d -1 Idiot +fbb0a8401a555b2042920d85b0cc21f6 -1 Spawning ammo boxes +19ba7ae749b25ebe492c833681044837 -1 Teleporting +dc2362f6565fa66705d2ad1923ff6fdc -1 Get lost bro +b9bb632f835c65183e8ff5b8cec5c632 -1 Yeah.. Banned... +faae2a8a8ab50beed469a40f953ae588 -1 No markers for you +21a19e1142119eef41594dbc43fa3878 -1 Script kiddie trolol. +d9dc6709c314e95ce173f2a94bddbfd6 -1 You've been trolled. +dd16060daaa73b57171fa85659197179 -1 You have probably been trolled +dc683b0f84a3942805133f66c8b9ab1d -1 My kungfu is strong +bf50d8aa2b5f65810c5231cc8271c199 -1 You have been detected with an STD. +d2aba4141792b06813bc7c25b1d29d4b -1 Guess who's back! +455c180dc23c11e888fd893ae15d8f7d -1 Giggity ban bro. +19ba7ae749b25ebe492c833681044837 -1 I like puddin and being an asshole. +a28703aa42af5367252edf29cd5e6794 -1 Yet another ban yay. +4a2386b96300aef49dd1b33a447c9cab -1 Love those bans! +e0a73089dbba1de5c9b7481e9efa7041 -1 He has crabs. +f882fa2a0d02ba6995b20152b7bee781 -1 Running out of ban reasons. +5ce90e28c21e71b76ca17a1a8946e6ed -1 Dont know what to say +4eca1302efe45aa1c9fbe0b5577c1725 -1 How cute. +dec49607ac619c6bd574504e0d5f1231 -1 Sexy butt +dd16060daaa73b57171fa85659197179 -1 script kiddie +d054ba6ef7b566fa670992311ea3a852 -1 script kiddie +e65cc8ba55e54c988f3d80ac6b12f70f -1 script kiddie +233f71eb781bfabb95733d179b4cd15c -1 markers + the rest +6f0e679649f800d5dd0957acef5e95c9 -1 markers +fc5ed89b5bedd564a1dae8f758bb83de -1 markers +adee0dfbea37da9980900209cbf14cb5 -1 markers +98df9a98cd938460f65c124a7c15594b -1 script kiddie +0a60cdbf6c70807a2433dd2189df049c -1 spawning crates + the rest +d3022b6a40b5f14fa4cdf2c7d920493c -1 crate spawning +dfdad159bf46a3fc12bc4f197fcfde2a -1 scripts +d551f3219f26595009be63c7425b6a9c -1 markers +1a248f29aaa37bc4c345012861003bc8 -1 Next time you stream dont let your GUID be shown +8889b1db6bfc88a8bfae0f9f9a2048da -1 You should know why Mr. Cheater +1b3e79fc7f70b462286087d9936f40e2 -1 Love banning you people. +d292dc20cfa3f43f08ebdfd0ba7f55ee -1 Dreaded cheater bans huh? +aa3e39d97b8e11c7cbfda8c106079b19 -1 Hey Clarence we got another cheater! +c0a10b12edaca6ee4b37ceb1fcb5336a -1 No surprise just another ban. +1dd7d7d71969c6d98bc5aff5d4182414 -1 We dont like cheaters be gone satan! +6b31461530e9e12cccce9af88438fa48 -1 Stop using the same stuff over and over again! +b7f0e476f52e30832915a7f2c349aec2 -1 Hey look.. Another person using an ammobox spawner +3bb2c51a08cf2311088cf1258fbc00e8 -1 Give up already +28717f2d7763fe2a4ded65fe8c061133 -1 We gon find you +582a6bf84a177a0a3bead1096d1d9664 -1 lol spawning local vehicles is useless +b97161c2fb7235a20517a7f8da70d4e2 -1 The jig is up boy +fc784f42110ca9e5b5aea8ac5d6f4f9d -1 Just your friendly neighborhood ban +d243c464a2e0f61233d0111a9ef9c636 -1 sigh another ammo box spawner +468bd7a4163977644a55a9e02e612704 -1 sigh another ammo box spawner +3b73c68a7a7d8d1fb8650561a2152576 -1 oh look another script kiddie +a0863f85ec742329e27cfc0fa20145bc -1 finally someone making their own cheats +8032fd2ddb93b93e02fdaf541eb376b7 -1 for the love of god just give up +cdda40a871835d92273becaf4f9fec3e -1 Script kiddies get banned +ffdf4cfaa25375f870b5da523c2253b9 -1 Tehee you got ban! +33d599a66702ab2a1752a37a448d5384 -1 Starting to loose count on how many of you use this known cheat +984fdf8e80ff94c36f158713fac94954 -1 zZzZzZzZzZ getting bored +bfdea2da3314fe5ee8a613a3f9411fa6 -1 dumbest name ever +403269f081137dbe14fdb12679ae51e0 -1 DUDE REALLY ANOTHER AMMO BOX SPAWNER +fdf1915e82e1aca5fe449c37bb4c9cb2 -1 Getting bored of banning you people +105d11f493a616a27a87869d056ab94b -1 Hoosah a cheater +59b06a037cc8aed4375dc0184a2d2bb5 -1 Taking out the trash +9cf0bd0a6bf4c1f2e395233cee2b40cb -1 More cheating trash hoosah! +e19c1b76e46b82063407b9a252104d0a -1 You cant fly +2a75f62815967c93c595bf6d8da4ec3f -1 Sigh just another ban +886e50aff2beb52cb8c54fea0a26d3c6 -1 and another ban yet again +cd4c8c7dd6b4d9dab4346e2d50902334 -1 lol cant even change infammook what a skiddie +6cd9a0c79e069e38f207cee707ad7e4b -1 Boredummmmmmm +a28703aa42af5367252edf29cd5e6794 -1 ban ban ban ban +4a2386b96300aef49dd1b33a447c9cab -1 plenty of bans to pass around +6828742fe98cd5cd6ef30750349cfd34 -1 Nom nom ban +38e35d2ffc0ac15c761d70bfe4ecece5 -1 Smoke the ban bro +20b1f7b093d83de19e4f8a8140d07ed0 -1 Loosing count on how many bans this is +b9d74c46da442199a79e97953a1ccb26 -1 lol MrMedic +182a95c1fb82683f49165d45eee960c5 -1 uber ban bro +c3c3c37cddb28977e4cd0ae41cbe4ae9 -1 For your sake stop cheating +f4d91c844bb8e89db77a10d4b4d93787 -1 We like passing bans around +794fcc9391e52cbdb88b5b6c471ec7b1 -1 Hope you enjoy your ban +4eca1302efe45aa1c9fbe0b5577c1725 -1 No god mode for you +0d00eb71226db1460a8fa74c37f09caf -1 I am the bananator +4eca1302efe45aa1c9fbe0b5577c1725 -1 Please just stop cheating it is pointless +b9d74c46da442199a79e97953a1ccb26 -1 Silly cheater scripts are for kids +4eca1302efe45aa1c9fbe0b5577c1725 -1 The atomic gun thats pretty old school +4eca1302efe45aa1c9fbe0b5577c1725 -1 Yet another script user +869ac323f7d5a4b8a8c1a4096ffff272 -1 Nope is right +7cc332db044ebbc56b84dbbbbafb7e96 -1 WOW lots of bans today +ddecb38ccd68c74517da1546520c3884 -1 You have balls to cheat on dayz not... +b9bb632f835c65183e8ff5b8cec5c632 -1 ban ban ban ban ban ban +c87b726fba67bc092e9db793b70263e1 -1 Like my new script detection? +bdd0f07fc7f6f5714be079656112c211 -1 New anti-cheats sucks huh? +56fea542239b086944205ad722c8f4ee -1 <3 new anticheat +e7d5c3257975cd11a683fb717a54d36b -1 DENIED! +55101c2990a63a73fe7a988d0281f9fd -1 DENIED +e2ab5a70fbce99f46e19a321b19ec3dc -1 Love Tonic +ff00afb58cadde624fb7bd4eb30fbb1f -1 Enjoy your bann on all DayZ servers +9d3a36ac8ee51778e2e94c60cfaa0be2 -1 Lol banned +e6586bd6efea7652b433b5a0ba41436a -1 BANNNNNNNNEDDDDDD +9d3a36ac8ee51778e2e94c60cfaa0be2 -1 New Script detection works good huh? +c2c522b5b5b6cbb4a6747459ec85557e -1 Cheating is pointless +a60df4872502dc224852a29b14ecc01f -1 Yepp its a ban +2e0c85ebec4a046c220924259359e6d5 -1 lol ammo box fail +8d63bb956796ab43f1705e9d2a27ac11 -1 Ohhh denied +62f084c3ffc429e97e0de04fc4310587 -1 Init cock block +ce4ec90eae510685c08adbd5458503f3 -1 yet more ammo box fail +aa41a7c43de1ff9d16b614f4e8f84a89 -1 Enjoy the ban +840733a1884f929800f24fd75febb0db -1 You lost the pissing contest +fd8a6c337bd4aa77248b9169b92cf313 -1 Another ammo box fail +358255903f69dcc87a415b87a03d84a6 -1 Another ammo box fail +9068b0e100fcd13e87c7ab8892c29bff -1 Spawning Ammo boxes and failed +01e239e1bd27b1396739125834340f7a -1 Not being creative enough +afbda17a2ac00a01c01f8a2955ddc601 -1 lol fail +44e1b94854339c1b5f57e8e5e4db4f5f -1 Fail +aa14845b9c0cc7e3b44b4d0d062324bb -1 Really not creative +1364d70f43b1a127853bef238874bba6 -1 Meh. +eb639023564e41ae5e1650261141007d -1 ohh denied +2893b620c65a207a3de2cafcb2f9b2a1 -1 Banned for cheating +9068b0e100fcd13e87c7ab8892c29bff -1 Banned for cheating +01e239e1bd27b1396739125834340f7a -1 Banned for cheating +afbda17a2ac00a01c01f8a2955ddc601 -1 Banned for cheating +44e1b94854339c1b5f57e8e5e4db4f5f -1 Banned for cheating +aa14845b9c0cc7e3b44b4d0d062324bb -1 lol not very smart +d03395b697082771e9aee5f76d474771 -1 denied of ammo +d1e1d3f6c591a934cc2dd425aa043a9d -1 No ammo for you +f6cc6749082fbfdb3e55bc002a7fb267 -1 No Ammo for you +9231b942e595276a417dc38fbf0b9824 -1 Ammo box spawning fail +eb639023564e41ae5e1650261141007d -1 Spawning ammo box fail +cb3af23b2721375465cf528aff353522 -1 banhammerlove +4dc4aeef6f339a1aa6e1cd4dc86feacd -1 banhammerlove +ad35bbf25c6c770b52bd2f0b38ff70e6 -1 banhammerlove +cefff21efd148d3fa5201843be954ff4 -1 banhammerlove +634bebf4d7a1a2b08a3d8b738485224b -1 banhammerlove +2f3d0a79e84f57be50e8105564b3a6fc -1 banhammerlove +e1ec7050e8de0b021edb93ffe21f50eb -1 banhammerlove +8e7cf5a6fa6c25a12c58a59423a8503a -1 banhammerlove +8d1af88516999099216095acf3f9e37f -1 banhammerlove +2893b620c65a207a3de2cafcb2f9b2a1 -1 Love Tonic +9068b0e100fcd13e87c7ab8892c29bff -1 Love Tonic +01e239e1bd27b1396739125834340f7a -1 Love Tonic +afbda17a2ac00a01c01f8a2955ddc601 -1 Love Tonic +44e1b94854339c1b5f57e8e5e4db4f5f -1 Love Tonic +bec8bbcacdde44c830f63520461365a6 -1 Love Tonic +8621bd9b10ac6a8904ded301a86ae15f -1 Dupeing backpacks +03bb2497133a4799630c22fe0b21388a -1 Duping with Lemaxo +2540e35496f80e2b62bb53e63e93c014 -1 Admin Ban +ec5b6090b77ffb975de7e8f5959f7962 -1 BEC : GameHack #38 +df20453e6cdf4d246fe69c377dd890dd -1 Combat logging and stream sniping +9d25481301e296aa6982ad4e77a35f04 -1 Not smart. +113cf913a36cbc914cbb7f6f12982cfa -1 Because +9d25481301e296aa6982ad4e77a35f04 -1 Admin Ban +5e90453ff9412a570f1a964397f902b4 -1 Admin Ban +244cc115637c70c1300a92908cf15089 -1 Don't like it, bring your case before us. +d288fcb55dde89c1153880c85a83fb50 -1 Admin Ban +2c904e217ba3fe6f6547aa779cc1bff9 -1 spawing in objects +c38e99892d6c528f8e6f08ddf998f484 -1 Scripting +c38e99892d6c528f8e6f08ddf998f484 -1 Scripting +493fc6d0b316f0134bca77bb244463d2 -1 Scripting +2c904e217ba3fe6f6547aa779cc1bff9 -1 Scripting +11a050f632630cf117e9134bd48da3bb -1 Scripting +ec024eb6f155ca6936f1b40e8186ad0c -1 Admin Ban +2c904e217ba3fe6f6547aa779cc1bff9 -1 Admin Ban +493fc6d0b316f0134bca77bb244463d2 -1 Admin Ban +c38e99892d6c528f8e6f08ddf998f484 -1 Admin Ban +5cb84378c55b814ec3c147ecc1757120 -1 Nice try +a950a2cfd2e926c5b0cc803ef4e14f5c -1 Scripting #101 +d323ce9ef5113ef1dcdf40669c125be6 -1 Scripting #102 +d323ce9ef5113ef1dcdf40669c125be6 -1 Scripting #102 +176.51.186.48 -1 Perma ban son... +82.6.50.36 -1 You got banned +76.188.209.92 -1 Long ban for you +71.163.130.247 -1 Other then your banned +76.187.243.157 -1 Perma ban son... +86.52.144.239 -1 Bans are a pain huh? +62.254.68.248 -1 Tonic's back, tell a friend. +120.148.214.221 -1 Tonic's back tell a friend. +67.249.49.119 -1 But your kungfu is weak. +92.8.152.209 -1 You may have cheated. +74.242.233.244 -1 Tonic's back! +108.231.105.146 -1 We don't know how to say this but you have been banned. +71.201.122.208 -1 Shit bro you got a perma ban! +93.80.49.100 -1 Smell that? Its a ban +24.179.212.138 -1 Yep youve been trolled. +94.175.79.5 -1 WIN. +71.201.122.208 -1 Perma ban yo. +71.180.84.203 -1 Perma ban yo. +67.197.120.178 -1 Perma ban yo. +86.25.202.224 -1 Hey bro you just earned an IP ban love Tonic +109.145.153.48 -1 Enjoy your IP ban cross-dayz +92.12.231.189 -1 I love IP bans +86.177.47.103 -1 Enjoy the IP Ban +81.163.104.197 -1 Invalid GUID +213.161.239.53 -1 Love Tonic +76.119.216.145 -1 Love Tonic +46.126.128.41 -1 Love Tonic +46.9.129.65 -1 Love Tonic ps you mad bro? +46.9.130.22 -1 Love Tonic ps you mad bro? +77.21.136.129 -1 One of the many bans passed around +31.205.19.78 -1 GUID switching +99.97.20.27 -1 Not smart. +68.100.166.118 -1 Don't like it, bring your case before us. +86.4.33.129 -1 Nice try diff --git a/Server Files/Battleye/createvehicle.txt b/Server Files/Battleye/createvehicle.txt new file mode 100644 index 000000000..ff4765499 --- /dev/null +++ b/Server Files/Battleye/createvehicle.txt @@ -0,0 +1,74 @@ +1 "" !="WeaponHolder" !="TinCan" !="Rabbit" !="Goat01_EP1" !="Goat02_EP1" !="Goat" !="WildBoar" !="Sheep" !="Sheep02_EP1" !="Sheep01_EP1" !="Hen" !="Cock" !="Cow01" !="Cow02" !="Cow03" !="Cow04" !="Cow01_EP1" !="zZombie_Base" !="z_hunter" !="z_teacher" !="z_doctor" !="z_suit1" !="z_suit2" !="z_worker1" !="z_worker2" !="z_worker3" !="z_villager1" !="z_villager2" !="z_villager3" !="z_soldier" !="z_soldier_heavy" !="z_soldier_pilot" !="z_policeman" !="z_priest" !="BoltSteelF" !="Land_Fire_DZ" !="SodaCan" !="JackDaniels" !="RoadFlare" !="ChemRed" !="ChemBlue" !="ChemGreen" !="Survivor1_DZ" !="Survivor2_DZ" !="Survivor3_DZ" !="SurvivorW2_DZ" !="Bandit1_DZ" !="CZ_VestPouch_EP1" !="DZ_Patrol_Pack_EP1" !="DZ_CivilBackpack_EP1" !="DZ_ALICE_Pack_EP1" !="SmokeShell" !="SmokeShellRed" !="SmokeShellGreen" !="MedBox0" !="Camo1_DZ" !="Soldier1_DZ" !="DZ_Backpack_EP1" !="Sniper1_DZ" !="DZ_Assault_Pack_EP1" !="BanditW1_DZ" !="G_40mm_HE" !="dog" !="WeaponHolder_MeleeCrowbar" !="WeaponHolder_ItemHatchet" !="WeaponHolder_PartGeneric" !="WeaponHolder_ItemJerrycan" !="WeaponHolder_PartFueltank" !="WeaponHolder_PartGlass" !="WeaponHolder_PartEngine" !="WeaponHolder_PartWheel" !="WeaponHolder_PartVRotor" !="DZ_Czech_Vest_Puch" !="DZ_British_ACU" !="DZ_TK_Assault_Pack_EP1" +1 "SeaGull" +5 "box" !="MedBox0" !="AmmoBoxSmall_556" !="AmmoBoxSmall_762" !="ItemMatchbox" !="ItemToolbox" !="CardBoardBox" !="FoodBox1" !="FoodBox2" !="FoodBox3" +5 "Mine" +5 "ARTY_" +5 "SADARM_" +5 "LASER_" +5 "WP_" +5 "_MLRS" +5 "_81" +5 "_82" +5 "_105" +5 "_120" +5 "_122" +5 "_227" +1 "Bo_" +5 "_AA" !"Soldier_Bodyguard_AA12_PMC_DZ" +5 "_AT" !="R_M136_AT" +1 "R_M136_AT" //keep monitoring to catch obvious abuse +5 "_AP" +5 "_80" +5 "_57" +5 "_85" +5 "_100" +5 "_125" +5 "_30" +5 "_ied" +5 "_CRV7" +5 "_MEEWS" +5 "_SMAW" +5 "_GRAD" +5 "_SABOT" +5 "_SH" +5 "KORD" +5 "DSHKM" +5 "MK19" +5 "AGS" +5 "Nest_" //Nest_M240 //Nest_PK +5 "R_PG" +5 "R_OG" +5 "B_" +5 "_YakB" +1 "_ball" +1 "_mk" +1 "_HE" !="z_soldier_heavy" //!="G_40mm_HE" //keep monitoring to catch obvious abuse +1 "HE_" //keep monitoring to catch obvious abuse +1 "M_" !="G_40mm_HE" //!="40mm_" //keep monitoring to catch obvious abuse +5 "Parachute" !="ParachuteWest" //under monitoring +1 "dog" //until released not welcome +5 "Land_" !="Land_Fire_DZ" !="Land_HBarrier1_DZ" +5 "BBarracks" +1 "_ep1" !="DZ_Patrol_Pack_EP1" !="DZ_CivilBackpack_EP1" !="CZ_VestPouch_EP1" !="DZ_ALICE_Pack_EP1" !="DZ_Backpack_EP1" !="DZ_Assault_Pack_EP1" !="DZ_TK_Assault_Pack_EP1" +1 "_baf" +1 "_pmc" +1 "cz_" !="CZ_VestPouch_EP1" +5 "_LHD_ +5 "_acr" +5 "MASH_" +5 "Fort_" !="Fort_RazorWire" +5 "BasicWeapons" +5 "SpecialWeapons" +5 "_uav" +//5 "AmmoBox" !="AmmoBoxSmall_556" !="AmmoBoxSmall_762" +//5 "WeaponsBox" +//5 "CacheBox" +//!="DZ_Backpack_EP1" +//!="MedBox0" //filtered now +//!="Sniper1_DZ" //filtered now +//!="Camo1_DZ" //filtered now +//!="Soldier1_DZ" //filtered now +//!="TentStorage" +//!="DZ_Assault_Pack_EP1" //filtered now +//!="BanditW1_DZ" //filtered now +//!="WeaponHolder_ItemTent" \ No newline at end of file diff --git a/Server Files/Battleye/deleteVehicle.txt b/Server Files/Battleye/deleteVehicle.txt new file mode 100644 index 000000000..8a291e2f3 --- /dev/null +++ b/Server Files/Battleye/deleteVehicle.txt @@ -0,0 +1 @@ +1 "" diff --git a/Server Files/Battleye/mpeventhandler.txt b/Server Files/Battleye/mpeventhandler.txt new file mode 100644 index 000000000..c08040e0e --- /dev/null +++ b/Server Files/Battleye/mpeventhandler.txt @@ -0,0 +1,178 @@ +1 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="spawn BIS_Effects_Burn" !="_this spawn fnc_plyrHit;" +5 "draw" +5 "hint" +5 "create" +5 "add" +5 "remove" +5 "delete" +5 "set" +5 "play" +5 "clear" +5 "disable" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "copy" +5 "switch" +5 "text" +5 "init" +5 "hide" +5 "group" +5 "icon" +5 "marker" +5 "server" +5 "compile" +5 "loadFile" +5 "say" +5 "call" +5 "move" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "chat" +5 "fade" +5 "action" +5 "exec" +5 "mission" +5 "kb" +5 "side" +5 "show" +5 "task" +5 "allow" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "enable" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "spawn" !="spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="spawn BIS_Effects_Burn" !="_this spawn fnc_plyrHit;" +5 "for" +1 "this" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="_v setVehicleInit format [\"[this, %1, %2,false,true]spawn BIS_Effects_Burn\",_int, _t];" !="_v setVehicleInit \"[this] spawn BIS_Effects_AirDestruction\";" !="_this spawn fnc_plyrHit;" +5 "format" +5 "skip" +5 "fail" +5 "force" +5 "parse" +5 "terminate" +5 "start" +5 "eventhandler" +5 "loading" +5 "remoteControl" +5 "toString" +5 "toArray" +5 "ctrlset" +5 "rland" +5 "trigger" +//5 "dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _object];" +1 "BIS_Effects" //kicking not needed anymore, monitoring only +5 "BIS_" !="BIS_Effects_AirDestruction" !="BIS_Effects_AirDestructionStage2" !="BIS_Effects_Burn" +5 "box" +5 "Mine" +5 "ARTY_" +5 "SADARM_" +5 "LASER_" +5 "WP_" +5 "_MLRS" +5 "_81" +5 "_82" +5 "-105" +5 "_120" +5 "_122" +5 "_227" +1 "Bo_" +5 "_AA" +5 "_AT" +5 "_80" +5 "_57" +5 "_85" +5 "_100" +5 "_125" +5 "_30" +5 "_ied" +5 "_CRV7" +5 "_MEEWS" +5 "_SMAW" +5 "_GRAD" +5 "_yakB" +5 "beeeh" +5 "hreh" +5 "local_sefFuel" +5 "local_gutObject" +5 "object_setFixServer" +5 "object_delLocal" +5 "fnc_vehicleEventHandler" +5 "player_humanityChange" +5 "fnc_usec_damageBleed" +5 "player_medBandage" +5 "player_medInject" +5 "player_medEpi" +5 "player_medTransfuse" +5 "player_medMorphine" +5 "player_medPainkiller" +5 "fnc_usec_damageHandler" +5 "fnc_usec_damageVehicle" +5 "fnc_usec_damageType" +5 "dayzplayermorph" +5 "server_playerMorph" +5 "hiveupdateresu" +5 "+" +//5 "markertype" //covered by 5 "marker" +5 "teamtype" +5 "BIS_fnc_swapVars" +5 "teamName" +5 "fn_swapVars.sqf" +5 "remotecmd" +5 "promptRName.sqf" +5 "%" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +5 "norrnRACarUp" +5 "norrnRAPicUp" +5 "getVariable" +5 "BIS_fnc_AAN" +5 "BIS_fnc_customGPSvideo" +5 "BIS_fnc_infoText" +5 "onEachFrame" +5 "hasInterface" +5 "onMapS" +5 "OnGroup" +5 "onDouble" +5 "onPreload" +5 "onTeamS" +5 "onShowNew" +//all below detected already by above +//5 "removeAllWeapons" +//5 "removeAllItems" +//5 "hideObject" +//5 "deleteCollection" +//5 "getPlayerUID" +//5 "setPos" +//5 "setDir" +//5 "setVector" +//5 "deleteVehicle" +//5 "createMine" +//5 "setDamage" +//5 "setDammage" +//5 "setHit" +//5 "GroupIcon" +//5 "setMarker" +//5 "addWaypoint" +//5 "createMarker" +//5 "clearMagazine" +//5 "clearWeapon" +//5 "addAmmo" +//5 "ejectPlayer" +//5 "setUnconscious" +//5 "disableUserInput" +//5 "copyFromClipboard" +//5 "copyToClipboard" +//5 "serverCommand" +//5 "playMusic" +//5 "playSound" +//5 "createSoundSource" +//5 "moveIn" +//5 "vehicleinit" +//5 "processinit" +//5 "addMPEventHandler" +//5 "addAction" +//5 "addEventHandler" +//5 "playMove" +//5 "playAction" +//5 "switchMove" +//5 "titleText" +//5 "cutText" +//5 "createLocation" +//1 "" \ No newline at end of file diff --git a/Server Files/Battleye/publicvariable.txt b/Server Files/Battleye/publicvariable.txt new file mode 100644 index 000000000..9519a5f4a --- /dev/null +++ b/Server Files/Battleye/publicvariable.txt @@ -0,0 +1,46 @@ +1 "" !="drn_AskServerDynamicWeatherEventArgs" !="dayzSpawnZed" !="dayzLogin" !="dayzLogin2" !="dayzLoginRecord" !="dayzCharDisco" !="dayzPlayerSave" !="usecBleed" !="dayzHit" !="usecTransfuse" !="usecBandage" !="dayzPlayerMorph" !="usecPainK" !="usecEpi" !="dayzPublishObj" !="dayzRoadFlare" !="dayzDiscoAdd" !="dayzGutBody" !="dayzHideBody" !="dayzDeleteObj" !="dayzUpdateVehicle" !="dayzSetFix" !="dayzHumanity" !="dayzDiscoRem" !="usecMorphine" !="dayzSetFuel" !="dayzFlies" !="changeCharacter" !="dayzSwitch" !="dayzFire" !="norrnRaDrag" !="norrnR180" !="norrnRalie" !="norrnRALW" !="norrnRACarUp" !="norrnRAPicUp" !="norrnRnoAnim" !="remExField" !="BIS_MPF_logic" !="remExFP" !="dayzDeath" !="player" !="drn_DynamicWeatherEventArgs" !="dayzSetDate" !="rsay" !="rland" !="rsetdir" !="_this spawn fnc_plyrHit;" +5 "teleported" +1 "nil" +1 "true" +1" false" +5 "remExFP" +//1 "remExField" +5 "BIS_MPF_logic" +1 "JIPrequest" +1 "JIPexec" +//1 "dayzDeath" +//1 "player" +1 "alive" +5 "dayzSetDate" +5 "rsay" +5 "rland" +5 "rsetdir" +5 "local_sefFuel" +1 "spawn" !="_this spawn fnc_plyrHit;" +1 "BIS_Effects" +5 "hiveupdateresu" +5 "eh_localCleanup" +5 "vehicle_handleInteract" +5 "server_characterSync" +5 "fnc_buildWeightedArray" +5 "server_hiveWrite" +5 "server_hiveReadWrite" +5 "spawn_heliCrash" +5 "server_getDiff" +5 "server_getDiff2" +5 "dayz_objectUID" +5 "dayz_objectUID2" +5 "dayz_recordLogin" +5 "monkymonitor" +5 "mmonitor" +5 "monky" +5 "adminrq" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +//1 "norrnRACarUp" +//1 "norrnRAPicUp" +//1 "" \ No newline at end of file diff --git a/Server Files/Battleye/publicvariableval.txt b/Server Files/Battleye/publicvariableval.txt new file mode 100644 index 000000000..942b4f43d --- /dev/null +++ b/Server Files/Battleye/publicvariableval.txt @@ -0,0 +1,238 @@ +//1 "" //+2 !="_this spawn fnc_plyrHit;" +1 "draw" +1 "hint" !="hintC" !="hintS" +1 "create" +1 "add" !="ladder" +1 "remove" !"removeAll" +1 "delete" +1 "set" +//1 "play" !="playmove" !="player" !="dayzPlayerSave" //+3 +1 "clear" +1 "disable" +1 "copy" +1 "switch" !="\"switchmove\"" !="\"remExField\" = [,,\"switchmove\",\"ActsPercMrunSlowWrflDf_FlipFlopPara\"]" +1 "text" +1 "init" +1 "hide" !"hideObject" +1 "group" +1 "icon" +1 "marker" +1 "server" +5 "compile" +5 "loadFile" +//1 "say" //+4 +5 "call" +1 "move" !="\"switchmove\"" !="\"playmove\"" !"moveIn" !"remove" !="\"remExField\" = [,,\"switchmove\",\"ActsPercMrunSlowWrflDf_FlipFlopPara\"]" +1 "chat" +1 "fade" +1 "action" +1 "exec" !"execVM" !"execFSM" !"jipexec" +5 "mission" +1 "kb" !="FoodCanFrankBeans" !="\"FoodCanFrankBeans\"" !"kbTell" !"kbReact" +1 "side" +1 "show" +1 "task" !"taskHint" +1 "allow" +5 "enable" +5 "spawn" !="_this spawn fnc_plyrHit;" +1 "for" +1 "this" !="_this spawn fnc_plyrHit;" +5 "format" +1 "skip" !"skipTime" +1 "fail" +1 "force" +5 "parse" +5 "terminate" +1 "start" +5 "eventhandler" +//5 "setTask" //covered by 5 "setT" +5 "hintC" +5 "hintS" +5 "loading" +//5 "callVar" //covered by 5 "call" +//5 "rspawn" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +5 "removeAll" +//5 "\"spawn\"" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +5 "\"call\"" +5 "call compile" +1 "jiprequest" !=",,\"JIPrequest\"" +1 "jipexec" //1 "rjipexec" +1 "remExField" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack1\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack2\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack3\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack4\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack5\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack6\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack7\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack8\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack9\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack10\"]" !="\"remExField\" = [,,\"JIPrequest\"]" !="\"remExField\" = [,,\"switchmove\",\"ActsPercMrunSlowWrflDf_FlipFlopPara\"]" +1 "remExFP" +//5 "setDate" //covered by 5 "setD" +//5 "setAccTime" //covered by 5 "setA" +5 "remoteControl" +5 "toString" +5 "toArray" +5 "ctrlset" +5 "rsay" +5 "rland" +5 "rsetDir" +5 "_YakB" +1 "BIS_" +5 "local_sefFuel" +5 "local_gutObject" +1 "object_setFixServer" +1 "object_delLocal" +1 "fnc_vehicleEventHandler" +1 "player_humanityChange" +1 "fnc_usec_damageBleed" +1 "player_medBandage" +1 "player_medInject" +1 "player_medEpi" +1 "player_medTransfuse" +1 "player_medMorphine" +1 "player_medPainkiller" +1 "fnc_usec_damageHandler" +1 "fnc_usec_damageVehicle" +5 "fnc_usec_damageType" +1 "dayzplayermorph" +1 "server_playerMorph" +5 "getVariable" +5 "hiveupdateresu" +5 "isServer" +5 "isDedicated" +5 "cutText" +5 "publicVariable" +//5 "setVariable" //covered by 5 "setV" +5 "code" +5 "onPlayer" +5 "select" +5 "while" +5 "count" +5 "markerText" +5 "BIS_fnc" +5 "+" //!"e+" +5 "\+" //!"e+" +5 "_bis" +//5 "trigger" +5 "markerType" +5 "teamtype" +//5 "BIS_fnc_swapVars" // covered by 5 "BIS_fnc" +5 "composeText" +5 "teamName" +//5 "createTeam" //covered by 5 "createT" +5 "execVM" +5 "fn_swapVars.sqf" +//5 "setVehicleInit" //covered by 5 "setV" +5 "processInitCommands" +5 "runInitScript" +//5 "clearVehicleInit" //covered by 5 "clearV" +//5 "createTrigger" //covered by 5 "createT" +//5 "setTriggerStatements" //covered by 5 "setT" +//5 "setTriggerText" //covered by 5 "setT" +5 "remotecmd" +5 "promptRName.sqf" +5 "%" +5 ".sqf\"]" !="init.sqf\"]" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +5 "norrnRACarUp" +5 "norrnRAPicUp" +5 "markerBrush" +5 "hideObject" +5 "deleteCollection" +5 "forceEnd" +//5 "createUnit" //covered by 5 "createU" +//5 "createGroup" //covered by 5 "createG" +//5 "createVehicle" //covered by 5 "createV" +//5 "createMarker" //covered by 5 "createM" +//5 "createMine" //covered by 5 "createM" +5 "createAgent" +//5 "createSoundsource" //covered by 5 "createS" +//5 "createSimpleTask" //covered by 5 "createS" +//5 "createDialog" //covered by 5 "createD" +//5 "createDiaryRecord" //covered by 5 "createD" +5 "deleteVehicle" +5 "deleteTeam" +//5 "respawn" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +//5 "setVehicleVarName" //covered by 5 "setV" +5 "getPlayerUID" +5 "getVariable" +5 "removeM" +5 "removeW" +5 "addAction" +//5 "addEventHandler" //covered by 5 "eventhandler" +//5 "addMagazine" //covered by 5 "addM" +5 "AddM" +5 "AddP" +5 "AddS" +5 "AddV" +5 "AddW" +//5 "setVehicleAmmo" //covered by 5 "setV" +//5 "setA" +5 "setAcc" +5 "setAtt" +5 "setC" +5 "setD" +5 "setF" +5 "setG" +5 "setH" +5 "setM" +//5 "setO" +5 "setObj" +5 "setOver" +5 "setP" +5 "setR" +5 "setS" +5 "setT" +//5 "setU" +5 "setUnit" +5 "setV" +5 "setW" +5 "execFSM" +5 "clearM" +5 "clearV" +5 "clearW" +5 "createD" +5 "createG" +5 "createM" +5 "createS" +5 "createT" +5 "createU" +5 "createV" +5 "debugLog" +5 "debugFSM" +5 "deleteM" +//5 "enableSimulation" //covered by 5 "enable" +5 "kbTell" +5 "kbReact" +5 "fadeSound" +5 "fadeMusic" +5 "showC" +5 "skipTime" +5 "taskHint" +5 "titleCut" +1 "titleText" +5 "getM" +5 "getFSMvariable" +5 "getG" +5 "moveIn" +5 "synchronizeO" +5 "synchronizeT" +5 "synchronizeW" +5 "triggerA" +5 "triggerS" +5 "triggerT" +5 "MarkerColor" +5 "MarkerDir" +5 "MarkerPos" +5 "MarkerSize" +5 "onEachFrame" +5 "hasInterface" +5 "onMapS" +5 "OnGroup" +5 "onDouble" +5 "onPreload" +5 "onTeamS" +5 "onShowNew" +//5 "setUnitRecoilCoefficient" //covered 5 "setUnit" +5 "setUnconscious" +//5 "setUnitPos" //covered 5 "setUnit" +//5 "parseText" //covered by 5 "parse" +//1 "" +5 !="_this spawn fnc_plyrHit;" +//1 "request" //+6 \ No newline at end of file diff --git a/Server Files/Battleye/publicvariablevar.txt b/Server Files/Battleye/publicvariablevar.txt new file mode 100644 index 000000000..442e66196 --- /dev/null +++ b/Server Files/Battleye/publicvariablevar.txt @@ -0,0 +1 @@ +//wrong file \ No newline at end of file diff --git a/Server Files/Battleye/remotecontrol.txt b/Server Files/Battleye/remotecontrol.txt new file mode 100644 index 000000000..f5efa40a4 --- /dev/null +++ b/Server Files/Battleye/remotecontrol.txt @@ -0,0 +1 @@ +1 "" \ No newline at end of file diff --git a/Server Files/Battleye/remoteexec.txt b/Server Files/Battleye/remoteexec.txt new file mode 100644 index 000000000..c17479846 --- /dev/null +++ b/Server Files/Battleye/remoteexec.txt @@ -0,0 +1,178 @@ +1 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="spawn BIS_Effects_Burn" !="[this] spawn BIS_Effects_AirDestruction" !="_this spawn fnc_plyrHit;" +5 "draw" +5 "hint" +5 "create" +5 "add" +5 "remove" +5 "delete" +5 "set" +5 "play" +5 "clear" +5 "disable" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "copy" +5 "switch" +5 "text" +5 "init" +5 "hide" +5 "group" +5 "icon" +5 "marker" +5 "server" +5 "compile" +5 "loadFile" +5 "say" +5 "call" +5 "move" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "chat" +5 "fade" +5 "action" +5 "exec" +5 "mission" +5 "kb" +5 "side" +5 "show" +5 "task" +5 "allow" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +5 "enable" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" +1 "spawn" !="spawn BIS_Effects_AirDestruction" !="spawn BIS_Effects_AirDestructionStage2" !="spawn BIS_Effects_Burn" !="[this] spawn BIS_Effects_AirDestruction" !="_this spawn fnc_plyrHit;" +5 "for" +1 "this" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="_v setVehicleInit format [\"[this, %1, %2,false,true]spawn BIS_Effects_Burn\",_int, _t];" !="_v setVehicleInit \"[this] spawn BIS_Effects_AirDestruction\";" !="_this spawn fnc_plyrHit;" +1 "format" +5 "skip" +5 "fail" +5 "force" +5 "parse" +5 "terminate" +5 "start" +5 "eventhandler" +5 "loading" +5 "remoteControl" +5 "toString" +5 "toArray" +5 "ctrlset" +5 "rland" +5 "trigger" +//5 "dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _object];" //+2 +1 "BIS_Effects" //kicking not needed anymore, monitoring only +1 "BIS_" !="BIS_Effects_AirDestruction" !="BIS_Effects_AirDestructionStage2" !="BIS_Effects_Burn" !="[this] spawn BIS_Effects_AirDestruction" +5 "box" +5 "Mine" +5 "ARTY_" +5 "SADARM_" +5 "LASER_" +5 "WP_" +5 "_MLRS" +5 "_81" +5 "_82" +5 "-105" +5 "_120" +5 "_122" +5 "_227" +1 "Bo_" +5 "_AA" +5 "_AT" +5 "_80" +5 "_57" +5 "_85" +5 "_100" +5 "_125" +5 "_30" +5 "_ied" +5 "_CRV7" +5 "_MEEWS" +5 "_SMAW" +5 "_GRAD" +5 "_yakB" +5 "beeeh" +5 "hreh" +5 "local_sefFuel" +5 "local_gutObject" +5 "object_setFixServer" +5 "object_delLocal" +5 "fnc_vehicleEventHandler" +5 "player_humanityChange" +5 "fnc_usec_damageBleed" +5 "player_medBandage" +5 "player_medInject" +5 "player_medEpi" +5 "player_medTransfuse" +5 "player_medMorphine" +5 "player_medPainkiller" +5 "fnc_usec_damageHandler" +5 "fnc_usec_damageVehicle" +5 "fnc_usec_damageType" +5 "dayzplayermorph" +5 "server_playerMorph" +5 "hiveupdateresu" +5 "+" +//5 "markertype" //covered by 5 "marker" +5 "teamtype" +5 "BIS_fnc_swapVars" +5 "teamName" +5 "fn_swapVars.sqf" +5 "remotecmd" +5 "promptRName.sqf" +5 "%" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +5 "norrnRACarUp" +5 "norrnRAPicUp" +5 "getVariable" +5 "BIS_fnc_AAN" +5 "BIS_fnc_customGPSvideo" +5 "BIS_fnc_infoText" +5 "onEachFrame" +5 "hasInterface" +5 "onMapS" +5 "OnGroup" +5 "onDouble" +5 "onPreload" +5 "onTeamS" +5 "onShowNew" +//all below detected already by above +//5 "removeAllWeapons" +//5 "removeAllItems" +//5 "hideObject" +//5 "deleteCollection" +//5 "getPlayerUID" +//5 "setPos" +//5 "setDir" +//5 "setVector" +//5 "deleteVehicle" +//5 "createMine" +//5 "setDamage" +//5 "setDammage" +//5 "setHit" +//5 "GroupIcon" +//5 "setMarker" +//5 "addWaypoint" +//5 "createMarker" +//5 "clearMagazine" +//5 "clearWeapon" +//5 "addAmmo" +//5 "ejectPlayer" +//5 "setUnconscious" +//5 "disableUserInput" +//5 "copyFromClipboard" +//5 "copyToClipboard" +//5 "serverCommand" +//5 "playMusic" +//5 "playSound" +//5 "createSoundSource" +//5 "moveIn" +//5 "vehicleinit" +//5 "processinit" +//5 "addMPEventHandler" +//5 "addAction" +//5 "addEventHandler" +//5 "playMove" +//5 "playAction" +//5 "switchMove" +//5 "titleText" +//5 "cutText" +//5 "createLocation" +//1 "" \ No newline at end of file diff --git a/Server Files/Battleye/scripts.txt b/Server Files/Battleye/scripts.txt new file mode 100644 index 000000000..87fe30162 --- /dev/null +++ b/Server Files/Battleye/scripts.txt @@ -0,0 +1,283 @@ +//new //#+2 ;PoC +1 addAction !"\"addAction\"," !"_action1 = _unit addAction [localize \"str_actions_medical_01" !"s_player_grabflare = player addAction [format[localize \"str_actions_medical_15\",_te" !"raddAction = 'addAction'" !"raddActioncode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addAction.sqf')" !"null = _holder addAction [format[(localize \"STR_DAYZ_CODE_1\"),_name], \"\z\addons\dayz_code\actions\object_pickup.sqf\"," !"NORRN_dropAction = player addAction [\"Drop body\", \"\z\addons\dayz_code\medical\drop_body.sqf\",_dragee, 0, false, true];" !"s_player_dropflare = player addAction [format[localize \"str_actions_medical_16\",_text]," +1 addEventHandler !"\"addEventHandler" !"displayAddEventHandler" !"ctrlAddEventHandler" !"raddEventhandler = 'addEventhandler'" !"raddEventhandlercode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addEventhandler.sqf')" !"id = _unit addeventhandler [\"HandleDamage\",{_this call local_zombieDamage}];" !"id = _unit addeventhandler [\"Killed\",{[_this,\"zombieKills\"] call local_eventKill}];" !"eh1 = _unit addeventhandler [\"HandleDamage\",{if (local (_this select 0)) then {_this call fnc_usec_damageVehicle}}];" !"eh2 = _unit addeventhandler [\"Killed\",{if (local (_this select 0)) then {_this call object_vehicleKilled}}];" !"eh3 = _unit addEventHandler [\"GetOut\", {[(_this select 0),"position"] call server_updateObject;}];" !"eh1 = _unit addeventhandler [\"HandleDamage\",{_this call fnc_usec_damageHandler;0} ];" !"eh2 = _unit addEventHandler [\"Fired\", {_this call player_fired;}];" !"eh3 = _unit addEventHandler [\"Killed\", {_id = [] spawn player_death;}];" !"_id = player addEventHandler [\"Respawn\", {_id = [] spawn player_death;}];" !"dayz_originalPlayer = _oldUnit;\n_oldUnit addEventHandler [\"HandleDamage\",{false}];\n_oldUnit disableAI \"ANIM\";" !"_timeN = time;\n\n_id = _agent addeventhandler [\"HandleDamage\",{_this call local_zombieDamage}];" !"eh_player_killed = player addeventhandler [\"FiredNear\",{_this call player_weaponFiredNear;} ];" +1 displayAddEventHandler !"\"displayAddEventHandler\"," !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"_this call dayz_spaceInterrupt\"];\nplayer disableConversation" +5 addGroupIcon !"\"addGroupIcon\"," +1 addPublicVariableEventHandler !"\"addPublicVariableEventHandler\"," !"DynamicWeather_DebugTextEventArgs\" addPublicVariableEventHandler {" !"\"remExField" addPublicVariableEventHandler {_this call BIS_MPF_remoteExecution" !"\"dayzSetFuel\" addPublicVariableEventHandler {(_this select" !"\"drn_DynamicWeather_DebugTextEventArgs\" addPublicVariableEventHandler {" !"\"dayzSetFuel\" addPublicVariableEventHandler {(_this select" +1 addRating !"\"addRating\"," +1 addResources !"\"addResources\"," +1 addSwitchableUnit !"\"addSwitchableUnit\"," !"addSwitchableUnit _newUnit;" !"addSwitchableUnit dayz_originalPlayer;" +5 addWaypoint !"\"addWaypoint\"," +1 allowDamage !"\"allowDamage\"," !"player allowDamage true;" !"_object allowDamage false;" !"_veh allowDamage true;" !"player allowDamage false;\n_lastAte = _survival select 1;\n_lastDrank = _survival select 2; !"_unit setCaptive 3;\n_unit switchMove \"AmovPpneMstpSnonWnonDnon_healed\";\n_unit allowDamage false;\nsleep 0.01;!"_object setPos _position;\n_object setDir _dir;\n _object allowDamage false;"!"_character allowDamage true;" !"if (!_isSync) then {\n_veh allowDamage true;\n_veh setDamage 1;\nplayer setDamage 1;\n};" !"if (!_isSync) then {\n_vehicle allowDamage true;\n_vehicle setDamage 1;\n_character setVelocity [0,0,100];\n};" !"_old = player;\nplayer allowDamage false;" !"player allowDamage false;\n_object = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"];" !"player allowdamage false;\ndiag_log (\"PUBLISH: Attempt \" + _class);\n_worldspace = [_dir,_location];" +1 allowDammage !"\"allowDammage\"," !"this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this" +1 attachTo !"\"attachTo\"," !"_point attachTo [_unit,_modelPos,_wound];" !"_fl attachto [_v,[0,0,0],\"destructionEffect2\"];" !"_dragee attachto [_unit,[0.1, 1.01, 0]];" !"_bolt attachTo [_hitObject,_val,_hitMemoryPt];" !"_flare attachTo [player,[0,0,0],\"granat2\"];" !"_smoke attachto [_vehicle,[0,0,0],\"destructionEffect1\"];" !"_smoke attachto [_v,[0,0,0],\"destructionEffect1\"];" +1 createDialog !"\"createDialog\"," !"createDialog \"RscDisplayGenderSelect\";" +1 createMarker !"\"createMarker\"," !"createMarkerLocal" !"if (isnil 'BIS_GITA_fnc_createMarkers' || false) then {" +1 createMarkerLocal !"\"createMarkerLocal\"," !"rcreateMarkerLocal = 'createMarkerLocal'" !"rcreateMarkerLocalcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'createMarkerLocal.sqf')" +1 createMenu !"\"createMenu\"," !"if (isnil 'BIS_fnc_createmenu' || false) then {" +1 createSimpleTask !"\"createSimpleTask\"," !"rcreateSimpleTask = 'createSimpleTask'" !"rcreateSimpleTaskcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'createSimpleTask.sqf')" +1 createUnit !"\"createUnit\"," !"BIS_MPF_logic = BIS_MPF_dummygroup createUnit [" !"_newUnit = _group createUnit [_class,dayz_spawnPos,[],0,\"NONE\"]" +5 createMine !"\"createMine\"," +5 createTarget !"\"createTarget\"," +5 createVehicle !"\"createVehicle\"," !"createVehicleLocal" !"createVehicle [\"WeaponHolder\", _iPos, [], _radius, \"CAN_COLLIDE\"" !"_fire = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"" !"_object = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"" !"if (_height < 100) then {\n_bolt = createVehicle [\"BoltSteelF\", _endPos, [], 0, \"CAN_COLLIDE\"];\n_bolt setPosATL _endPos;" !"_tent = createVehicle [\"TentStorage\", _location, [], 0, \"CAN_COLLIDE\"];\n_tent setdir _dir;" !"if ((random _int)>2.2) then\n{\n_b=\"SmallSecondary\" createvehicle (getpos _v);\n};" !"exitwith {};\n_b=\"SmallSecondary\" createvehicle (_v modelToWorld _effect2pos);\n} foreach (_list);" !"_bag = createVehicle [format[\"WeaponHolder_%1\",_item],getPosATL player,[], 0, \"CAN_COLLIDE\"];\n_bag setdir (getDir player);" !"_bag = createVehicle [\"WeaponHolder_ItemTent\",_pos,[], 0, \"CAN_COLLIDE\"];\n_bag setdir _dir;\nplayer reveal _bag;" !"_object = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"];\n_object setDir _dir;\nplayer reveal _object;" !"_item = createVehicle [_iItem, _iPos, [], _radius, \"CAN_COLLIDE\"];" !"_item = createVehicle [\"WeaponHolder\", position player, [], 0.0, \"CAN_COLLIDE\"];" !"_holder = \"WeaponHolder\" createVehicle _pos;" !"_bolt = createVehicle [\"WoodenArrowF\", _endPos, [], 0, \"CAN_COLLIDE\"];" !"_weapon = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"];" !"_fire = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"];" !"_weapon = _classname createVehicle _location;\n_weapon setDir _dir;\n_weapon setpos _location;\nplayer reveal _weapon;" !"dayz_hasFire = createVehicle [_classname, _location, [], 0, \"CAN_COLLIDE\"];" !=_veh = createVehicle [\"Sign_arrow_down_large_EP1\", _location, [], 0, \"CAN_COLLIDE\"];" !"_tent = createVehicle [\"VaultStorageLocked\", _location, [], 0, \"CAN_COLLIDE\"];" !"_holder = createVehicle [\"VaultStorage\",_pos,[], 0, \"CAN_COLLIDE"\];" +5 createVehicleLocal !"\"createVehicleLocal\"," !"_tag = \"Sign_sphere10cm_EP1\" createVehicleLocal _position;" !"_point = \"Logic\" createVehicleLocal getPosATL _unit;" !"_object = _type createVehicleLocal _position;" !"_fl = \"#particlesource\" createVehicleLocal getpos _v;" !"_lightArea = \"#lightpoint\" createVehicleLocal (getPosATL _flare);" !"_lightSpark = \"#lightpoint\" createVehicleLocal (getPosATL _flare);" !"_source = \"#particlesource\" createVehicleLocal getpos (_this select 0);" !"_source = \"#particlesource\" createVehicleLocal _pos;\n_source setParticleParams" !"_smoke = \"#particlesource\" createVehicleLocal _pos;\n_smoke attachto [_v,[0,0,0],\"destructionEffect1\"];" !"_Crater= \"CraterLong\" createvehiclelocal [_pos select 0, _pos select 1, 0];\n_Crater setdir (_dir + (180 * _i));" !"_source = \"#particlesource\" createVehicleLocal getPosATL _unit;" !"if (_debug) then \n{\n_source = \"#particlesource"\ createVehicleLocal position player;\n_source setDropInterval 0.1;" +1 disableUserInput !"\"disableUserInput\"," !"disableUserInput false;" +1 enableSimulation !"\"enableSimulation\"," !"renablesimulation = 'enablesimulation'" !"renablesimulationcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'enablesimulation.sqf')" !"this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this" !"dayz_originalPlayer enableSimulation true;" !">> \"dayz_anim\" >> \"isUpdated\");\nplayer enableSimulation true;" +1 ctrlSetEventHandler !"\"ctrlSetEventHandler\"," !"_menu ctrlSetText format[_type,_name];\n_menu ctrlSetEventHandler [\"ButtonClick\",_compile];" +1 ctrlAddEventHandler !"\"ctrlAddEventHandler\"," +1 displayAddEventHandler !"\"displayAddEventHandler\"," !"dayz_lastCheckBit = 0;\n\n(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"_this call dayz_spaceInterrupt\"];" +1 displaySetEventHandler !"\"displaySetEventHandler\"," +1 editorSetEventHandler !"\"editorSetEventHandler\"," +1 inGameUISetEventHandler !"\"inGameUISetEventHandler\"," +1 onPlayerConnected !"\"onPlayerConnected\"," !"textLogFormat [\"MPF_Client JIPonPlayerConnectedSendJIPrequest" !"ca\Modules\MP\data\scripts\JIPonPlayerConnectedSendJIPrequest.sqf" +1 onPlayerDisconnected !"\"OnPlayerDisconnected\"," +1 publicVariable !"\"publicVariable\"," !"publicVariableClient" !"publicVariableServer" !"addPublicVariableEventHandler" !"publicVariable \"dayzDiscoRem\";" !"publicVariable \"dayzPlayerSave\";" !"publicVariable _playerObjName;" !"publicVariable \"BIS_MPF_logic\";" !"publicVariable \"usecEpi\";" !"publicVariable \"remExFP\";" !"publicVariable \"dayzLogin\";" !"publicVariable \"dayzLogin2\";" !"publicVariable \"dayzHitV\";" !"publicVariable \"dayzUpdateVehicle\";" !"usecBandage = [_unit,player];\npublicVariable \"usecBandage\";" !"usecBandage = [player,player];\npublicVariable \"usecBandage\";\nplayer setdamage 0;" !"usecBleed = [_unit,_wound,_hit];\npublicVariable \"usecBleed\";" !"usecBleed = [player,_x,0];\npublicVariable \"usecBleed\";\n} forEach (_medical select 8);" !"usecBleed = [_playerObj,_x,0];\npublicVariable \"usecBleed\";\n} forEach (_medical select 8);" !"dayzRoadFlare = [_projectile,0];\npublicVariable \"dayzRoadFlare\";\n_id = _this spawn player_throwObject;" !"dayzHideBody = _item;\npublicVariable \"dayzHideBody\";\nhideBody _item;\" hideBody _item;" !"usecTransfuse = [_unit,player];\npublicVariable \"usecTransfuse\";" !"player removeMagazine \"ItemMorphine\";\n\nusecMorphine = [_unit,player];\npublicVariable \"usecMorphine\";" !"usecMorphine = [player,player];\npublicVariable \"usecMorphine\";\nplayer setVariable [\"USEC_inPain\", false, true];" !"dayzSetFix = [_vehicle,_selection,0];\npublicVariable \"dayzSetFix\";" !"dayzSetFuel spawn local_sefFuel;\npublicVariable \"dayzSetFuel\";" !"usecPainK = [_unit,player];\npublicVariable \"usecPainK\";" !"dayzGutBody = _array;\npublicVariable \"dayzGutBody\";" !"dayzDeath = [dayz_characterID,0,_body,_playerID,dayz_playerName];\npublicVariable \"dayzDeath\";" !"publicVariable \"dayzPublishObj\";\nif (isServer) then {\ndayzPublishObj call server_publishObj;\n};" +1 publicVariableClient !"\"publicVariableClient\"," !"_clientID publicVariableClient \"dayzPlayerLogin\";" +1 publicVariableServer !"\"publicVariableServer\"," !"publicVariableServer \"dayzPlayerSave\";" !"publicVariableServer \"dayzDiscoRem\";" !"publicVariableServer \"dayzLogin\";" !"publicVariableServer \"dayzLoginRecord\";" !"publicVariableServer \"dayzCharDisco\";\nif (isServer) then {\n\ndayzCharDisco call server_characterSync;" !="publicVariableServer \"dayz_logDamage\";" +1 removeAllEventHandlers !"\"removeAllEventHandlers\"," +1 sendTask !"\"sendTask\"," +1 serverCommand !"\"serverCommand\"," !"serverCommandAvailable" +1 serverCommandAvailable !"\"serverCommandAvailable\"," +1 setCurrentTask !"\"setCurrentTask\"," !"rsetCurrentTask = 'setCurrentTask'" !"rsetCurrentTaskcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setCurrentTask.sqf')" !"rsetCurrentTaskArrays = 'setCurrentTaskArrays'" !"rsetCurrentTaskArrayscode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setCurrentTaskArrays" +5 setDamage !"\"setDamage\"," !"_vehicle setDamage 0;" !"player setdamage 0;" !"if (alive player) then { player SetDamage 1;};" !"if (_ent isKindOf \"Animal\") then {\n_ent setDamage 1;" !"player setDamage 1;\n0.1 fadeSound 0;"!"(vehicle _x) setDamage 1;\n_x setDamage 1;\n};" !"if (!_isSync) then {\n_veh allowDamage true;\n_veh setDamage 1;\nplayer setDamage 1;\n};" !"if (!_isSync) then {\n_vehicle allowDamage true;\n_vehicle setDamage 1;\n_character setVelocity [0,0,100];\n};" !"_object setdir _dir;\n_object setDamage _damage;" !"if (!(_group in _groups)) then {_groups set [count _groups,_group];};\n_x setDamage 1;\n};" !"if (_ent isKindOf \"Animal\" or _isZombie) then {\n_ent setDamage 1;" +5 setDammage !"\"setDammage\"," +5 setDate !"\"setDate\"," !"rsetDate = 'setDate'" !"rsetDatecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setDate.sqf')" !"dayzSetDate" +5 setFog !"\"setFog\"," !"0 setOvercast _currentOvercast;\n0 setFog _currentFog;" !"if (_currentWeatherChange == \"FOG\") then {\n_timeUntilCompletion setFog _targetWeatherValue;\n};" !"0 setFog _initialFog;\n\nif (_initialOvercast == -1) then {" +5 setFuel !"\"setFuel\"," !"z\addons\dayz_code\compile\local_setFuel.sqf" !"\"dayzSetFuel\"" !"dayzSetFuel_code" !"dayzSetFuel = _val;" +5 setHit !"\"setHit\"," !"object_setHitServer = compile preprocessFileLineNumbers \"\z" !"object_setHit = compile preprocessFileLineNumbers \"\z" !"player setHit[\"legs\",1];" !"player setHit[\"hands\",1];" !"_unit setHit[\"legs\",0];" !"_unit setHit[\"hands\",0];" !"_unit setHit[_selection,_damage];" !"_total = [_unit,_hit,_damage] call object_setHitServer;" !"_ent setHit [\"legs\",1];\n_ent setVariable [\"hit_legs\",2,true];" !"z\addons\dayz_code\compile\object_setHit.sqf" !"[player,\"legs\", (_fractures select 0)] call object_setHit;" !"[player,\"hands\", (_fractures select 1)] call object_setHit;" !"z\addons\dayz_code\compile\object_setHitServer.sqf" !"_unit setHit[_selection,(_dam + _damage)];" //!"call object_setHit" +1 setMarkerPos !"\"setMarkerPos\"," !"setMarkerPosLocal" +5 setMarkerPosLocal !"\"setMarkerPosLocal\"," !"rsetMarkerPosLocal = 'setMarkerPosLocal'" !"rsetMarkerPosLocalcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setMarkerPosLocal.sqf')" +5 setOverCast !"\"setOverCast\"," !"0 setOvercast _currentOvercast;\n0 setFog _currentFog;" !"if (_currentWeatherChange == \"OVERCAST\") then {\n_timeUntilCompletion setOvercast _targetWeatherValue;" !"0 setOvercast _initialOvercast;\n\nif (_initialOvercast >= 0.75) then {" +1 setVariable !"\"setVariable\"," !"_x setVariable[\"lastAttack\",time];" !"player setVariable[\"USEC_lowBlood\"," !"player setVariable [\"temperature\",dayz_temperatur," !"_x setVariable [\"zombied\",objNull,true];" !"_x setVariable [\"cleared\",true,true];" !"_x setVariable [\"looted\",_dateNow,true];" !"_agent setVariable [_name, _value];" !"player setVariable[\"medForceUpdate\"," !"player setVariable [\"bodyName\",dayz_playerName,true];" !"uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];" !"_agent setvariable [\"state\",_state];" !"uinamespace setvariable ['BIS_InfoText',_this select 0]" !"_agent setvariable [\"state\",_state];" !"_item setVariable [\"created\",(DateToNumber date),true];" !"_unit setVariable [\"myDest\",_pos];" !"player setVariable [\"messing\",[dayz_hunger,dayz_thirst],true];" !"_hitter setVariable[\"headShots\",(_headShots + 1),true];" !"_hitter setVariable["\firedHit\",[_zed,_selection],true];" !"_hitter setVariable["\firedDamage\",_damage,true];" !"_killer setVariable[_type,(_kills + 1),true];" !"_zombie setVariable [\"targets\"," !"_group setVariable [\"targets\"," !"_unit setVariable [\"hit_legs\",0];" !"_unit setVariable [\"hit_hands\",0];" !"_unit setVariable [_strH,_damage,true];" !"player setVariable [\"BIS_Conversations\", true];" !" _ent setHit [\"legs\",1];\n_ent setVariable [\"hit_legs\",2,true];" +1 setVehicleInit !"\"setVehicleInit\"," !"_v setVehicleInit \"[this] spawn BIS_Effects_AirDestruction\";" !"_v setVehicleInit format [\"[this, %1, %2]spawn BIS_Effects_AirDestructionStage2\",_int, _t];\nprocessInitCommands;" !"if (local _v) then\n{\n_v setVehicleInit format [\"[this, %1, %2,false,true]spawn BIS_Effects_Burn\",_int, _t];" +1 setWind !"\"setWint\"," !"setWind [_currentWindX, _currentWindZ, true];" +5 addAmmo !"\"addAmmo\"," +5 addMPEventHandler !"\"addMPEventHandler\"," !="_this spawn fnc_plyrHit;" +5 clearPlayerInit !"\"clearPlayerInit\"," +1 clearVehicleInit !"\"clearVehicleInit\"," !"if (isserver) then {deletevehicle _snd;};\nclearVehicleInit _v;" !"clearVehicleInit _v;\ndeletevehicle _fl;deletevehicle _sm;" !"clearvehicleinit _v;\n_crw= crew _v;" !"clearvehicleinit _v;\ndeleteVehicle _v;" +5 commandFSM !"\"commandFSM\"," +5 disableTIEquipment !"\"disableTIEquipment\"," +5 SetCamUseTi !"\"SetCamUseTi\"," +5 doFSM !"\"doFSM\"," +5 EjectPlayer !"\"EjectPlayer\"," +5 enableCamShake !"\"enableCamShake\"," !"enableCamShake true;\naddCamShake [5-_level, 1, 2];" !"enableCamShake false;" +5 enableTeamSwitch !"\"enableTeamSwitch\"," +5 fireAtTarget !"\"fireAtTarget\"," +5 onCommandModeChanged !"\"onCommandModeChanged\"," +5 onMapSingleClick !"\"onMapSingleClick\"," +5 onTeamSwitch !"\"onTeamSwitch\"," +5 openDSInterface !"\"openDSinterface\"," !"if (_lbselected == \"DSInterface\") then {openDSInterface;};" +1 processInitCommands !"\"processInitCommands\"," !"processInitCommands; \n};\nif (_v iskindof \"tank\"" !"Effects_AirDestructionStage2\",_int, _t];\nprocessInitCommands" !"_v setVehicleInit format [\"[this, %1, %2,false,true]spawn BIS_Effects_Burn\",_int, _t];\nprocessInitCommands;" +5 setAmmoCargo !"\"setAmmoCargo\"," +1 setFSMVariable !"\"setFSMvariable\"," !"_handle setFSMVariable [\"_thirst\",0];" !"_handle setFSMVariable [\"_hunger\",0];" !"_handle setFSMVariable [\"_command\",\"none\"];" !"_handle setFSMVariable [\"_maxSpeed\",_maxSpeed];" !"_handle setFSMVariable [\"_forceChange\",true];" !"_handle setFSMVariable [\"_command\",\"stay];" !"_handle setFSMVariable [\"_command\",\"track\"];" !"_handle setFSMVariable [\"_target\",_target];" !"_handle setFSMVariable [\"_watchDog\",_watchDog];" !"_handle setFSMVariable [\"_actionWarn\",_actionWarn];" !"_handle setFSMVariable [\"_thirst\",_thirst];" !"_handle setFSMVariable [\"_hunger\",_hunger];" +5 SetFuelCargo !"\"setFuelCargo\"," +1 setGroupIconsVisible !"\"setGroupIconsVisible\"," +5 setObjectProxy !"\"setObjectProxy\"," +1 setpos !"\"setPos\"," !"setPosATL" !"setPosASL" !"setPosASL2" !"ctrlSetPosition" !"sliderSetPosition" !"progressSetPosition" !"camSetPos" !"preloadCamera _setPos" !"BIS_fnc_sceneSetPosFormation" !"_agent = createAgent [_type, _Pos, [], 0, \"FORM\"];\n_agent setpos _Pos;" !"private [\"_test\", \"_test2\"];\n_test = (_this select 0) setPos (position (_this select 0)); if (isnil \"_test\") then {_test = false};" !"[_flare, -90, -10] call object_setpitchbank;\n_flare setPos (getPos _flare);" !"_object = _type createVehicleLocal _position;\n_object setPos _position;\n_object setDir _dir;\n_object allowDamage false;" !"_tent setdir _dir;\n_tent setpos _location;\nplayer reveal _tent;" !"_logic = _this select 0;\n_logic setpos [1000,10,0];\n\n\nwaituntil {!isnil \"BIS_MPF_InitDone\"}; !"_Crater setpos [_pos select 0, _pos select 1, 0];\n_Crater setPos [_pos select 0, _pos select 1, ((0 - _i)/13)];" !"_Crater= \"CraterLong\" createvehiclelocal [_pos select 0, _pos select 1, 0];\n_Crater setdir (_dir + (180 * _i));" +1 setPosATL !"\"setPosATL\"," !"player setPosATL _mylastPos;" !"player setPosATL dayz_spawnPos;" !"player setPosATL _setPos;" !"_item setPosATL _ipos;" !"player setPosATL [-2148,6655,0];" !"_agent setPosATL _position;" !"_bolt setPosATL _endPos;" +1 setposASL !"\"setPosASL\"," !"setPosASL2" !"if (_isOnDeck) then {\n_unit setPosAsl [(_position select 0), (_position select 1), (LHA_height+1)];\n};" +5 setPosASL2 !"\"setPosASL2\"," +5 setRepairCargo !"\"setRepairCargo\"," +5 setUnconscious !"\"setUnconscious\"," +5 setVehicleAmmo !"\"setVehicleAmmo\"," +5 setVehicleArmor !"\"setVehicleArmor\"," +5 setVehicleLock !"\"setVehicleLock\"," +5 setVehiclePosition !"\"setVehiclePosition\"," +5 setViewDistance !"\"setViewDistance\"," +5 setWeaponReloadingTime !"\"setWeaponReloadingTime\"," !"_vehicle setWeaponReloadingTime [_gunner,_muzzle,1];" +5 setWeaponState !"\"setWeaponState\"," +5 skipTime !"\"skipTime\"," !"rskiptime = 'skiptime'" !"rskiptimecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'skiptime.sqf')" +5 teamSwitch !"\"teamSwitch\"," +5 waypointVisible !"\"waypointVisible\"," +1 putWeaponPool !"\"putWeaponPool\"," +1 pickWeaponPool !"\"pickWeaponPool\"," +1 fillWeaponsFromPool !"\"fillWeaponsFromPool\"," +1 visiblePosition !"\"visiblePosition\"," +1 setTerrainGrid !"\"setTerrainGrid\"," +1 WorldToScreen !"\"WorldToScreen\"," !"posWorldToScreen" +1 WorldToModel !"\"WorldToModel\"," !"_relPos = _building worldToModel (getPosATL _unit1);" !"_pondPos = (_x worldToModel _playerPos) select 2;" +1 posWorldToScreen !"\"posWorldToScreen\"," +1 ScreenToWorld !"\"ScreenToWorld\"," +5 loadFile !"\"loadFile\"," +1 selectNoPlayer !"\"selectNoPlayer\"," !"selectNoPlayer;" +5 createLocation !"\"createLocation\"," +5 openMap !"\"openMap\"," +1 hideObject !"\"hideObject\"" !"rhideObject = 'hideObject'" !"rhideObjectcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'hideObject.sqf')" +1 JIPexec !"\"JIPexec\"," !"rJIPexeccode" !"rJIPexec = 'JIPexec'" !"rJIPexeccode = compile PreprocessFile (BIS_PathMPscriptCommands + 'JIPexec.sqf')" !"scriptName \"MP\data\scriptCommands\JIPexec.sqf\";\n\nprivate[\"_remExField\",\"_caller\",\"_target\"];" !"[nil, _targetClient,\"loc\", rJIPEXEC, BIS_MPF_ServerPersistentCallsArray select _i] call RE;" +1 JIPrequest !"\"JIPrequest\"," !"rJIPrequestcode" !"rJIPrequest = 'JIPrequest'" !"rJIPrequestcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'JIPrequest.sqf')" !"ca\Modules\MP\data\scripts\JIPonPlayerConnectedSendJIPrequest.sqf" !"scriptName \"MP\data\scriptCommands\JIPrequest.sqf\";\n_caller = _this select 0;" +5 setCaptive !"\"setCaptive\"," !"rsetCaptive = 'setCaptive'" !"rsetCaptivecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setCaptive.sqf')" !"sleep 1;\n_unit setCaptive true;\n_unit setVariable [\"NORRN_unconscious\", true, true];" !"if (local _unit) then {_unit setCaptive false};" +1 clearMagazineCargo !"\"clearMagazineCargo\"," !"clearMagazineCargoGlobal" !"rclearMagazineCargo = 'clearMagazineCargo'" !"rclearMagazineCargocode = compile PreprocessFile (BIS_PathMPscriptCommands + 'clearMagazineCargo.sqf" +1 clearMagazineCargoGlobal !"\"clearMagazineCargoGlobal\"," !_mags = getMagazineCargo _firePlace;\nclearMagazineCargoGlobal _firePlace;\nclearWeaponCargoGlobal _firePlace;" +1 clearWeaponCargo !"\"clearWeaponCargo\"," !"clearWeaponCargoGlobal" !"rclearWeaponCargo = 'clearWeaponCargo'" !"rclearWeaponCargocode = compile PreprocessFile (BIS_PathMPscriptCommands + 'clearWeaponCargo.sqf')" +1 clearWeaponCargoGlobal !"\"clearWeaponCargoGlobal\"," !_mags = getMagazineCargo _firePlace;\nclearMagazineCargoGlobal _firePlace;\nclearWeaponCargoGlobal _firePlace;" +5 onDoubleClick !"\"onDoubleClick\"," +5 addWeapon !"\"addWeapon\"," !"addWeaponPool" !"addWeaponCargo" !"addWeaponCargoGlobal" !"player addWeapon \"Loot\";" !"player addWeapon \"Flare\";" !"raddWeapon = 'addWeapon'" !"raddWeaponcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addWeapon.sqf')" !"raddWeaponCargocode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addWeaponCargo.sqf')" !"if (_isOK) then {\nplayer addWeapon _x;\n};\n} forEach _wpns;\n};" !"if (_item == (configfile >> \"cfgweapons\" >> (configName _item))) then {_unit addWeapon configName _item;};" !"if (isClass (configfile >> \"cfgweapons\" >> (_item))) then {_unit addWeapon _item;}" !"if(_buy_o_sell == "buy") then {\nplayer addWeapon _part_out;\n} else {\nplayer addMagazine _part_out;\n};" +5 addWeaponPool !"\"addWeaponPool\"," +5 addWeaponCargo !"\"addWeaponCargo\"," !"addWeaponCargoGlobal" !"raddWeaponCargo = 'addWeaponCargo'" !"raddWeaponCargocode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addWeaponCargo.sqf')" +5 addWeaponCargoGlobal !"\"addWeaponCargoGlobal\"," !"_box addWeaponCargoGlobal [_create,_qty];" !"_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];" !"dayz_myBackpack addWeaponCargoGlobal [_x,(_backpackWpnQtys select _countr)];" !"if (_bcpkWpn != \"\") then {\ndayz_myBackpack addWeaponCargoGlobal [_bcpkWpn,1];\n};\n};" !"if (_iItem != \"\") then {\n_item addWeaponCargoGlobal [_iItem,1];\n};" +5 addMagazine !"\"addMagazine\"," !"addMagazineCargo" !"addMagazineCargoGlobal" !"addMagazinePool" !"addMagazineTurret" !"player addMagazine 'crowbar_swing';" !"raddMagazine = 'addMagazine'" !"raddMagazinecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addMagazine.sqf')" !"if (_isOK) then {\nif (_val != -1) then {\nplayer addMagazine [_item,_val];\n} else {\nplayer addMagazine _item;\n};" !"if(!isNil \"_array\") then {\n_agent addMagazine _loot;\n};" !"sleep 8;\n{player addMagazine _x} forEach _inventory;\ndeleteVehicle _object;" !"{\nplayer addMagazine _x;\n} forEach _create;" !"if (_isOK) then {\nplayer addMagazine _x;\n};\n} forEach _mags;" !"if (_item == (configfile >> \"cfgmagazines\" >> (configName _item))) then {_unit addMagazine configName _item;};" !"if (isClass (configfile >> \"cfgmagazines\" >> (_item))) then {_unit addMagazine _item;};" !"for \"_x\" from 1 to _qty do {\nplayer removeMagazine \"ItemWaterbottleUnfilled\";\nplayer addMagazine \"ItemWaterbottle\";\n}; !"if (_item == \"ItemWaterbottle\") then {\nplayer addMagazine \"ItemWaterbottleUnfilled\";\n};" !"player playActionNow \"stop\";\nplayer addMagazine \"ItemBandage\";" !"if (local _item) then {\nfor \"_x\" from 1 to _qty do {\n_item addMagazine \"FoodSteakRaw\";\n};" !"for \"_x\" from 1 to _qty do {\nplayer removeMagazine \"FoodSteakRaw\";\nplayer addMagazine \"FoodSteakCooked\";\nsleep 1;\n};" +5 addMagazinePool !"\"addMagazinePool\"," +5 addMagazineTurret !"\"addMagazineTurret\"," !="_vehicle removeMagazineTurret [_ammo,_turret];\n_vehicle addMagazineTurret [_ammo,_turret];\nplayer removeMagazine _ammo;" +5 addMagazineCargo !"\"addMagazineCargo\"," !"_box addMagazineCargoGlobal [_create,_qty];" !"addMagazineCargoGlobal" !"raddMagazineCargo = 'addMagazineCargo'" !"raddMagazineCargocode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addMagazineCargo.sqf')" +5 addMagazineCargoGlobal !"addMagazineCargo" !"\"addMagazineCargoGlobal\"," !"holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];" !"_firePlace addMagazineCargoGlobal [\"PartWoodPile\",_qty];" !"dayz_myBackpack addmagazineCargoGlobal [_x,(_backpackmagQtys select _countr)];" !"dayz_myBackpack addMagazineCargoGlobal [_x,(_backpackMagQty select _countr)];" +5 addBackpack !"\"addBackpack\"," !"addBackpackCargo" !"addBackpackCargoGlobal" !"player addBackpack _backpackType;" !"_newUnit addBackpack _newBackpackType;" !"player addBackpack _bcpk;" !"player addBackpack _part_out;" +5 addBackpackCargo !"\"addBackpackCargo\"," !"addBackpackCargoGlobal" +5 addBackpackCargoGlobal !"\"addBackpackCargoGlobal\"," !"_box addBackpackCargoGlobal [_create,_qty];" !"_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];" +// test //#+3 +//1 "if (alive player) then { player SetDamage 1;};" //happens on death //#+4 +1 limitSpeed !"\"limitSpeed\"," +1 setOwner !"\"setOwner\"," +//might be too spammy for now //#+5 +//1 call !"\"call\"," //#+6 +//1 spawn !"\"spawn\"," !"rspawn" //#+7 +5 "rspawn" !"rspawn = 'spawn'" !"rspawncode = compile PreprocessFile (BIS_PathMPscriptCommands + 'spawn.sqf')" !"rspawncode" +//1 with !"\"with\"," //#+8 +1 deleteVehicle !"\"deleteVehicle\"," !"dayz_flyMonitor = dayz_flyMonitor - [_x];\ndeleteVehicle _x;" !"deleteVehicle _x;\ndayz_bodyMonitor set [_cursor,\"DEL\"];" !"sleep 5;\n};\n{deleteVehicle _x;} forEach _items;" !"sleep 1;\n};\ndeleteVehicle _source;\ndeleteVehicle _point;" !"if (_nearByPlayer) then {\ndeleteVehicle _agent;\n};" !"_object = nearestObject [_position,_type];\ndeleteVehicle _object;" !"_oldUnit disableAI \"MOVE\";\n} else {\ndeleteVehicle _oldUnit;\n};" !"{deleteVehicle _x} forEach _nearByObj;\n_x setVariable [\"cleared\",true,true];" !"dayzDeleteObj call local_deleteObj;\n};\n deleteVehicle _obj;" !"player addWeapon \"Flare\";\n\nsleep 0.1;\ndeleteVehicle _old;" !"if (local _unit) then {\ndeleteVehicle _unit;" !"};\ndeleteVehicle _lightArea;\ndeleteVehicle _lightSpark;" !"waitUntil{!(alive _flare)};\ndeleteVehicle _lightSpark;" !"if (!isNull _tent) then {\nif (local _tent) then {deleteVehicle _tent};" !"hideBody _item;\nsleep 10;\ndeleteVehicle _item;" !"sleep 5;\ndeleteVehicle _agent;" !"dayzDeleteObj call local_deleteObj;\n};\n\ndeleteVehicle _obj;" !"deleteVehicle _object;\nr_action = false;\ncall fnc_usec_medic_removeActions;" !"if (_isOk) then {\n deleteVehicle _holder;" !"_flare = _this select 3;\ndeleteVehicle _flare;" !"dayz_hasFire = objNull;\ndeleteVehicle _obj;" !"deleteVehicle _object;\n\n_weapon = _classname createVehicle _location;" !"if (!isNull _agent) then {\ndeleteVehicle _agent;" !"{deleteVehicle _x} forEach _zombies;" !"deleteVehicle _agent;\n} else {\ndayz_bodyMonitor set" !"deleteVehicle _x;\n_delQtyZ = _delQtyZ + 1;" !"if (!(isNull _sfx)) then {\ndeleteVehicle _sfx;\n};" !"deleteVehicle _body;\n_delQtyP = _delQtyP + 1;\n};" !"_dwUSOFC=_dwUSOFC+1;\ndeleteVehicle _x;" !"deleteVehicle _x;\n_dwUFPC=_dwUFPC+1;" !"deleteVehicle _x;\n};\n} forEach allMissionObjects \"ReammoBox\"" !"BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};" !"if (_isOk) then {\ndeleteVehicle _holder;\nif (_classname in [\"MeleeHatchet\",\"MeleeCrowbar\"]) then {" !"if (_fade) then {_int=_int - 0.02 - rain/10;};\nsleep 3;\n};\n\ndeletevehicle _fl;" !"clearVehicleInit _v;\ndeletevehicle _fl;deletevehicle _sm;" !"deleteVehicle _smoke;\ndeleteVehicle _fire;\ndeleteVehicle _shards;\ndeleteVehicle _dirt;" !"if (_isOk) then {\ndeleteVehicle _holder;" +1 compile !"\"compile\"," !"\"z\addons\dayz_code\compile" !"call compile preprocessFileLineNumbers \"\z\addons\dayz_code" !"compile preprocessFileLineNumbers '\ca\modules\alice\data\scripts" !"compile preprocessFileLineNumbers '\ca\modules_e\alice2\data\scripts" !"compile preprocessFileLineNumbers 'ca\modules\dyno\data\scripts" !"compile preprocessFileLineNumbers 'ca\modules_e\gita\data\scripts" !"\"z\addons\dayz_code\init\compiles.sqf" !"_this call compile preprocessfilelinenumbers 'ca\ui\scripts\ui_loadingText.sqf';" !"_recompile" !"\"call compile format[\"\"player%1 = player;\"\",_playerUID];\"" !"call compile format[\"\"player%1 = player;\"\",_playerUID];" !"call compile format[\"player%1 = player;\",_playerUID];" !"'] call compile preprocessFileLineNumbers 'ca\Warfare2\Scripts" !"= compile preprocessFileLineNumbers 'ca\modules\function" !"'_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile '\ca\ui\scripts\handleGear.sqf'" !"BIS_MPF_remoteExecutionServer = compile preprocessFile (BIS_MP_Path + BIS_PATH_SQF + \"remExServer.sqf\");" !"compile preprocessFileLineNumbers \"\ca\Data\ParticleEffects\SCRIPTS" !"compile preprocessFile \"\ca\Data\ParticleEffects\SCRIPTS" !"compile PreprocessFile (BIS_PathMPscriptCommands" !"_code = call compile format[\"r%1code\",_targetScript];" !"compile (preprocessFileLineNumbers \"ca\characters_e\data\scripts" !"compile preprocessFileLineNumbers 'ca\modules_e\functions" !"compile preprocessFileLineNumbers 'ca\modules_acr\functions" !"compile preprocessfilelinenumbers 'ca\missions_acr\data\scripts" !"compile preprocessFileLineNumbers 'ca\modules_pmc\functions" !"compile preprocessFileLineNumbers 'ca\missions_ew\functions" !"call (compile \"deactivateKey (_keyString + (str _i))\");" !"if (isText (_class >> \"WeaponSlots\")) then \n{_slotsCode = getText (_class >> \"WeaponSlots\"); _slotsVar = call compile _slotsCode;}" !"_dummy = [_this, 'CA_VO_Init'] call compile preprocessFile '\ca\ui\scripts\HideVideoOptions.sqf';" !"['_dummy']; _dummy = [_this, \"CA_VO_ToggleAll\"] call compile preprocessfilelinenumbers \"\ca\ui\scripts\HideVideoOptions.sqf\";" !"['_dummy']; _dummy = [_this, \"CA_VO_ToggleAdvanced\"] call compile preprocessfilelinenumbers \"\ca\ui\scripts\HideVideoOptions.sqf\";" !"private [\"_amm\"];\n_amm=_this select 4;\n_this call (call compile GetText (configFile >> \"CfgAmmo\" >> _amm >> \"muzzleEffect\"));" !"['BIS_RscMiniMap',_this select 0]; _this call compile preprocessfilelinenumbers 'ca\ui\scripts\MiniMap.sqf';" +1 exec !"\"exec\"," !"execVM" !"execFSM" !"JIPexec" !"_localExec" !"Init script executed at" +1 execVM !"\"execVM\"," !"execVM \"z\addons\dayz_code\medical\init_medical.sqf\"" !"execVM \"z\addons\dayz_code\external\DynamicWeatherEffects.sqf\"" !"execVM \"z\addons\dayz_code\medical\publicEH\load_wounded.sqf\"" !"execVM \"z\addons\dayz_code\medical\load\load_wounded.sqf\"" !"execVM \"z\addons\dayz_code\medical\publicEH\deadState.sqf\"" !"private [\"_dummy\"]; _dummy = [_this,\"onLBSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onLBListSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKillFocus"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKeyDown\",0,107,0,107] execVM \"\ca\ui\scripts\handleGear.sqf\";" +1 execFSM !"\"execFSM\"," !"execFSM \"\z\addons\dayz_code\system" !"execFSM '\z\AddOns\dayz_code\system" !"execfsm \"CA\animals2\Data\scripts\idleSpecialAnim.fsm\"" !"execFSM \"CA\animals2\Data\scripts\\reactFire.fsm\"" !"rexecfsm = 'execfsm'" !"rexecfsmcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'execfsm.sqf')" +//1 setDir !"\"setDir\"," //!"_Crater setdir (_dir + (180 * _i));" //#+9 +1 setVectorUp !"\"setVectorUp\"," !"_bolt setVectorUp _vUp;" +1 SetVectorDir !"\"SetVectorDir\"," !"_obj setVectorDirAndUp [_vdir, _vup];" +1 setVectorDirAndUp !"\"setVectorDirAndUp\"," !"_obj setVectorDirAndUp [_vdir, _vup];" +1 setVelocity !"\"setVelocity\"," !"_character setVelocity [0,0,100];" !"_car setvelocity [1,0,0];" !"_object setvelocity [1,0,0];" !"_vehicle setvelocity [0,0,1];" !"if (_velz>1) then {_v setvelocity [_xv/1.3,_yv/1.3,0]}" !"(_v setvelocity [velocity _v select 0,velocity _v select 1,0]);" +1 setVelocityTransformation !"\"setVelocityTransformation\"," +1 selectPlayer !"\"selectPlayer\"," !"selectPlayer _newUnit;" !"selectPlayer dayz_originalPlayer;" +1 isServer !"\"isServer\"," !"if ((_persistent) && (!_error) && (isServer)) then" !"if (isServer) then {BIS_DEBUG_MPF_SERVERORCLIENT = \"(server)\";} else {BIS_DEBUG_MPF_SERVERORCLIENT = \"(c)\";};" !"{ BIS_functions_mainscope = _this select 0; if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};}" !"scriptName \"MP\data\scripts\JIPwaitFor.sqf\";\n\nif (!isServer) then\n{\n\nwaitUntil {!isNil {player}};" !"if ((!isServer) && (isNull player) ) then\n{\nwaitUntil {!isNull player};\nwaitUntil {time > 3};\n};" !"if ((!isServer) && (player != player)) then\n{\n waitUntil {player == player};\n waitUntil {time > 3};\n};" !"if(isServer) then {\ndayz_players = [];\ndead_bodyCleanup = [];\n};" !"BIS_DEBUG_MPF_SERVERORCLIENT,_caller, local _caller]; \n\nif (isServer) then\n{" !"if (!isServer) then {textLogFormat [\"MPF_Client FUNCTIONS init.sqf ...\"];};" !"if (!isServer) then {\n \"drn_DynamicWeatherEventArgs\" addPublicVariableEventHandler {" !"if (isServer) then {\n waitUntil{dayz_preloadFinished};\n};" +1 isDedicated !"\"isDedicated\"," !"if (!isDedicated) then {\n\n0 fadeSound 0;\n0 cutText [(localize" !"if (!isDedicated) then {\n\"dayzSetDate\" addPublicVariableEventHandler {setDate (_this select 1)};" !"if (!isDedicated) then {\n_config = configFile >> \"CfgLoot\";" !"if(isDedicated) then {\ndayz_disco = [];\n};" !"if (!isDedicated) then {\nif (!isNull _agent) then {\ndeleteVehicle _agent;\n};\n} else {\n[_agent] call zombie_findOwner;" !"if(isDedicated) then {\nsetDate _date;\ndayzSetDate = _date;\npublicVariable \"dayzSetDate\";\n}; +1 removeAllWeapons !"\"removeAllWeapons\"," !"rremoveAllWeapons = 'removeAllWeapons'" !"rremoveAllWeaponscode = compile PreprocessFile (BIS_PathMPscriptCommands + 'removeAllWeapons.sqf')" !"{_newUnit removeMagazine _x;} forEach magazines _newUnit;\nremoveAllWeapons _newUnit;" !"removeallweapons _v;\n\nif (local _v) then {_expl=\"HelicopterExploSmall\" createvehicle (getpos _v);};" +1 addMenu !"\"addMenu\"," !"addMenuItem" +1 addMenuItem !"\"addMenuItem\"," +1 createTeam !"\"createTeam\"," +5 addVehicle !"\"addVehicle\"," +5 fireAtTarget !"\"fireAtTarget\"," +1 allowGetIn !"\"allowGetIn\"," +5 drawArrow !"\"drawArrow\"," +5 drawEllipse !"\"drawEllipse\"," +5 drawIcon !"\"drawIcon\"," +5 drawLine !"\"drawLine\"," +5 drawLink !"\"drawLink\"," +5 drawLocation !"\"drawLocation\"," +5 drawRectangle !"\"drawRectangle\"," +5 setWaypointPosition !"\"setWaypointPosition\"," +5 setWPPos !"\"setWPPos\"," +5 setWaypointScript !"\"setWaypointScript\"," +1 setGroupIconParams !"\"setGroupIconParams\"," +1 setGroupIcon !"\"setGroupIcon\"," +1 show3DIcons !"\"show3DIcons\"," +1 setFriend !"\"setFriend\"," +1 createCenter !"\"createCenter\"," !"BIS_MPF_ServerInitDone = true;\ncreatecenter sidelogic;" +1 missionNamespace !"\"missionNamespace\"," !"_handle = [_display] call (missionnamespace getvariable _x);" +1 uiNamespace !"\"uiNamespace\"," !"_display = uiNamespace getVariable 'DAYZ_GUI_display';" !"uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];" !"_display = uiNamespace getVariable 'DAYZ_GUI_waiting';" !"_display = uinamespace getvariable \"BIS_InfoText\";" !"uinamespace setvariable ['BIS_InfoText',_this select 0]" !"uiNamespace setVariable ['DAYZ_GUI_waiting', _this select 0];" !with (uinamespace) do {\n BIS_loadingScreen = _this select 0;" !"uinamespace setvariable ['BIS_RscMiniMap',_this select 0];" !"uinamespace setvariable ['BIS_RscMiniMapSmall',_this select 0];" +1 removeBackpack !"\"removeBackPack\"," !"_classname = _array select 0;\nremoveBackpack player;" +1 removeAllItems !"\"removeAllItems\"," +1 setAperture !"\"setAperture\"," +1 "camSetPos" !"\"camSetPos\"," +5 "copyFromClipboard" !"\"copyFromClipboard\"," +5 "copyToClipboard" !"\"copyToClipboard\"," +5 "deleteCollection" !"\"deleteCollection\"," +5 "callVar" !"\"callVar\"," !"rcallVar = 'callVar'" !"rcallVarcode = compile PreprocessFile (BIS_PathMPscriptCommandsCustom + 'callVar.sqf')" !"_libraryCustom = \n[\n\"callVar\"\n];" +1 "remExField" !"\"remExField\"," !"\"remExField\" addPublicVariableEventHandler {_this call BIS_MPF_remoteExecutionServer};" !"if (isNil \"remExField\") then {remExField = [];};" !"private[\"_remExField\",\"_caller\",\"_target\"];\n\n_caller = _this select 0;" +1 "remExFP" !"\"remExFP\"," !"\"remExFP\" addPublicVariableEventHandler {_this call BIS_MPF_remoteExecutionServer};" !"if (isNil \"remExFP\") then {remExFP = [];};" !"if ((_this select 0 == \"persistent\") || (_this select 0 == \"remExFP\")) then {_persistent = true;} else {_persistent = false;};" +1 "remExWrite.sqf" !"scriptName \"MP\data\scripts\remExWrite.sqf\";" !"RE = compile preprocessFile (BIS_MP_Path + BIS_PATH_SQF + \"remExWrite.sqf\");" +1 "remExServer.sqf" !"scriptName \"MP\data\scripts\remExServer.sqf\";" !"BIS_MPF_remoteExecutionServer = compile preprocessFile (BIS_MP_Path + BIS_PATH_SQF + \"remExServer.sqf\");" +1 "call RE" !"if (_local) then {\n_unit say [_sound, _dis];\n} else {\n[nil,_unit,rSAY,[_sound, _dis]] call RE;\n};\n};" !"_dir = [_unit,player] call BIS_Fnc_dirTo;\n_unit setDir _dir;\n[objNull, _unit, rPlayMove,_move] call RE;" !"if(_currentWpn != \"\") then {_newUnit selectWeapon _currentWpn;};\n[objNull, player, rSwitchMove,_currentAnim] call RE;" !"if (_currentAnim != \"\") then {\n[objNull, player, rSwitchMove,_currentAnim] call RE;\n};" !"[nil, _targetClient,\"loc\", rJIPEXEC, BIS_MPF_ServerPersistentCallsArray select _i] call RE;" !"BIS_MPF_clientJIPlogic = player;\n\nnic = [BIS_MPF_clientJIPlogic,nil,rJIPREQUEST] call RE;" !"[objNull, player, rSwitchMove,\"\"] call RE;\nplayer playActionNow \"stop\";" !"[nil,_trap,rSAY,[\"trap_bear_0\",60]] call RE;" !"waituntil {!isnil \"BIS_MPF_InitDone\"};\n_spawn = [nil, nil, \"per\", rEXECVM,\"ca\Modules\Functions\init.sqf\"] call RE;" +1 "spawn RE" +1 "toArray" !"\"toArray\"," !"BIS_fnc_invCodeToArray" !"ca\modules\functions\inventory\fn_invCodeToArray.sqf" !"_anim = animationState player;\n_anim4 = toArray _anim;\n_anim4 resize 4;" !"_type = surfaceType _pos;\n_typeA = toArray _type;" !"if([\"Wheel\",_x,false] call fnc_inString) then {\n_part = \"PartWheel\";\n_cmpt = \"Wheel\";\n_array = toArray _x;" !"{_casesensitive = _this select 2;};\n\n_findarray = toArray _find;\n_stringarray = toArray _string;" !"_text = _this;\n_textArrayUnicode = [];\n{_textArrayUnicode = _textArrayUnicode + [toarray _x]} foreach _text;" !"_cmpt = toArray (_x);\n_cmpt set [0,20];\n_cmpt set [1,toArray ("-") select 0]" +//1 "titleText" !"\"titleText\"," !"rtitleText = 'titleText'" !"rtitleTextcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'titleText.sqf')" !"if (_isDead) then {\nTitleText[\"Pulse is extremely weak\",\"PLAIN DOWN\",3];" !"if (_isCardiac) then {\nTitleText[\"Pulse is weak\",\"PLAIN DOWN\",3];\n} else {\nTitleText[\"Pulse is strong\",\"PLAIN DOWN\",3];" //#+10 +//1 "cutText" //#+11 +1 "createTrigger" !"\"createTrigger\"," !"_t=createTrigger[\"EmptyDetector\",(_player modelToWorld[0,0,0])];" +1 "_fnc" !"BIS_fnc" !"BIS_SSM_fnc" !"BIS_GITA_fnc" !"BIS_ALICE_fnc" !"BIS_EW_fnc !"BIS_PMC_fnc" !"drn_fnc_DynamicWeather_ShowDebugTextLocal" +1 "BIS_fnc" !"if (isnil 'BIS_fnc" !"BIS_fnc_createmenu" !"BIS_fnc_sceneSetPosFormation" !"BIS_Fnc_dirTo" !"BIS_fnc_invAdd" !"BIS_fnc_invCodeToArray" !"BIS_fnc_halo" !"BIS_fnc_invSlotsEmpty" !"BIS_fnc_invSlotType" !"BIS_fnc_vectorDiff" !"BIS_fnc_findSafePos" !"BIS_fnc_isPosBlacklisted" !"BIS_fnc_inTrigger" !"BIS_fnc_selectRandom" !"BIS_fnc_infoText" !"bis_fnc_init" !"BIS_fnc_arrayFindDeep" !"Error: BIS_FNC" !"BIS_FNC Error:" !"bis_fnc_flies" !"BIS_fnc_relativeDirTo" +1 "BIS_SSM_fnc" !"if (isnil 'BIS_SSM_fnc" +1 "BIS_GITA_fnc" !"if (isnil 'BIS_GITA_fnc" !"if (isnil 'BIS_GITA_fnc_createMarkers' || false) then {" +1 "BIS_ALICE_fnc" !"if (isnil 'BIS_ALICE_fnc" +1 "BIS_EW_fnc" !"if (isnil 'BIS_EW_fnc" +1 "BIS_PMC_fnc" !"if (isnil 'BIS_PMC_fnc" +1 "BIS_fnc_destroyCity" !"if (isnil 'BIS_fnc_destroycity" +1 "BIS_fnc_spawnVehicle" !"if (isnil 'BIS_fnc_spawnVehicle" +1 "BIS_fnc_halo" !"if (isnil 'BIS_fnc_halo" +1 "BIS_fnc_sceneSetPosFormation" !"if (isnil 'BIS_fnc_scenesetposformation" +1 "BIS_fnc_invAdd" !"if (isnil 'BIS_fnc_invAdd" !"_isOk = [player,_config] call BIS_fnc_invAdd;" !"_isOk = [player,_config2] call BIS_fnc_invAdd;" !"_result = [player,\"PartWoodPile\"] call BIS_fnc_invAdd;" !"INV_ Error: BIS_FNC_invAdd" +1 "BIS_fnc_infoText" !"if (isnil 'BIS_fnc_infoText" !"_first = [_x select 0,_x select 1] spawn BIS_fnc_infoText;" !"_first = [_world,_town,localize (\"str_player_06\") + \" \" + str(_days)] spawn BIS_fnc_infoText;" +1 "AttachObject" !"\"AttachObject\"," !"lightAttachObject" !"triggerAttachObject" !"waypointAttachObject" +1 "lightAttachObject" !"\"lightAttachObject\"," !"_lightArea lightAttachObject [_flare, [0,0,0]];" !"_lightSpark lightAttachObject [_flare, [0,0,0]];" !"_li lightAttachObject [_flare, [0,0,0]];" !"_li lightAttachObject [_v, [0,0,0]];" +1 "triggerAttachObject" !"\"triggerAttachObject\"," +1 "waypointAttachObject" !"\"waypointAttachObject\"," +5 "remoteControl" !"\"remoteControl\"," +1 "switchCamera" !"\"switchCamera\"," !"rswitchCamera = 'switchCamera'" !"rswitchCameracode = compile PreprocessFile (BIS_PathMPscriptCommands + 'switchCamera.sqf')" +1 "BIS_fnc_AAN" +//little tries //#+12 +1 "rsetTask" !"rsetTaskState = 'setTaskState'" !"rsetTaskStatecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'setTaskState.sqf')" +1 "rsay" !"rsay = 'say'" !"rsaycode" !"if (_local) then {\n_unit say [_sound, _dis];\n} else {\n[nil,_unit,rSAY,[_sound, _dis]] call RE;\n};\n};" !"[nil,_trap,rSAY,[\"trap_bear_0\",60]] call RE;" +1 "rsaycode" !"rsaycode = compile PreprocessFile (BIS_PathMPscriptCommands + 'say.sqf')" !"rsaycode"// +1 "rland" !"rland = 'land'" !"rlandcode" +1 "rlandcode" !"rlandcode = compile PreprocessFile (BIS_PathMPscriptCommands + 'land.sqf')" !"rlandcode"// +1 "player action" +1 "vehicle player setPos" +1 "vehicle player setPosASL" +5 "(vehicle player) addEventHandler [\"handleDamage\", { false }];" +5 "player addEventHandler [\"handleDamage\", { false }];" +5 "attachObject player" +1 "(vehicle player) setPos" +1 "(vehicle player) setPosASL" +//isn't welcome ingame //#+13 +5 "CBA_EVENT_KEY_LOGIC setDamage 1;" +1 "_tp = \"removeallweapons player;" +5 "player addweapon 'Truckhorn2';" +5 "player selectweapon 'Truckhorn2';" +5 "player setVehicleInit _svr;" +5 "_object = createVehicle ['%1', [%2, %3, %4], [], 0, 'CAN_COLLIDE'];" +5 "player setVariable['lastPos',0];" +5 "hint format [\"A %1 has been added\", gun]" +5 "vehicle player setpos _pos;" +5 "marker2 setMarkerPosLocal (getPos veh)" +1 "private [\"_dummy\"]; _dummy =" !"private [\"_dummy\"]; _dummy = [_this,\"onLBSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onLBListSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKillFocus"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKeyDown\",0,107,0,107] execVM \"\ca\ui\scripts\handleGear.sqf\";" +5 "marker2 = createMarkerLocal [marker2,getPos veh];" +5 "marker2 = \"VehMarker\" + (str i);" +1 "private [\"_dummy\"]; _dummy" !"private [\"_dummy\"]; _dummy = [_this,\"onLBSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onLBListSelChanged\"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKillFocus"] execVM \"\ca\ui\scripts\handleGear.sqf\";" !"private [\"_dummy\"]; _dummy = [_this,\"onKeyDown\",0,107,0,107] execVM \"\ca\ui\scripts\handleGear.sqf\";" +5 TKCV1_0\TKCOWNS.sqf +5 "[_this,\"players\"] execVM \"\ca\ui\scripts\dedicatedServerInterface.sqf\";" +5 "_v addweapon \"A\"+\"A1\"+\"2_PM\"+\"C\"; _v addmagazine \"20R\"+\"nd" +5 "zombieshield" +5 "playershield" +5 "spawn{player addAction [" +// not much of use //#+14 +5 "666.sqf" +1 "wuat\\" +1 " ESP " +5 _markerMirador +5 Bo_Mk82 +1 htelepos +1 Teleport +1 Trigger !"createTrigger" !"call BIS_fnc_inTrigger" !"if (isnil 'BIS_fnc_sceneCreateSceneTrigger' || false) then {" +5 aa12 !"Soldier_Bodyguard_AA12_PMC_DZ" +5 azp85 +5 bomblauncher +5 teled +5 U-NO- +5 gau +5 "God mode" +5 GodMode +5 hacks +5 Infammo +5 "Infinite Ammo" +5 InfiniteAmmo +5 Killplayer +5 m1a1 +5 M1A2_TUSK_MG +5 OwnageMenu +// names useless //#+15 +5 Darky +5 Vojtec +5 MrMedic +5 "Raiin" +//5 Loki //too short, might cause another useless ban //#+16 +//5 Alex //triggers at locALEXec, useless anyway //#+17 +5 Alexenderp$ck +5 Gerk +5 Troopman +5 Troopmon +5 Alexenderpackk +5 "Init RE" \ No newline at end of file diff --git a/Server Files/Battleye/selectplayer.txt b/Server Files/Battleye/selectplayer.txt new file mode 100644 index 000000000..f5efa40a4 --- /dev/null +++ b/Server Files/Battleye/selectplayer.txt @@ -0,0 +1 @@ +1 "" \ No newline at end of file diff --git a/Server Files/Battleye/setdamage.txt b/Server Files/Battleye/setdamage.txt new file mode 100644 index 000000000..d062d049e --- /dev/null +++ b/Server Files/Battleye/setdamage.txt @@ -0,0 +1,2 @@ +1 "" +1 "1.000000" \ No newline at end of file diff --git a/Server Files/Battleye/setpos.txt b/Server Files/Battleye/setpos.txt new file mode 100644 index 000000000..f28b22c50 --- /dev/null +++ b/Server Files/Battleye/setpos.txt @@ -0,0 +1,121 @@ +5 "SurvivorWcombat_DZ" +5 "SurvivorWdesert_DZ" +5 "SurvivorWurban_DZ" +5 "SurvivorWpink_DZ" +5 "SurvivorW3_DZ" +5 "SurvivorW2_DZ" +5 "Survivor1_DZ" +5 "Survivor2_DZ" +5 "Bandit1_DZ" +5 "BanditW1_DZ" +5 "BanditW2_DZ" +5 "Soldier_Crew_PMC" +5 "Sniper1_DZ" +5 "Camo1_DZ" +5 "Soldier1_DZ" +5 "Rocket_DZ" +5 "Rocker2_DZ" +5 "Priest_DZ" +5 "Functionary1_EP1_DZ" +5 "GUE_Commander_DZ" +5 "Ins_Soldier_GL_DZ" +5 "Haris_Press_EP1_DZ" +5 "Pilot_EP1_DZ" +5 "RU_Policeman_DZ" +5 "pz_policeman" +5 "pz_suit1" +5 "pz_suit2" +5 "pz_worker1" +5 "pz_worker2" +5 "pz_worker3" +5 "pz_doctor" +5 "pz_teacher" +5 "pz_hunter" +5 "pz_villager1" +5 "pz_villager2" +5 "pz_villager3" +5 "pz_priest" +5 "Soldier_TL_PMC_DZ" +5 "Soldier_Sniper_PMC_DZ" +5 "Soldier_Bodyguard_AA12_PMC_DZ" +5 "Drake_Light_DZ" +5 "CZ_Special_Forces_GL_DES_EP1_DZ" +5 "TK_INS_Soldier_EP1_DZ" +5 "TK_INS_Warlord_EP1_DZ" +5 "Offroad_DSHKM_Gue" +5 "Old_moto_TK_Civ_EP1" +5 "MMT_Civ" +5 "Old_bike_TK_INS_EP1" +5 "Old_bike_TK_CIV_EP1" +5 "TT650_Ins" +5 "TT650_Civ" +5 "TT650_TK_CIV_EP1" +5 "ATV_US_EP1" +5 "hilux1_civil_3_open_EP1" +5 "hilux1_civil_2_covered" +5 "datsun1_civil_3_open" +5 "Pickup_PK_TK_GUE_EP1" +5 "VWGolf" +5 "Lada1" +5 "Lada2" +5 "LadaLM" +5 "Lada2_TK_CIV_EP1" +5 "Skoda" +5 "SkodaGreen" +5 "SkodaRed" +5 "SkodaBlue" +5 "car_sedan" +5 "car_hatchback" +5 "policecar" +5 "GLT_M300_LT" +5 "GLT_M300_ST" +5 "Volha_1_TK_CIV_EP1" +5 "Volha_2_TK_CIV_EP1" +5 "VolhaLimo_TK_CIV_EP1" +5 "UAZ_Unarmed_TK_EP1" +5 "UAZ_RU" +5 "UAZ_INS" +5 "UAZ_CDF" +5 "Ikarus" +5 "SUV_TK_CIV_EP1" +5 "SUV_Green" +5 "SUV_Yellow" +5 "SUV_White" +5 "SUV_Silver" +5 "SUV_Red" +5 "SUV_Pink" +5 "SUV_Orange" +5 "SUV_Charcoal" +5 "SUV_Blue" +5 "UH1H_DZ" +5 "Mi17_Civilian_DZ" +5 "Mi17_DZ" +5 "LandRover_CZ_EP1" +5 "HMMWV_Ambulance" +5 "HMMWV_DES_EP1" +5 "HMMWV_Ambulance_CZ_DES_EP1" +5 "PBX" +5 "Zodiac" +5 "RHIB" +5 "Fishing_Boat" +5 "Smallboat_1" +5 "Smallboat_2" +5 "KamazRefuel" +5 "UralRefuel_TK_EP1" +5 "MtvrRefuel_DES_EP1" +5 "Ural_UN_EP1" +5 "Ural_TK_CIV_EP1" +5 "Ural_CDF" +5 "Kamaz" +5 "tractor" +1 "CSJ_GyroP" +5 "S1203_ambulance_EP1" +5 "S1203_TK_CIV_EP1" +5 "MH6J_DZ" +5 "AH6X_DZ" +5 "MTVR_DES_EP1" +5 "LandRover_MG_TK_EP1" +5 "M1030_US_DES_EP1" +5 "V3S_Civ" +5 "Parachute" +1 "" \ No newline at end of file diff --git a/Server Files/Battleye/setvariable.txt b/Server Files/Battleye/setvariable.txt new file mode 100644 index 000000000..d6ef1c9fd --- /dev/null +++ b/Server Files/Battleye/setvariable.txt @@ -0,0 +1,35 @@ +1 "" !="drn_AskServerDynamicWeatherEventArgs" !="dayzLogin" !="dayzLogin2" !="dayzLoginRecord" !="dayzCharDisco" !="dayzPlayerSave" !="usecBleed" !="dayzHit" !="usecTransfuse" !="usecBandage" !="dayzPlayerMorph" !="usecPainK" !="usecEpi" !="dayzPublishObj" !="dayzRoadFlare" !="dayzDiscoAdd" !="dayzGutBody" !="dayzHideBody" !="dayzDeleteObj" !="dayzUpdateVehicle" !="dayzSetFix" !="dayzHumanity" !="dayzDiscoRem" !="usecMorphine" !="dayzSetFuel" !="dayzFlies" !="changeCharacter" !="dayzSwitch" !="dayzFire" !="norrnRaDrag" !="norrnR180" !="norrnRalie" !="norrnRALW" !="norrnRACarUp" !="norrnRAPicUp" !="norrnRnoAnim" !="remExField" !="BIS_MPF_logic" !="remExFP" !="dayzDeath" !="player" !="drn_DynamicWeatherEventArgs" !="dayzSetDate" !="rsay" !="rland" !="rsetdir" !"\"zombiespawn\" = " !"\"targets\" = []" !"\"targets\" = []" !"\"zombied\" = " !"\"startcombattimer\" = " !"\"posforceupdate\" = " !"\"combattimeout\" = " !"\"messing\" = [" !="_this spawn fnc_plyrHit;" +5 "teleported" +1 "nil" +1 "true" +1" false" +1 "remExFP" +//1 "remExField" //+2 +1 "BIS_MPF_logic" +1 "JIPrequest" +1 "JIPexec" +//1 "dayzDeath" //+3 +//1 "player" //+4 +1 "alive" +5 "dayzSetDate" +5 "rsay" +5 "rland" +5 "rsetdir" +5 "local_sefFuel" +1 "spawn" !"\"zombiespawn\" = " !="_this spawn fnc_plyrHit;" +1 "BIS_Effects" +5 "hiveupdateresu" +5 "monkymonitor" +5 "mmonitor" +5 "monky" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +5 "norrnRACarUp" +5 "norrnRAPicUp" +// added following to 1 "" to lower spam in setVariable.log !="_this spawn fnc_plyrHit;" +//"" !"\"zombiespawn\" = " !"\"targets\" = []" !"\"targets\" = []" !"\"zombied\" = " !"\"startcombattimer\" = " !"\"posforceupdate\" = " !"\"combattimeout\" = " !"\"messing\" = [" +//1 "" !="_this spawn fnc_plyrHit;" diff --git a/Server Files/Battleye/setvariableval.txt b/Server Files/Battleye/setvariableval.txt new file mode 100644 index 000000000..9cd796889 --- /dev/null +++ b/Server Files/Battleye/setvariableval.txt @@ -0,0 +1,237 @@ +//1 "" //+2 !="_this spawn fnc_plyrHit;" +1 "draw" +1 "hint" !="hintC" !="hintS" +1 "create" +1 "add" !="ladder" +1 "remove" !"removeAll" +1 "delete" +1 "set" +//1 "play" !="playmove" !="player" !="dayzPlayerSave" //+3 +1 "clear" +1 "disable" +1 "copy" +1 "switch" !="\"switchmove\"" +1 "text" +1 "init" +1 "hide" !"hideObject" +1 "group" +1 "icon" +1 "marker" +1 "server" +5 "compile" +5 "loadFile" +//1 "say" //+4 +5 "call" +1 "move" !="\"switchmove\"" !="\"playmove\"" !"moveIn" !"remove" +1 "chat" +1 "fade" +1 "action" +1 "exec" !"execVM" !"execFSM" !"jipexec" +5 "mission" +1 "kb" !="FoodCanFrankBeans" !="\"FoodCanFrankBeans\"" !"kbTell" !"kbReact" +1 "side" +1 "show" +1 "task" !"taskHint" +1 "allow" +5 "enable" +5 "spawn" !="_this spawn fnc_plyrHit;" +1 "for" +1 "this" !="_this spawn fnc_plyrHit;" +5 "format" +1 "skip" !"skipTime" +1 "fail" +1 "force" +5 "parse" +5 "terminate" +1 "start" +5 "eventhandler" +//5 "setTask" //covered by 5 "setT" +5 "hintC" +5 "hintS" +5 "loading" +//5 "callVar" //covered by 5 "call" +//5 "rspawn" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +5 "removeAll" +//5 "\"spawn\"" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +5 "\"call\"" +5 "call compile" +1 "jiprequest" !=",,\"JIPrequest\"" +1 "jipexec" //1 "rjipexec" +1 "remExField" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack1\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack2\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack3\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack4\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack5\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack6\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack7\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack8\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack9\"]" !="\"remExField\" = [,,\"playmove\",\"ZombieStandingAttack10\"]" !="\"remExField\" = [,,\"JIPrequest\"]" +1 "remExFP" +//5 "setDate" //covered by 5 "setD" +//5 "setAccTime" //covered by 5 "setA" +5 "remoteControl" +5 "toString" +5 "toArray" +5 "ctrlset" +5 "rsay" +5 "rland" +5 "rsetDir" +5 "_YakB" +1 "BIS_" +5 "local_sefFuel" +5 "local_gutObject" +1 "object_setFixServer" +1 "object_delLocal" +1 "fnc_vehicleEventHandler" +1 "player_humanityChange" +1 "fnc_usec_damageBleed" +1 "player_medBandage" +1 "player_medInject" +1 "player_medEpi" +1 "player_medTransfuse" +1 "player_medMorphine" +1 "player_medPainkiller" +1 "fnc_usec_damageHandler" +1 "fnc_usec_damageVehicle" +1 "fnc_usec_damageType" +1 "dayzplayermorph" +1 "server_playerMorph" +5 "getVariable" +5 "hiveupdateresu" +5 "isServer" +5 "isDedicated" +5 "cutText" +5 "publicVariable" +//5 "setVariable" //covered by 5 "setV" +5 "code" +5 "onPlayer" +5 "select" +5 "while" +1 "count" +5 "markerText" +5 "BIS_fnc" +5 "+" //!"e+" //might cause some rare kicks for items with too high numbers +5 "\+" !"e+" +5 "_bis" +//5 "trigger" +5 "markertype" +5 "teamtype" +//5 "BIS_fnc_swapVars" // covered by 5 "BIS_fnc" +5 "composeText" +5 "teamName" +//5 "createTeam" //covered by 5 "createT" +5 "execVM" +5 "fn_swapVars.sqf" +//5 "setVehicleInit" //covered by 5 "setV" +5 "processInitCommands" +//5 "clearVehicleInit" //covered by 5 "clearV" +//5 "createTrigger" //covered by 5 "createT" +//5 "setTriggerStatements" //covered by 5 "setT" +//5 "setTriggerText" //covered by 5 "setT" +5 "remotecmd" +5 "promptRName.sqf" +5 "%" +5 ".sqf\"]" !="init.sqf\"]" +5 "rpcCodeVarName" +5 "rpcDirectCall" +5 "broadcastRpcCallAll" +5 "broadcastRpcCallIfLocal" +5 "callRpcProcedure" +5 "registerBroadcastRpc" +5 "norrnRACarUp" +5 "norrnRAPicUp" +5 "markerBrush" +5 "hideObject" +5 "deleteCollection" +5 "forceEnd" +//5 "createUnit" //covered by 5 "createU" +//5 "createGroup" //covered by 5 "createG" +//5 "createVehicle" //covered by 5 "createV" +//5 "createMarker" //covered by 5 "createM" +//5 "createMine" //covered by 5 "createM" +5 "createAgent" +//5 "createSoundsource" //covered by 5 "createS" +//5 "createSimpleTask" //covered by 5 "createS" +//5 "createDialog" //covered by 5 "createD" +//5 "createDiaryRecord" //covered by 5 "createD" +5 "deleteVehicle" +5 "deleteTeam" +//5 "respawn" //covered by 5 "spawn" !="_this spawn fnc_plyrHit;" +//5 "setVehicleVarName" //covered by 5 "setV" +5 "getPlayerUID" +5 "getVariable" +5 "removeM" +5 "removeW" +5 "addAction" +//5 "addEventhandler" //covered by 5 "eventhandler" +//5 "addMagazine" //covered by 5 "addM" +5 "AddM" +5 "AddP" +5 "AddS" +5 "AddV" +5 "AddW" +//5 "setVehicleAmmo" //covered by 5 "setV" +//5 "setA" +5 "setAcc" +5 "setAtt" +5 "setC" +5 "setD" +5 "setF" +5 "setG" +5 "setH" +5 "setM" +//5 "setO" +5 "setObj" +5 "setOver" +5 "setP" +5 "setR" +5 "setS" +5 "setT" +//5 "setU" +5 "setUnit" +5 "setV" +5 "setW" +5 "execFSM" +5 "clearM" +5 "clearV" +5 "clearW" +5 "createD" +5 "createG" +5 "createM" +5 "createS" +5 "createT" +5 "createU" +5 "createV" +5 "debugLog" +5 "debugFSM" +5 "deleteM" +//5 "enableSimulation" //covered by 5 "enable" +5 "kbTell" +5 "kbReact" +5 "fadeSound" +5 "fadeMusic" +5 "showC" +5 "skipTime" +5 "taskHint" +5 "titleCut" +5 "titleText" +5 "getM" +5 "getFSMvariable" +5 "getG" +5 "moveIn" +5 "synchronizeO" +5 "synchronizeT" +5 "synchronizeW" +5 "triggerA" +5 "triggerS" +5 "triggerT" +5 "MarkerColor" +5 "MarkerDir" +5 "MarkerPos" +5 "MarkerSize" +5 "onEachFrame" +5 "hasInterface" +5 "onMapS" +5 "OnGroup" +5 "onDouble" +5 "onPreload" +5 "onTeamS" +5 "onShowNew" +//5 "setUnitRecoilCoefficient" //covered 5 "setUnit" +5 "setUnconscious" +//5 "setUnitPos" //covered 5 "setUnit" +//5 "parseText" //covered by 5 "parse" +//1 "" +5 !="_this spawn fnc_plyrHit;" +//1 "request" //+6 \ No newline at end of file diff --git a/Server Files/Battleye/teamswitch.txt b/Server Files/Battleye/teamswitch.txt new file mode 100644 index 000000000..8a291e2f3 --- /dev/null +++ b/Server Files/Battleye/teamswitch.txt @@ -0,0 +1 @@ +1 "" diff --git a/dayz_code/CfgMagazines.hpp b/dayz_code/CfgMagazines.hpp index cf98f6e72..0b72d81c6 100644 --- a/dayz_code/CfgMagazines.hpp +++ b/dayz_code/CfgMagazines.hpp @@ -1,7 +1,7 @@ class CfgMagazines { class CA_Magazine; // External class reference - class ItemTent : CA_Magazine { + class ItemTentDomed : CA_Magazine { scope = public; count = 1; type = (256 * 3); @@ -14,6 +14,7 @@ class CfgMagazines { class Pitch { text = $STR_PITCH_TENT; script = "spawn player_tentPitch;"; + create = "TentStorageDomed"; }; }; }; diff --git a/dayz_code/actions/build.sqf b/dayz_code/actions/build.sqf index e0443ea2e..e6c77b884 100644 --- a/dayz_code/actions/build.sqf +++ b/dayz_code/actions/build.sqf @@ -29,7 +29,7 @@ _offset_z = 0; _offset_z_attach = 0.5; // Start Preview loop -_tmpbuilt = createVehicle ["_classname", _location, [], 0, "CAN_COLLIDE"]; +_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; _tmpbuilt setdir _dir; _tmpbuilt attachTo [player,[_offset_x,_offset_y,_offset_z_attach]]; diff --git a/dayz_code/actions/dog/feed.sqf b/dayz_code/actions/dog/feed.sqf index a1d050f46..9099ac486 100644 --- a/dayz_code/actions/dog/feed.sqf +++ b/dayz_code/actions/dog/feed.sqf @@ -10,10 +10,20 @@ player playActionNow "PutDown"; switch (_type) do { case 0: { - player removeMagazine "FoodSteakRaw"; - _handle setFSMVariable ["_hunger",0]; - player removeAction s_player_feeddog; - s_player_feeddog = -1; + // expanded to allow all meats as input + _removed = 0; + _itemIn = "FoodmeatRaw"; + _countIn = 1; + { + if( (_removed < _countIn) && ((_x == _itemIn) || configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn)) then { + _removed = _removed + ([player,_x] call BIS_fnc_invRemove); + }; + } forEach magazines player; + if(_removed == _countIn) then { + _handle setFSMVariable ["_hunger",0]; + player removeAction s_player_feeddog; + s_player_feeddog = -1; + }; }; case 1: { diff --git a/dayz_code/actions/gather_meat.sqf b/dayz_code/actions/gather_meat.sqf index 639c41956..acb64d775 100644 --- a/dayz_code/actions/gather_meat.sqf +++ b/dayz_code/actions/gather_meat.sqf @@ -9,38 +9,74 @@ _config = configFile >> "CfgSurvival" >> "Meat" >> _type; player removeAction s_player_butcher; s_player_butcher = -1; - if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then { //Get Animal Type _isListed = isClass (_config); _text = getText (configFile >> "CfgVehicles" >> _type >> "displayName"); + // force animation player playActionNow "Medic"; - - _dis=10; - _sfx = "gut"; - [player,_sfx,0,false,_dis] call dayz_zombieSpeak; - [player,_dis,true,(getPosATL player)] spawn player_alertZombies; - _item setVariable["meatHarvested",true,true]; - - _qty = 2; - if (_isListed) then { - _qty = getNumber (_config >> "yield"); - }; - - if (_hasKnifeBlunt) then { _qty = round(_qty / 2); }; - - _array = [_item,_qty]; + // Alert zombies + [player,10,true,(getPosATL player)] spawn player_alertZombies; - if (local _item) then { - _array spawn local_gutObject; - } else { - dayzGutBody = _array; - publicVariable "dayzGutBody"; - }; + r_interrupt = false; + _animState = animationState player; + r_doLoop = true; + _started = false; + _finished = false; - sleep 6; - _string = format[localize "str_success_gutted_animal",_text,_qty]; - cutText [_string, "PLAIN DOWN"]; + while {r_doLoop} do { + _animState = animationState player; + _isMedic = ["medic",_animState] call fnc_inString; + if (_isMedic) then { + _started = true; + }; + if (_started and !_isMedic) then { + r_doLoop = false; + _finished = true; + }; + if (r_interrupt) then { + r_doLoop = false; + }; + sleep 0.1; + }; + r_doLoop = false; + + if (!_finished) exitWith { + r_interrupt = false; + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + cutText ["Canceled gutting." , "PLAIN DOWN"]; + _abort = true; + }; + + _hasHarvested = _item getVariable["meatHarvested",false]; + + if(_finished and !_hasHarvested) then { + + _item setVariable["meatHarvested",true,true]; + + // Play sound since we finished + [player,"gut",0,false,10] call dayz_zombieSpeak; + + _qty = 2; + if (_isListed) then { + _qty = getNumber (_config >> "yield"); + }; + + if (_hasKnifeBlunt) then { _qty = round(_qty / 2); }; + + _array = [_item,_qty]; + + if (local _item) then { + _array spawn local_gutObject; + } else { + dayzGutBody = _array; + publicVariable "dayzGutBody"; + }; + + _string = format[localize "str_success_gutted_animal",_text,_qty]; + cutText [_string, "PLAIN DOWN"]; + }; }; \ No newline at end of file diff --git a/dayz_code/actions/gather_zparts.sqf b/dayz_code/actions/gather_zparts.sqf index a9346d8ed..47134fd3e 100644 --- a/dayz_code/actions/gather_zparts.sqf +++ b/dayz_code/actions/gather_zparts.sqf @@ -15,24 +15,64 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then { _isListed = isClass (_config); _text = getText (configFile >> "CfgVehicles" >> _type >> "displayName"); + // force animation player playActionNow "Medic"; - [player,"gut",0,false] call dayz_zombieSpeak; - _item setVariable["meatHarvested",true,true]; + + // Alert zombies + [player,50,true,(getPosATL player)] spawn player_alertZombies; + + r_interrupt = false; + _animState = animationState player; + r_doLoop = true; + _started = false; + _finished = false; - _qty = 1; - - _id = [player,100,true,(getPosATL player)] spawn player_alertZombies; - - _array = [_item,_qty]; - - if (local _item) then { - _array spawn local_gutObjectZ; - } else { - dayzGutBody = _array; - publicVariable "dayzGutBodyZ"; + while {r_doLoop} do { + _animState = animationState player; + _isMedic = ["medic",_animState] call fnc_inString; + if (_isMedic) then { + _started = true; + }; + if (_started and !_isMedic) then { + r_doLoop = false; + _finished = true; + }; + if (r_interrupt) then { + r_doLoop = false; + }; + sleep 0.1; }; + r_doLoop = false; + + if (!_finished) exitWith { + r_interrupt = false; + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + cutText ["Canceled gutting." , "PLAIN DOWN"]; + _abort = true; + }; + + _hasHarvested = _item getVariable["meatHarvested",false]; - sleep 6; - _string = format["Successfully Gutted Zombie",_text,_qty]; - cutText [_string, "PLAIN DOWN"]; + if(_finished and !_hasHarvested) then { + + _item setVariable["meatHarvested",true,true]; + + // Play sound since we finished + [player,"gut",0,false,10] call dayz_zombieSpeak; + + _qty = 1; + + _array = [_item,_qty]; + + if (local _item) then { + _array spawn local_gutObjectZ; + } else { + dayzGutBody = _array; + publicVariable "dayzGutBodyZ"; + }; + + _string = format["Successfully Gutted Zombie",_text,_qty]; + cutText [_string, "PLAIN DOWN"]; + }; }; \ No newline at end of file diff --git a/dayz_code/actions/object_pickup.sqf b/dayz_code/actions/object_pickup.sqf index 5ef23e35d..eac139568 100644 --- a/dayz_code/actions/object_pickup.sqf +++ b/dayz_code/actions/object_pickup.sqf @@ -1,5 +1,8 @@ private["_array","_type","_classname","_holder","_config","_isOk","_muzzles","_playerID","_claimedBy","_text","_control","_dialog","_item","_val","_max","_bolts","_quivers","_quiver","_broken"]; +// Exit if player zombie +if(player isKindOf "PZombie_VB") exitWith {}; + if(TradeInprogress) exitWith { cutText ["Take item already in progress." , "PLAIN DOWN"]; }; TradeInprogress = true; @@ -14,7 +17,7 @@ _text = getText (configFile >> _type >> _classname >> "displayName"); _claimedBy = _holder getVariable["claimed","0"]; // Check if any players are nearby if not allow player to claim item. -_playerNear = {isPlayer _x} count (player nearEntities ["AllVehicles", 6]) > 1; +_playerNear = {isPlayer _x} count (player nearEntities ["Man", 6]) > 1; // Only allow if not already claimed. if (_claimedBy == "0" or !_playerNear) then { @@ -53,33 +56,43 @@ if(_classname isKindOf "Bag_Base_EP1") then { diag_log("Picked up a bag: " + _classname); }; -_config = (configFile >> _type >> _classname); -_isOk = [player,_config] call BIS_fnc_invAdd; -if (_isOk) then { - deleteVehicle _holder; - if (_classname in ["MeleeHatchet","MeleeCrowbar","MeleeMachete"]) then { +// test to see if item still exists just before adding and removing +if(_holder == objNull) exitWith {}; - if (_type == "cfgWeapons") then { - _muzzles = getArray(configFile >> "cfgWeapons" >> _classname >> "muzzles"); - //_wtype = ((weapons player) select 0); - if (count _muzzles > 1) then { - player selectWeapon (_muzzles select 0); - } else { - player selectWeapon _classname; +_obj = nearestObjects [(getPosATL player), [(typeOf _holder)], 5]; +_qty = count _obj; + +if(_qty >= 1) then { + + _config = (configFile >> _type >> _classname); + _isOk = [player,_config] call BIS_fnc_invAdd; + if (_isOk) then { + + deleteVehicle _holder; + if (_classname in ["MeleeHatchet","MeleeCrowbar","MeleeMachete"]) then { + + if (_type == "cfgWeapons") then { + _muzzles = getArray(configFile >> "cfgWeapons" >> _classname >> "muzzles"); + //_wtype = ((weapons player) select 0); + if (count _muzzles > 1) then { + player selectWeapon (_muzzles select 0); + } else { + player selectWeapon _classname; + }; }; }; - }; -} else { - _holder setVariable["claimed","0",true]; - cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"]; - if (_classname == "MeleeCrowbar") then { - player removeMagazine 'crowbar_swing'; - }; - if (_classname == "MeleeHatchet") then { - player removeMagazine 'hatchet_swing'; - }; - if (_classname == "MeleeMachete") then { - player removeMagazine 'Machete_swing'; + } else { + _holder setVariable["claimed","0",true]; + cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"]; + if (_classname == "MeleeCrowbar") then { + player removeMagazine 'crowbar_swing'; + }; + if (_classname == "MeleeHatchet") then { + player removeMagazine 'hatchet_swing'; + }; + if (_classname == "MeleeMachete") then { + player removeMagazine 'Machete_swing'; + }; }; }; TradeInprogress = false; diff --git a/dayz_code/actions/player_build.sqf b/dayz_code/actions/player_build.sqf index 7f98cdb78..282a04aaf 100644 --- a/dayz_code/actions/player_build.sqf +++ b/dayz_code/actions/player_build.sqf @@ -3,8 +3,6 @@ private["_location","_isOk","_dir","_classname","_item"]; if(TradeInprogress) exitWith { cutText ["Building already in progress." , "PLAIN DOWN"]; }; TradeInprogress = true; -_location = player modeltoworld [0,1,0]; -// _location set [2,0]; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _isWater = (surfaceIsWater _location) or dayz_isSwimming; _bypass = false; @@ -18,6 +16,7 @@ _item = _this; _classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create"); _require = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "require"); _text = getText (configFile >> "CfgVehicles" >> _classname >> "displayName"); +_attachToOffset = getArray (configFile >> "CfgVehicles" >> _classname >> "offset"); _hasbuilditem = _this in magazines player; _hasrequireditem = _require in items player; @@ -29,15 +28,12 @@ if (_hasrequireditem or _bypass) then { _dir = getDir player; - _offset_x = 0; - _offset_y = 1.5; - _offset_z = 0; - _offset_z_attach = 0.5; + _location = [0,0,0]; // Start Preview loop _tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; _tmpbuilt setdir _dir; - _tmpbuilt attachTo [player,[_offset_x,_offset_y,_offset_z_attach]]; + _tmpbuilt attachTo [player,_attachToOffset]; _cancel = false; _counter = 0; @@ -85,9 +81,6 @@ if (_hasrequireditem or _bypass) then { if(!_cancel) then { - _hasbuilditem = _this in magazines player; - if (!_hasbuilditem) exitWith {cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]}; - _dir = getDir player; player removeMagazine _item; @@ -104,6 +97,9 @@ if (_hasrequireditem or _bypass) then { sleep 5; + _hasbuilditem = _this in magazines player; + if (!_hasbuilditem) exitWith {cutText [format[(localize "str_player_31"),_text,"build"] , "PLAIN DOWN"]}; + player allowDamage false; _object = createVehicle [_classname, _built_location, [], 0, "CAN_COLLIDE"]; _object setDir _dir; diff --git a/dayz_code/actions/refuel.sqf b/dayz_code/actions/refuel.sqf index d93ff3135..436ab205a 100644 --- a/dayz_code/actions/refuel.sqf +++ b/dayz_code/actions/refuel.sqf @@ -28,7 +28,7 @@ for "_x" from 1 to _refuelQty do { _fillCounter = _fillCounter + 1; if(_refuelQty == 1) then { - cutText ["Preparing to refuel, stand still to fill empty jerry can.", "PLAIN DOWN"]; + cutText ["Preparing to refuel, stand still to drain full jerry can.", "PLAIN DOWN"]; } else { cutText [format[("Preparing to refuel, stand still to drain full jerry can %1 of %2."),_fillCounter,_refuelQty] , "PLAIN DOWN"]; }; @@ -39,35 +39,49 @@ for "_x" from 1 to _refuelQty do { [player,"refuel",0,false] call dayz_zombieSpeak; [player,20,true,(getPosATL player)] spawn player_alertZombies; - r_interrupt = false; - _animState = animationState player; - r_doLoop = true; - _started = false; - _finished = false; - - while {r_doLoop} do { + if(!dayz_isSwimming) then { + + r_interrupt = false; _animState = animationState player; - _isMedic = ["medic",_animState] call fnc_inString; - if (_isMedic) then { - _started = true; + r_doLoop = true; + _started = false; + _finished = false; + + while {r_doLoop} do { + _animState = animationState player; + _isMedic = ["medic",_animState] call fnc_inString; + if (_isMedic) then { + _started = true; + }; + if (_started and !_isMedic) then { + r_doLoop = false; + _finished = true; + }; + if (r_interrupt) then { + r_doLoop = false; + }; + sleep 0.1; }; - if (_started and !_isMedic) then { - r_doLoop = false; + r_doLoop = false; + + if (!_finished) exitWith { + r_interrupt = false; + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + cutText ["Canceled refuel." , "PLAIN DOWN"]; + _abort = true; + }; + } else { + // Alternate method in water make sure player stays in one spot for 6 seconds + _location1 = getPosATL player; + sleep 6; + _location2 = getPosATL player; + + if(_location1 distance _location2 > 0.1) then { + _finished = false; + } else { _finished = true; }; - if (r_interrupt) then { - r_doLoop = false; - }; - sleep 0.1; - }; - r_doLoop = false; - - if (!_finished) exitWith { - r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; - cutText ["Canceled refuel." , "PLAIN DOWN"]; - _abort = true; }; if (_finished) then { @@ -77,6 +91,11 @@ for "_x" from 1 to _refuelQty do { player removeMagazine "ItemJerrycan"; player addMagazine "ItemJerrycanEmpty"; + // Get fuel levels again to prevent wasted gas from others filling + _curFuel = ((fuel _vehicle) * _capacity); + _newFuel = (_curFuel + _canSize); + _newFuel = (_newFuel / _capacity); + dayzSetFuel = [_vehicle,_newFuel]; publicVariable "dayzSetFuel"; if (local _vehicle) then { diff --git a/dayz_code/actions/siphonFuel.sqf b/dayz_code/actions/siphonFuel.sqf index 49181e92a..36e578aab 100644 --- a/dayz_code/actions/siphonFuel.sqf +++ b/dayz_code/actions/siphonFuel.sqf @@ -35,65 +35,93 @@ for "_x" from 1 to _siphonQty do { cutText [format[("Preparing to siphon, stand still to fill empty jerry can %1 of %2."),_fillCounter,_siphonQty] , "PLAIN DOWN"]; }; - // force animation - player playActionNow "Medic"; - // Play sound and alert zombies - [player,"refuel",0,false] call dayz_zombieSpeak; + // alert zombies [player,20,true,(getPosATL player)] spawn player_alertZombies; - r_interrupt = false; - _animState = animationState player; - r_doLoop = true; - _started = false; - _finished = false; - - while {r_doLoop} do { + if(!dayz_isSwimming) then { + + // force animation + player playActionNow "Medic"; + + r_interrupt = false; _animState = animationState player; - _isMedic = ["medic",_animState] call fnc_inString; - if (_isMedic) then { - _started = true; + r_doLoop = true; + _started = false; + _finished = false; + + while {r_doLoop} do { + _animState = animationState player; + _isMedic = ["medic",_animState] call fnc_inString; + if (_isMedic) then { + _started = true; + }; + if (_started and !_isMedic) then { + r_doLoop = false; + _finished = true; + }; + if (r_interrupt) then { + r_doLoop = false; + }; + sleep 0.1; }; - if (_started and !_isMedic) then { - r_doLoop = false; + r_doLoop = false; + + if (!_finished) exitWith { + r_interrupt = false; + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + cutText ["Canceled siphon." , "PLAIN DOWN"]; + _abort = true; + }; + + } else { + // Alternate method in water make sure player stays in one spot for 6 seconds + _location1 = getPosATL player; + sleep 6; + _location2 = getPosATL player; + + if(_location1 distance _location2 > 0.1) then { + _finished = false; + } else { _finished = true; }; - if (r_interrupt) then { - r_doLoop = false; - }; - sleep 0.1; - }; - r_doLoop = false; - - if (!_finished) exitWith { - r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; - cutText ["Canceled siphon." , "PLAIN DOWN"]; - _abort = true; }; if (_finished) then { if ("ItemJerrycanEmpty" in magazines player) then { + // Play sound + [player,"refuel",0,false] call dayz_zombieSpeak; + player removeMagazine "ItemJerrycanEmpty"; player addMagazine "ItemJerrycan"; - //apply newFuel to vehicle on every peer - //["dayzSetFuel",[_vehicle,_newFuel]] call broadcastRpcCallAll; - - dayzSetFuel = [_vehicle,_newFuel]; - if (local _vehicle) then { - dayzSetFuel spawn local_setFuel; - }; - publicVariable "dayzSetFuel"; + // Get fuel levels again to ensure proper fuel level from others siphoning + _curFuel = ((fuel _vehicle) * _capacity); + _newFuel = (_curFuel - _canSize); - cutText [format["%1 has been drained for %2 litres of Fuel",_nameType,_canSize], "PLAIN DOWN"]; + // calculate minimum needed fuel + _newFuel = (_newFuel / _capacity); + + if (_newFuel > 0) then { + + dayzSetFuel = [_vehicle,_newFuel]; + if (local _vehicle) then { + dayzSetFuel spawn local_setFuel; + }; + publicVariable "dayzSetFuel"; + + cutText [format["%1 has been drained for %2 litres of Fuel",_nameType,_canSize], "PLAIN DOWN"]; - call fnc_usec_medic_removeActions; - r_action = false; + call fnc_usec_medic_removeActions; + r_action = false; - sleep 1; + sleep 1; + } else { + _abort = true; + }; + } else { _abort = true; diff --git a/dayz_code/actions/tame_dog.sqf b/dayz_code/actions/tame_dog.sqf index e4c399ad8..59a2626c1 100644 --- a/dayz_code/actions/tame_dog.sqf +++ b/dayz_code/actions/tame_dog.sqf @@ -1,6 +1,7 @@ /* - File: tame_dog.sqf + File: tame_dog.sqf 1.1 Author: Kane "Alby" Stone + Edited by: [VB]AWOL Description: Allows a player to tame/domesticate a dog. @@ -19,18 +20,47 @@ _caller = _this select 1; _id = _this select 2; _dog = _this select 3; -player removeMagazine "FoodSteakRaw"; -_animalID = _dog getVariable "fsm_handle"; -_animalID setFSMVariable ["_isTamed", true]; -sleep 1; -diag_log format["DEBUG: %1, id: %2 [%3]",_dog,_animalID,completedFSM _animalID]; -if (!moveToCompleted _dog) then { - _dog moveTo (position _dog); -}; -_dog disableAI "FSM"; -(group _dog) setBehaviour "AWARE"; -_fsmid = [_dog, typeOf _dog] execFSM "\z\addons\dayz_code\system\dog_agent.fsm"; -_fsmid setFSMVariable ["_handle", _fsmid]; -player setVariable ["dogID", _fsmid]; -_dog setVariable ["fsm_handle", _fsmid]; -_dog setVariable ["characterID", dayz_characterID, true]; \ No newline at end of file +// expanded to allow all meats as input +_removed = 0; +_itemIn = "FoodmeatRaw"; +_countIn = 1; + +{ + if( (_removed < _countIn) && ((_x == _itemIn) || configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn)) then { + _removed = _removed + ([player,_x] call BIS_fnc_invRemove); + }; + if(_removed == 1) exitWith { _selected = _x; }; + +} forEach magazines player; + +// get name of item removed +_textRemoved = getText(configFile >> "CfgMagazines" >> _selected >> "displayName"); + +// Only proceed if removed count matches +if(_removed == _countIn) then { + + // add failure rate based on skill level variable (days alive) + _chanceToFail = ((random 1 + (dayz_skilllevel/100)) > 0.5); + + if(!_chanceToFail) then { + + _animalID = _dog getVariable "fsm_handle"; + _animalID setFSMVariable ["_isTamed", true]; + sleep 1; + diag_log format["DEBUG: %1, id: %2 [%3]",_dog,_animalID,completedFSM _animalID]; + if (!moveToCompleted _dog) then { + _dog moveTo (position _dog); + }; + _dog disableAI "FSM"; + (group _dog) setBehaviour "AWARE"; + _fsmid = [_dog, typeOf _dog] execFSM "\z\addons\dayz_code\system\dog_agent.fsm"; + _fsmid setFSMVariable ["_handle", _fsmid]; + player setVariable ["dogID", _fsmid]; + _dog setVariable ["fsm_handle", _fsmid]; + _dog setVariable ["characterID", dayz_characterID, true]; + + cutText [format["Dog consumed %1, and is now tamed.",_textRemoved], "PLAIN DOWN"]; + } else { + cutText [format["Dog consumed %1, yet remains untamed.",_textRemoved], "PLAIN DOWN"]; + }; +}; \ No newline at end of file diff --git a/dayz_code/actions/tent_pitch.sqf b/dayz_code/actions/tent_pitch.sqf index 782c9d873..7664d41ee 100644 --- a/dayz_code/actions/tent_pitch.sqf +++ b/dayz_code/actions/tent_pitch.sqf @@ -47,20 +47,20 @@ if (!_isOk) then { [player,_sfx,0,false,_dis] call dayz_zombieSpeak; [player,_dis,true,(getPosATL player)] spawn player_alertZombies; + _classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Pitch" >> "create"); + sleep 5; //place tent (local) - _tent = createVehicle ["TentStorage", _location, [], 0, "CAN_COLLIDE"]; - _tent setdir _dir; - _tent setpos _location; - player reveal _tent; - _location = getPosATL _tent; + _object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; + _object setdir _dir; + _object setpos _location; + player reveal _object; + _location = getPosATL _object; - _tent setVariable ["characterID",dayz_characterID,true]; + _object setVariable ["characterID",dayz_characterID,true]; - //player setVariable ["tentUpdate",["Land_A_tent",_dir,_location,[dayz_tentWeapons,dayz_tentMagazines,dayz_tentBackpacks]],true]; - - //["dayzPublishObj",[dayz_characterID,_tent,[_dir,_location],"TentStorage"]] call callRpcProcedure; - dayzPublishObj = [dayz_characterID,_tent,[_dir,_location],"TentStorage"]; + //["dayzPublishObj",[dayz_characterID,_tent,[_dir,_location],_classname]] call callRpcProcedure; + dayzPublishObj = [dayz_characterID,_object,[_dir,_location],_classname]; publicVariableServer "dayzPublishObj"; cutText [localize "str_success_tent_pitch", "PLAIN DOWN"]; diff --git a/dayz_code/cfgLoot.hpp b/dayz_code/cfgLoot.hpp index 5714d3be6..40ab741af 100644 --- a/dayz_code/cfgLoot.hpp +++ b/dayz_code/cfgLoot.hpp @@ -339,4 +339,77 @@ class CfgLoot { 0.01 } }; + + clothes[] = { + { + "Skin_RU_Policeman_DZ", + "Skin_Pilot_EP1_DZ", + "Skin_Functionary1_EP1_DZ", + "Skin_Priest_DZ", + "Skin_Rocker2_DZ", + "Skin_SurvivorW3_DZ", + "Skin_SurvivorWpink_DZ", + "Skin_SurvivorWurban_DZ", + }, + { + 0.01, + 0.02, + 0.03, + 0.02, + 0.02, + 0.05, + 0.02, + 0.01, + } + }; + militaryclothes[] = { + { + "Skin_Camo1_DZ", + "Skin_Sniper1_DZ", + "Skin_Rocket_DZ", + "Skin_Soldier1_DZ", + "Skin_Drake_Light_DZ", + "Skin_Soldier_TL_PMC_DZ", + "Skin_Soldier_Sniper_PMC_DZ", + "Skin_Soldier_Bodyguard_AA12_PMC_DZ", + "Skin_CZ_Special_Forces_GL_DES_EP1_DZ", + }, + { + 0.03, // "Skin_Camo1_DZ", + 0.02, // "Skin_Sniper1_DZ", + 0.03, // "Skin_Rocket_DZ", + 0.05, // "Skin_Soldier1_DZ", + 0.01, // "Skin_Drake_Light_DZ" + 0.02, // Skin_Soldier_TL_PMC_DZ + 0.02, // Skin_Soldier_Sniper_PMC_DZ + 0.02, // Skin_Soldier_Bodyguard_AA12_PMC_DZ + 0.02, // Skin_CZ_Special_Forces_GL_DES_EP1_DZ + } + }; + specialclothes[] = { + { + "Skin_Ins_Soldier_GL_DZ", + "Skin_GUE_Commander_DZ", + "Skin_Bandit1_DZ", + "Skin_Bandit2_DZ", + "Skin_BanditW1_DZ", + "Skin_BanditW2_DZ", + "Skin_TK_INS_Soldier_EP1_DZ", + "Skin_TK_INS_Warlord_EP1", + "Skin_SurvivorWcombat_DZ", + "Skin_SurvivorWdesert_DZ", + }, + { + 0.01, //"Skin_Ins_Soldier_GL_DZ", + 0.01, //"Skin_GUE_Commander_DZ", + 0.05, //"Skin_Bandit1_DZ", + 0.02, //"Skin_Bandit2_DZ", + 0.05, //"Skin_BanditW1_DZ", + 0.03, //"Skin_BanditW2_DZ", + 0.01, //"Skin_TK_INS_Soldier_EP1_DZ", + 0.01, //"Skin_TK_INS_Warlord_EP1", + 0.01, //"Skin_SurvivorWcombat_DZ", + 0.03, //"Skin_SurvivorWdesert_DZ", + } + }; }; \ No newline at end of file diff --git a/dayz_code/cfgVehicles.hpp b/dayz_code/cfgVehicles.hpp index fc6d70fd2..81eb6db2d 100644 --- a/dayz_code/cfgVehicles.hpp +++ b/dayz_code/cfgVehicles.hpp @@ -666,6 +666,22 @@ class Citizen1; // External class reference weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; canHideBodies = 1; }; + class Bandit2_DZ: Soldier_Crew_PMC + { + scope = 2; + displayName = "$STR_CHAR_2"; + weapons[] = {"Throw","Put"}; + model = "\ca\characters_E\GER\GER_rifleman"; + portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA"; + magazines[] = {}; + backpack = ""; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + hiddenSelections[] = {"Camo"}; + hiddenSelectionsTextures[] = {"\dayz\textures\clothes\bandit_tex1_co.paa"}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + }; class BAF_Soldier_Officer_W; class Rocket_DZ: BAF_Soldier_Officer_W { diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index b3f6ed4df..b8001f3f5 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -428,17 +428,17 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu s_player_studybody = -1; }; - /* - //Dog - if (_isDog and _isAlive and (_hasRawMeat) and _canDo and _ownerID == "0" and player getVariable ["dogID", 0] == 0) then { - if (s_player_tamedog < 0) then { - s_player_tamedog = player addAction [localize "str_actions_tamedog", "\z\addons\dayz_code\actions\tame_dog.sqf", cursorTarget, 1, false, true, "", ""]; + if(dayz_tameDogs) then { + //Dog + if (_isDog and _isAlive and (_hasRawMeat) and _canDo and _ownerID == "0" and player getVariable ["dogID", 0] == 0) then { + if (s_player_tamedog < 0) then { + s_player_tamedog = player addAction [localize "str_actions_tamedog", "\z\addons\dayz_code\actions\tame_dog.sqf", cursorTarget, 1, false, true, "", ""]; + }; + } else { + player removeAction s_player_tamedog; + s_player_tamedog = -1; }; - } else { - player removeAction s_player_tamedog; - s_player_tamedog = -1; }; - */ if (_isDog and _ownerID == dayz_characterID and _isAlive and _canDo) then { _dogHandle = player getVariable ["dogID", 0]; diff --git a/dayz_code/compile/player_gearSync.sqf b/dayz_code/compile/player_gearSync.sqf index 375ba1a35..d4b7fbc7f 100644 --- a/dayz_code/compile/player_gearSync.sqf +++ b/dayz_code/compile/player_gearSync.sqf @@ -1,5 +1,5 @@ private ["_objects"]; -_objects = nearestObjects [getPosATL player, ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage","VaultStorage"], 10]; +_objects = nearestObjects [getPosATL player, ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage"], 10]; { //["dayzUpdateVehicle",[_x,"gear"]] call callRpcProcedure; dayzUpdateVehicle = [_x,"gear"]; diff --git a/dayz_code/compile/player_packTent.sqf b/dayz_code/compile/player_packTent.sqf index bc5d3bd95..87dacba97 100644 --- a/dayz_code/compile/player_packTent.sqf +++ b/dayz_code/compile/player_packTent.sqf @@ -1,7 +1,7 @@ /* [_obj] spawn player_packTent; */ -private["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr"]; +private["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr"]; _obj = _this; _ownerID = _obj getVariable["CharacterID","0"]; _objectID = _obj getVariable["ObjectID","0"]; @@ -28,10 +28,15 @@ if(_ownerID == dayz_characterID) then { sleep 3; + _classname = getText (configFile >> "CfgMagazines" >> (typeOf_obj) >> "create"); + + _location = _pos; + //place tent (local) - _bag = createVehicle ["WeaponHolder_ItemTent",_pos,[], 0, "CAN_COLLIDE"]; - _bag setdir _dir; - player reveal _bag; + //_bag = createVehicle ["WeaponHolder_ItemTent",_pos,[], 0, "CAN_COLLIDE"]; + _object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; + _object setdir _dir; + player reveal _object; _holder = "WeaponHolder" createVehicle _pos; diff --git a/dayz_code/compile/spawn_loot.sqf b/dayz_code/compile/spawn_loot.sqf index 0c7c93e05..5d8885516 100644 --- a/dayz_code/compile/spawn_loot.sqf +++ b/dayz_code/compile/spawn_loot.sqf @@ -17,7 +17,14 @@ switch (_iClass) do { _weights = dayz_CLChances select _index; _cntWeights = count _weights; _qty = 0; - _max = ceil(random 2) + 1; + + // If clothing just spawn one bag of clothes + if(_iClass == "clothes" or _iClass == "militaryclothes" or _iClass == "specialclothes") then { + _max = 1; + } else { + _max = ceil(random 2) + 1; + }; + while {_qty < _max} do { _tQty = round(random 1) + 1; _index = floor(random _cntWeights); diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 56488fb17..d0ca90004 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -329,6 +329,10 @@ class CfgSurvival { sex = "male"; playerModel = "Bandit1_DZ"; }; + class Skin_Bandit2_DZ: Default { + sex = "male"; + playerModel = "Bandit2_DZ"; + }; class Skin_BanditW1_DZ: Default { sex = "female"; playerModel = "BanditW1_DZ"; @@ -451,23 +455,16 @@ class CfgBuildingLoot { { "Winchester1866","weapon" }, { "WeaponHolder_ItemTent","object" }, + { "WeaponHolder_ItemTentDomed","object" }, { "","military" }, { "","trash" }, {"Crossbow_DZ","weapon"}, { "Binocular","weapon" }, { "PartWoodPile","magazine" }, - { "Skin_Camo1_DZ","magazine" }, - { "Skin_Sniper1_DZ","magazine" }, + { "","clothes" }, + { "","specialclothes" }, { "WeaponHolder_MeleeCrowbar","object" }, {"MR43","weapon"}, - { "Skin_RU_Policeman_DZ","magazine" }, - { "Skin_Pilot_EP1_DZ","magazine" }, - { "Skin_Functionary1_EP1_DZ","magazine" }, - { "Skin_Priest_DZ","magazine" }, - { "Skin_Rocker2_DZ","magazine" }, - { "Skin_SurvivorW3_DZ","magazine" }, - { "Skin_SurvivorWpink_DZ","magazine" }, - { "Skin_SurvivorWurban_DZ","magazine" }, }; itemChance[] = { @@ -491,23 +488,16 @@ class CfgBuildingLoot { 0.01, //18 0.01, 0.01, + 0.01, 0.03, 0.5, 0.01, 0.06, 0.06, - 0.01, + 0.03, 0.01, 0.08, 0.03, - 0.01, - 0.02, - 0.03, - 0.02, - 0.02, - 0.05, - 0.02, - 0.01, }; }; class Office: Residential { @@ -619,6 +609,8 @@ class CfgBuildingLoot { { "Winchester1866","weapon" }, { "WeaponHolder_ItemTent","object" }, + { "WeaponHolder_ItemTentDomed","object" }, + { "","food" }, { "","trash" }, {"Crossbow_DZ","weapon"}, @@ -645,13 +637,14 @@ class CfgBuildingLoot { 0.01, //18 0.01, 0.01, + 0.01, 0.3, 0.15, 0.01, 0.05, 0.02, 0.01 - }; + }; }; class HeliCrash: Default { zombieChance = 0.4; @@ -676,19 +669,13 @@ class CfgBuildingLoot { { "NVGoggles","weapon" }, { "AmmoBoxSmall_556","object" }, { "AmmoBoxSmall_762","object" }, - { "Skin_Camo1_DZ","magazine" }, - { "Skin_Sniper1_DZ","magazine" }, + { "","militaryclothes" }, {"G36C","weapon"}, {"G36C_camo","weapon"}, //{"G36_C_SD_camo","weapon"}, {"G36A_camo","weapon"}, {"G36K_camo","weapon"}, {"100Rnd_762x54_PK","magazine"}, - { "Skin_Rocket_DZ","magazine" }, - { "Skin_Soldier1_DZ","magazine" }, - { "Skin_Soldier_TL_PMC_DZ","magazine" }, - { "Skin_Soldier_Sniper_PMC_DZ","magazine" }, - { "Skin_Soldier_Bodyguard_AA12_PMC_DZ","magazine" }, }; itemChance[] = { 0.02, //{"FN_FAL","weapon"}, @@ -707,19 +694,13 @@ class CfgBuildingLoot { 0.02, //{"NVGoggles","weapon"} 0.1, //AmmoBoxSmall_556 0.1, //AmmoBoxSmall_762 - 0.08, //Skin_Camo1_DZ - 0.05, //Skin_Sniper1_DZ + 0.08, //militaryclothes 0.03, //G36C" 0.02, //G36C_camo //0.01, //G36_C_SD_camo 0.02, //G36A_camo 0.02, //G36K_camo 0.01, //("100Rnd_762x54_PK","magazine"} - 0.01, - 0.05, - 0.02, // Skin_Soldier_TL_PMC_DZ - 0.02, // Skin_Soldier_Sniper_PMC_DZ - 0.02, // Skin_Soldier_Bodyguard_AA12_PMC_DZ }; }; class HeliCrash_No50s: Default { @@ -743,8 +724,7 @@ class HeliCrash_No50s: Default { {"NVGoggles","weapon"}, {"AmmoBoxSmall_556","object"}, {"AmmoBoxSmall_762","object"}, - {"Skin_Camo1_DZ","magazine"}, - {"Skin_Sniper1_DZ","magazine"}, + { "","militaryclothes" }, {"G36C","weapon"}, {"G36C_camo","weapon"}, //{"G36_C_SD_camo","weapon"}, @@ -767,8 +747,7 @@ class HeliCrash_No50s: Default { 0.02, //{"NVGoggles","weapon"} 0.1, //AmmoBoxSmall_556 0.1, //AmmoBoxSmall_762 - 0.08, //Skin_Camo1_DZ - 0.05, //Skin_Sniper1_DZ + 0.08, //militaryclothes 0.03, //G36C" 0.02, //G36C_camo //0.01, //G36_C_SD_camo @@ -950,18 +929,7 @@ class HeliCrash_No50s: Default { {"G36_C_SD_camo","weapon"}, {"M40A3","weapon"}, {"100Rnd_762x54_PK","magazine"}, - { "Skin_Soldier1_DZ","magazine" }, - { "Skin_Ins_Soldier_GL_DZ","magazine" }, - { "Skin_GUE_Commander_DZ","magazine" }, - { "Skin_Bandit1_DZ","magazine" }, - { "Skin_BanditW1_DZ","magazine" }, - { "Skin_BanditW2_DZ","magazine" }, - { "Skin_Drake_Light_DZ","magazine" }, - { "Skin_CZ_Special_Forces_GL_DES_EP1_DZ","magazine" }, - { "Skin_TK_INS_Soldier_EP1_DZ","magazine" }, - { "Skin_TK_INS_Warlord_EP1","magazine" }, - { "Skin_SurvivorWcombat_DZ","magazine" }, - { "Skin_SurvivorWdesert_DZ","magazine" }, + { "","militaryclothes" }, }; itemChance[] = { 0.10, @@ -1014,19 +982,8 @@ class HeliCrash_No50s: Default { 0.01, //Sa58V_CCO_EP1 0.01, //{"G36_C_SD_camo","weapon"}, 0.02, // M40A3 - 0.01, //("100Rnd_762x54_PK","magazine"} - 0.05, - 0.01, - 0.01, - 0.01, - 0.01, - 0.01, - 0.01, - 0.01, - 0.03, - 0.01, - 0.01, - 0.03, + 0.01, //("100Rnd_762x54_PK","magazine"} + 0.05, // militaryclothes }; }; class Hunting: Default { @@ -1433,6 +1390,10 @@ class HeliCrash_No50s: Default { // DAYZ AMP More buildings + class Mass_grave: HouseRoaming { + minRoaming = 8; + maxRoaming = 16; + }; class Land_Shed_W02_EP1: FarmRoaming{}; class Land_MBG_ApartmentsOne_W: HouseRoaming{}; class Land_MBG_ApartmentsTwo_P: HouseRoaming{}; @@ -1658,6 +1619,37 @@ class HeliCrash_No50s: Default { zombieChance = 0.3; zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"}; itemType[] = { + { "ItemWatch","generic" }, + { "ItemCompass","generic" }, + { "ItemMap","weapon" }, + { "Makarov","weapon" }, + { "Colt1911","weapon" }, + { "ItemFlashlight","generic" }, + { "ItemKnife","generic" }, + { "ItemMatchbox","generic" }, + { "ItemToolbox","weapon" }, + { "","generic" }, + { "","food" }, + { "WeaponHolder_PartGeneric","object" }, + { "WeaponHolder_PartWheel","object" }, + { "WeaponHolder_PartFueltank","object" }, + { "WeaponHolder_PartEngine","object" }, + { "WeaponHolder_PartGlass","object" }, + { "WeaponHolder_ItemJerrycan","object" }}; + itemChance[] = {0.15,0.01,0.05,0.02,0.02,0.05,0.05,0.05,0.02,0.15,0.05,0.06,0.05,0.03,0.01,0.07,0.03}; + }; + + class DynamicDebrisMilitary: Default + { + lootChance = 0.4; + minRoaming = 0; + maxRoaming = 2; + zombieChance = 0.3; + zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"}; + itemType[] = { + { "ItemEtool","weapon" }, + { "ItemSandbag","magazine"}, + { "","military" }, { "ItemWatch","generic" }, { "ItemCompass","generic" }, { "ItemMap","weapon" }, @@ -1676,9 +1668,62 @@ class HeliCrash_No50s: Default { { "WeaponHolder_PartGlass","object" }, { "WeaponHolder_PartVRotor","object" }, { "WeaponHolder_ItemJerrycan","object" }}; - itemChance[] = {0.15,0.01,0.05,0.02,0.02,0.05,0.05,0.05,0.02,0.15,0.05,0.06,0.05,0.03,0.01,0.07,0.01,0.03}; + itemChance[] = {0.05,0.11,0.08,0.15,0.01,0.05,0.02,0.02,0.05,0.05,0.05,0.02,0.15,0.05,0.06,0.05,0.03,0.02,0.03,0.02,0.03}; + }; + + class MassGrave: Default { + zombieChance = 0.3; + maxRoaming = 3; + zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3"}; + lootChance = 0.5; + lootPos[] = {}; + itemType[] = { + { "ItemWatch","generic" }, + { "ItemCompass","generic" }, + { "ItemMap","weapon" }, + { "Makarov","weapon" }, + { "Colt1911","weapon" }, + + { "ItemKnife","generic" }, + { "ItemMatchbox","generic" }, + { "ItemToolbox","weapon" }, + + { "WeaponHolder_ItemJerrycanEmpty","object" }, + { "","generic" }, + { "huntingrifle","weapon" }, + { "LeeEnfield","weapon" }, + { "Winchester1866","weapon" }, + { "","trash" }, + {"Crossbow_DZ","weapon"}, + { "PartWoodPile","magazine" }, + { "WeaponHolder_ItemHatchet","object" }, + { "MR43","weapon" }, + {"WeaponHolder_ItemMachete", "object"} + }; + itemChance[] = { + 0.06, + 0.08, + 0.05, + 0.06, + 0.08, + + 0.05, + 0.06, + 0.08, + + 0.06, + 0.28, + 0.01, + 0.04, + 0.03, + 0.22, + 0.03, + 0.11, + 0.17, + 0.06, + 0.03 + }; }; - class Land_House_C_1_EP1: Residential { lootPos[] = { diff --git a/dayz_code/init/object_pickupAction.sqf b/dayz_code/init/object_pickupAction.sqf index 5245f4691..06f1d0154 100644 --- a/dayz_code/init/object_pickupAction.sqf +++ b/dayz_code/init/object_pickupAction.sqf @@ -5,6 +5,9 @@ _classname = _this select 2; _name = getText (configFile >> _type >> _classname >> "displayName"); +// Exit if player zombie +if(player isKindOf "PZombie_VB") exitWith {}; + actionMonitor = { private["_holder","_type","_classname","_name","_action","_distance","_run","_timeout"]; _holder = _this select 0; diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index 9fb6ac605..d3e4b2924 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -2,6 +2,7 @@ disableSerialization; //Model Variables Bandit1_DZ = "Bandit1_DZ"; +Bandit2_DZ = "Bandit2_DZ"; BanditW1_DZ = "BanditW1_DZ"; BanditW2_DZ = "BanditW2_DZ"; Survivor1_DZ = "Survivor2_DZ"; @@ -35,8 +36,8 @@ SurvivorWcombat_DZ = "SurvivorWcombat_DZ"; SurvivorWdesert_DZ = "SurvivorWdesert_DZ"; SurvivorWurban_DZ = "SurvivorWurban_DZ"; -AllPlayers = ["SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"]; -AllPlayersVehicles = ["SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"]; +AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ"]; +AllPlayersVehicles = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","AllVehicles"]; PZombie_VB = "PZombie_VB"; @@ -76,7 +77,7 @@ meatcooked = [ no_output_food = ["FoodMRE", "FoodPistachio", "FoodNutmix","FoodBioMeat"]+meatcooked+meatraw; -badfood = ["FoodBioMeat"]; +badfood = ["FoodBioMeat","FoodCanUnlabeled"]; food_with_output=[ "FoodCanBakedBeans", @@ -386,7 +387,7 @@ dayzPlayerDeaths = []; dayz_dawn = 6; dayz_dusk = 18; if(isNil "dayz_maxAnimals") then { - dayz_maxAnimals = 5; + dayz_maxAnimals = 8; }; DAYZ_agentnumber = 0; dayz_animalDistance = 800; @@ -395,19 +396,21 @@ dayz_zSpawnDistance = 1000; if(isNil "dayz_maxLocalZombies") then { dayz_maxLocalZombies = 40; }; - if(isNil "dayz_maxGlobalZombies") then { dayz_maxGlobalZombies = 30; }; - if(isNil "dayz_maxZeds") then { dayz_maxZeds = 500; }; - if(isNil "DZEdebug") then { DZEdebug = false; }; - +if(isNil "dayz_tameDogs") then { + dayz_tameDogs = false; +}; +if(isNil "dayz_paraSpawn") then { + dayz_paraSpawn = false; +}; dayz_spawnPos = getPosATL player; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index dac32ecd1..8e6b18a9d 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -137,7 +137,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 1.0.0.1 (1.7.6.1)"; + text = "DayZ Epoch 1.0.0.2pre (1.7.6.1)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; diff --git a/dayz_code/system/player_monitor.fsm b/dayz_code/system/player_monitor.fsm index 304376d03..20a132c4f 100644 --- a/dayz_code/system/player_monitor.fsm +++ b/dayz_code/system/player_monitor.fsm @@ -34,9 +34,9 @@ item29[] = {"Load_In",2,250,-75.000000,850.000000,25.000000,900.000000,0.000000, item30[] = {"Bad_Version",4,218,50.000000,650.000000,150.000000,700.000000,0.000000,"Bad" \n "Version"}; item31[] = {"ERROR__Bad_Versi",2,250,175.000000,650.000000,275.000000,700.000000,0.000000,"ERROR:" \n "Bad Version"}; item32[] = {"Display_Ready",4,218,-175.000000,900.000000,-75.000000,950.000000,0.000000,"Display" \n "Ready"}; -item33[] = {"Preload_Display",2,250,-75.000000,950.000000,25.000000,1000.000000,0.000000,"Preload" \n "Display"}; +item33[] = {"Preload_Display",2,4346,-75.000000,950.000000,25.000000,1000.000000,0.000000,"Preload" \n "Display"}; item34[] = {"Preload_Done",4,218,-175.000000,1000.000000,-75.000000,1050.000000,0.000000,"Preload" \n "Done"}; -item35[] = {"Initialize",2,4346,-75.000000,1050.000000,25.000000,1100.000000,0.000000,"Initialize"}; +item35[] = {"Initialize",2,250,-75.000000,1050.000000,25.000000,1100.000000,0.000000,"Initialize"}; item36[] = {"Finish",1,250,-75.000000,1150.000000,25.000000,1200.000000,0.000000,"Finish"}; item37[] = {"True",8,218,25.000000,1100.000000,125.000000,1150.000000,0.000000,"True"}; item38[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"}; @@ -119,8 +119,8 @@ link59[] = {51,52}; link60[] = {52,29}; link61[] = {53,54}; link62[] = {54,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-442.430725,330.314087,1379.589600,739.273743,1062,880,1}; -window[] = {2,-1,-1,-1,-1,890,130,1101,130,3,1080}; +globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-390.091248,277.974548,1239.554443,681.356201,754,630,1}; +window[] = {2,-1,-1,-1,-1,786,26,997,26,3,772}; *//*%FSM*/ class FSM { @@ -691,8 +691,13 @@ class FSM "_setDir = _worldspace select 0;" \n "_setPos = _worldspace select 1;" \n "" \n - "player setPosATL _setPos;" \n - "player setDir _setDir;" \n + "if(dayz_paraSpawn) then {" \n + " _para = createVehicle [""ParachuteWest"", _setPos, [], 0, ""FLY""]; " \n + " player moveInDriver _para;" \n + "} else {" \n + " player setPosATL _setPos;" \n + " player setDir _setDir;" \n + "};" \n "" \n "//Legs and Arm fractures" \n "_legs = player getVariable [""hit_legs"",0];" \n @@ -986,7 +991,7 @@ class FSM "" \n "reload player;" \n "" \n - "if (_currentAnim != """") then {" \n + "if (_currentAnim != """" and !dayz_paraSpawn) then {" \n " [objNull, player, rSwitchMove,_currentAnim] call RE;" \n "};" \n "if (_currentWpn != """") then {" \n @@ -1279,7 +1284,7 @@ class FSM { name = "Stream"; init = /*%FSM*/"//stream in location" \n - "call stream_locationCheck;" \n + "//call stream_locationCheck;" \n "" \n "_zombies = (getPosATL player) nearEntities [""zZombie_Base"",30];" \n "{deleteVehicle _x} forEach _zombies;" \n diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index e64a1f664..c4ca8f488 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1086,6 +1086,12 @@ class CfgMagazines scope = 2; displayName = "Bandit Outfit"; descriptionShort = "Bandit Outfit"; + }; + class Skin_Bandit2_DZ: SkinBase + { + scope = 2; + displayName = "Bandit Camo"; + descriptionShort = "Bandit Camo Outfit"; }; class Skin_BanditW1_DZ: SkinBase { @@ -1928,6 +1934,7 @@ class CfgMagazines { text = "$STR_PITCH_TENT"; script = "spawn player_tentPitch;"; + create = "TentStorage"; }; }; }; @@ -2081,6 +2088,7 @@ class CfgVehicles animated = 0; vehicleClass = "Fortifications"; icon = "\Ca\misc\data\icons\I_drutkolczasty_CA.paa"; + offset[] = {0,1.5,0.5}; accuracy = 0.3; mapSize = 5.5; displayName = "Wire (CAT1)"; @@ -2099,6 +2107,7 @@ class CfgVehicles scope = 2; destrType = "DestructNo"; cost = 100; + offset[] = {0,1.5,0.5}; model = "\ca\misc\jezek_kov"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; @@ -2114,6 +2123,7 @@ class CfgVehicles vehicleClass = "Fortifications"; model = "\ca\misc\Fort_Razorwire"; icon = "\Ca\misc\data\icons\I_drutkolczasty_CA.paa"; + offset[] = {0,1,5,0.5}; accuracy = 0.3; mapSize = 5.5; displayName = "Wire"; @@ -2129,6 +2139,7 @@ class CfgVehicles cost = 100; model = "\ca\misc2\BagFenceLong.p3d"; icon = "\Ca\misc3\data\Icons\icon_fortBagFenceLong_ca.paa"; + offset[] = {0,1,5,0.5}; mapSize = 2; armor = 400; displayName = "Bag Fence"; @@ -2140,6 +2151,7 @@ class CfgVehicles animated = 0; vehicleClass = "Fortifications"; typicalCargo[] = {}; + offset[] = {0,1,5,0.5}; irTarget = 0; accuracy = 0.3; transportAmmo = 0; @@ -2157,18 +2169,20 @@ class CfgVehicles displayName = "H-barrier cube"; GhostPreview = "Land_HBarrier1Preview"; }; - - class WoodGate_DZ: BuiltItems + class Land_kulna; + class WoodGate_DZ: Land_kulna { scope = 2; - destrType = "DestructTree"; + destrType = "DestructBuilding"; cost = 100; - model = "\ca\structures\Wall\Gate_wood2_5"; - icon = "\ca\data\data\Unknown_object.paa"; - mapSize = 2; - armor = 50; - displayName = "Locked Wood Gate"; + offset[] = {0,2.5,1}; + //model = "\ca\structures\Wall\Gate_wood2_5"; + //icon = "\ca\data\data\Unknown_object.paa"; + //mapSize = 2; + armor = 100; + displayName = "Wooden Shack"; vehicleClass = "Fortifications"; + /* class AnimationSources { class DoorR { @@ -2177,6 +2191,7 @@ class CfgVehicles initPhase = 0; } } + */ }; class BearTrap_DZ: TrapItems { @@ -2260,6 +2275,7 @@ class CfgVehicles init = "[(_this select 0),'cfgWeapons','Colt1911'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; + class WeaponHolder_ItemHatchet: WeaponHolderBase { scope = 2; @@ -2270,6 +2286,16 @@ class CfgVehicles init = "[(_this select 0),'cfgWeapons','ItemHatchet'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; + class WeaponHolder_ItemMachete: WeaponHolderBase + { + scope = 2; + displayName = "Machete"; + model="\z\addons\dayz_communityassets\models\machete.p3d"; + class eventHandlers + { + init = "[(_this select 0),'cfgWeapons','ItemMachete'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + }; + }; class WeaponHolder_MeleeCrowbar: WeaponHolderBase { scope = 2; @@ -2310,6 +2336,16 @@ class CfgVehicles init = "[(_this select 0),'cfgMagazines','ItemTent'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; + class WeaponHolder_ItemTentDomed: WeaponHolderBase + { + scope = 2; + displayName = "Domed Desert Tent"; + model = "\dayz_equip\proxy\tentbag.p3d"; + class eventHandlers + { + init = "[(_this select 0),'cfgMagazines','ItemTentDomed'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + }; + }; class WeaponHolder_ItemVault: WeaponHolderBase { scope = 2; @@ -2440,6 +2476,17 @@ class CfgVehicles init = "[(_this select 0),'cfgMagazines','ItemOilBarrel'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; + + class WeaponHolder_ItemJerrycanEmpty: WeaponHolderBase + { + scope = 2; + displayName = "$STR_EQUIP_NAME_39"; + model = "\dayz_equip\proxy\jerrycan.p3d"; + class eventHandlers + { + init = "[(_this select 0),'cfgMagazines','ItemJerrycanEmpty'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + }; + }; class WeaponHolder_ItemJerrycan: WeaponHolderBase { scope = 2; @@ -2462,6 +2509,16 @@ class CfgVehicles transportMaxMagazines = 50; transportMaxWeapons = 10; transportMaxBackpacks = 5; + create = "WeaponHolder_ItemTent"; + }; + class TentStorageDomed: TentStorage + { + vehicleClass = "Survival"; + model = "\dayz_equip\models\astan.p3d"; + transportMaxMagazines = 75; + transportMaxWeapons = 12; + transportMaxBackpacks = 7; + create = "WeaponHolder_ItemTentDomed"; }; class VaultStorage: Land_A_tent { diff --git a/dayz_equip/models/astan.p3d b/dayz_equip/models/astan.p3d new file mode 100644 index 000000000..b457046cb Binary files /dev/null and b/dayz_equip/models/astan.p3d differ diff --git a/dayz_equip/textures/tent_personal_co.paa b/dayz_equip/textures/tent_personal_co.paa new file mode 100644 index 000000000..1485a7b3e Binary files /dev/null and b/dayz_equip/textures/tent_personal_co.paa differ diff --git a/dayz_server/compile/server_playerDied.sqf b/dayz_server/compile/server_playerDied.sqf index fa53b75c2..064415b0c 100644 --- a/dayz_server/compile/server_playerDied.sqf +++ b/dayz_server/compile/server_playerDied.sqf @@ -29,13 +29,23 @@ if (_killerName != "nil") then } else { - _message = format["%1 was killed by %2 with weapon %3",_victimName, _killerName, _weapon]; + _message = format["%1 was killed by %2 with weapon %3 from %4m",_victimName, _killerName, _weapon, _distance]; _loc_message = format["PKILL: %1 was killed by %2 with weapon %3 from %4m", _victimName, _killerName, _weapon, _distance]; }; diag_log _loc_message; - // [nil, nil, rspawn, [_killer, _message], { (_this select 0) globalChat (_this select 1) }] call RE; - // [nil, nil, rHINT, _message] call RE; + if(DZE_DeathMsgGlobal) then { + [nil, nil, rspawn, [_killer, _message], { (_this select 0) globalChat (_this select 1) }] call RE; + }; + if(DZE_DeathMsgSide) then { + [nil, nil, rspawn, [_killer, _message], { (_this select 0) sideChat (_this select 1) }] call RE; + }; + if(DZE_DeathMsgTitleTextLocal) then { + [nil,nil,"loc",rTITLETEXT,_message,"PLAIN DOWN"] call RE; + }; + if(DZE_DeathMsgTitleText) then { + [nil,nil,"per",rTITLETEXT,_message,"PLAIN DOWN"] call RE; + }; // build array to store death messages to allow viewing at message board in trader citys. PlayerDeaths set [count PlayerDeaths,_message]; diff --git a/dayz_server/compile/server_playerSetup.sqf b/dayz_server/compile/server_playerSetup.sqf index c80377a2d..c251aa915 100644 --- a/dayz_server/compile/server_playerSetup.sqf +++ b/dayz_server/compile/server_playerSetup.sqf @@ -1,4 +1,4 @@ -private["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_lastinstance","_friendlies","_randomSpot","_position","_debug","_distance","_hit","_fractures","_score","_findSpot","_mkr","_counter","_isNear","_isZero","_pos","_isIsland","_w","_clientID"]; +private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_lastinstance","_friendlies","_randomSpot","_position","_debug","_distance","_hit","_fractures","_score","_findSpot","_pos","_isIsland","_w","_clientID","_spawnMC"]; //Wait for HIVE to be free //diag_log ("SETUP: attempted with " + str(_this)); @@ -197,7 +197,12 @@ if (_randomSpot) then { if(isnil "spawnShoremode") then { spawnShoremode = 1; }; - + if(isnil "spawnMarkerCount") then { + spawnMarkerCount = 4; + }; + + // The wiki states floor has a uniform distribution but will not reach the last number so we add +1 + _spawnMC = spawnMarkerCount + 1; //spawn into random _findSpot = true; @@ -205,11 +210,12 @@ if (_randomSpot) then { while {_findSpot} do { _counter = 0; while {_counter < 20 and _findSpot} do { - _mkr = "spawn" + str(round(random 4)); + // switched to floor + _mkr = "spawn" + str(floor(random _spawnMC)); _position = ([(getMarkerPos _mkr),0,spawnArea,10,0,2000,spawnShoremode] call BIS_fnc_findSafePos); _isNear = count (_position nearEntities ["Man",100]) == 0; _isZero = ((_position select 0) == 0) and ((_position select 1) == 0); - //Island Check //TeeChange + //Island Check //TeeChange _pos = _position; _isIsland = false; //Can be set to true during the Check for [{_w=0},{_w<=150},{_w=_w+2}] do { diff --git a/dayz_server/compile/server_spawnCrashSite.sqf b/dayz_server/compile/server_spawnCrashSite.sqf index 12c6598a1..ffee487e5 100644 --- a/dayz_server/compile/server_spawnCrashSite.sqf +++ b/dayz_server/compile/server_spawnCrashSite.sqf @@ -22,13 +22,18 @@ while {true} do { _timeToSpawn = time + _frequency + _timeAdjust; //Adding some Random systems - _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ"] call BIS_fnc_selectRandom; + _crashModel = ["UH60Wreck_DZ","UH1Wreck_DZ","Mass_grave"] call BIS_fnc_selectRandom; - //Crash loot just uncomment the one you wish to use by default with 50cals is enabled. - //Table including 50 cals - _lootTable = ["Military","HeliCrash","MilitarySpecial"] call BIS_fnc_selectRandom; - //Table without 50 cals - //_lootTable = ["Military","HeliCrash_No50s","MilitarySpecial"] call BIS_fnc_selectRandom; + + if(_crashModel == "Mass_grave") then { + _lootTable = "MassGrave"; + } else { + //Crash loot just uncomment the one you wish to use by default with 50cals is enabled. + //Table including 50 cals + _lootTable = ["Military","HeliCrash","MilitarySpecial"] call BIS_fnc_selectRandom; + //Table without 50 cals + //_lootTable = ["Military","HeliCrash_No50s","MilitarySpecial"] call BIS_fnc_selectRandom; + }; _crashName = getText (configFile >> "CfgVehicles" >> _crashModel >> "displayName"); @@ -74,6 +79,13 @@ while {true} do { _crash setVariable ["ObjectID",1,true]; + _num = round(random _randomizedLoot) + _guaranteedLoot; + + if(_crashModel == "Mass_grave") then { + _spawnFire = false; + _num = _num * 2; + }; + if (_spawnFire) then { //["dayzFire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll; dayzFire = [_crash,2,time,false,_fadeFire]; @@ -81,11 +93,11 @@ while {true} do { _crash setvariable ["fadeFire",_fadeFire,true]; }; - _num = round(random _randomizedLoot) + _guaranteedLoot; + _config = configFile >> "CfgBuildingLoot" >> _lootTable; _itemTypes = [] + getArray (_config >> "itemType"); - _index = dayz_CBLBase find "HeliCrash"; + _index = dayz_CBLBase find _lootTable; _weights = dayz_CBLChances select _index; _cntWeights = count _weights; diff --git a/dayz_server/compile/server_updateObject.sqf b/dayz_server/compile/server_updateObject.sqf index 7ee630bf6..a322b549e 100644 --- a/dayz_server/compile/server_updateObject.sqf +++ b/dayz_server/compile/server_updateObject.sqf @@ -8,7 +8,6 @@ _type = _this select 1; _parachuteWest = typeOf _object == "ParachuteWest"; _isNotOk = false; _firstTime = false; -_removeCounter = 0; _objectID = _object getVariable ["ObjectID","0"]; _uid = _object getVariable ["ObjectUID","0"]; @@ -33,12 +32,14 @@ if (!_parachuteWest) then { // Loop to wait it out _counter = _object getVariable ["markedForRemoval","0"]; - _removeCounter = _object setVariable ["markedForRemoval",(_counter + 1)]; + + _removeCounter = _counter + 1; + _object setVariable ["markedForRemoval",(_counter + 1)]; }; }; -if (_isNotOk and _removeCounter < 10) exitWith { diag_log(format["About to remove vehicle: %1 - %2 / 10", typeOf _object, _removeCounter]); }; -if (_isNotOk and _removeCounter >= 10) exitWith { deleteVehicle _object; }; +if (_isNotOk and _removeCounter < 5) exitWith { diag_log(format["About to remove vehicle: %1 - %2 / 10", typeOf _object, _removeCounter]); }; +if (_isNotOk and _removeCounter >= 5) exitWith { deleteVehicle _object; }; _lastUpdate = _object getVariable ["lastUpdate",time]; diff --git a/dayz_server/init/server_functions.sqf b/dayz_server/init/server_functions.sqf index 1e8f24799..dc4379e2e 100644 --- a/dayz_server/init/server_functions.sqf +++ b/dayz_server/init/server_functions.sqf @@ -205,8 +205,6 @@ spawn_vehicles = { } else { // Spawn around buildings and 50% near roads if((random 1) > 0.5) then { - - waitUntil{!isNil "BIS_fnc_selectRandom"}; _position = RoadList call BIS_fnc_selectRandom; @@ -220,8 +218,6 @@ spawn_vehicles = { } else { - - waitUntil{!isNil "BIS_fnc_selectRandom"}; _position = BuildingList call BIS_fnc_selectRandom; @@ -260,6 +256,24 @@ spawn_vehicles = { clearWeaponCargoGlobal _veh; clearMagazineCargoGlobal _veh; + // Add 0-3 loots to vehicle using random cfgloots + _allCfgLoots = [] + (getArray (configFile >> "cfgLoot")); + _num = floor(random 4); + + for "_x" from 1 to _num do { + _iClass = _allCfgLoots call BIS_fnc_selectRandom; + + _itemTypes = [] + ((getArray (configFile >> "cfgLoot" >> _iClass)) select 0); + _index = dayz_CLBase find _iClass; + _weights = dayz_CLChances select _index; + _cntWeights = count _weights; + + _index = floor(random _cntWeights); + _index = _weights select _index; + _itemType = _itemTypes select _index; + _item addMagazineCargoGlobal [_itemType,1]; + }; + [_veh,[_dir,_objPosition],_vehicle,true,"0"] call server_publishVeh; }; }; @@ -269,11 +283,10 @@ spawn_vehicles = { spawn_roadblocks = { private["_position","_veh","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_isRoad","_roadlist","_istoomany"]; _WreckList = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; - _WreckLoot = ["DynamicDebris"]; + waitUntil{!isNil "BIS_fnc_selectRandom"}; if (isDedicated) then { - waitUntil{!isNil "BIS_fnc_selectRandom"}; _position = RoadList call BIS_fnc_selectRandom; _position = _position modelToWorld [0,0,0]; @@ -295,10 +308,14 @@ spawn_roadblocks = { _marker setMarkerType "DOT"; }; - waitUntil{!isNil "BIS_fnc_selectRandom"}; _spawnveh = _WreckList call BIS_fnc_selectRandom; - waitUntil{!isNil "BIS_fnc_selectRandom"}; - _spawnloot = _WreckLoot call BIS_fnc_selectRandom; + + if(_spawnveh == "HMMWVWreck" or _spawnveh == "UralWreck" or _spawnveh == "UAZWreck") then { + _spawnloot = "DynamicDebrisMilitary"; + } else { + _spawnloot = "DynamicDebris"; + }; + diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); _veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; @@ -341,36 +358,28 @@ spawn_roadblocks = { }; -// Damage generator fuction +if(isnil "DynamicVehicleDamageLow") then { + DynamicVehicleDamageLow = 0; +}; +if(isnil "DynamicVehicleDamageHigh") then { + DynamicVehicleDamageHigh = 100; +}; + +// Damage generator function generate_new_damage = { - private ["_damage","_rnd"]; - _rnd = random 1; - if(_rnd > 0.5) then { - _damage = 0; - } else { - _rnd = random 1; - if(_rnd > 0.5) then { - _damage = 0.50; - } else { - _damage = 1; - }; - }; + private ["_damage"]; + _damage = (random ((DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow))/100; _damage; }; // Damage generator fuction generate_exp_damage = { - private ["_damage","_rnd"]; - _rnd = random 1; - if(_rnd > 0.5) then { - _damage = 0; - } else { - _rnd = random 1; - if(_rnd > 0.5) then { - _damage = 0.50; - } else { - _damage = 0.85; - }; + private ["_damage"]; + _damage = (random ((DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow))/100; + + // limit this to 85% since vehicle would blow up otherwise. + if(_damage >= 0.85) then { + _damage = 0.85; }; _damage; };