X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fmidi2cfg-ng.conf;h=fb0c879860386b95c1bdd4fdd3b4c2d69a8d1c2c;hb=898ba887aa3011d8b955186123d87e993a847c81;hp=46777e62bad6fbf3f58ced6b2daa1a7a3bd6d205;hpb=65af10196e9fda9db27ed4849f65dab857db9363;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index 46777e62..fb0c8798 100644
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -9,6 +9,8 @@ time_forgetfulness 3
 raw set places_tuba "tUba1 tUba2 tUba3 tUba4 tUba5 tUba6 tUba7 tUba8 tUba9 tUba10 tUba11 tUba12 tUba13 tUba14 tUba15 tUba16 tUba17 tUba18 tUba19 tUba20 tUba21 tUba22 tUba23 tUba24 tUba25 tUba26 tUba27 tUba28 tUba29 tUba30 tUba31 tUba32"
 raw set places_percussion "tChr1 tChr2 tChr3 tChr4 tChr5 tChr6 tChr7 tChr8 tChr9 tChr10 tChr11 tChr12 tChr13 tChr14 tChr15 tChr16 tChr17 tChr18 tChr19 tChr20 tChr21 tChr22 tChr23 tChr24 tChr25 tChr26 tChr27 tChr38 tChr39 tChr30 tChr31 tChr32"
 raw set places_vocals "tVocals"
+raw set places_metalsteps "tMetalSteps1 tMetalSteps2 tMetalSteps3"
+raw set places_nosteps "tNoSteps1 tNoSteps2 tNoSteps3 tNoSteps4"
 
 raw settemp bot_ai_thinkinterval 0
 raw settemp bot_sound_monopoly 1
@@ -436,7 +438,7 @@ bot accordeon
 		cmd barrier
 		cmd selectweapon 15
 		cmd wait 0.5
-		raw impulse 20
+		cmd impulse 20
 		raw settemp g_balance_tuba_attenuation 0.1
 		raw settemp g_balance_tuba_damage 0
 
@@ -534,8 +536,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
@@ -609,6 +609,8 @@ bot crylink
 		percussion 34
 	percussion 72 # 072_Whistle_2_Low_Long-0.wav
 		percussion 45
+	percussion 75 # 075_Claves-0.wav
+		percussion 34
 
 # nex is nex NONE
 bot nex
@@ -672,10 +674,6 @@ bot hagar
 		percussion 35
 	percussion 61 # 061_Bongo_Low-0.wav
 		percussion 35
-	percussion 65 # 065_Timbale_High-0.wav
-		percussion 35
-	percussion 66 # 066_Timbale_Low-0.wav
-		percussion 35
 
 # TODO hookbomb would be useful for #60
 
@@ -731,6 +729,8 @@ bot hook
 		busy 0.9
 	percussion 81 # 081_Triangle_2_Open-0.wav
 		percussion 62
+	percussion 80 # 081_Triangle_1_Mute-0.wav
+		percussion 62
 
 # seeker is BADFLYSOUND tag
 bot seeker
@@ -794,6 +794,7 @@ bot rifle
 		busy 0.9
 
 bot jetpack
+	channels 10
 	init
 		time -2
 		cmd aimtarget "tPercussion 1"
@@ -811,8 +812,44 @@ bot jetpack
 		percussion 42
 	percussion 64 # 064_Conga_Low-0.wav
 		percussion 42
+	percussion 70 # 070_Maracas-0.wav
+		percussion 42
+
+bot jumper
+	channels 10
+	init
+		time -2
+		cmd aimtarget "tPercussion 1"
+		cmd barrier
+		cmd wait 0.5
+	percussion 36 # 036_Kick_2-0.wav
+		time -0.6666666
+		buttons jump
+		time -0.5
+		buttons
+		time 0
+		busy 0.1
+
+bot metaljumper
+	channels 10
+	init
+		time -2
+		cmd aimtarget "tPercussion 1"
+		cmd barrier
+		cmd wait 0.5
+	percussion 65 # 065_Timbale_High-0.wav
+		time -0.6666666
+		buttons jump
+		time -0.5
+		buttons
+		time 0
+		busy 0.1
+		percussion 35
+	percussion 66 # 066_Timbale_Low-0.wav
+		percussion 65
 
 bot switcher
+	channels 10
 	init
 		time -2
 		cmd aimtarget "tPercussion 1"
@@ -827,6 +864,7 @@ bot switcher
 		percussion 29
 
 bot vocals
+	channels -1
 	init
 		time -2
 		cmd aimtarget "tPercussion 1"
@@ -862,7 +900,7 @@ bot common
 bot instance_tuba_red
 	include tuba_red
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
@@ -871,7 +909,7 @@ bot instance_tuba_red
 bot instance_tuba_blue
 	include tuba_blue
 	include common
-	count 8
+	count 16
 	init
 		cmd movetotarget @places_tuba
 		cmd barrier
@@ -880,18 +918,18 @@ bot instance_tuba_blue
 bot instance_accordeon_red
 	include accordeon_red
 	include common
-	count 8
+	count 16
 	init
-		cmd movetotarget @places_accordeon
+		cmd movetotarget @places_tuba
 		cmd barrier
 		super
 
 bot instance_accordeon_blue
 	include accordeon_blue
 	include common
-	count 8
+	count 16
 	init
-		cmd movetotarget @places_accordeon
+		cmd movetotarget @places_tuba
 		cmd barrier
 		super
 
@@ -941,7 +979,7 @@ bot instance_crylink
 		super
 
 bot instance_nex
-	include rocket
+	include nex
 	include common
 	count 16
 	init
@@ -950,7 +988,7 @@ bot instance_nex
 		super
 
 bot instance_minstanex
-	include rocket
+	include minstanex
 	include common
 	count 16
 	init
@@ -1007,11 +1045,29 @@ bot instance_jetpack
 	include jetpack
 	include common
 	count 16
+	init
+		cmd movetotarget @places_nosteps
+		cmd barrier
+		super
+
+bot instance_jumper
+	include jumper
+	include common
+	count 16
 	init
 		cmd movetotarget @places_percussion
 		cmd barrier
 		super
 
+bot instance_metaljumper
+	include metaljumper
+	include common
+	count 16
+	init
+		cmd movetotarget @places_metalsteps
+		cmd barrier
+		super
+
 bot instance_switcher
 	include switcher
 	include common