]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
use jumpers for a test
authorRudolf Polzer <divverent@xonotic.org>
Sun, 16 Oct 2011 17:24:06 +0000 (19:24 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 16 Oct 2011 17:24:06 +0000 (19:24 +0200)
misc/tools/midi2cfg-ng.conf
misc/tools/midi2cfg/stairs-min.mid
misc/tools/midi2cfg/stairs-min.rg [new file with mode: 0644]
misc/tools/midi2cfg/stairs-min.sh
misc/tools/midi2cfg/stairs.rg [new file with mode: 0644]

index a74e754dac3fbdee91d6e5521a073e6896f937cb..8401e4e1eb82e76410796581da31667322667ef9 100644 (file)
@@ -534,8 +534,6 @@ bot uzi
                percussion 27
        percussion 33 # 033_Metronome_Click-0.wav
                percussion 27
-       percussion 36 # 036_Kick_2-0.wav
-               percussion 27
        percussion 53 # 053_Cymbal_Ride_Bell-0.wav
                percussion 27
        percussion 54 # 054_Tombourine-0.wav
@@ -796,6 +794,7 @@ bot rifle
                busy 0.9
 
 bot jetpack
+       channels 10
        init
                time -2
                cmd aimtarget "tPercussion 1"
@@ -817,20 +816,22 @@ bot jetpack
                percussion 42
 
 bot jumper
+       channels 10
        init
                time -2
                cmd aimtarget "tPercussion 1"
                cmd barrier
                cmd wait 0.5
-#      percussion FIXME
-#              time -0.6666666
-#              buttons jump
-#              time -0.5
-#              buttons
-#              time 0
-#              busy 0.1
+       percussion 36 # 036_Kick_2-0.wav
+               time -0.6666666
+               buttons jump
+               time -0.5
+               buttons
+               time 0
+               busy 0.1
 
 bot switcher
+       channels 10
        init
                time -2
                cmd aimtarget "tPercussion 1"
@@ -845,6 +846,7 @@ bot switcher
                percussion 29
 
 bot vocals
+       channels -1
        init
                time -2
                cmd aimtarget "tPercussion 1"
index 6cae5af2538d6ed307c00d2822d1bac64b1b1c33..61ae5d220f1ce9b3be1f89a6861cc2e0c86a9022 100644 (file)
Binary files a/misc/tools/midi2cfg/stairs-min.mid and b/misc/tools/midi2cfg/stairs-min.mid differ
diff --git a/misc/tools/midi2cfg/stairs-min.rg b/misc/tools/midi2cfg/stairs-min.rg
new file mode 100644 (file)
index 0000000..96c4be7
Binary files /dev/null and b/misc/tools/midi2cfg/stairs-min.rg differ
index dfbfe26fe62e9e6478cc384f40ba354f2255dda2..7bee2fb40fbeafbed96d70b3ff9759d3781b537d 100755 (executable)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../midi2cfg-ng.pl ../midi2cfg-ng.conf stairs-min.mid 60 > ~/.xonotic/data/stairs.cfg
+../midi2cfg-ng.pl ../midi2cfg-ng.conf stairs-min.mid 6 > ~/.xonotic/data/x.cfg
diff --git a/misc/tools/midi2cfg/stairs.rg b/misc/tools/midi2cfg/stairs.rg
new file mode 100644 (file)
index 0000000..31aa5a7
Binary files /dev/null and b/misc/tools/midi2cfg/stairs.rg differ