diff --git a/iw4x/iw4x_00/mp/basemaps.arena b/iw4x/iw4x_00/mp/basemaps.arena index 69782f6..2ff80d8 100644 --- a/iw4x/iw4x_00/mp/basemaps.arena +++ b/iw4x/iw4x_00/mp/basemaps.arena @@ -365,55 +365,51 @@ } { - map "mp_cross_fire" - longname "MPUI_CROSSFIRE" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_CROSSFIRE" - mapimage "preview_mp_cross_fire" - mapoverlay "compass_overlay_map_blank" - allieschar "us_army" - axischar "opforce_composite" - useteamzones "true" - environment "urban" + map "mp_crossfire" + longname "MPUI_CROSSFIRE" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CROSSFIRE" + mapimage "preview_mp_crossfire" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } { - map "mp_bloc" - longname "MPUI_BLOC" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_BLOC" - mapimage "preview_mp_bloc" - mapoverlay "compass_overlay_map_blank" - allieschar "socom_141_forest" - axischar "opforce_airborne" - useteamzones "true" - environment "forest" + map "mp_bloc" + longname "MPUI_BLOC" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_BLOC" + mapimage "preview_mp_bloc" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { - map "mp_killhouse" - longname "MPUI_KILLHOUSE" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_KILLHOUSE" - mapimage "preview_mp_killhouse" - mapoverlay "compass_overlay_map_blank" - allieschar "socom_141_forest" - axischar "opforce_airborne" - useteamzones "true" - environment "urban" + map "mp_killhouse" + longname "MPUI_KILLHOUSE" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_KILLHOUSE" + mapimage "preview_mp_killhouse" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { - map "mp_cargoship" - longname "MPUI_CARGOSHIP" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_CARGOSHIP" - mapimage "preview_mp_cargoship" - mapoverlay "compass_overlay_map_blank" - allieschar "socom_141_forest" - axischar "opforce_airborne" - useteamzones "true" - environment "urban" + map "mp_cargoship" + longname "MPUI_CARGOSHIP" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CARGOSHIP" + mapimage "preview_mp_cargoship" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { @@ -430,16 +426,15 @@ } { - map "mp_bog_sh" - longname "MPUI_BOG_SH" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_BOG" - mapimage "preview_mp_bog_sh" - mapoverlay "compass_overlay_map_blank" - allieschar "us_army" - axischar "opforce_composite" - useteamzones "true" - environment "urban" + map "mp_bog" + longname "MPUI_BOG" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_BOG" + mapimage "preview_mp_bog" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } { @@ -508,17 +503,15 @@ } { - map "mp_shipment" - longname "MPUI_SHIPMENT" - gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" - description "MPUI_DESC_MAP_SHIPMENT" - mapimage "preview_mp_shipment" - mapoverlay "compass_overlay_map_blank" - allieschar "socom_141_forest" - axischar "opforce_airborne" - environment "urban" - useteamzones "true" - dependency "mp_shipment_long" + map "mp_shipment" + longname "MPUI_SHIPMENT" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_SHIPMENT" + mapimage "preview_mp_shipment" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { @@ -561,124 +554,130 @@ } { - map "mp_backlot" - longname "MPUI_BACKLOT" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_BACKLOT" - mapimage "preview_mp_backlot" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "desert" + map "mp_backlot" + longname "MPUI_BACKLOT" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_BACKLOT" + mapimage "preview_mp_backlot" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } { - map "mp_farm" - longname "MPUI_FARM" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_FARM" - mapimage "preview_mp_farm" - mapoverlay "compass_overlay_map_blank " - allieschar "socom_141_forest" - axischar "opforce_airborne" - environment "forest" + map "mp_farm" + longname "MPUI_FARM" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_FARM" + mapimage "preview_mp_farm" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { - map "mp_countdown" - longname "MPUI_COUNTDOWN" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_COUNTDOWN" - mapimage "preview_mp_countdown" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "forest" + map "mp_countdown" + longname "MPUI_COUNTDOWN" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_COUNTDOWN" + mapimage "preview_mp_countdown" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + environment "forest" } { - map "mp_pipeline" - longname "MPUI_PIPELINE" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_PIPELINE" - mapimage "preview_mp_pipeline" - mapoverlay "compass_overlay_map_blank " - allieschar "socom_141_forest" - axischar "opforce_airborne" - environment "forest" + map "mp_pipeline" + longname "MPUI_PIPELINE" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_PIPELINE" + mapimage "preview_mp_pipeline" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_woodland" + axischar "iw3_spetsnaz_woodland" + useteamzones "true" + environment "forest" +} + + +{ + map "mp_crash_snow" + longname "MPUI_CRASH_SNOW" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CRASH_SNOW" + mapimage "preview_mp_crash_snow" + mapoverlay "compass_overlay_map_blank " + allieschar "socom_141_arctic" + axischar "opforce_arctic" + environment "forest" +} + + +{ + map "mp_carentan" + longname "MPUI_CARENTAN" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CARENTAN" + mapimage "preview_mp_carentan" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_sas_urban" + axischar "iw3_spetsnaz_urban" + environment "forest" +} + + +{ + map "mp_showdown" + longname "MPUI_SHOWDOWN" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_SHOWDOWN" + mapimage "preview_mp_showdown" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } { - map "mp_crash_snow" - longname "MPUI_CRASH_SNOW" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_CRASH_SNOW" - mapimage "preview_mp_crash_snow" - mapoverlay "compass_overlay_map_blank " - allieschar "socom_141_arctic" - axischar "opforce_arctic" - environment "arctic" + map "mp_convoy" + longname "MPUI_CONVOY" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CONVOY" + mapimage "preview_mp_convoy" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } { - map "mp_carentan" - longname "MPUI_CARENTAN" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_CARENTAN" - mapimage "preview_mp_carentan" - mapoverlay "compass_overlay_map_blank " - allieschar "seals_udt" - axischar "opforce_airborne" - environment "urban" + map "mp_citystreets" + longname "MPUI_CITYSTREETS" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_CITYSTREETS" + mapimage "preview_mp_citystreets" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } -{ - map "mp_showdown" - longname "MPUI_SHOWDOWN" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_SHOWDOWN" - mapimage "preview_mp_showdown" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "desert" -} { - map "mp_convoy" - longname "MPUI_CONVOY" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_CONVOY" - mapimage "preview_mp_convoy" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "desert" + map "mp_broadcast" + longname "MPUI_BROADCAST" + gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" + description "MPUI_DESC_MAP_BROADCAST" + mapimage "preview_mp_broadcast" + mapoverlay "compass_overlay_map_blank " + allieschar "iw3_usmc_desert" + axischar "iw3_opfor_desert" + environment "forest" } -{ - map "mp_citystreets" - longname "MPUI_CITYSTREETS" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_CITYSTREETS" - mapimage "preview_mp_citystreets" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "urban" -} - -{ - map "mp_broadcast" - longname "MPUI_BROADCAST" - gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw" - description "MPUI_DESC_MAP_BROADCAST" - mapimage "preview_mp_broadcast" - mapoverlay "compass_overlay_map_blank " - allieschar "us_army" - axischar "opforce_composite" - environment "desert" -} { map "mp_alpha" diff --git a/iw4x/iw4x_00/mp/factiontable.csv b/iw4x/iw4x_00/mp/factiontable.csv index 6ef5491..c06014f 100644 --- a/iw4x/iw4x_00/mp/factiontable.csv +++ b/iw4x/iw4x_00/mp/factiontable.csv @@ -10,8 +10,8 @@ socom_141_desert,MP_TASKFORCE_NAME,MP_TASKFORCE_SHORT_NAME,MP_TF141_ELIMINATED,M socom_141_forest,MP_TASKFORCE_NAME,MP_TASKFORCE_SHORT_NAME,MP_TF141_ELIMINATED,MP_TF141_FORFEITED,faction_128_taskforce141,faction_128_taskforce141_fade,UK_,mp_spawn_sas,mp_victory_sas,prop_flag_tf141,prop_flag_tf141_carry,objpoint_flag_taskforce,misc/ui_flagbase_black,0.2,0.2,0.2,headicon_taskforce141,com_plasticcase_taskforce141 seals_udt,MP_SEALS_UDT_NAME,MP_SEALS_UDT_SHORT_NAME,MP_SEALS_ELIMINATED,MP_SEALS_FORFEITED,faction_128_seals,faction_128_seals_fade,NS_,mp_spawn_seals,mp_victory_seals,prop_flag_seal,prop_flag_seal_carry,objpoint_flag_seals,misc/ui_flagbase_black,0.345,0.447,0.631,headicon_seals,com_plasticcase_seals iw3_opfor_desert,MPUI_OPFOR,MPUI_OPFOR_SHORT,MP_OPFOR_ELIMINATED,MP_OPFOR_FORFEITED,faction_128_arab,faction_128_arab_fade,IW3_AB_,IW3_mp_spawn_opfor,IW3_mp_victory_opfor,prop_flag_neutral,prop_flag_neutral,objpoint_flag_opfor,ui_flagbase_black,0.6,0.57,0.41,headicon_arab,com_plasticcase_beige_big -iw3_sas_urban,MPUI_SAS,MPUI_SAS_SHORT,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas,faction_128_sa_fades,IW3_UK_,IW3_mp_spawn_sas,IW3_mp_victory_sas,prop_flag_neutral,prop_flag_neutral,objpoint_flag_british,ui_flagbase_black,0.6,0.64,0.69,headicon_taskforce141,com_plasticcase_beige_big -iw3_sas_woodland,MPUI_SAS,MPUI_SAS_SHORT,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas,faction_128_sas_fade,IW3_UK_,IW3_mp_spawn_sas,IW3_mp_victory_sas,prop_flag_neutral,prop_flag_neutral,objpoint_flag_british,ui_flagbase_black,0.6,0.64,0.69,headicon_taskforce141,com_plasticcase_beige_big +iw3_sas_urban,MPUI_SAS,MPUI_SAS_SHORT,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas_external,faction_128_sas_external_fade,IW3_UK_,IW3_mp_spawn_sas,IW3_mp_victory_sas,prop_flag_neutral,prop_flag_neutral,objpoint_flag_british,ui_flagbase_black,0.6,0.64,0.69,headicon_taskforce141,com_plasticcase_beige_big +iw3_sas_woodland,MPUI_SAS,MPUI_SAS_SHORT,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas_external,faction_128_sas_external_fade,IW3_UK_,IW3_mp_spawn_sas,IW3_mp_victory_sas,prop_flag_neutral,prop_flag_neutral,objpoint_flag_british,ui_flagbase_black,0.6,0.64,0.69,headicon_taskforce141,com_plasticcase_beige_big iw3_spetsnaz_urban,MPUI_SPETSNAZ,MPUI_SPETSNAZ_SHORT,MP_SPETSNAZ_ELIMINATED,MP_SPETSNAZ_FORFEITED,faction_128_ussr,faction_128_ussr_fade,IW3_RU_,IW3_mp_spawn_soviet,IW3_mp_victory_soviet,prop_flag_neutral,prop_flag_neutral,objpoint_flag_russian,ui_flagbase_black,0.58,0.28,0.28,headicon_ussr,com_plasticcase_beige_big iw3_spetsnaz_woodland,MPUI_SPETSNAZ,MPUI_SPETSNAZ_SHORT,MP_SPETSNAZ_ELIMINATED,MP_SPETSNAZ_FORFEITED,faction_128_ussr,faction_128_ussr_fade,IW3_RU_,IW3_mp_spawn_soviet,IW3_mp_victory_soviet,prop_flag_neutral,prop_flag_neutral,objpoint_flag_russian,ui_flagbase_black,0.58,0.28,0.28,headicon_ussr,com_plasticcase_beige_big iw3_usmc_desert,MPUI_MARINES,MPUI_MARINES_SHORT,MP_MARINES_ELIMINATED,MP_MARINES_FORFEITED,faction_128_usmc,faction_128_usmc_fade,IW3_US_,IW3_mp_spawn_usa,IW3_mp_victory_usa,prop_flag_neutral,prop_flag_neutral,objpoint_flag_american,ui_flagbase_black,0,0,0,headicon_rangers,com_plasticcase_beige_big @@ -24,4 +24,4 @@ opforce_snow,MP_SPETSNAZ_NAME,MP_SPETSNAZ_NAME,MP_SPETSNAZ_ELIMINATED,MP_SPETSNA opforce_urban,MP_SPETSNAZ_NAME,MP_SPETSNAZ_NAME,MP_SPETSNAZ_ELIMINATED,MP_SPETSNAZ_FORFEITED,faction_128_ussr,faction_128_ussr_fade,IW5_RU_,iw5_ru_spawn_music,iw5_ru_victory_music,prop_flag_speznas,prop_flag_speznas_carry,objpoint_flag_ussr,misc/ui_flagbase_red,0.6,0.263,0.243,headicon_ussr,com_plasticcase_ussr opforce_woodland,MP_SPETSNAZ_NAME,MP_SPETSNAZ_NAME,MP_SPETSNAZ_ELIMINATED,MP_SPETSNAZ_FORFEITED,faction_128_ussr,faction_128_ussr_fade,IW5_RU_,iw5_ru_spawn_music,iw5_ru_victory_music,prop_flag_speznas,prop_flag_speznas_carry,objpoint_flag_ussr,misc/ui_flagbase_red,0.6,0.263,0.243,headicon_ussr,com_plasticcase_ussr pmc_africa,MP_PMC,MP_PMC_SHORT_NAME,MP_PMC_ELIMINATED,MP_PMC_FORFEITED,faction_128_pmc,faction_128_pmc_fade,IW5_PC_,iw5_pc_spawn_music,iw5_pc_victory_music,prop_flag_pmc,prop_flag_pmc_carry,objpoint_flag_pmc,misc/ui_flagbase_black,0.345,0.447,0.631,headicon_pmc,com_plasticcase_pmc -sas_urban,MP_SAS,MP_SAS_SHORT_NAME,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas,faction_128_sas_fade,IW5_UK_,iw5_uk_spawn_music,iw5_uk_victory_music,prop_flag_sas,prop_flag_sas_carry,objpoint_flag_sas,misc/ui_flagbase_black,0.2,0.2,0.2,headicon_sas,com_plasticcase_sas +sas_urban,MP_SAS,MP_SAS_SHORT_NAME,MP_SAS_ELIMINATED,MP_SAS_FORFEITED,faction_128_sas_external,faction_128_sas_external_fade,IW5_UK_,iw5_uk_spawn_music,iw5_uk_victory_music,prop_flag_sas,prop_flag_sas_carry,objpoint_flag_sas,misc/ui_flagbase_black,0.2,0.2,0.2,headicon_sas,com_plasticcase_sas diff --git a/iw4x/iw4x_03/images/faction_128_arab.iwi b/iw4x/iw4x_03/images/faction_128_arab.iwi deleted file mode 100644 index 8313e05..0000000 Binary files a/iw4x/iw4x_03/images/faction_128_arab.iwi and /dev/null differ diff --git a/iw4x/iw4x_03/images/faction_128_arab_crate.iwi b/iw4x/iw4x_03/images/faction_128_arab_crate.iwi deleted file mode 100644 index 88e4d58..0000000 Binary files a/iw4x/iw4x_03/images/faction_128_arab_crate.iwi and /dev/null differ diff --git a/iw4x/iw4x_03/images/faction_128_arab_fade.iwi b/iw4x/iw4x_03/images/faction_128_arab_fade.iwi deleted file mode 100644 index a758c5d..0000000 Binary files a/iw4x/iw4x_03/images/faction_128_arab_fade.iwi and /dev/null differ diff --git a/iw4x/iw4x_03/images/faction_128_russia_red.iwi b/iw4x/iw4x_03/images/faction_128_russia_red_iw3.iwi similarity index 100% rename from iw4x/iw4x_03/images/faction_128_russia_red.iwi rename to iw4x/iw4x_03/images/faction_128_russia_red_iw3.iwi diff --git a/iw4x/iw4x_03/images/faction_128_sas_black.iwi b/iw4x/iw4x_03/images/faction_128_sas_black_iw3.iwi similarity index 100% rename from iw4x/iw4x_03/images/faction_128_sas_black.iwi rename to iw4x/iw4x_03/images/faction_128_sas_black_iw3.iwi diff --git a/iw4x/iw4x_03/images/faction_128_sas_iw5.iwi b/iw4x/iw4x_03/images/faction_128_sas_iw5.iwi new file mode 100644 index 0000000..ae9db5a Binary files /dev/null and b/iw4x/iw4x_03/images/faction_128_sas_iw5.iwi differ