First attempts to spawn/despawn screens.

diff --git a/maps/function2012_stage.map b/maps/function2012_stage.map
index 11a738e2cae41d35a9780aa13c8af057ddaee15a..641486d553b541d756ec13d53d0cdb8265c657af 100644 (file)
--- a/maps/function2012_stage.map
+++ b/maps/function2012_stage.map
@@ -3704,14 +3704,6 @@ map_function2012_stage/coin
 ( -2304 -2080 -1088 ) ( -2304 -2016 -1088 ) ( -2304 -2080 -1024 ) map_function2012_stage/cloud 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -2752 640 1280 ) ( -2752 544 1280 ) ( -2816 640 1280 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -2752 640 1280 ) ( -2816 640 1280 ) ( -2752 640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -2752 640 1280 ) ( -2752 640 384 ) ( -2752 544 1280 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -2816 544 384 ) ( -2752 544 384 ) ( -2816 640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -2752 -640 384 ) ( -2752 -640 1280 ) ( -2688 -640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -2816 544 384 ) ( -2816 640 384 ) ( -2816 544 1280 ) map_function2012_stage/pinkybrain_roto 256 219.4285888672 0 -2.5 1.7499998808 0 0 0
-}
-{
 patchDef2
 {
 facility114invx/base-baseblack
@@ -17616,13 +17608,14 @@ map_function2012_stage/pipecap
 "classname" "func_camera"
 "target" "target_position_mario"
 "targetname" "mariocamera"
+"effects" "16"
 {
-( -2688 384 1280 ) ( -2688 -512 1280 ) ( -2752 384 1280 ) common/caulk -0 128 0 0.25 5 0 0 0
-( -2688 640 1088 ) ( -2752 640 1088 ) ( -2688 640 192 ) common/caulk -0 109.7142944336 0 0.25 3.5000002384 0 0 0
-( -2688 384 1088 ) ( -2688 384 192 ) ( -2688 -512 1088 ) common/caulk 127.9999923706 109.714263916 0 5.0000004768 3.5000002384 0 0 0
-( -2688 -512 384 ) ( -2624 -512 384 ) ( -2688 384 384 ) common/caulk -0 128 0 0.25 5 0 0 0
-( -2752 -640 192 ) ( -2752 -640 1088 ) ( -2688 -640 192 ) common/caulk -0 109.7142944336 0 0.25 3.5000002384 0 0 0
-( -2752 -512 192 ) ( -2752 384 192 ) ( -2752 -512 1088 ) common/camera 128 109.7142944336 0 -5.0000004768 3.5000002384 0 0 0
+( -2624 384 1408 ) ( -2624 -512 1408 ) ( -2688 384 1408 ) common/caulk 0 128 0 0.25 5 0 0 0
+( -2624 640 1216 ) ( -2688 640 1216 ) ( -2624 640 320 ) common/caulk 0 146.2857208252 0 0.25 3.5000002384 0 0 0
+( -2624 384 1216 ) ( -2624 384 320 ) ( -2624 -512 1216 ) common/caulk 127.9999923706 146.2856903076 0 5.0000004768 3.5000002384 0 0 0
+( -2624 -512 512 ) ( -2560 -512 512 ) ( -2624 384 512 ) common/caulk 0 128 0 0.25 5 0 0 0
+( -2688 -640 320 ) ( -2688 -640 1216 ) ( -2624 -640 320 ) common/caulk 0 146.2857208252 0 0.25 3.5000002384 0 0 0
+( -2688 -512 320 ) ( -2688 384 320 ) ( -2688 -512 1216 ) common/camera 128 146.2857208252 0 -5.0000004768 3.5000002384 0 0 0
 }
 }
 {
@@ -17767,7 +17760,7 @@ map_function2012_stage/pipecap
 }
 {
 "classname" "target_spawn"
-"origin" "-2624.000000 0.000000 800.000000"
+"origin" "-2560.000000 0.000000 832.000000"
 "target" "mariocamera"
 "targetname" "mario_camera_updater"
 "message" "SendFlags 16777215"
@@ -22114,3 +22107,43 @@ map_function2012_stage/bar_crylink
 ( -3328 -816 -24 ) ( -3136 -400 -24 ) ( -3328 -816 104 ) common/trigger 64 0 0 -0.25 0.25 0 0 0
 }
 }
+{
+"classname" "func_wall"
+"effects" "16"
+"targetname" "intro"
+{
+( -2752 640 1280 ) ( -2752 544 1280 ) ( -2816 640 1280 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2752 640 1280 ) ( -2816 640 1280 ) ( -2752 640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2752 640 1280 ) ( -2752 640 384 ) ( -2752 544 1280 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2816 544 384 ) ( -2752 544 384 ) ( -2816 640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2752 -640 384 ) ( -2752 -640 1280 ) ( -2688 -640 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2816 544 384 ) ( -2816 640 384 ) ( -2816 544 1280 ) map_function2012_stage/intro 256 219.4285888672 0 -2.5 1.7499998808 0 0 0
+}
+}
+{
+"classname" "func_wall"
+"effects" "16"
+"targetname" "patb_rotozoomer"
+{
+( -2688 640 1344 ) ( -2688 544 1344 ) ( -2752 640 1344 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2688 640 1344 ) ( -2752 640 1344 ) ( -2688 640 448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2688 640 1344 ) ( -2688 640 448 ) ( -2688 544 1344 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2752 544 448 ) ( -2688 544 448 ) ( -2752 640 448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2688 -640 448 ) ( -2688 -640 1344 ) ( -2624 -640 448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -2752 544 448 ) ( -2752 640 448 ) ( -2752 544 1344 ) map_function2012_stage/pinkybrain_roto 256 256.0000305176 0 -2.5 1.7499998808 0 0 0
+}
+}
+{
+"classname" "target_spawn"
+"origin" "-2560.000000 -64.000000 832.000000"
+"targetname" "introspawner"
+"message" "effects 0"
+"target" "intro"
+}
+{
+"classname" "target_spawn"
+"origin" "-2560.000000 -128.000000 832.000000"
+"target" "intro"
+"message" "effects 16"
+"targetname" "introremover"
+}

diff --git a/scripts/map_function2012_stage.shader b/scripts/map_function2012_stage.shader
index 9f3cda8a8a3f6cf2e6c42d7057c6b481fad604c8..d6364a80b503bd5ac123153234b3227a5943b4d6 100644 (file)
--- a/scripts/map_function2012_stage.shader
+++ b/scripts/map_function2012_stage.shader
@@ -76,6 +76,26 @@ textures/map_function2012_stage/base-baseblack
        }
 }
 
+//INTRO
+
+textures/map_function2012_stage/intro
+{
+       qer_editorimage textures/map_function2012_stage/intro.tga
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+       cull none
+
+       {
+               map textures/map_function2012_stage/intro.tga
+       }
+       {
+       blendfunc filter
+}
+}
+
+
+
 //BARS
 textures/map_function2012_stage/bar_tuba
 {
@@ -814,4 +834,5 @@ textures/map_function2012_stage/pinkybrain_roto
        {
        blendfunc filter
 }
-}      
\ No newline at end of file
+}
+