From 37a2f0dbb643134f3aac1558d1ed6eb79efa995a Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Wed, 10 Jan 2024 03:31:38 -0800 Subject: [PATCH] MOTD: add Survival maps --- README.md | 8 +- build.bat | 1 + maps/mp/so_zencounter_zm_prison.d3dbsp | 1 + maps/mp/zm_prison.d3dbsp | 395 +++++++++++++++++- scripts/zm/replaced/zm_alcatraz_gamemodes.gsc | 43 ++ scripts/zm/zm_prison/zm_prison_reimagined.csc | 12 + scripts/zm/zm_prison/zm_prison_reimagined.gsc | 7 + ui_mp/t6/hud/scoreboard.lua | 15 +- zone_source/includes/clientscripts.zone | 1 + .../includes/so_zencounter_zm_prison.zone | 74 ++++ .../includes/specialty_divetonuke.zone | 19 +- zone_source/includes/specialty_mulekick.zone | 10 +- zone_source/zm_prison.zone | 2 + 13 files changed, 557 insertions(+), 31 deletions(-) create mode 100644 maps/mp/so_zencounter_zm_prison.d3dbsp create mode 100644 scripts/zm/zm_prison/zm_prison_reimagined.csc create mode 100644 zone_source/includes/so_zencounter_zm_prison.zone diff --git a/README.md b/README.md index e428b402..9e5d47be 100644 --- a/README.md +++ b/README.md @@ -671,6 +671,7 @@ * Ends the game ## Maps +* All locations can be played on Survival and Grief game modes * All quests can be completed with any amount of players * All quests give players all perks on completion @@ -712,12 +713,10 @@ * Fixed zombie pathing at Town in Bookstore #### Bus Depot -* Added Grief game mode * Lava in starting area activates immediately * Lava pit is accessible #### Diner -* Added Survival and Grief game modes * Wallbuys: M14, MP5, Remington 870, Galvaknuckles * Perks: Juggernog, Quick Revive, Speed Cola, Double Tap * No Pack-a-Punch @@ -728,7 +727,6 @@ * Replaced Galvaknuckles wallbuy with Claymore wallbuy (also added to Grief) #### Power Station -* Added Survival and Grief game modes * Wallbuys: M14, Olympia, MP5, AK74u, Remington 870, Bowie Knife * Perks: Juggernog, Quick Revive, Speed Cola, Double Tap, Tombstone Soda * Pack-a-Punch @@ -739,14 +737,12 @@ * Moved Tombstone Soda to the laundry room front door #### Tunnel -* Added Survival and Grief game modes * Wallbuys: M14, Olympia, AK74u, M16, Semtex, Bowie Knife * Added Mystery Box location * Perks: Juggernog, Quick Revive, Speed Cola, Double Tap, Stamin-Up * Pack-a-Punch #### Cornfield -* Added Survival and Grief game modes * Wallbuys: M14, Olympia, B23R, MP5, AK74u, M16, Remington 870, Semtex, Claymore * Added Mystery Box location * No perks @@ -831,7 +827,6 @@ * Fixed locked hint string not showing on Blundergat Upgrade buildable table #### Docks -* Added Grief game mode * Wallbuys: M14, Olympia, MP5, Uzi, M1927 * Perks: Juggernog * Pack-a-Punch @@ -877,7 +872,6 @@ * Added better randomization for buildables #### Maze -* Added Grief game mode * Wallbuys: M14, Olympia, B23R, PDW, AN94, LSAT * Perks: Juggernog, Quick Revive, Speed Cola, Double Tap, Stamin-Up, Mule Kick * Pack-a-Punch diff --git a/build.bat b/build.bat index cfe1cd1d..9f679f8a 100644 --- a/build.bat +++ b/build.bat @@ -44,6 +44,7 @@ if %ERRORLEVEL% NEQ 0 pause if %ERRORLEVEL% NEQ 0 pause "%OAT_BASE%\Linker.exe" ^ +--load "%OAT_GAME%\zone\all\so_zencounter_zm_prison.ff" ^ --load "%OAT_GAME%\zone\all\zm_prison_patch.ff" ^ --load "%OAT_GAME%\zone\all\zm_prison.ff" ^ --base-folder "%OAT_BASE%" ^ diff --git a/maps/mp/so_zencounter_zm_prison.d3dbsp b/maps/mp/so_zencounter_zm_prison.d3dbsp new file mode 100644 index 00000000..98586bc2 --- /dev/null +++ b/maps/mp/so_zencounter_zm_prison.d3dbsp @@ -0,0 +1 @@ +// removed \ No newline at end of file diff --git a/maps/mp/zm_prison.d3dbsp b/maps/mp/zm_prison.d3dbsp index 31e892e5..1af419f5 100644 --- a/maps/mp/zm_prison.d3dbsp +++ b/maps/mp/zm_prison.d3dbsp @@ -16490,7 +16490,7 @@ "guid" "112CA443" } { -"script_string" " zclassic_perks_prison zgrief_perks_cellblock" +"script_string" " zclassic_perks_prison zstandard_perks_cellblock zgrief_perks_cellblock" "targetname" "zm_perk_machine" "script_noteworthy" "specialty_fastreload" "angles" "0 270 0" @@ -16500,7 +16500,7 @@ "guid" "375B4685" } { -"script_string" " zgrief_perks_cellblock" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" "origin" "888 9057 1544.5" "model" "p6_anim_zm_buildable_pap" "classname" "script_struct" @@ -16511,7 +16511,7 @@ "guid" "4C900751" } { -"script_string" " zgrief_perks_cellblock" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" "classname" "script_struct" "model" "zombie_sign_please_wait" "angles" "0 3.18772e-006 -180" @@ -16520,7 +16520,7 @@ "guid" "284B1301" } { -"script_string" " zgrief_perks_cellblock" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" "angles" "0 180 0" "origin" "891.5 9069 1597.5" "script_sound" "mx_packa_jingle" @@ -16595,7 +16595,7 @@ "angles" "0 180 0" "script_noteworthy" "specialty_deadshot" "targetname" "zm_perk_machine" -"script_string" " zgrief_perks_cellblock" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" "guid" "73495CFC" } { @@ -16613,7 +16613,7 @@ "angles" "0 270 0" "script_noteworthy" "specialty_rof" "targetname" "zm_perk_machine" -"script_string" "zgrief_perks_cellblock" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" "guid" "D2CFC664" } { @@ -18650,7 +18650,7 @@ "angles" "0 0 0" "script_int" "2" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "E7561DF3" } @@ -18662,7 +18662,7 @@ "angles" "0 0 0" "script_int" "2" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "766976B6" } @@ -18675,7 +18675,7 @@ "guid" "7C0BD070" } { -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "script_noteworthy" "initial_spawn" "script_int" "1" "angles" "0 180 0" @@ -18694,12 +18694,12 @@ "angles" "0 0 0" "script_int" "2" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "5CFE76A4" } { -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "script_noteworthy" "initial_spawn" "script_int" "2" "angles" "0 0 0" @@ -18718,14 +18718,14 @@ "angles" "0 180 0" "script_int" "1" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "35FB84ED" } { "targetname" "player_respawn_point" "script_noteworthy" "zone_cellblock_west" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "origin" "904 9672 1470" "script_int" "2000" "radius" "2000" @@ -18741,7 +18741,7 @@ "angles" "0 0 0" "script_int" "2" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "0E0E4402" } @@ -18753,13 +18753,13 @@ "angles" "0 180 0" "script_int" "1" "script_noteworthy" "initial_spawn" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "targetname" "pf3767_auto1" "guid" "4DECB9CE" } { "targetname" "pf3767_auto1" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "script_noteworthy" "initial_spawn" "script_int" "1" "angles" "0 180 0" @@ -18771,7 +18771,7 @@ } { "targetname" "pf3767_auto1" -"script_string" "zgrief_cellblock" +"script_string" "zstandard_cellblock zgrief_cellblock" "script_noteworthy" "initial_spawn" "script_int" "1" "angles" "0 180 0" @@ -21184,4 +21184,365 @@ "classname" "script_struct" "targetname" "pf3764_auto40" "guid" "584BCB81" +} +{ +"origin" "0 0 0" +"lutmaterial" "zm_prison_lut" +"fsi" "zm_alcatraz" +"lightingquality" "1000" +"wsi" "zm_alcatraz" +"newsun" "1" +"classname" "worldspawn" +"skyboxmodel" "skybox_zm_alcatraz" +"guid" "1D2D59BC" +} +{ +"angles" "1.00052e-005 31.2 -2" +"origin" "2157.57 9582.24 1614.48" +"targetname" "game_mode_object" +"script_string" "zstandard zgrief" +"script_parameters" "p6_zm_al_bodybag" +"script_noteworthy" "cellblock" +"model" "p6_zm_al_bodybag" +"classname" "script_struct" +"guid" "E4C60006" +} +{ +"angles" "0.460225 178.909 117.588" +"origin" "-193.79 8991.74 1365.81" +"targetname" "game_mode_object" +"script_string" "zstandard zgrief" +"script_parameters" "p6_zm_al_bodybag" +"script_noteworthy" "cellblock" +"model" "p6_zm_al_bodybag" +"classname" "script_struct" +"guid" "CFFA1CE2" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_bodybag" +"script_noteworthy" "cellblock" +"script_parameters" "p6_zm_al_bodybag" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"origin" "860.98 9017.61 1562" +"angles" "0 89 0" +"guid" "F60F1A58" +} +{ +"classname" "script_model" +"model" "p6_zm_buildable_bench_tarp" +"origin" "1345.37 9733.38 1544" +"targetname" "buildables_tarp" +"angles" "0 90 0" +"guid" "E64652A3" +} +{ +"classname" "script_model" +"model" "p6_zm_buildable_bench_tarp" +"origin" "3373 9399 1336" +"targetname" "buildables_tarp" +"angles" "0 90 0" +"guid" "45B18087" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"origin" "2166.06 9558.95 1558" +"angles" "0 278.9 0" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "8E2D8770" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"origin" "2167.23 9570.87 1611.77" +"angles" "87.8 278.9 -5.86821e-006" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "BA2AF9F4" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"angles" "0 83.9 0" +"origin" "2134.42 9555.25 1558" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "BC322779" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"origin" "2144.1 9598.73 1558" +"angles" "0 188.9 0" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "393EE186" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"origin" "2153 9604.18 1611.77" +"angles" "87.8 233.9 -2.4623e-005" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "D900B46E" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"angles" "0 353.9 0" +"origin" "2140.4 9630.38 1558" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "1F31A097" +} +{ +"angles" "0 303.483 0" +"classname" "script_struct" +"model" "mil_barbedwire2" +"origin" "2155.77 9580.09 1599" +"modelscale" ".75" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "mil_barbedwire2" +"guid" "02049387" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_surgery_cart" +"angles" "1.00002 314.5 87" +"origin" "2167.64 9638.81 1607.1" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_surgery_cart" +"guid" "87D75700" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_surgery_cart" +"angles" "270 239.495 102.205" +"origin" "2158.47 9546.8 1603" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_surgery_cart" +"guid" "16F16354" +} +{ +"origin" "-182.86 9019.02 1367.08" +"model" "p6_zm_al_copypaper_box_open" +"classname" "script_struct" +"angles" "348.31 97.8555 -1.6033" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_copypaper_box_open" +"guid" "4042D323" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_laundry_bag_pile_64" +"origin" "947.47 9052.49 1544" +"angles" "0 179.918 0" +"modelscale" ".85" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_laundry_bag_pile_64" +"guid" "98B32E9F" +} +{ +"classname" "script_struct" +"model" "zm_al_kitchen_table_01" +"angles" "294.4 8.46521e-008 93.6002" +"origin" "914.65 9028.67 1596.08" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "zm_al_kitchen_table_01" +"guid" "1AE46219" +} +{ +"origin" "953.95 9000.42 1566.64" +"model" "berlin_com_pallet" +"classname" "script_struct" +"angles" "70.6 185.859 0.0628668" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "berlin_com_pallet" +"guid" "38E2835C" +} +{ +"angles" "1.60619 165.837 178.716" +"origin" "831.44 9081.08 1587.92" +"model" "p6_zm_al_horrific_bed_mattress_3" +"classname" "script_struct" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_horrific_bed_mattress_3" +"guid" "39D51406" +} +{ +"classname" "script_struct" +"model" "mil_barbedwire2" +"origin" "858.76 9018.4 1607" +"angles" "0 0 0" +"modelscale" ".75" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "mil_barbedwire2" +"guid" "EE8BBB86" +} +{ +"angles" "90 261 -7.28034e-006" +"classname" "script_struct" +"model" "p6_zm_al_infirmary_bed_frame" +"origin" "862.52 9028.97 1601.32" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_infirmary_bed_frame" +"guid" "61CEC8D6" +} +{ +"modelscale" ".75" +"origin" "862.71 9016.26 1600.08" +"model" "afr_corrugated_metal4x8_holes" +"classname" "script_struct" +"angles" "85.1876 285.151 114.28" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "afr_corrugated_metal4x8_holes" +"guid" "FE4B1D11" +} +{ +"origin" "859.01 9032.68 1544.5" +"model" "zm_al_kitchen_table_01" +"classname" "script_struct" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "zm_al_kitchen_table_01" +"angles" "0 0 0" +"guid" "4FFEC056" +} +{ +"angles" "0 231.646 0" +"origin" "965.58 9066.25 1544" +"model" "p6_zm_al_laundry_bag" +"classname" "script_struct" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_laundry_bag" +"guid" "B4614162" +} +{ +"angles" "0 71.8 2.50448e-006" +"origin" "823.63 9058.64 1544.23" +"model" "p6_zm_al_surgery_cart" +"classname" "script_struct" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_surgery_cart" +"guid" "D1F663C2" +} +{ +"origin" "-206.19 8993.18 1333.13" +"model" "zm_al_kitchen_table_01" +"classname" "script_struct" +"angles" "0 357.1 -86.2" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "zm_al_kitchen_table_01" +"guid" "69DD9750" +} +{ +"angles" "7.51518e-006 177.1 -61.8" +"origin" "-191.09 9010.02 1356.83" +"model" "p6_zm_al_infirmary_bed_frame" +"classname" "script_struct" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_infirmary_bed_frame" +"guid" "8007C1EF" +} +{ +"classname" "script_struct" +"model" "p6_zm_al_desk_small" +"origin" "-228.09 9007.06 1397.86" +"angles" "353.636 56.2894 -176.214" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "p6_zm_al_desk_small" +"guid" "3638D2FB" +} +{ +"angles" "5.99662 175.932 179.65" +"classname" "script_struct" +"model" "mil_barbedwire2" +"origin" "-212.67 9020.39 1417.05" +"modelscale" ".75" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "mil_barbedwire2" +"guid" "7FB67FAE" +} +{ +"angles" "273.108 175.067 -175.398" +"classname" "script_struct" +"model" "mil_barbedwire2" +"origin" "-153.8 9012.33 1367.96" +"modelscale" ".75" +"script_noteworthy" "cellblock" +"script_string" "zstandard zgrief" +"targetname" "game_mode_object" +"script_parameters" "mil_barbedwire2" +"guid" "17E6D694" +} +{ +"origin" "1769.1 10697 1334" +"model" "zombie_vending_three_gun_on" +"classname" "script_struct" +"angles" "0 1.00179e-005 0" +"script_noteworthy" "specialty_additionalprimaryweapon" +"targetname" "zm_perk_machine" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" +"guid" "5C944D7E" +} +{ +"origin" "373.1 10691 1336" +"model" "zombie_vending_nuke_on" +"classname" "script_struct" +"angles" "0 1.00179e-005 0" +"script_noteworthy" "specialty_flakjacket" +"targetname" "zm_perk_machine" +"script_string" " zstandard_perks_cellblock zgrief_perks_cellblock" +"guid" "F8E3FE1D" } \ No newline at end of file diff --git a/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc b/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc index 871469f6..477ecbbb 100644 --- a/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc +++ b/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc @@ -13,6 +13,7 @@ init() level.custom_vending_precaching = maps\mp\zm_prison::custom_vending_precaching; add_map_gamemode("zclassic", maps\mp\zm_prison::zclassic_preinit, undefined, undefined); + add_map_gamemode("zstandard", ::zstandard_preinit, undefined, undefined); add_map_gamemode("zgrief", scripts\zm\replaced\zm_alcatraz_grief_cellblock::zgrief_preinit, undefined, undefined); add_map_location_gamemode("zclassic", "prison", maps\mp\zm_alcatraz_classic::precache, maps\mp\zm_alcatraz_classic::main); @@ -25,4 +26,46 @@ init() scripts\zm\replaced\utility::add_struct_location_gamemode_func("zstandard", "docks", scripts\zm\locs\zm_prison_loc_docks::struct_init); scripts\zm\replaced\utility::add_struct_location_gamemode_func("zgrief", "docks", scripts\zm\locs\zm_prison_loc_docks::struct_init); +} + +zstandard_preinit() +{ + level.force_team_characters = 1; + level.should_use_cia = 0; + + if (randomint(100) > 50) + level.should_use_cia = 1; + + level.givecustomloadout = maps\mp\zm_prison::givecustomloadout; + level.precachecustomcharacters = ::precache_team_characters; + level.givecustomcharacters = ::give_team_characters; + level.gamemode_post_spawn_logic = ::give_player_shiv; + + flag_wait("start_zombie_round_logic"); +} + +give_team_characters() +{ + self detachall(); + self set_player_is_female(0); + + if (isdefined(level.should_use_cia)) + { + if (level.should_use_cia) + { + self setmodel("c_zom_player_grief_inmate_fb"); + self setviewmodel("c_zom_oleary_shortsleeve_viewhands"); + self.characterindex = 0; + } + else + { + self setmodel("c_zom_player_grief_guard_fb"); + self setviewmodel("c_zom_grief_guard_viewhands"); + self.characterindex = 1; + } + } + + self setmovespeedscale(1); + self setsprintduration(4); + self setsprintcooldown(0); } \ No newline at end of file diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.csc b/scripts/zm/zm_prison/zm_prison_reimagined.csc new file mode 100644 index 00000000..76e39142 --- /dev/null +++ b/scripts/zm/zm_prison/zm_prison_reimagined.csc @@ -0,0 +1,12 @@ +#include clientscripts\mp\_utility; +#include clientscripts\mp\zombies\_zm_utility; + +main() +{ + if (is_gametype_active("zstandard")) + { + level.zombiemode_using_additionalprimaryweapon_perk = 1; + level.zombiemode_using_divetonuke_perk = 1; + clientscripts\mp\zombies\_zm_perk_divetonuke::enable_divetonuke_perk_for_level(); + } +} \ No newline at end of file diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.gsc b/scripts/zm/zm_prison/zm_prison_reimagined.gsc index 936b0652..8a78faf0 100644 --- a/scripts/zm/zm_prison/zm_prison_reimagined.gsc +++ b/scripts/zm/zm_prison/zm_prison_reimagined.gsc @@ -61,6 +61,13 @@ main() replaceFunc(maps\mp\zombies\_zm_weap_tomahawk::tomahawk_return_player, scripts\zm\replaced\_zm_weap_tomahawk::tomahawk_return_player); replaceFunc(maps\mp\zombies\_zm_zonemgr::manage_zones, ::manage_zones); + if (is_gametype_active("zstandard")) + { + level.zombiemode_using_additionalprimaryweapon_perk = 1; + level.zombiemode_using_divetonuke_perk = 1; + maps\mp\zombies\_zm_perk_divetonuke::enable_divetonuke_perk_for_level(); + } + door_changes(); } diff --git a/ui_mp/t6/hud/scoreboard.lua b/ui_mp/t6/hud/scoreboard.lua index dcd955f0..773f64b9 100644 --- a/ui_mp/t6/hud/scoreboard.lua +++ b/ui_mp/t6/hud/scoreboard.lua @@ -571,13 +571,18 @@ function UpdateGameScoreboard(ScoreboardWidget) end if CoD.isZombie == true then local GamemodeGroup = UIExpression.DvarString(nil, "ui_zm_gamemodegroup") + local Mapname = CoD.Zombie.GetUIMapName() if GamemodeGroup == CoD.Zombie.GAMETYPEGROUP_ZCLASSIC then FactionColorR = CoD.Zombie.SingleTeamColor.r FactionColorG = CoD.Zombie.SingleTeamColor.g FactionColorB = CoD.Zombie.SingleTeamColor.b elseif GamemodeGroup == CoD.Zombie.GAMETYPEGROUP_ZSURVIVAL then if CoD.Zombie.IsSurvivalUsingCIAModel == true then - FactionColorR, FactionColorG, FactionColorB = Engine.GetFactionColor("cia") + if Mapname == CoD.Zombie.MAP_ZM_PRISON then + FactionColorR, FactionColorG, FactionColorB = Engine.GetFactionColor("inmates") + else + FactionColorR, FactionColorG, FactionColorB = Engine.GetFactionColor("cia") + end end end end @@ -780,8 +785,8 @@ ScoreboardUpdateTeamElement = function (TeamElement, FactionTeam, FactionColorR, TeamElement.teamScore:setText(ScoreboardTeam.score) if CoD.isZombie == true then local GamemodeGroup = UIExpression.DvarString(nil, "ui_zm_gamemodegroup") + local Mapname = CoD.Zombie.GetUIMapName() if GamemodeGroup == CoD.Zombie.GAMETYPEGROUP_ZCLASSIC then - local Mapname = CoD.Zombie.GetUIMapName() if Mapname == CoD.Zombie.MAP_ZM_TOMB then TeamElement.factionIcon:setImage(RegisterMaterial("faction_tomb")) elseif Mapname == CoD.Zombie.MAP_ZM_BURIED then @@ -797,7 +802,11 @@ ScoreboardUpdateTeamElement = function (TeamElement, FactionTeam, FactionColorR, if Dvar.ui_gametype:get() == CoD.Zombie.GAMETYPE_ZCLEANSED and ScoreboardTeam.team == CoD.TEAM_AXIS then TeamElement.factionIcon:setImage(RegisterMaterial("faction_zombie")) elseif CoD.Zombie.IsSurvivalUsingCIAModel == true then - TeamElement.factionIcon:setImage(RegisterMaterial("faction_cia")) + if Mapname == CoD.Zombie.MAP_ZM_PRISON then + TeamElement.factionIcon:setImage(RegisterMaterial("faction_inmates")) + else + TeamElement.factionIcon:setImage(RegisterMaterial("faction_cia")) + end end elseif GamemodeGroup == CoD.Zombie.GAMETYPEGROUP_ZENCOUNTER then if Dvar.ui_gametype:get() == CoD.Zombie.GAMETYPE_ZCLEANSED and ScoreboardTeam.team == CoD.TEAM_AXIS then diff --git a/zone_source/includes/clientscripts.zone b/zone_source/includes/clientscripts.zone index ce0f46e0..2d91fa0f 100644 --- a/zone_source/includes/clientscripts.zone +++ b/zone_source/includes/clientscripts.zone @@ -1,5 +1,6 @@ script,scripts/zm/_zm_reimagined.csc script,scripts/zm/zm_buried/zm_buried_reimagined.csc +script,scripts/zm/zm_prison/zm_prison_reimagined.csc script,scripts/zm/zgrief/zgrief_reimagined.csc script,scripts/zm/replaced/_zm.csc script,scripts/zm/replaced/_zm_weapons.csc diff --git a/zone_source/includes/so_zencounter_zm_prison.zone b/zone_source/includes/so_zencounter_zm_prison.zone new file mode 100644 index 00000000..b3bcefbd --- /dev/null +++ b/zone_source/includes/so_zencounter_zm_prison.zone @@ -0,0 +1,74 @@ +image,~~-gjun_art_plastic_tarp_c-rg~4b76f708 +material,mc/plastic_tarp_blue +xmodel,p6_zm_buildable_bench_tarp +techniqueset,mc_sw4_3d_char_skin_hero_9949fq1j +techniqueset,mc_sw4_3d_char_skin_tension_qjfww0e3 +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_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 +image,~-gc_gen_eye_green_c +material,mc/mtl_gen_eye_iris_green +image,~~-gc_zom_grief_guard_body_s-~a82f74ad +image,c_zom_grief_guard_body_n +image,~-gc_zom_grief_guard_body_c +material,mc/mtl_c_zom_grief_guard_body +xmodel,c_zom_player_grief_guard_fb +image,~~-gc_zom_grief_inmate_upper_~e98cab1c +image,c_zom_grief_inmate_upper_n +image,~-gc_zom_grief_inmate_upper_c +material,mc/mtl_c_zom_grief_inmate_body_upper +image,~~-gc_zom_grief_inmate_lower_~f7b89e9b +image,c_zom_grief_inmate_lower_n +image,~-gc_zom_grief_inmate_lower_c +material,mc/mtl_c_zom_grief_inmate_body_lower +image,~~-gc_zom_oleary_intro_arm_go~998befc1 +image,c_gen_arm_hirez_clean_n +image,~-gc_zom_oleary_intro_arm_gore1_c +material,mc/mtl_c_zom_oleary_intro_arm_gore1 +image,c_usa_secserv_head_m +image,~~-gc_usa_secserv_head_s-rgb&~396d272a +image,c_usa_secserv_head_n +image,~-gc_usa_secserv_head_c +material,mc/mtl_c_usa_secserv_head_jones +image,~-gc_gen_eye_blue_c +material,mc/mtl_gen_eye_iris_blue +xmodel,c_zom_player_grief_inmate_fb +image,~~-gviewarm_zom_oleary_shorts~b297930a +image,viewarm_zom_oleary_shortsleeve_n +image,~-gviewarm_zom_oleary_shortsleeve_c +material,mc/mtl_viewarm_zom_oleary_rolledsleeve +xmodel,c_zom_oleary_shortsleeve_viewhands +image,~~-gc_zom_grief_guard_viewarm~bb3e844e +image,c_zom_grief_guard_viewarm_n +image,~-gc_zom_grief_guard_viewarm_c +material,mc/mtl_viewarm_zom_grief_guard +xmodel,c_zom_grief_guard_viewhands +image,team_icon_guards +material,faction_guards +image,team_icon_inmates +material,faction_inmates +image,waypoint_revive_guards +material,waypoint_revive_guards +image,waypoint_revive_inmates +material,waypoint_revive_inmates +image,p6_zm_al_shock_box_e +image,~~-gp6_zm_al_shock_box_s-rgb&~4066ec70 +material,mc/mtl_p6_zm_al_shock_box_on +xmodel,p6_zm_al_shock_box_on +fx,maps/zombie_alcatraz/fx_alcatraz_skull_elec +footsteptable,default_1st_person +footsteptable,default_3rd_person +footsteptable,default_1st_person_quiet +footsteptable,default_3rd_person_quiet +footsteptable,default_3rd_person_loud +footsteptable,default_ai \ No newline at end of file diff --git a/zone_source/includes/specialty_divetonuke.zone b/zone_source/includes/specialty_divetonuke.zone index 738ba73a..6170ede5 100644 --- a/zone_source/includes/specialty_divetonuke.zone +++ b/zone_source/includes/specialty_divetonuke.zone @@ -1,5 +1,18 @@ -xmodel,t6_wpn_zmb_perk_bottle_nuke_view -xmodel,t6_wpn_zmb_perk_bottle_nuke_world +image,specialty_divetonuke_zombies +material,specialty_divetonuke_zombies +image,~-gmtl_t6_zmb_perk_bottle_nuke_col material,mc/mtl_t6_wpn_zmb_perk_bottle_nuke material,mc/mtl_t6_wpn_zmb_perk_bottle_nuke_alpha -image,~-gmtl_t6_zmb_perk_bottle_nuke_col \ No newline at end of file +xmodel,t6_wpn_zmb_perk_bottle_nuke_view +xmodel,t6_wpn_zmb_perk_bottle_nuke_world +weapon,zombie_perk_bottle_nuke +rawfile,vision/zombie_cosmodrome_divetonuke.vision +image,fxt_debris_clump_rocks +material,gfx_fxt_debris_clump_rocks +material,gfx_flamethrower_smoke +material,gfx_flamethrower_smoke_add_z100 +material,gfx_fxt_smk_gen_z120 +image,fxt_smk_def_2 +material,gfx_fxt_smk_def_2_z200 +material,gfx_fxt_distortion_ring_thin +fx,maps/zombie/fx_zmb_phdflopper_exp \ No newline at end of file diff --git a/zone_source/includes/specialty_mulekick.zone b/zone_source/includes/specialty_mulekick.zone index cbd7b445..1cceb3e9 100644 --- a/zone_source/includes/specialty_mulekick.zone +++ b/zone_source/includes/specialty_mulekick.zone @@ -1 +1,9 @@ -image,specialty_mulekick_zombies \ No newline at end of file +fx,misc/fx_zombie_cola_arsenal_on +image,specialty_mulekick_zombies +material,specialty_additionalprimaryweapon_zombies +image,~-gmtl_t6_zmb_perk_bottle_mul~af598fa4 +material,mc/mtl_t6_wpn_zmb_perk_bottle_mule_kick +material,mc/mtl_t6_wpn_zmb_perk_bottle_mule_kick_alpha +xmodel,t6_wpn_zmb_perk_bottle_mule_kick_view +xmodel,t6_wpn_zmb_perk_bottle_mule_kick_world +weapon,zombie_perk_bottle_additionalprimaryweapon \ No newline at end of file diff --git a/zone_source/zm_prison.zone b/zone_source/zm_prison.zone index afce4296..d55e2c7c 100644 --- a/zone_source/zm_prison.zone +++ b/zone_source/zm_prison.zone @@ -2,6 +2,8 @@ >type,fastfile >name,zm_prison +include,includes/so_zencounter_zm_prison + include,includes/m1911_zm weapon,knife_zm_alcatraz