summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/p0_master.map18
-rw-r--r--maps/p4_thepress.map8
-rw-r--r--maps/p9_reactor.map23
-rw-r--r--sound/analmango/painting-p3.wav (renamed from pending/painting-p3.wav)bin449780 -> 449780 bytes
-rw-r--r--sound/analmango/painting-v4.wav (renamed from pending/painting-v4.wav)bin174692 -> 174692 bytes
5 files changed, 45 insertions, 4 deletions
diff --git a/maps/p0_master.map b/maps/p0_master.map
index 7fe3902..11efad2 100644
--- a/maps/p0_master.map
+++ b/maps/p0_master.map
@@ -78,3 +78,21 @@
"wait" "120"
"random" "60"
}
+// entity 2
+{
+"classname" "target_delay"
+"origin" "-8.000000 48.000000 -304.000000"
+"angle" "-90.000000"
+"targetname" "global_painting_2"
+"target" "global_painting_3"
+"wait" "23"
+}
+// entity 3
+{
+"classname" "target_delay"
+"origin" "-48.000000 48.000000 -304.000000"
+"angle" "-90.000000"
+"targetname" "global_painting_1"
+"target" "global_painting_2"
+"wait" "10"
+}
diff --git a/maps/p4_thepress.map b/maps/p4_thepress.map
index 6d3dc92..c01c8a4 100644
--- a/maps/p4_thepress.map
+++ b/maps/p4_thepress.map
@@ -4030,7 +4030,7 @@ nexus6/barrel_rst_sign
"angle" "90"
"speed" "1917"
"wait" "360000"
-"targetname" "box_1"
+"targetname" "global_painting_1"
"sound1to2" "sound/null.wav"
"sound2to1" "sound/null.wav"
"soundPos1" "sound/null.wav"
@@ -4048,7 +4048,7 @@ nexus6/barrel_rst_sign
// entity 24
{
"classname" "trigger_multiple"
-"target" "box_1"
+"target" "global_painting_1"
"wait" "-1"
// brush 0
{
@@ -4084,7 +4084,7 @@ nexus6/barrel_rst_sign
"classname" "target_delay"
"origin" "-496.000000 -1624.000000 -16.000000"
"wait" "0.95"
-"targetname" "box_1"
+"targetname" "global_painting_1"
"target" "box_3"
}
// entity 27
@@ -4114,7 +4114,7 @@ nexus6/barrel_rst_sign
"classname" "target_delay"
"origin" "-496.000000 -1664.000000 -16.000000"
"wait" "0.5"
-"targetname" "box_1"
+"targetname" "global_painting_1"
"target" "box_2"
}
// entity 29
diff --git a/maps/p9_reactor.map b/maps/p9_reactor.map
index 3af86e8..899aebe 100644
--- a/maps/p9_reactor.map
+++ b/maps/p9_reactor.map
@@ -7853,6 +7853,15 @@ nexus6/cement_1_gunky
( 2240 272 -320 ) ( 2240 272 136 ) ( 2248 272 -320 ) common/ladder 0 0 0 0.5 0.5 134217728 0 0
( 2240 272 -320 ) ( 2240 320 -320 ) ( 2240 272 136 ) common/ladder 0 0 0 0.5 0.5 134217728 0 0
}
+// brush 848
+{
+( 2312 -152 56 ) ( 2312 -192 56 ) ( 2272 -152 56 ) analmango/pk01_panel02_d 0 0 45 0.125 0.125 134217728 0 0
+( 2304 -152 8 ) ( 2264 -152 8 ) ( 2304 -152 -8 ) analmango/pk01_panel02_d 0 0 45 0.125 0.125 134217728 0 0
+( 2296 -144 8 ) ( 2296 -144 -8 ) ( 2296 -184 8 ) analmango/pk01_panel02_d 82.7451629639 210.7451629639 45 0.125 0.125 134217728 0 0
+( 2264 -192 -8 ) ( 2304 -192 -8 ) ( 2264 -152 -8 ) analmango/pk01_panel02_d 0 0 45 0.125 0.125 134217728 0 0
+( 2256 -184 -8 ) ( 2256 -184 8 ) ( 2296 -184 -8 ) analmango/pk01_panel02_d 45.2548332214 45.2548332214 45 0.125 0.125 134217728 0 0
+( 2264 -192 -8 ) ( 2264 -152 -8 ) ( 2264 -192 8 ) analmango/pk01_panel02_d 0 0 45 0.125 0.125 134217728 0 0
+}
}
// entity 1
{
@@ -9982,3 +9991,17 @@ analmango/reactor_beam
"wait" "20"
"random" "15"
}
+// entity 133
+{
+"classname" "target_speaker"
+"origin" "2568.000000 -296.000000 24.000000"
+"targetname" "global_painting_3"
+"noise" "sound/analmango/painting-p3.wav"
+}
+// entity 134
+{
+"classname" "target_speaker"
+"origin" "2280.000000 -168.000000 24.000000"
+"targetname" "global_painting_2"
+"noise" "sound/analmango/painting-v4.wav"
+}
diff --git a/pending/painting-p3.wav b/sound/analmango/painting-p3.wav
index 49080ba..49080ba 100644
--- a/pending/painting-p3.wav
+++ b/sound/analmango/painting-p3.wav
Binary files differ
diff --git a/pending/painting-v4.wav b/sound/analmango/painting-v4.wav
index 8adc7fb..8adc7fb 100644
--- a/pending/painting-v4.wav
+++ b/sound/analmango/painting-v4.wav
Binary files differ