Replace the func_door with a func_button in the shotgun slap part

diff --git a/maps/tutorial_level1.map b/maps/tutorial_level1.map
index 79a7ad8a441f82b01ea0d1776a115fbf9780e95c..f3e530c94095770c07d8f8cfeb5604903881dae2 100644 (file)
--- a/maps/tutorial_level1.map
+++ b/maps/tutorial_level1.map
@@ -1620,11 +1620,11 @@ brushDef
 {
 brushDef
 {
-( 320 -1024 192 ) ( 320 -1280 192 ) ( 304 -1024 192 ) ( ( 0.015625 0 32 ) ( 0 0.015625 1000.25 ) ) common/caulk 0 0 0
-( 320 -1088 192 ) ( 304 -1088 192 ) ( 320 -1088 0 ) ( ( 0.015625 0 23.75 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 320 -1024 192 ) ( 320 -1280 192 ) ( 304 -1024 192 ) ( ( 0.015625 0 32 ) ( 0 0.015625 1000.25 ) ) common/nodrawnonsolid 0 0 0
+( 320 -1088 192 ) ( 304 -1088 192 ) ( 320 -1088 0 ) ( ( 0.015625 0 23.75 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0
 ( 320 -1024 192 ) ( 320 -1024 0 ) ( 320 -1280 192 ) ( ( 0.0078125 0 16 ) ( 0 0.0078125 0 ) ) effects_jumppad/jumppadfx1_d 0 0 0
-( 304 -1280 0 ) ( 320 -1280 0 ) ( 304 -1024 0 ) ( ( 0.015625 0 32 ) ( 0 0.015625 23.75 ) ) common/caulk 0 0 0
-( 304 -1216 0 ) ( 304 -1216 192 ) ( 320 -1216 0 ) ( ( 0.015625 0 1000.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 304 -1280 0 ) ( 320 -1280 0 ) ( 304 -1024 0 ) ( ( 0.015625 0 32 ) ( 0 0.015625 23.75 ) ) common/nodrawnonsolid 0 0 0
+( 304 -1216 0 ) ( 304 -1216 192 ) ( 320 -1216 0 ) ( ( 0.015625 0 1000.25 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 0 0 0
 ( 312 -1282 0 ) ( 312 -1026 0 ) ( 312 -1282 192 ) ( ( 0.0078125 0 497.984375 ) ( 0 0.0078125 0 ) ) effects_jumppad/jumppadfx1_d 0 0 0
 }
 }
@@ -4872,12 +4872,12 @@ brushDef
 {
 brushDef
 {
-( 2160 -2752 192 ) ( 2160 -2816 192 ) ( 2144 -2752 192 ) ( ( 0.015625 0 3 ) ( 0 0.015625 39 ) ) common/caulk 134217728 0 0
-( 2160 -2752 168 ) ( 2144 -2752 168 ) ( 2160 -2752 0 ) ( ( 0.015625 0 217 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 2176 -2752 168 ) ( 2176 -2752 0 ) ( 2176 -2816 168 ) ( ( 0.015625 0 3 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 2144 -2816 0 ) ( 2160 -2816 0 ) ( 2144 -2752 0 ) ( ( 0.015625 0 3 ) ( 0 0.015625 217 ) ) common/caulk 134217728 0 0
-( 2144 -3024 -96 ) ( 2144 -3024 72 ) ( 2160 -3024 -96 ) ( ( 0.015625 0 39 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 2144 -2816 24 ) ( 2144 -2752 24 ) ( 2144 -2816 192 ) ( ( 0.015625 0 253 ) ( 0 0.0078125 0 ) ) trak5x/trim-vert1 134217728 0 0
+( 2160 -2752 192 ) ( 2160 -2816 192 ) ( 2144 -2752 192 ) ( ( 0.015625 0 3 ) ( 0 0.015625 39 ) ) common/caulk 0 0 0
+( 2160 -2752 168 ) ( 2144 -2752 168 ) ( 2160 -2752 0 ) ( ( 0.015625 0 217 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 2176 -2752 168 ) ( 2176 -2752 0 ) ( 2176 -2816 168 ) ( ( 0.015625 0 3 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 2144 -2816 0 ) ( 2160 -2816 0 ) ( 2144 -2752 0 ) ( ( 0.015625 0 3 ) ( 0 0.015625 217 ) ) common/caulk 0 0 0
+( 2144 -3008 -96 ) ( 2144 -3008 72 ) ( 2160 -3008 -96 ) ( ( 0.015625 0 39 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 2144 -2816 24 ) ( 2144 -2752 24 ) ( 2144 -2816 192 ) ( ( 0.015625 0 253 ) ( 0 0.0078125 0 ) ) trak5x/trim-vert1 0 0 0
 }
 }
 {
@@ -5840,17 +5840,6 @@ brushDef
 {
 brushDef
 {
-( 320 -2752 192 ) ( 320 -3008 192 ) ( 304 -2752 192 ) ( ( 0.015625 0 59 ) ( 0 0.015625 1000.25 ) ) common/caulk 0 0 0
-( 320 -2816 192 ) ( 304 -2816 192 ) ( 320 -2816 0 ) ( ( 0.015625 0 23.75 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( 320 -2752 192 ) ( 320 -2752 0 ) ( 320 -3008 192 ) ( ( 0.0078125 0 29.5 ) ( 0 0.0078125 0 ) ) effects_jumppad/jumppadfx1_d 0 0 0
-( 304 -3008 0 ) ( 320 -3008 0 ) ( 304 -2752 0 ) ( ( 0.015625 0 59 ) ( 0 0.015625 23.75 ) ) common/caulk 0 0 0
-( 304 -2944 0 ) ( 304 -2944 192 ) ( 320 -2944 0 ) ( ( 0.015625 0 1000.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( 312 -3010 0 ) ( 312 -2754 0 ) ( 312 -3010 192 ) ( ( 0.0078125 0 484.484375 ) ( 0 0.0078125 0 ) ) effects_jumppad/jumppadfx1_d 0 0 0
-}
-}
-{
-brushDef
-{
 ( 448 -2800 208 ) ( 448 -2960 208 ) ( 128 -2800 208 ) ( ( 0.0078125 0 29.5 ) ( 0 0.0078125 244 ) ) common/caulk 0 0 0
 ( 128 -2960 192 ) ( 448 -2960 192 ) ( 128 -2800 192 ) ( ( 0.03125 0 54 ) ( 0 0.00390625 6 ) ) ex2x/trim-warn1 0 0 0
 ( 320 -3040 227.25 ) ( 320 -3008 240 ) ( 320 -2736 192 ) ( ( 0.0078125 0 29.5 ) ( 0 0.0078125 0 ) ) trak5x/base-base1b 0 0 0
@@ -8903,24 +8892,6 @@ brushDef
 "origin" "1632.000000 -3136.000000 0.000000"
 }
 {
-"classname" "func_door"
-"health" "40"
-"angle" "-2"
-"wait" "-1"
-"lip" "8"
-{
-brushDef
-{
-( 944 -2112 176 ) ( 944 -2176 176 ) ( 912 -2112 176 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 511.5 ) ) facility114x/base-basered 134217728 0 0
-( 944 -2152 16 ) ( 912 -2152 16 ) ( 944 -2152 0 ) ( ( 0.0078125 0 0.5 ) ( 0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
-( 936 -2144 16 ) ( 936 -2144 0 ) ( 936 -2208 16 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
-( 912 -2208 0 ) ( 944 -2208 0 ) ( 912 -2144 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 1 ) ) common/caulk 134217728 0 0
-( 912 -2200 0 ) ( 912 -2200 16 ) ( 944 -2200 0 ) ( ( 0.0078125 0 511.5 ) ( 0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
-( 920 -2208 0 ) ( 920 -2144 0 ) ( 920 -2208 16 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
-}
-}
-}
-{
 "classname" "light"
 "origin" "800.000000 -2176.000000 96.000000"
 "light" "120"
@@ -8928,7 +8899,6 @@ brushDef
 {
 "classname" "trigger_multiple"
 "message" "Slap the red structure with the shotgun secondary to clear the way."
-"target" "target_remove_shotgun_shells"
 "wait" "5"
 {
 brushDef
@@ -8943,10 +8913,28 @@ brushDef
 }
 }
 {
-"classname" "target_items"
-"origin" "864.000000 -2080.000000 96.000000"
-"angle" "-180.000000"
-"targetname" "target_remove_shotgun_shells"
-"ammo_shells" "0"
-"spawnflags" "2"
+"classname" "func_button"
+"angle" "-2"
+"spawnflags" "128"
+"target" "relay_deactivate_shotgun_3"
+"health" "40"
+"targetname" "button_weapon_shotgun_3"
+"speed" "150"
+{
+brushDef
+{
+( 936 -2152 176 ) ( 936 -2200 176 ) ( 920 -2152 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
+( 936 -2152 176 ) ( 920 -2152 176 ) ( 936 -2152 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
+( 936 -2152 176 ) ( 936 -2152 0 ) ( 936 -2200 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
+( 920 -2200 0 ) ( 936 -2200 0 ) ( 920 -2152 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 920 -2200 0 ) ( 920 -2200 176 ) ( 936 -2200 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
+( 920 -2200 0 ) ( 920 -2152 0 ) ( 920 -2200 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) facility114x/base-basered 134217728 0 0
+}
+}
+}
+{
+"classname" "relay_deactivate"
+"origin" "1024.000000 -2176.000000 96.000000"
+"targetname" "relay_deactivate_shotgun_3"
+"target" "button_weapon_shotgun_3"
 }