diff --git a/mp_player_model_pack/scripts/mp/_pmp_main.gsc b/mp_player_model_pack/scripts/mp/_pmp_main.gsc index d1f4e0e..e50613a 100644 --- a/mp_player_model_pack/scripts/mp/_pmp_main.gsc +++ b/mp_player_model_pack/scripts/mp/_pmp_main.gsc @@ -32,7 +32,16 @@ set_player_model_override( team, weapon ) self setsprintduration( 4 ); self setsprintcooldown( 0 ); - possible_models = game[ "characters" ][ team ]; + possible_models = []; + + if ( !level.teambased || level.multiteam ) + { + possible_models = arrayCombine( game[ "characters" ][ "allies" ], game[ "characters" ][ "axis" ], false, true ); + } + else + { + possible_models = game[ "characters" ][ team ]; + } if ( isDefined( possible_models ) && possible_models.size > 0 ) { diff --git a/mp_player_model_pack/zone_source/mod.zone b/mp_player_model_pack/zone_source/mod.zone index 96ba8dc..605107f 100644 --- a/mp_player_model_pack/zone_source/mod.zone +++ b/mp_player_model_pack/zone_source/mod.zone @@ -6,6 +6,9 @@ >level.ipak_read,dlczm2 >level.ipak_read,dlczm4 +//Shared assets +include,shared + //Origins include,tomb/player_models/dempsey include,tomb/player_models/nikolai diff --git a/mp_player_model_pack/zone_source/prison/player_models/arlington.zone b/mp_player_model_pack/zone_source/prison/player_models/arlington.zone index 69ccb25..b885a45 100644 --- a/mp_player_model_pack/zone_source/prison/player_models/arlington.zone +++ b/mp_player_model_pack/zone_source/prison/player_models/arlington.zone @@ -1,6 +1,4 @@ //Model -material,mc/mtl_c_gen_insidemouth_thermal -material,mc/mtl_c_gen_insidemouth image,~~-gc_zom_arlington_hat_s-rgb~1ae9d89b image,c_zom_arlington_hat_n image,~-gc_zom_arlington_hat_c @@ -20,7 +18,6 @@ material,mc/mtl_c_zom_arlington_intro_jacket image,c_zom_arlington_intro_head_m image,~~-gc_zom_arlington_head_s-rg~8d91aecd image,c_zom_arlington_head_n -image,skin_pore_detail_test image,~-gc_zom_arlington_head_c material,mc/mtl_c_zom_arlington_head image,~-gc_zom_arlington_eye_c diff --git a/mp_player_model_pack/zone_source/prison/player_models/guard.zone b/mp_player_model_pack/zone_source/prison/player_models/guard.zone index 11bfa61..8d90e7f 100644 --- a/mp_player_model_pack/zone_source/prison/player_models/guard.zone +++ b/mp_player_model_pack/zone_source/prison/player_models/guard.zone @@ -1,13 +1,11 @@ image,c_usa_milcas_mcknight_head_m image,~~-gc_usa_milcas_mcknight_hea~adb169c4 image,c_usa_milcas_mcknight_head_n -image,skin_pore_detail_test image,~-gc_usa_milcas_mcknight_head_c material,mc/mtl_c_usa_milcas_mcknight_head image,c_usa_milcas_mcknight_head_tns_com image,c_usa_milcas_mcknight_head_tns_str material,mc/mtl_c_usa_milcas_mcknight_head_tns -material,mc/mtl_gen_eye_iris_thermal image,~~-gc_zom_grief_guard_body_s-~a82f74ad image,c_zom_grief_guard_body_n image,~-gc_zom_grief_guard_body_c diff --git a/mp_player_model_pack/zone_source/shared.zone b/mp_player_model_pack/zone_source/shared.zone new file mode 100644 index 0000000..bcb3c0d --- /dev/null +++ b/mp_player_model_pack/zone_source/shared.zone @@ -0,0 +1,24 @@ +//Common assets shared between models +material,mc/mtl_c_gen_insidemouth_thermal +material,mc/mtl_c_gen_insidemouth +image,skin_pore_detail_test +material,mc/mtl_gen_eye_iris_thermal +techniqueset,mc_sw4_3d_char_eye_cornea_2eww29wu +techniqueset,mc_sw4_3d_thermal_char_17f49w63 +image,c_gen_eye_color_a +image,c_gen_eye_n +image,c_gen_eye_ir +image,thermal_gradient5 +material,mc/mtl_gen_eye_cornea_thermal_s +material,mc/mtl_gen_eye_cornea +image,c_gen_eye_rim_mask_c +image,~~-gc_gen_eye_s-rgb&~-rc_gen_~1d123e2c +image,~-gc_gen_eye_blue_c +material,mc/mtl_gen_eye_iris_blue +image,c_gen_arm_rim_mask_norim_c +image,~~-gc_gen_insidemouth_s-rgb&~~8dbd539a +image,c_gen_insidemouth_n +image,~-gc_gen_insidemouth_c +image,c_gen_insidemouth_ir +image,~-gc_gen_eye_brown_c +material,mc/mtl_gen_eye_iris_brown \ No newline at end of file diff --git a/mp_player_model_pack/zone_source/tomb/player_models/dempsey.zone b/mp_player_model_pack/zone_source/tomb/player_models/dempsey.zone index 0b05302..e9c0f10 100644 --- a/mp_player_model_pack/zone_source/tomb/player_models/dempsey.zone +++ b/mp_player_model_pack/zone_source/tomb/player_models/dempsey.zone @@ -1,6 +1,4 @@ //Model -techniqueset,mc_sw4_3d_char_eye_cornea_2eww29wu -techniqueset,mc_sw4_3d_thermal_char_17f49w63 image,~~-gc_zom_tomb_dempsey_body_s~f607f5b1 image,c_zom_tomb_dempsey_body_n image,~-gc_zom_tomb_dempsey_body_c @@ -9,24 +7,7 @@ image,~~-gc_zom_tomb_dempsey_gear_s~d044caa7 image,c_zom_tomb_dempsey_gear_n image,~-gc_zom_tomb_dempsey_gear_c material,mc/mtl_c_zom_tomb_dempsey_gear -image,c_gen_eye_color_a -image,c_gen_eye_n -image,c_gen_eye_ir -image,thermal_gradient5 -material,mc/mtl_gen_eye_cornea_thermal_s -material,mc/mtl_gen_eye_cornea -image,c_gen_eye_rim_mask_c -image,~~-gc_gen_eye_s-rgb&~-rc_gen_~1d123e2c -image,~-gc_gen_eye_blue_c -material,mc/mtl_gen_eye_iris_thermal -material,mc/mtl_gen_eye_iris_blue image,c_gen_arm_rim_mask_norim_c -image,~~-gc_gen_insidemouth_s-rgb&~~8dbd539a -image,c_gen_insidemouth_n -image,~-gc_gen_insidemouth_c -image,c_gen_insidemouth_ir -material,mc/mtl_c_gen_insidemouth_thermal -material,mc/mtl_c_gen_insidemouth image,c_zom_tomb_dempsey_head_m image,~~-gc_zom_tomb_dempsey_head_s~ca0de1e9 image,c_zom_tomb_dempsey_head_n diff --git a/mp_player_model_pack/zone_source/tomb/player_models/takeo.zone b/mp_player_model_pack/zone_source/tomb/player_models/takeo.zone index 2186deb..46f07ce 100644 --- a/mp_player_model_pack/zone_source/tomb/player_models/takeo.zone +++ b/mp_player_model_pack/zone_source/tomb/player_models/takeo.zone @@ -7,8 +7,6 @@ image,~~-gc_zom_tomb_takeo_gear_s-r~605e9c8e image,c_zom_tomb_takeo_gear_n image,~-gc_zom_tomb_takeo_gear_c material,mc/mtl_c_zom_tomb_takeo_gear -image,~-gc_gen_eye_brown_c -material,mc/mtl_gen_eye_iris_brown image,c_zom_tomb_takeo_head_m image,~~-gc_zom_tomb_takeo_head_s-r~a134de05 image,c_zom_tomb_takeo_head_n diff --git a/mp_player_model_pack/zone_source/transit/player_models/cdc.zone b/mp_player_model_pack/zone_source/transit/player_models/cdc.zone index e2e6cf6..bddd744 100644 --- a/mp_player_model_pack/zone_source/transit/player_models/cdc.zone +++ b/mp_player_model_pack/zone_source/transit/player_models/cdc.zone @@ -1,7 +1,5 @@ //Model techniqueset,mc_lit_sm_b0c0s0_q94f27qw -techniqueset,mc_sw4_3d_thermal_char_17f49w63 -techniqueset,mc_sw4_3d_char_eye_cornea_2eww29wu image,~~-gc_zom_player_cdc_comandma~4b2fd433 image,c_zom_player_cdc_comandmask_n image,~-gc_zom_player_cdc_comandmask_c @@ -17,12 +15,6 @@ image,~~-gc_zom_player_cdc_body_s-r~6380ed7b image,c_zom_player_cdc_body_n image,~-gc_zom_player_cdc_body_c material,mc/mtl_c_zom_player_cdc_body -image,~~-gc_gen_insidemouth_s-rgb&~~8dbd539a -image,c_gen_insidemouth_n -image,~-gc_gen_insidemouth_c -image,c_gen_insidemouth_ir -material,mc/mtl_c_gen_insidemouth_thermal -material,mc/mtl_c_gen_insidemouth image,c_zom_player_cdc_head_m image,~~-gc_zom_player_cdc_head_s-r~aa6f69ee image,c_zom_player_cdc_head_n @@ -37,8 +29,6 @@ material,mc/mtl_gen_eye_cornea image,c_gen_eye_rim_mask_c image,~~-gc_gen_eye_s-rgb&~-rc_gen_~1d123e2c image,~-gc_gen_eye_brown_c -material,mc/mtl_gen_eye_iris_thermal -material,mc/mtl_gen_eye_iris_brown xmodel,c_zom_player_cdc_fb //Viewmodel diff --git a/mp_player_model_pack/zone_source/transit/player_models/farmgirl.zone b/mp_player_model_pack/zone_source/transit/player_models/farmgirl.zone index b333c7e..6a33c73 100644 --- a/mp_player_model_pack/zone_source/transit/player_models/farmgirl.zone +++ b/mp_player_model_pack/zone_source/transit/player_models/farmgirl.zone @@ -30,8 +30,6 @@ image,~-gc_zom_player_farmgirl_hair_c material,mc/mtl_c_zom_player_farmgirl_hair image,~~-gc_zom_player_farmgirl_s-r~4fdced88 material,mc/mtl_c_zom_player_farmgirl_skin -image,~~-gc_gen_eye_s-rgb&~-rc_gen_~1d123e2c -image,~-gc_gen_eye_brown_c material,mc/mtl_gen_eye_iris_thermal material,mc/mtl_gen_eye_iris_brown xmodel,c_zom_player_farmgirl_fb