From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Oct 2011 17:24:06 +0000 (+0200)
Subject: use jumpers for a test
X-Git-Tag: xonotic-v0.6.0~69^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4dedc9e0b689f3142ee28e62073f790c3ff4218a;p=xonotic%2Fxonotic.git

use jumpers for a test
---

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index a74e754d..8401e4e1 100644
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -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"
diff --git a/misc/tools/midi2cfg/stairs-min.mid b/misc/tools/midi2cfg/stairs-min.mid
index 6cae5af2..61ae5d22 100644
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
index 00000000..96c4be76
Binary files /dev/null and b/misc/tools/midi2cfg/stairs-min.rg differ
diff --git a/misc/tools/midi2cfg/stairs-min.sh b/misc/tools/midi2cfg/stairs-min.sh
index dfbfe26f..7bee2fb4 100755
--- a/misc/tools/midi2cfg/stairs-min.sh
+++ b/misc/tools/midi2cfg/stairs-min.sh
@@ -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
index 00000000..31aa5a75
Binary files /dev/null and b/misc/tools/midi2cfg/stairs.rg differ