From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 19 Nov 2011 18:36:29 +0000 (+0100)
Subject: now with appropriate sound :)
X-Git-Tag: xonotic-v0.6.0~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21fbec8409f140d3a3efe32ba76da96c7d2dad00;p=xonotic%2Fxonotic-maps.pk3dir.git

now with appropriate sound :)
---

diff --git a/maps/xoylent.map b/maps/xoylent.map
index c84be13b..0b46dd31 100644
--- a/maps/xoylent.map
+++ b/maps/xoylent.map
@@ -26750,8 +26750,8 @@ exx/trim-baseboard
 "targetname" "Egg_DoorTriggerThreadbare"
 "spawnflags" "1"
 "message" "^1Access granted!\n^7Welcome Bobbin."
-"target" "Egg_DoorOpenerDelay"
-"delay" "3"
+"target" "Egg_DoorOpenerDelayThreadbare"
+"delay" "1"
 {
 ( 576 -696 744 ) ( 576 -760 744 ) ( 512 -696 744 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
 ( 576 -720 792 ) ( 512 -720 792 ) ( 576 -720 728 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
@@ -26877,12 +26877,29 @@ exx/trim-baseboard
 "spawnflags" "1"
 "target2" "Egg_DoorSpeaker"
 {
-( 552 -720 768 ) ( 552 -736 768 ) ( 536 -720 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
-( 552 -720 768 ) ( 536 -720 768 ) ( 552 -720 752 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
-( 552 -720 768 ) ( 552 -720 752 ) ( 552 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
-( 536 -736 752 ) ( 552 -736 752 ) ( 536 -720 752 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
-( 536 -736 752 ) ( 536 -736 768 ) ( 552 -736 752 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
-( 536 -736 752 ) ( 536 -720 752 ) ( 536 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
+( 568 -720 768 ) ( 568 -736 768 ) ( 552 -720 768 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 568 -720 768 ) ( 552 -720 768 ) ( 568 -720 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 568 -720 768 ) ( 568 -720 752 ) ( 568 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
+( 552 -736 752 ) ( 568 -736 752 ) ( 552 -720 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 552 -736 752 ) ( 552 -736 768 ) ( 568 -736 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 552 -736 752 ) ( 552 -720 752 ) ( 552 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
+}
+}
+{
+"classname" "trigger_multiple"
+"delay" "4"
+"targetname" "Egg_DoorOpenerDelayThreadbare"
+"target" "Egg_DoorOpener"
+"spawnflags" "1"
+"target2" "Egg_DoorSpeaker"
+"noise" "sound/map_xoylent/easteregg_tuba.ogg"
+{
+( 536 -720 768 ) ( 536 -736 768 ) ( 520 -720 768 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 536 -720 768 ) ( 520 -720 768 ) ( 536 -720 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 536 -720 768 ) ( 536 -720 752 ) ( 536 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
+( 520 -736 752 ) ( 536 -736 752 ) ( 520 -720 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 520 -736 752 ) ( 520 -736 768 ) ( 536 -736 752 ) common/trigger 128 0 0 0.125 0.125 134217728 0 0
+( 520 -736 752 ) ( 520 -720 752 ) ( 520 -736 768 ) common/trigger 0 0 0 0.125 0.125 134217728 0 0
 }
 }
 {
diff --git a/sound/map_xoylent/easteregg_tuba.mid b/sound/map_xoylent/easteregg_tuba.mid
new file mode 100644
index 00000000..d8437c0a
Binary files /dev/null and b/sound/map_xoylent/easteregg_tuba.mid differ
diff --git a/sound/map_xoylent/easteregg_tuba.ogg b/sound/map_xoylent/easteregg_tuba.ogg
new file mode 100644
index 00000000..d1c02ac9
Binary files /dev/null and b/sound/map_xoylent/easteregg_tuba.ogg differ