From e2b50d691ad6d8df66bd270bace825ca6beb58f6 Mon Sep 17 00:00:00 2001 From: Louvenarde Date: Sat, 3 Feb 2024 14:31:41 +0100 Subject: [PATCH] Fix for #20 #21 #22 ? --- iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc | 33 +++++++++++++---------- iw4x/iw4x_00/mp/basemaps.arena | 30 ++++++++++----------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc index 4dc9e6e..ff51171 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc @@ -389,8 +389,15 @@ balanceTeams() setGhillieModels( env ) { level.environment = env; + switch ( env ) { + default: + case "iw3": + game["allies_model"]["GHILLIE"] = game["allies_model"]["SNIPER"]; + game["axis_model"]["GHILLIE"] = game["axis_model"]["SNIPER"]; + break; + case "desert": mptype\mptype_ally_ghillie_desert::precache(); mptype\mptype_opforce_ghillie_desert::precache(); @@ -415,8 +422,6 @@ setGhillieModels( env ) game["allies_model"]["GHILLIE"] = mptype\mptype_ally_ghillie_forest::main; game["axis_model"]["GHILLIE"] = mptype\mptype_opforce_ghillie_forest::main; break; - default: - break; } } @@ -597,8 +602,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_axis_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_axis_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_rifleman::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_cqb::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_engineer::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_engineer::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_cqb::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_comp_riot::main; break; @@ -615,8 +620,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_ally_urban_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_ally_urban_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_urban_assault::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_urban_specops::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_recon::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_urban_recon::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_specops::main; game[team + "_model"]["RIOT"] = mptype\mptype_seal_udt_riot::main; break; @@ -633,8 +638,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_ally_woodland_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_ally_woodland_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_woodland_assault::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_woodland_specops::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_recon::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_woodland_recon::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_specops::main; game[team + "_model"]["RIOT"] = mptype\mptype_tf141_forest_riot::main; break; @@ -651,8 +656,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_axis_urban_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_axis_urban_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_urban_assault::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_urban_cqb::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_engineer::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_urban_engineer::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_cqb::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main; break; @@ -669,8 +674,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_axis_woodland_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_axis_woodland_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_woodland_rifleman::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_woodland_cqb::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_engineer::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_woodland_engineer::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_cqb::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main; break; @@ -687,8 +692,8 @@ setTeamModels( team, charSet ) game[team + "_model"]["SNIPER"] = mptype\mptype_ally_sniper::main; game[team + "_model"]["LMG"] = mptype\mptype_ally_support::main; game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_rifleman::main; - game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_cqb::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_engineer::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_engineer::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_cqb::main; game[team + "_model"]["RIOT"] = mptype\mptype_us_army_riot::main; break; diff --git a/iw4x/iw4x_00/mp/basemaps.arena b/iw4x/iw4x_00/mp/basemaps.arena index 0217c12..62bcf50 100644 --- a/iw4x/iw4x_00/mp/basemaps.arena +++ b/iw4x/iw4x_00/mp/basemaps.arena @@ -373,7 +373,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" } @@ -386,7 +386,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" useteamzones "true" } @@ -400,7 +400,7 @@ allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" useteamzones "true" - environment "forest" + environment "iw3" } { @@ -412,7 +412,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" useteamzones "true" } @@ -438,7 +438,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" } { @@ -515,7 +515,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" } { @@ -566,7 +566,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" } @@ -579,7 +579,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" useteamzones "true" } @@ -592,7 +592,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" useteamzones "true" } @@ -605,7 +605,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_woodland" axischar "iw3_spetsnaz_woodland" - environment "forest" + environment "iw3" useteamzones "true" } @@ -633,7 +633,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_sas_urban" axischar "iw3_spetsnaz_urban" - environment "forest" + environment "iw3" useteamzones "true" } @@ -647,7 +647,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" } @@ -660,7 +660,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" } @@ -673,7 +673,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" } @@ -687,7 +687,7 @@ mapoverlay "compass_overlay_map_blank " allieschar "iw3_usmc_desert" axischar "iw3_opfor_desert" - environment "forest" + environment "iw3" useteamzones "true" }