Skip to content

Commit

Permalink
Fixed double spawning
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tinter
Tinter committed Oct 4, 2020
1 parent 79bb76f commit b55c613
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 262 deletions.
361 changes: 188 additions & 173 deletions furniture/buildings.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,173 +1,188 @@
//Order matters, first entry found is the entry used
_validBuildings = [
"Cargo_house_base_F",
"Cargo_HQ_base_F",
"Cargo_Tower_base_F",
"i_House_Big_01_b_base_F",
"i_House_Big_02_b_base_F",
"i_House_Small_01_b_base_F",
"i_House_Small_02_b_base_F",
"i_House_Small_02_c_base_F",
"i_Shop_02_b_base_F",
"i_Stone_House_Big_01_b_base_F",
"i_Stone_Shed_01_b_base_F",
"i_Stone_Shed_01_c_base_F",
"Land_Airport_01_hangar_F",
"Land_Airport_01_terminal_F",
"Land_Airport_02_terminal_F",
"Land_Airport_Tower_F",
"Land_Addon_03mid_V1_ruins_F",
"Land_Barn_01_brown_F",
"Land_Barn_01_brown_F",
"Land_Barn_01_grey_F",
"Land_Barn_01_grey_F",
"Land_Barn_02_F",
"Land_Barn_04_F",
"Land_Barracks_03_F",
"Land_Barracks_04_F",
"Land_Bunker_01_big_F",
"Land_Bunker_01_HQ_F",
"Land_Bunker_01_small_F",
"Land_Bunker_01_tall_F",
"Land_BusStop_01_shelter_F",
"Land_BusStop_02_shelter_F",
"Land_Caravan_01_green_F",
"Land_Caravan_01_rust_F",
"Land_CarService_F",
"Land_Chapel_Small_V1_F",
"Land_Chapel_Small_V2_F",
"Land_Chapel_V1_F",
"Land_Chapel_V2_F",
"Land_DeerStand_01_F",
"Land_DeerStand_02_F",
"Land_d_Addon_02_V1_F",
"Land_d_House_Big_01_V1_F",
"Land_d_House_Big_02_V1_F",
"Land_d_House_Small_01_V1_F",
"Land_d_House_Small_02_V1_F",
"Land_d_Shop_01_V1_F",
"Land_d_Shop_02_V1_F",
"Land_d_Stone_HouseBig_V1_F",
"Land_d_Stone_HouseSmall_V1_F",
"Land_d_Stone_Shed_V1_F",
"Land_FeedShack_01_F",
"Land_FuelStation_01_shop_F",
"Land_FuelStation_01_workshop_F",
"Land_FuelStation_02_workshop_F",
"Land_FuelStation_03_shop_F",
"Land_FuelStation_Build_F",
"Land_GarageOffice_01_F",
"Land_GarageRow_01_large_F",
"Land_GarageShelter_01_F",
"Land_GH_House_2_F",
"Land_Greenhouse_01_damaged_F",
"Land_Greenhouse_01_F",
"Land_HealthCenter_01_F",
"Land_Hotel_01_F",
"Land_Hotel_02_F",
"Land_House_1B01_F",
"Land_House_1W01_F",
"Land_House_1W02_F",
"Land_House_1W03_F",
"Land_House_1W04_F",
"Land_House_1W05_F",
"Land_House_1W06_F",
"Land_House_1W07_F",
"Land_House_1W08_F",
"Land_House_1W09_F",
"Land_House_1W10_F",
"Land_House_1W11_F",
"Land_House_1W12_F",
"Land_House_2B01_F",
"Land_House_2B01_F",
"Land_House_2B02_F",
"Land_House_2B03_F",
"Land_House_2B04_F",
"Land_House_2W01_F",
"Land_House_2W02_F",
"Land_House_2W03_F",
"Land_House_2W04_F",
"Land_House_2W05_F",
"Land_House_Big_01_F",
"Land_House_Big_02_F",
"Land_House_Big_03_F",
"Land_House_Big_04_F",
"Land_House_Small_01_F",
"Land_House_Small_02_F",
"Land_House_Small_03_F",
"Land_House_Small_04_F",
"Land_House_Small_05_F",
"Land_House_Small_06_F",
"Land_i_Addon_02_b_white_F",
"Land_i_Addon_03_V1_F",
"Land_i_Addon_04_V1_F",
"Land_i_Barracks_V1_F",
"Land_i_Garage_V1_F",
"Land_i_House_Big_01_V1_F",
"Land_i_House_Big_02_V1_F",
"Land_i_House_Small_01_V1_F",
"Land_i_House_Small_02_V1_F",
"Land_i_House_Small_03_V1_F",
"Land_i_Shed_Ind_F",
"Land_i_Shop_01_V1_F",
"Land_i_Shop_02_V1_F",
"Land_i_Stone_HouseBig_V1_F",
"Land_i_Stone_HouseSmall_V1_F",
"Land_i_Stone_Shed_V1_F",
"Land_Kiosk_blueking_F",
"Land_Medevac_house_V1_F",
"Land_Metal_Shed_F",
"Land_MilOffices_V1_F",
"Land_Offices_01_V1_F",
"Land_PoliceStation_01_F",
"Land_Radar_01_HQ_F",
"Land_Rail_Station_Big_F",
"Land_Rail_Warehouse_Small_F",
"Land_Research_house_V1_F",
"Land_Research_HQ_F",
"Land_School_01_F",
"Land_Shed_02_F",
"Land_Shed_08_brown_F",
"Land_Shed_08_brown_F",
"Land_Shed_08_grey_F",
"Land_Shed_08_grey_F",
"Land_Shop_City_01_F",
"Land_Shop_City_02_F",
"Land_Shop_City_03_F",
"Land_Shop_City_05_F",
"Land_Shop_City_06_F",
"Land_Shop_City_07_F",
"Land_Shop_Town_01_F",
"Land_Slum_01_F",
"Land_Slum_02_F",
"Land_Slum_03_F",
//Slum 3 must be above Slum 1 because for some reason it inherits from it
"Land_Slum_House03_F",
"Land_Slum_House01_F",
"Land_Slum_House02_F",
"Land_SM_01_shed_F",
"Land_SM_01_shed_unfinished_F",
"Land_Supermarket_01_malden_F",
"Land_Unfinished_Building_01_F",
"Land_Unfinished_Building_02_F",
"Land_u_Addon_01_V1_F",
"Land_u_Addon_02_V1_F",
"Land_u_Shed_Ind_F",
"Land_VillageStore_01_F",
"Land_Warehouse_03_F",
"Land_WIP_F"
];

tint_translationNamespace = [] call CBA_fnc_createNamespace;
tint_translationNamespace setVariable ["Land_i_House_Small_01_V1_F", "i_House_Small_01_b_base_F"];
tint_translationNamespace setVariable ["i_House_Small_02_c_base_F", "i_House_Small_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_House_Big_01_V1_F", "i_House_Big_01_b_base_F"];
tint_translationNamespace setVariable ["Land_i_House_Big_02_V1_F", "i_House_Big_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_Shop_02_V1_F", "i_Shop_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_Stone_HouseBig_V1_F", "i_Stone_House_Big_01_b_base_F"];
tint_translationNamespace setVariable ["i_Stone_Shed_01_c_base_F", "i_Stone_Shed_01_b_base_F"];
tint_translationNamespace setVariable ["Land_Barn_01_brown_F", "Land_Barn_01_grey_F"];
tint_translationNamespace setVariable ["Land_Shed_08_brown_F", "Land_Shed_08_grey_F"];
tint_translationNamespace setVariable ["Land_Caravan_01_rust_F", "Land_Caravan_01_green_F"];
tint_translationNamespace setVariable ["Land_Greenhouse_01_damaged_F", "Land_Greenhouse_01_F"];
tint_translationNamespace setVariable ["Land_Chapel_V2_F", "Land_Chapel_V1_F"];
//Order matters, first entry found is the entry used
_validBuildings = [
"Cargo_house_base_F",
"Cargo_HQ_base_F",
"Cargo_Tower_base_F",
//Destroyed buildings must be above and present to prevent furniture spawning
"Land_i_House_Big_01_V1_dam_F",
"Land_i_House_Big_02_V1_dam_F",
"Land_i_House_Small_01_V1_dam_F",
"Land_i_House_Small_02_V1_dam_F",
"Land_i_Stone_HouseBig_V1_dam_F",
"Land_i_Stone_HouseSmall_V1_dam_F",
"Land_i_Stone_Shed_V1_dam_F",
"Land_u_Addon_01_V1_dam_F",
"Land_u_House_Big_01_V1_dam_F",
"Land_u_House_Big_02_V1_dam_F",
"Land_u_House_Small_01_V1_dam_F",
"Land_u_House_Small_02_V1_dam_F",
"Land_u_Shop_01_V1_dam_F",
"Land_u_Shop_02_V1_dam_F",
"i_House_Big_01_b_base_F",
"i_House_Big_02_b_base_F",
"i_House_Small_01_b_base_F",
"i_House_Small_02_b_base_F",
"i_House_Small_02_c_base_F",
"i_Shop_02_b_base_F",
"i_Stone_House_Big_01_b_base_F",
"i_Stone_Shed_01_b_base_F",
"i_Stone_Shed_01_c_base_F",
"Land_Airport_01_hangar_F",
"Land_Airport_01_terminal_F",
"Land_Airport_02_terminal_F",
"Land_Airport_Tower_F",
"Land_Addon_03mid_V1_ruins_F",
"Land_Barn_01_brown_F",
"Land_Barn_01_brown_F",
"Land_Barn_01_grey_F",
"Land_Barn_01_grey_F",
"Land_Barn_02_F",
"Land_Barn_04_F",
"Land_Barracks_03_F",
"Land_Barracks_04_F",
"Land_Bunker_01_big_F",
"Land_Bunker_01_HQ_F",
"Land_Bunker_01_small_F",
"Land_Bunker_01_tall_F",
"Land_BusStop_01_shelter_F",
"Land_BusStop_02_shelter_F",
"Land_Caravan_01_green_F",
"Land_Caravan_01_rust_F",
"Land_CarService_F",
"Land_Chapel_Small_V1_F",
"Land_Chapel_Small_V2_F",
"Land_Chapel_V1_F",
"Land_Chapel_V2_F",
"Land_DeerStand_01_F",
"Land_DeerStand_02_F",
"Land_d_Addon_02_V1_F",
"Land_d_House_Big_01_V1_F",
"Land_d_House_Big_02_V1_F",
"Land_d_House_Small_01_V1_F",
"Land_d_House_Small_02_V1_F",
"Land_d_Shop_01_V1_F",
"Land_d_Shop_02_V1_F",
"Land_d_Stone_HouseBig_V1_F",
"Land_d_Stone_HouseSmall_V1_F",
"Land_d_Stone_Shed_V1_F",
"Land_FeedShack_01_F",
"Land_FuelStation_01_shop_F",
"Land_FuelStation_01_workshop_F",
"Land_FuelStation_02_workshop_F",
"Land_FuelStation_03_shop_F",
"Land_FuelStation_Build_F",
"Land_GarageOffice_01_F",
"Land_GarageRow_01_large_F",
"Land_GarageShelter_01_F",
"Land_GH_House_2_F",
"Land_Greenhouse_01_damaged_F",
"Land_Greenhouse_01_F",
"Land_HealthCenter_01_F",
"Land_Hotel_01_F",
"Land_Hotel_02_F",
"Land_House_1B01_F",
"Land_House_1W01_F",
"Land_House_1W02_F",
"Land_House_1W03_F",
"Land_House_1W04_F",
"Land_House_1W05_F",
"Land_House_1W06_F",
"Land_House_1W07_F",
"Land_House_1W08_F",
"Land_House_1W09_F",
"Land_House_1W10_F",
"Land_House_1W11_F",
"Land_House_1W12_F",
"Land_House_2B01_F",
"Land_House_2B01_F",
"Land_House_2B02_F",
"Land_House_2B03_F",
"Land_House_2B04_F",
"Land_House_2W01_F",
"Land_House_2W02_F",
"Land_House_2W03_F",
"Land_House_2W04_F",
"Land_House_2W05_F",
"Land_House_Big_01_F",
"Land_House_Big_02_F",
"Land_House_Big_03_F",
"Land_House_Big_04_F",
"Land_House_Small_01_F",
"Land_House_Small_02_F",
"Land_House_Small_03_F",
"Land_House_Small_04_F",
"Land_House_Small_05_F",
"Land_House_Small_06_F",
"Land_i_Addon_02_b_white_F",
"Land_i_Addon_03_V1_F",
"Land_i_Addon_04_V1_F",
"Land_i_Barracks_V1_F",
"Land_i_Garage_V1_F",
"Land_i_House_Big_01_V1_F",
"Land_i_House_Big_02_V1_F",
"Land_i_House_Small_01_V1_F",
"Land_i_House_Small_02_V1_F",
"Land_i_House_Small_03_V1_F",
"Land_i_Shed_Ind_F",
"Land_i_Shop_01_V1_F",
"Land_i_Shop_02_V1_F",
"Land_i_Stone_HouseBig_V1_F",
"Land_i_Stone_HouseSmall_V1_F",
"Land_i_Stone_Shed_V1_F",
"Land_Kiosk_blueking_F",
"Land_Medevac_house_V1_F",
"Land_Metal_Shed_F",
"Land_MilOffices_V1_F",
"Land_Offices_01_V1_F",
"Land_PoliceStation_01_F",
"Land_Radar_01_HQ_F",
"Land_Rail_Station_Big_F",
"Land_Rail_Warehouse_Small_F",
"Land_Research_house_V1_F",
"Land_Research_HQ_F",
"Land_School_01_F",
"Land_Shed_02_F",
"Land_Shed_08_brown_F",
"Land_Shed_08_brown_F",
"Land_Shed_08_grey_F",
"Land_Shed_08_grey_F",
"Land_Shop_City_01_F",
"Land_Shop_City_02_F",
"Land_Shop_City_03_F",
"Land_Shop_City_05_F",
"Land_Shop_City_06_F",
"Land_Shop_City_07_F",
"Land_Shop_Town_01_F",
"Land_Slum_01_F",
"Land_Slum_02_F",
"Land_Slum_03_F",
//Slum 3 must be above Slum 1 because for some reason it inherits from it
"Land_Slum_House03_F",
"Land_Slum_House01_F",
"Land_Slum_House02_F",
"Land_SM_01_shed_F",
"Land_SM_01_shed_unfinished_F",
"Land_Supermarket_01_malden_F",
"Land_Unfinished_Building_01_F",
"Land_Unfinished_Building_02_F",
"Land_u_Addon_01_V1_F",
"Land_u_Addon_02_V1_F",
"Land_u_Shed_Ind_F",
"Land_VillageStore_01_F",
"Land_Warehouse_03_F",
"Land_WIP_F"
];

tint_translationNamespace = [] call CBA_fnc_createNamespace;
tint_translationNamespace setVariable ["Land_i_House_Small_01_V1_F", "i_House_Small_01_b_base_F"];
tint_translationNamespace setVariable ["i_House_Small_02_c_base_F", "i_House_Small_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_House_Big_01_V1_F", "i_House_Big_01_b_base_F"];
tint_translationNamespace setVariable ["Land_i_House_Big_02_V1_F", "i_House_Big_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_Shop_02_V1_F", "i_Shop_02_b_base_F"];
tint_translationNamespace setVariable ["Land_i_Stone_HouseBig_V1_F", "i_Stone_House_Big_01_b_base_F"];
tint_translationNamespace setVariable ["i_Stone_Shed_01_c_base_F", "i_Stone_Shed_01_b_base_F"];
tint_translationNamespace setVariable ["Land_Barn_01_brown_F", "Land_Barn_01_grey_F"];
tint_translationNamespace setVariable ["Land_Shed_08_brown_F", "Land_Shed_08_grey_F"];
tint_translationNamespace setVariable ["Land_Caravan_01_rust_F", "Land_Caravan_01_green_F"];
tint_translationNamespace setVariable ["Land_Greenhouse_01_damaged_F", "Land_Greenhouse_01_F"];
tint_translationNamespace setVariable ["Land_Chapel_V2_F", "Land_Chapel_V1_F"];
25 changes: 14 additions & 11 deletions furniture/functions/fn_dressDown.sqf
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
params["_house"];

_objects = _house getVariable ["tint_house_objects", []];
{
deleteVehicle _x;
} foreach _objects;
_house setVariable ["tint_house_objects", nil];
_house setVariable ["tint_house_dressed", false];

_house removeEventHandler["Killed", _house getVariable ["tint_house_killedEH", -1]];
_house setVariable ["tint_house_killedEH", nil];
params["_house"];

_objects = _house getVariable ["tint_house_objects", []];
{
deleteVehicle _x;
} foreach _objects;
_house setVariable ["tint_house_objects", nil];
_house setVariable ["tint_house_dressed", false];

_house removeEventHandler["Dammaged", _house getVariable ["tint_house_damagedEH", -1]];
_house setVariable ["tint_house_damagedEH", nil];

_house removeEventHandler["Killed", _house getVariable ["tint_house_killedEH", -1]];
_house setVariable ["tint_house_killedEH", nil];
Loading

0 comments on commit b55c613

Please sign in to comment.