From b1e0774bb871d2c5815d8e15f7fd76bed6431d9d Mon Sep 17 00:00:00 2001 From: Louvenarde Date: Sun, 14 Apr 2024 11:53:55 +0200 Subject: [PATCH] (did i forgert to commit these?) --- iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc | 26 +++++++------- zone_source/iw4x_team_iw3_opfor_desert.csv | 32 ++++++----------- zone_source/iw4x_team_iw3_sas_urban.csv | 25 +++++-------- zone_source/iw4x_team_iw3_sas_woodland.csv | 25 +++++-------- zone_source/iw4x_team_iw3_spetsnaz_urban.csv | 30 ++++------------ .../iw4x_team_iw3_spetsnaz_woodland.csv | 36 +++++++------------ zone_source/iw4x_team_iw3_usmc_desert.csv | 18 +++------- 7 files changed, 65 insertions(+), 127 deletions(-) diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc index ff51171..6502104 100644 --- a/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc +++ b/iw4x/iw4x_00/maps/mp/gametypes/_teams.gsc @@ -602,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_engineer::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_cqb::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_cqb::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_engineer::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_comp_riot::main; break; @@ -620,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_recon::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_specops::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_urban_specops::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_recon::main; game[team + "_model"]["RIOT"] = mptype\mptype_seal_udt_riot::main; break; @@ -638,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_recon::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_specops::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_woodland_specops::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_recon::main; game[team + "_model"]["RIOT"] = mptype\mptype_tf141_forest_riot::main; break; @@ -656,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_engineer::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_cqb::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_urban_cqb::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_engineer::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main; break; @@ -674,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_engineer::main; - game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_cqb::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_woodland_cqb::main; + game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_engineer::main; game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main; break; @@ -692,12 +692,12 @@ 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_engineer::main; - game[team + "_model"]["SMG"] = mptype\mptype_ally_cqb::main; + game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_cqb::main; + game[team + "_model"]["SMG"] = mptype\mptype_ally_engineer::main; game[team + "_model"]["RIOT"] = mptype\mptype_us_army_riot::main; break; - + case "delta_multicam": mptype\mptype_delta_multicam_assault::precache(); mptype\mptype_delta_multicam_lmg::precache(); diff --git a/zone_source/iw4x_team_iw3_opfor_desert.csv b/zone_source/iw4x_team_iw3_opfor_desert.csv index 637912c..ce61869 100644 --- a/zone_source/iw4x_team_iw3_opfor_desert.csv +++ b/zone_source/iw4x_team_iw3_opfor_desert.csv @@ -200,32 +200,22 @@ sound,IW3_AB_1mc_capture_c sound,IW3_AB_1mc_take_positions sound,IW3_AB_1mc_lead_lost sound,IW3_AB_1mc_hq_online -sound,IW3_AB_mp_stm_grenade -sound,IW3_AB_1mc_team_hardcore -sound,IW3_AB_1mc_friendlyair -sound,IW3_AB_mp_cmd_movein -sound,IW3_AB_1mc_capturing_c -sound,IW3_AB_1mc_capturing_c -sound,IW3_AB_1mc_losing -sound,IW3_AB_1mc_ourflag -sound,IW3_AB_1mc_ourflag -sound,IW3_AB_1mc_team_hardcore -sound,IW3_AB_mp_stm_grenade -sound,IW3_AB_mp_cmd_suppressfire -sound,IW3_AB_1mc_hq_captured -sound,IW3_AB_1mc_lost_b -sound,IW3_AB_1mc_ouruavonline -sound,IW3_AB_1mc_gridiron -sound,IW3_AB_1mc_hq_captured +sound,IW3_AB_mp_rsp_nosir sound,IW3_AB_1mc_hq_online -sound,IW3_AB_1mc_bomb_lost -sound,IW3_AB_1_inform_reloading_generic +sound,IW3_AB_1mc_mission_success +sound,IW3_AB_1mc_capturing_a +sound,IW3_AB_1mc_readytomove +sound,IW3_AB_1mc_hardcore_tm_death +sound,IW3_AB_1mc_hq_online +sound,IW3_AB_1mc_lastalive +sound,IW3_AB_1mc_capture_b +sound,IW3_AB_1_threat_infantry_generic sound,IW3_mp_spawn_opfor sound,IW3_mp_victory_opfor xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_opfor -material,headicon_arab +material,headicon_opfor xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral diff --git a/zone_source/iw4x_team_iw3_sas_urban.csv b/zone_source/iw4x_team_iw3_sas_urban.csv index c4a95a8..3b9d082 100644 --- a/zone_source/iw4x_team_iw3_sas_urban.csv +++ b/zone_source/iw4x_team_iw3_sas_urban.csv @@ -35,8 +35,8 @@ xmodel,body_mp_sas_urban_specops xmodel,viewhands_black_kit xmodel,body_mp_sas_urban_specops xmodel,viewhands_black_kit -material,faction_128_sas_external -material,faction_128_sas_external_fade +material,faction_128_sas +material,faction_128_sas_fade sound,IW3_UK_1mc_enemy_has_a sound,IW3_UK_1mc_enemy_has_b sound,IW3_UK_1mc_enemy_has_c @@ -185,26 +185,19 @@ sound,IW3_UK_1mc_defend sound,IW3_UK_mp_cmd_regroup sound,IW3_UK_1mc_enemyflag_return sound,IW3_UK_1mc_domination -sound,IW3_UK_1mc_enemyheli -sound,IW3_UK_1mc_enemyheli -sound,IW3_UK_mp_stm_sniper -sound,IW3_UK_mp_stm_sniper -sound,IW3_UK_1mc_bomb_defused -sound,IW3_UK_1mc_ourflag -sound,IW3_UK_1mc_attack +sound,IW3_UK_1mc_sabotage +sound,IW3_UK_1_inform_reloading_generic sound,IW3_UK_1mc_boost -sound,IW3_UK_1mc_positions_lock -sound,IW3_UK_1_inform_attack_thwc4 -sound,IW3_UK_1_inform_attack_thwc4 -sound,IW3_UK_1mc_encourage_win -sound,IW3_UK_1_inform_plant_claymore +sound,IW3_UK_1_inform_reloading_generic +sound,IW3_UK_1mc_enemy_take_a +sound,IW3_UK_1_reaction_casualty_generic sound,IW3_UK_1mc_promoted sound,IW3_mp_spawn_sas sound,IW3_mp_victory_sas xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_british -material,headicon_taskforce141 +material,headicon_british xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral diff --git a/zone_source/iw4x_team_iw3_sas_woodland.csv b/zone_source/iw4x_team_iw3_sas_woodland.csv index 8338c2e..e1976e0 100644 --- a/zone_source/iw4x_team_iw3_sas_woodland.csv +++ b/zone_source/iw4x_team_iw3_sas_woodland.csv @@ -45,8 +45,8 @@ xmodel,viewhands_sas_woodland xmodel,body_mp_usmc_woodland_specops xmodel,head_mp_usmc_tactical_mich_stripes_nomex xmodel,viewhands_sas_woodland -material,faction_128_sas_external_fade -material,faction_128_sas_external +material,faction_128_sas +material,faction_128_sas_fade sound,IW3_UK_1mc_enemy_has_a sound,IW3_UK_1mc_enemy_has_b sound,IW3_UK_1mc_enemy_has_c @@ -195,26 +195,19 @@ sound,IW3_UK_1mc_defend sound,IW3_UK_mp_cmd_regroup sound,IW3_UK_1mc_enemyflag_return sound,IW3_UK_1mc_domination -sound,IW3_UK_1mc_enemyheli -sound,IW3_UK_1mc_enemyheli -sound,IW3_UK_mp_stm_sniper -sound,IW3_UK_mp_stm_sniper -sound,IW3_UK_1mc_bomb_defused -sound,IW3_UK_1mc_ourflag -sound,IW3_UK_1mc_attack +sound,IW3_UK_1mc_sabotage +sound,IW3_UK_1_inform_reloading_generic sound,IW3_UK_1mc_boost -sound,IW3_UK_1mc_positions_lock -sound,IW3_UK_1_inform_attack_thwc4 -sound,IW3_UK_1_inform_attack_thwc4 -sound,IW3_UK_1mc_encourage_win -sound,IW3_UK_1_inform_plant_claymore +sound,IW3_UK_1_inform_reloading_generic +sound,IW3_UK_1mc_enemy_take_a +sound,IW3_UK_1_reaction_casualty_generic sound,IW3_UK_1mc_promoted sound,IW3_mp_spawn_sas sound,IW3_mp_victory_sas xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_british -material,headicon_taskforce141 +material,headicon_british xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral diff --git a/zone_source/iw4x_team_iw3_spetsnaz_urban.csv b/zone_source/iw4x_team_iw3_spetsnaz_urban.csv index 1d24733..93bcfd1 100644 --- a/zone_source/iw4x_team_iw3_spetsnaz_urban.csv +++ b/zone_source/iw4x_team_iw3_spetsnaz_urban.csv @@ -200,35 +200,17 @@ sound,IW3_RU_1_inform_plant_claymore sound,IW3_RU_1mc_hq_located sound,IW3_RU_1mc_enemyflag_return sound,IW3_RU_1mc_bomb_taken -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_losing_a -sound,IW3_RU_1mc_losing_a -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_mp_stm_grenade +sound,IW3_RU_1mc_new_positions sound,IW3_RU_1mc_enemy_take_a -sound,IW3_RU_1mc_obj_defend -sound,IW3_RU_1mc_enemyflag -sound,IW3_RU_1mc_challengecomplete -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_rhp_inform_attack_scan -sound,IW3_RU_1mc_challengecomplete -sound,IW3_RU_mp_stm_holdyourfire -sound,IW3_RU_1mc_losing -sound,IW3_RU_1mc_lost_c -sound,IW3_RU_1mc_encourage_win -sound,IW3_RU_1mc_freeforall -sound,IW3_RU_1mc_bomb_planted -sound,IW3_RU_1mc_boost -sound,IW3_RU_1mc_highspeed +sound,IW3_RU_1mc_gridiron +sound,IW3_RU_1mc_capture_c +sound,IW3_RU_1mc_hq_offline sound,IW3_mp_spawn_soviet sound,IW3_mp_victory_soviet xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_russian -material,headicon_ussr +material,headicon_russian xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral diff --git a/zone_source/iw4x_team_iw3_spetsnaz_woodland.csv b/zone_source/iw4x_team_iw3_spetsnaz_woodland.csv index e546c02..cfb5bf7 100644 --- a/zone_source/iw4x_team_iw3_spetsnaz_woodland.csv +++ b/zone_source/iw4x_team_iw3_spetsnaz_woodland.csv @@ -200,35 +200,23 @@ sound,IW3_RU_1_inform_plant_claymore sound,IW3_RU_1mc_hq_located sound,IW3_RU_1mc_enemyflag_return sound,IW3_RU_1mc_bomb_taken -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_mp_stm_grenade +sound,IW3_RU_1mc_lost_b +sound,IW3_RU_1mc_new_positions +sound,IW3_RU_1mc_lost_b sound,IW3_RU_1mc_enemy_take_a -sound,IW3_RU_1mc_obj_defend -sound,IW3_RU_1mc_enemyflag -sound,IW3_RU_1mc_challengecomplete -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_mp_stm_grenade -sound,IW3_RU_rhp_inform_attack_scan -sound,IW3_RU_1mc_challengecomplete -sound,IW3_RU_mp_stm_holdyourfire -sound,IW3_RU_1mc_losing -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_losing_b -sound,IW3_RU_1mc_lost_c -sound,IW3_RU_1mc_encourage_win -sound,IW3_RU_1mc_freeforall -sound,IW3_RU_1mc_bomb_planted -sound,IW3_RU_1mc_boost -sound,IW3_RU_1mc_highspeed +sound,IW3_RU_1mc_lost_b +sound,IW3_RU_1mc_lost_b +sound,IW3_RU_1mc_lost_b +sound,IW3_RU_1mc_lost_b +sound,IW3_RU_1mc_gridiron +sound,IW3_RU_1mc_capture_c +sound,IW3_RU_1mc_hq_offline sound,IW3_mp_spawn_soviet sound,IW3_mp_victory_soviet xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_russian -material,headicon_ussr +material,headicon_russian xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral diff --git a/zone_source/iw4x_team_iw3_usmc_desert.csv b/zone_source/iw4x_team_iw3_usmc_desert.csv index ce2e89c..d099737 100644 --- a/zone_source/iw4x_team_iw3_usmc_desert.csv +++ b/zone_source/iw4x_team_iw3_usmc_desert.csv @@ -202,23 +202,15 @@ sound,IW3_US_1mc_lost_c sound,IW3_US_1mc_promoted sound,IW3_US_1mc_hardcore_tm_death sound,IW3_US_1mc_lastalive -sound,IW3_US_1mc_control_won -sound,IW3_US_1mc_boost -sound,IW3_US_1mc_boost -sound,IW3_US_1mc_headquarters -sound,IW3_US_1mc_headquarters -sound,IW3_US_mp_cmd_holdposition -sound,IW3_US_1mc_challenge_complete -sound,IW3_US_1mc_boost -sound,IW3_US_1mc_readytomove -sound,IW3_US_fp1_inform_attack_air -sound,IW3_US_1mc_secure_c +sound,IW3_US_1mc_secure_a +sound,IW3_US_mp_cmd_attackleftflank +sound,IW3_US_1mc_securing_c sound,IW3_mp_spawn_usa sound,IW3_mp_victory_usa xmodel,prop_flag_neutral -fx,ui_flagbase_black +fx,misc/ui_flagbase_black material,objpoint_flag_american -material,headicon_rangers +material,headicon_american xmodel,com_plasticcase_beige_big xmodel,prop_flag_neutral