updates for toilet and kitchen sink

kitchenSink positions can be added to kitchenSinkPos at any time and
should spawn without BE kicks.
This commit is contained in:
vbawol 2017-10-19 13:16:27 -05:00
parent 184b2da59e
commit d2bdbcb5d6
5 changed files with 35 additions and 34 deletions

View File

@ -1,3 +1,3 @@
5 "" !="Construct_f" !="I_UAV_01_F" !="(I|B|O)_UAV_AI" !"_EPOCH" !="B_65x39_Minigun_Caseless_Red_splash" !="B_762x51_Minigun_Tracer_Yellow_splash" !="B_(Swing|Stick)" !"^SmokeShell" !"^G_40mm_" !"^F_40mm_" !"Sub_F_" !"^F_Signal_" !="mini_Grenade" !="GrenadeHand" !="LaserTarget(C|W|E)" !"^Chemlight_" !="APERS(TripMine_Wire|BoundingMine_Range|Mine_Range)_Ammo" !="(SatchelCharge|DemoCharge|ClaymoreDirectionalMine)_Remote_Ammo" !="Epoch_(Sapper|Sapper(B|G)|Cloak)_F" !="EPOCH_RyanZombie_[1-5](|_(C|Sp|B|W|M|P))" !="GreatWhite_F" !="groundWeaponHolder" !="WeaponHolderSimulated" !="Epoch_(Male|Female)_F" !"Supply[0-9]" !"Steerable_Parachute_F" !="Epoch_Female_CamoRed_F" !="Land_Cages_F" !="(O|I|B)_UAV_01_backpack_F" !="I_(helipilot|helicrew)_F" !="#smokesource" !="SmokeLauncherAmmo" !="B_AssaultPack_(khk|dgtl|rgr|sgg|cbr|mcamo|ocamo)" !="B_Kitbag_(rgr|mcamo|sgg|cbr)" !="B_TacticalPack_(rgr|mcamo|ocamo|blk|oli)" !="B_FieldPack_(khk|ocamo|oucamo|cbr|blk|oli)" !="B_Carryall_(ocamo|oucamo|mcamo|khk|cbr|oli)" !="B_Parachute" !="SLAMDirectionalMine_Wire_Ammo" !="(CMflare_Chaff|Sapper_Charge|SapperB_Charge|ATMine_Range)_Ammo"
5 "_EPOCH" !="BarrelBomb_EPOCH_Remote_Ammo" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !=".+_(SIM|Ghost)_EPOCH" !="smallbackpack_(red|green|teal|pink)_epoch" !="(FirePlace|FirePlaceOn|Jack|Freezer|Tarp|Bobber|BarbedWire)_EPOCH"
5 "_EPOCH" !="BarrelBomb_EPOCH_Remote_Ammo" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet|toilet|KitchenSink)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !=".+_(SIM|Ghost)_EPOCH" !="smallbackpack_(red|green|teal|pink)_epoch" !="(FirePlace|FirePlaceOn|Jack|Freezer|Tarp|Bobber|BarbedWire)_EPOCH"
5 SeaGull

View File

@ -1 +1 @@
5 "" !" GroundWeaponHolder$" !" WeaponHolderSimulated$" !" Epoch_(Sapper|Sapper(B|G)|Cloak|Female_CamoRed)_F$" !" EPOCH_RyanZombie_[1-5](|_(C|Sp|B|W|M|P))$" !" (Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH$" !" (Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Cabinet|Freezer|Tarp)_EPOCH$" !" I_(Soldier[1-3]|Soldier)_EPOCH$" !" I_(helipilot|helicrew)_F$" !" I_UAV_01_F$" !" (I|B|O)_UAV_AI$" !" I_Boat_Armed_01_minigun_F" !" Land_Cages_F$" !"(Bobber|Rabbit|BarbedWire)_EPOCH$" !"_(SIM|Ghost)_EPOCH$" !"(B_Heli_Transport_01|GreatWhite)_F"
5 "" !" GroundWeaponHolder$" !" WeaponHolderSimulated$" !" Epoch_(Sapper|Sapper(B|G)|Cloak|Female_CamoRed)_F$" !" EPOCH_RyanZombie_[1-5](|_(C|Sp|B|W|M|P))$" !" (Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH$" !" (Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Cabinet|Freezer|Tarp|toilet|KitchenSink)_EPOCH$" !" I_(Soldier[1-3]|Soldier)_EPOCH$" !" I_(helipilot|helicrew)_F$" !" I_UAV_01_F$" !" (I|B|O)_UAV_AI$" !" I_Boat_Armed_01_minigun_F" !" Land_Cages_F$" !"(Bobber|Rabbit|BarbedWire)_EPOCH$" !"_(SIM|Ghost)_EPOCH$" !"(B_Heli_Transport_01|GreatWhite)_F"

View File

@ -1 +1 @@
5 "" !="Epoch_(Male|Female)_F" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" !=".+_(SIM|Ghost)_EPOCH" !="(FirePlace|FirePlaceOn)_EPOCH"
5 "" !="Epoch_(Male|Female)_F" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Rabbit|Cabinet|toilet|KitchenSink)_EPOCH" !="(Sheep|Goat|Snake|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="Foundation_EPOCH" !="WoodFoundation_EPOCH" !=".+_(SIM|Ghost)_EPOCH" !="(FirePlace|FirePlaceOn)_EPOCH"

View File

@ -236,7 +236,7 @@ if (isText(_simulClassConfig)) then {
};
_currentTarget removeEventHandler["EpeContactStart", _onContactEH];
EPOCH_velTransform = false;
_disallowed = ["Tarp_SIM_EPOCH", "Freezer_SIM_EPOCH", "Fridge_SIM_EPOCH", "Shelf_SIM_EPOCH", "Pelican_SIM_EPOCH", "Wardrobe_SIM_EPOCH", "Bed_SIM_EPOCH", "Couch_SIM_EPOCH", "Cooker_SIM_EPOCH", "Chair_SIM_EPOCH", "Filing_SIM_EPOCH", "Table_SIM_EPOCH", "Locker_SIM_EPOCH", "ToolRack_SIM_EPOCH", "Shoebox_SIM_EPOCH", "Bunk_SIM_EPOCH", "Jack_SIM_EPOCH"];
_disallowed = ["Tarp_SIM_EPOCH", "Freezer_SIM_EPOCH", "Fridge_SIM_EPOCH", "Shelf_SIM_EPOCH", "Pelican_SIM_EPOCH", "Wardrobe_SIM_EPOCH", "Bed_SIM_EPOCH", "Couch_SIM_EPOCH", "Cooker_SIM_EPOCH", "Chair_SIM_EPOCH", "Filing_SIM_EPOCH", "Table_SIM_EPOCH", "Locker_SIM_EPOCH", "ToolRack_SIM_EPOCH", "Shoebox_SIM_EPOCH", "Bunk_SIM_EPOCH", "Jack_SIM_EPOCH", "toilet_SIM_EPOCH", "KitchenSink_SIM_EPOCH"];
if !(_class in _disallowed) then {
_currentTarget spawn EPOCH_countdown;
};

View File

@ -15,11 +15,12 @@ class CfgBuildingLootPos
toolRackPos[] = {};
shoeboxPos[] = {};
toiletPos[] = {};
kitchenSinkPos[] = {};
lootBias = 40;
limit = 3;
lootType = "normal";
normal[] = {{"shelfPos","Shelf_EPOCH",true},{"fridgePos","Fridge_EPOCH",true},{"bedPos","Bed_EPOCH",false},{"couchPos","Couch_EPOCH",false},{"wardrobePos","wardrobe_epoch",false},{"cookerPos","cooker_epoch",false},{"chairPos",{"Chair_EPOCH","ChairRed_EPOCH"},true},{"filingPos","Filing_epoch",true},{"pelicanPos","Pelican_EPOCH",false},{"tablePos","Table_EPOCH",false},{"lockerPos","Locker_EPOCH",false},{"toolRackPos","ToolRack_EPOCH",false},{"shoeboxPos","Shoebox_EPOCH",false},{"palletPos","Tarp_EPOCH",false},{"freezerPos","Freezer_EPOCH",false},{"cabinetPos","Cabinet_EPOCH",false},{"toiletPos","toilet_epoch",false}};
mil[] = {{"shelfPos","Shelf_EPOCH",true},{"fridgePos","Fridge_EPOCH",true},{"bedPos","Bunk_EPOCH",false},{"couchPos","Couch_EPOCH",false},{"wardrobePos","wardrobe_epoch",false},{"cookerPos","cooker_epoch",false},{"chairPos",{"Chair_EPOCH","ChairRed_EPOCH"},true},{"filingPos","Filing_epoch",true},{"pelicanPos","Pelican_EPOCH",false},{"tablePos","Table_EPOCH",false},{"lockerPos","Locker_EPOCH",false},{"toolRackPos","ToolRack_EPOCH",false},{"shoeboxPos","Shoebox_EPOCH",false},{"palletPos","Tarp_EPOCH",false},{"freezerPos","Freezer_EPOCH",false},{"cabinetPos","Cabinet_EPOCH",false},{"toiletPos","toilet_epoch",false}};
normal[] = {{"shelfPos","Shelf_EPOCH",true},{"fridgePos","Fridge_EPOCH",true},{"bedPos","Bed_EPOCH",false},{"couchPos","Couch_EPOCH",false},{"wardrobePos","wardrobe_epoch",false},{"cookerPos","cooker_epoch",false},{"chairPos",{"Chair_EPOCH","ChairRed_EPOCH"},true},{"filingPos","Filing_epoch",true},{"pelicanPos","Pelican_EPOCH",false},{"tablePos","Table_EPOCH",false},{"lockerPos","Locker_EPOCH",false},{"toolRackPos","ToolRack_EPOCH",false},{"shoeboxPos","Shoebox_EPOCH",false},{"palletPos","Tarp_EPOCH",false},{"freezerPos","Freezer_EPOCH",false},{"cabinetPos","Cabinet_EPOCH",false},{"toiletPos","toilet_epoch",false},{"kitchenSinkPos","KitchenSink_epoch",false}};
mil[] = {{"shelfPos","Shelf_EPOCH",true},{"fridgePos","Fridge_EPOCH",true},{"bedPos","Bunk_EPOCH",false},{"couchPos","Couch_EPOCH",false},{"wardrobePos","wardrobe_epoch",false},{"cookerPos","cooker_epoch",false},{"chairPos",{"Chair_EPOCH","ChairRed_EPOCH"},true},{"filingPos","Filing_epoch",true},{"pelicanPos","Pelican_EPOCH",false},{"tablePos","Table_EPOCH",false},{"lockerPos","Locker_EPOCH",false},{"toolRackPos","ToolRack_EPOCH",false},{"shoeboxPos","Shoebox_EPOCH",false},{"palletPos","Tarp_EPOCH",false},{"freezerPos","Freezer_EPOCH",false},{"cabinetPos","Cabinet_EPOCH",false},{"toiletPos","toilet_epoch",false},{"kitchenSinkPos","KitchenSink_epoch",false}};
};
class Land_Kiosk_redburger_F : Default
{
@ -677,7 +678,7 @@ class CfgBuildingLootPos
shoeboxPos[] = {{{-5.70313,-4.57422,-5.49586},271.096}};
palletPos[] = {{{-4.17969,-5.43848,-5.50872},238}};
};
class Land_Church_01_V2_F : Land_Church_01_V1_F {};
class Land_Church_01_V2_F : Land_Church_01_V1_F {};
class Land_Castle_01_tower_F : Default
{
shelfPos[] = {{{2.58398,2.0791,-9.50637},85.6591}};
@ -4848,34 +4849,34 @@ class CfgBuildingLootPos
freezerPos[] = {{{-5.04785,1.56201,-1.60012},90}};
cabinetPos[] = {{{-8.79102,-1.59473,-0.300119},0}};
};
class Land_i_House_Small_03_V1_dam_F : Default
class Land_i_House_Small_03_V1_dam_F : Default
{
tablePos[] = {{{3.97192,-5.14429,-0.399977},184.648}};
shoeboxPos[] = {{{1.03833,1.97803,-0.399977},359.648}};
KitchenSinkPos[] = {{{-4.81128,2.74316,-0.399977},269.648}};
toiletPos[] = {{{1.43848,5.02466,-0.399977},359.648}};
};
class Land_u_House_Small_02_V1_dam_F : Default
class Land_u_House_Small_02_V1_dam_F : Default
{
chairPos[] = {{{2.06104,-0.303467,-1.07093},273.648}};
tablePos[] = {{{6.60864,-2.21667,-1.07093},179.648}};
};
class Land_i_House_Small_02_V3_dam_F : Default
class Land_i_House_Small_02_V3_dam_F : Default
{
couchPos[] = {{{6.16943,-1.03198,-0.925534},4.99999}};
};
class Land_i_House_Small_02_V2_dam_F : Default
class Land_i_House_Small_02_V2_dam_F : Default
{
bedPos[] = {{{6.95679,-0.921143,-0.999897},358}};
toolRackPos[] = {{{0.935547,0.244019,-1.04277},88}};
};
class Land_i_House_Small_02_V1_dam_F : Default
class Land_i_House_Small_02_V1_dam_F : Default
{
shoeboxPos[] = {{{2.6355,-2.07544,-0.927456},88}};
freezerPos[] = {{{7.27197,-1.90771,-0.927456},88}};
KitchenSinkPos[] = {{{7.29883,1.40063,-0.927456},90}};
};
class Land_i_Barracks_V1_dam_F : Default
class Land_i_Barracks_V1_dam_F : Default
{
shelfPos[] = {{{-13.2607,1.86938,3.88759},264}};
chairPos[] = {{{7.35889,-3.00977,0.487596},88},{{-7.59131,3.71997,0.487596},88}};
@ -4886,7 +4887,7 @@ class CfgBuildingLootPos
};
class Land_i_Barracks_V2_dam_F : Land_i_Barracks_V1_dam_F{};
class Land_TentHangar_V1_F : Default
class Land_TentHangar_V1_F : Default
{
couchPos[] = { {{8.67236,-3.95703,-4.10237},356}};
lockerPos[] = { {{-9.604,1.47412,-4.10237},264}};
@ -4894,18 +4895,18 @@ class CfgBuildingLootPos
};
class Land_TentHangar_V1_dam_F : Land_TentHangar_V1_F {};
class Land_Dome_Big_F : Default
class Land_Dome_Big_F : Default
{
chairPos[] = {{{16.2844,15.4109,-10.1997},356},{{-13.9492,-19.0752,-10.1997},216}};
pelicanPos[] = {{{21.5835,-2.73999,-10.1997},356}};
palletPos[] = {{{-5.73926,-1.4939,-10.1997},356},{{3.42236,10.5425,-10.1997},356},{{-8.70752,20.2468,-10.1997},356}};
};
class Land_Dome_Small_F : Default
class Land_Dome_Small_F : Default
{
chairPos[] = {{{2.98877,12.7253,-6.98321},329},{{-4.11328,-12.5012,-6.98321},216}};
palletPos[] = {{{-1.65088,1.33276,-6.98321},329},{{10.731,-0.450806,-6.94824},329}};
};
class Land_GH_MainBuilding_entry_F : Default
class Land_GH_MainBuilding_entry_F : Default
{
palletPos[] = {{{-2.0636,-18.1663,-0.128474},329}};
};
@ -4927,8 +4928,8 @@ class CfgBuildingLootPos
class Land_i_House_Small_01_V2_dam_F : Land_i_House_Small_01_V1_F {};
class Land_i_House_Small_01_V3_dam_F : Land_i_House_Small_01_V1_F {};
class Land_u_House_Small_01_V1_dam_F : Land_i_House_Small_01_V1_F {};
class bunker_epoch : Default {
shelfPos[] = {
{ {-6.09766,-2.83032,0.188561}, 269 }
@ -4964,7 +4965,7 @@ class CfgBuildingLootPos
{ {-5.7334,5.8186,0.188561}, 355.754 }
};
};
class bunker_epoch_01 : Default
class bunker_epoch_01 : Default
{
bedPos[] = {{{-5.6062,-4.66162,0.198561},0}};
wardrobePos[] = {{{-4.96973,-1.5188,0.198561},0}};
@ -4975,30 +4976,30 @@ class CfgBuildingLootPos
lockerPos[] = {{{-2.90576,-5.85986,0.198561},180}};
toolRackPos[] = {{{-0.807129,0.849365,0.198561},0.999984}};
};
class bunker_epoch_02 : Default
class bunker_epoch_02 : Default
{
filingPos[] = {{{-4.68335,6.02905,0.198561}, 0 }};
pelicanPos[] = {{{3.39038,4.75586,0.998561},106},{{3.44043,-5.27368,1.09856},187}};
tablePos[] = {{{-5.69214,-5.26318,0.198561},270}};
shoeboxPos[] = {{{-0.34082,-0.652588,0.198561},0}};
};
class bunker_epoch_03 : Default
class bunker_epoch_03 : Default
{
palletPos[] = {{{5.12939,-4.6543,0.198561},280},{{-5.00098,4.79419,0.198561},280},{{-4.95093,-4.89502,0.198561},280},{{4.92627,5.02051,0.198561},280}};
freezerPos[] = {{{0.429932,-0.184326,0.198561},280}};
};
class bunker_epoch_04 : Default
class bunker_epoch_04 : Default
{
shelfPos[] = {{{5.03784,6.09985,0.198561},358}};
couchPos[] = {{{5.24194,-4.54272,0.198561},358}};
toolRackPos[] = {{{-6.33521,-2.39136,0.198561},269}};
palletPos[] = {{{-4.91284,5.15063,0.198561},358}};
};
class bunker_epoch_05 : Default
class bunker_epoch_05 : Default
{
toolRackPos[] = {{{-6.34375,-4.08228,0.198561},269 },{{4.22607,6.44775,0.198561},358}};
};
class bunker_epoch_06 : Default
class bunker_epoch_06 : Default
{
bedPos[] = {{{0.781494,-0.343262,0.398561},357}};
couchPos[] = {{{4.94385,-4.66699,0.398561},0.999985}};
@ -5006,7 +5007,7 @@ class CfgBuildingLootPos
palletPos[] = {{{-4.90674,-4.79785,0.398561},0.999985}};
freezerPos[] = {{{-4.82007,5.51099,0.398561},0.999985}};
};
class bunker_epoch_07 : Default
class bunker_epoch_07 : Default
{
fridgePos[] = {{{-5.98901,5.21826,0.198561},271}};
couchPos[] = {{{4.22314,4.99194,0.198561},271}};
@ -5014,20 +5015,20 @@ class CfgBuildingLootPos
tablePos[] = {{{5.75464,-2.42407,0.198561},91}};
lockerPos[] = {{{3.51074,-5.99731,-0.00143862},181}};
};
class bunker_epoch_08 : Default
class bunker_epoch_08 : Default
{
pelicanPos[] = {{{5.34814,-5.12524,0.0985613},157}};
tablePos[] = {{{5.72852,4.86255,0.0985613},90}};
palletPos[] = {{{-1.03052,-1.6283,0.0985613},90},{{-5.45703,5.45093,0.0985613},90}};
};
class bunker_epoch_09 : Default
class bunker_epoch_09 : Default
{
filingPos[] = {{{-0.427002,-3.22974,0.198561},270}};
lockerPos[] = {{{3.94238,3.28931,0.198561},0}};
toolRackPos[] = {{{-4.68579,2.68604,0.198561},90}};
cabinetPos[] = {{{-2.53271,-5.63306,1.59856},0}};
};
class bunker_epoch_10 : Default
class bunker_epoch_10 : Default
{
filingPos[] = {{{5.95313,-5.95898,0.198561},93}};
pelicanPos[] = {{{1.65479,0.0246582,0.198561},93}};
@ -5035,11 +5036,11 @@ class CfgBuildingLootPos
palletPos[] = {{{1.10596,2.43481,0.198561},360}};
freezerPos[] = {{{2.24316,-2.00635,0.198561},90}};
};
class bunker_epoch_11 : Default
class bunker_epoch_11 : Default
{
palletPos[] = {{{-0.422363,-0.419922,0.198561},90},{{1.23438,-3.04443,0.198561},90},{{2.97192,1.48828,0.198561},90},{{-1.42578,3.52393,0.198561},90},{{-4.94702,-1.37012,0.198561},90}};
};
class bunker_epoch_12 : Default
class bunker_epoch_12 : Default
{
cookerPos[] = {{{-0.17749,3.62891,0.198561},0}};
chairPos[] = {{{-2.82349,3.24341,0.198561},319}};
@ -5047,7 +5048,7 @@ class CfgBuildingLootPos
lockerPos[] = {{{3.52197,0.408203,0.198561},90}};
palletPos[] = {{{2.68945,-2.72729,0.198561},90}};
};
class bunker_epoch_13 : Default
class bunker_epoch_13 : Default
{
wardrobePos[] = {{{-5.40405,3.79126,0.0153623},180}};
cookerPos[] = {{{3.54663,4.09839,0.215362},180}};
@ -5055,14 +5056,14 @@ class CfgBuildingLootPos
filingPos[] = {{{-1.15649,3.83398,0.0153623},89}};
pelicanPos[] = {{{-3.9458,-3.77197,0.115362},53}};
};
class bunker_epoch_14 : Default
class bunker_epoch_14 : Default
{
fridgePos[] = {{{3.50195,-3.10852,0.232163},93}};
cookerPos[] = {{{5.59717,5.83398,0.232163},359}};
filingPos[] = {{{-5.47656,2.58411,0.232163},359}};
tablePos[] = {{{-3.96191,-3.97363,0.232163},90}};
};
class bunker_epoch_15 : Default
class bunker_epoch_15 : Default
{
fridgePos[] = {{{5.34229,-1.59033,0.198561},180}};
chairPos[] = {{{2.95605,2.72632,0.198561},313}};