From 6ac5750a4ee5d261a272229134e8a65592636105 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 11 Jan 2024 01:05:17 -0800 Subject: [PATCH] Borough: add Head Chopper via mapents --- maps/mp/zm_buried.d3dbsp | 32 ++++++++++--------- .../zm/replaced/zm_buried_grief_street.gsc | 12 ------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/maps/mp/zm_buried.d3dbsp b/maps/mp/zm_buried.d3dbsp index ad4b9796..df41c83c 100644 --- a/maps/mp/zm_buried.d3dbsp +++ b/maps/mp/zm_buried.d3dbsp @@ -11406,7 +11406,7 @@ "target" "buildable_turbine" "classname" "trigger_use" "targetname" "turbine_buildable_trigger" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "script_location" "processing street" "script_angles" "0 90 0" "guid" "AAFE088E" @@ -11417,7 +11417,7 @@ "target" "buildable_subwoofer" "targetname" "subwoofer_zm_buildable_trigger" "classname" "trigger_use" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "script_angles" "0 180 0" "script_location" "processing street" "guid" "27EE2AA0" @@ -11438,7 +11438,8 @@ "target" "buildable_headchopper" "classname" "trigger_use" "targetname" "headchopper_buildable_trigger" -"script_gameobjectname" "zclassic" +"script_gameobjectname" "zclassic zstandard zgrief" +"script_location" "processing street" "script_angles" "0 70 0" "guid" "9400B034" } @@ -11466,7 +11467,7 @@ "model" "p6_anim_zm_buildable_view_tramplesteam" "classname" "script_model" "targetname" "buildable_springpad" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "script_location" "processing street" "guid" "FB39E3C9" } @@ -11501,7 +11502,7 @@ "model" "p6_anim_zm_buildable_turbine" "angles" "1.00179e-005 2.50448e-006 -1.32111e-005" "origin" "-348.5 744 188" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "script_location" "processing street" "guid" "ED5BE537" } @@ -11567,7 +11568,7 @@ } { "target" "subwoofer_bench" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "665.78 -1138.42 99.15" "angles" "0 270 -0.000276555" "model" "t6_wpn_zmb_subwoofer" @@ -11600,7 +11601,8 @@ "model" "p6_anim_zm_buildable_tramplesteam" "angles" "61.5365 340.343 0.216167" "origin" "1271.89 1495.38 77.78" -"script_gameobjectname" "zclassic" +"script_gameobjectname" "zclassic zstandard zgrief" +"script_location" "processing street" "guid" "78482AAD" } { @@ -11673,7 +11675,7 @@ "target" "buildable_springpad" "targetname" "springpad_zm_buildable_trigger" "classname" "trigger_use" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "script_angles" "0 90 0" "script_location" "processing street" "guid" "087688C3" @@ -20553,7 +20555,7 @@ "guid" "77CAE415" } { -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "-474.72 -1508.07 150" "script_noteworthy" "gunshop_chest_zbarrier" "type" "zmcore_MagicBox" @@ -20582,7 +20584,7 @@ "guid" "97AC858B" } { -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "-796.26 -89.04 303" "script_noteworthy" "tunnels_chest1_zbarrier" "type" "zmcore_MagicBox" @@ -20611,7 +20613,7 @@ "guid" "A08322A6" } { -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "-1009.74 618.04 158" "script_noteworthy" "jail_chest1_zbarrier" "type" "zmcore_MagicBox" @@ -20640,7 +20642,7 @@ "guid" "232AB47B" } { -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "425.77 1375.15 158" "script_noteworthy" "courtroom_chest1_zbarrier" "type" "zmcore_MagicBox" @@ -20694,7 +20696,7 @@ "type" "zmcore_MagicBox" "script_noteworthy" "maze_chest2_zbarrier" "origin" "5605.74 276.96 17" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "guid" "C1E2E663" } { @@ -20732,7 +20734,7 @@ "type" "zmcore_MagicBox" "script_noteworthy" "maze_chest1_zbarrier" "origin" "4127.04 1271.74 17" -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "guid" "9D602221" } { @@ -20754,7 +20756,7 @@ "guid" "7DD3C53B" } { -"script_gameobjectname" "zclassic zgrief" +"script_gameobjectname" "zclassic zstandard zgrief" "origin" "-61.47 642.64 -8" "script_noteworthy" "start_chest_zbarrier" "type" "zmcore_MagicBox" diff --git a/scripts/zm/replaced/zm_buried_grief_street.gsc b/scripts/zm/replaced/zm_buried_grief_street.gsc index c535d77a..97ec52e7 100644 --- a/scripts/zm/replaced/zm_buried_grief_street.gsc +++ b/scripts/zm/replaced/zm_buried_grief_street.gsc @@ -21,18 +21,6 @@ precache() precachemodel("zm_collision_buried_street_grief"); precachemodel("p6_zm_bu_buildable_bench_tarp"); - trig = spawn("script_model", (1288, 1485, 59)); - trig.angles = (0, 0, 0); - trig.script_angles = (0, 70, 0); - trig.targetname = "headchopper_buildable_trigger"; - trig.target = "buildable_headchopper"; - - ent = spawn("script_model", (1271.89, 1495.38, 77.78)); - ent.angles = (61.5365, 340.343, 0.216167); - ent.targetname = "buildable_headchopper"; - ent.target = "headchopper_bench"; - ent setmodel("t6_wpn_zmb_chopper"); - level.chalk_buildable_pieces_hide = 1; griefbuildables = array("chalk", "turbine", "springpad_zm", "subwoofer_zm", "headchopper_zm"); maps\mp\zm_buried_buildables::include_buildables(griefbuildables);