Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / misc / tools / midi2cfg-ng.conf

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index 977301982c6c76df6b546229e0664b9493d05eb2..331f4affc2bfe5896d97cb56658ca0c17248bf0f 100644 (file)
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -1,3 +1,8 @@
+// for walking bots:
+// :%s/cc teleport\(totarget\)/move\1/g
+// for teleporting bots:
+// :%s/move\(totarget\)/cc teleport\1/g
+
 timeoffset_preinit 2
 timeoffset_postinit 2
 timeoffset_predone 2
@@ -6,11 +11,11 @@ timeoffset_preintermission 2
 timeoffset_postintermission 2
 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"
+list 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
+list 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
+list places_vocals tVocals
+list places_metalsteps tMetalSteps1 tMetalSteps2 tMetalSteps3
+list places_nosteps tNoSteps1 tNoSteps2 tNoSteps3 tNoSteps4
 
 raw settemp bot_ai_thinkinterval 0
 raw settemp bot_sound_monopoly 1
@@ -20,401 +25,481 @@ bot notebot
                time 0
                cmd debug_assert_canfire 1
                buttons left backward crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -18
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -17
                time 0
                cmd debug_assert_canfire 1
                buttons backward crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -17
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -16
                time 0
                cmd debug_assert_canfire 1
                buttons right backward crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -16
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -13
                time 0
                cmd debug_assert_canfire 1
                buttons forward right crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -13
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -12
                time 0
                cmd debug_assert_canfire 1
                buttons crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -12
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -11
                time 0
                cmd debug_assert_canfire 1
                buttons left backward crouch attack2
+               aim_random -5 5 0.05
                time 0.05
        note off -11
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -10
                time 0
                cmd debug_assert_canfire 1
                buttons right crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -10
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -9
                time 0
                cmd debug_assert_canfire 1
                buttons forward left crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -9
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -8
                time 0
                cmd debug_assert_canfire 1
                buttons forward crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -8
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -7
                time 0
                cmd debug_assert_canfire 1
                buttons left crouch attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -7
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -6
                time 0
                cmd debug_assert_canfire 1
                buttons left backward attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -6
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -5
                time 0
                cmd debug_assert_canfire 1
                buttons backward attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -5
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -4
                time 0
                cmd debug_assert_canfire 1
                buttons backward right attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -4
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -3
                time 0
                cmd debug_assert_canfire 1
                buttons right crouch attack2
+               aim_random -5 5 0.05
                time 0.05
        note off -3
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -2
                time 0
                cmd debug_assert_canfire 1
                buttons forward left crouch attack2
+               aim_random -5 5 0.05
                time 0.05
        note off -2
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on -1
                time 0
                cmd debug_assert_canfire 1
                buttons forward right attack1
+               aim_random -5 5 0.05
                time 0.05
        note off -1
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 0
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 0
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 1
                time 0
                cmd debug_assert_canfire 1
                buttons left backward attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 1
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 2
                time 0
                cmd debug_assert_canfire 1
                buttons right attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 2
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 3
                time 0
                cmd debug_assert_canfire 1
                buttons forward left attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 3
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 4
                time 0
                cmd debug_assert_canfire 1
                buttons forward attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 4
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 5
                time 0
                cmd debug_assert_canfire 1
                buttons left attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 5
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 6
                time 0
                cmd debug_assert_canfire 1
                buttons forward right attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 6
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 7
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 7
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 8
                time 0
                cmd debug_assert_canfire 1
                buttons backward right jump attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 8
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 9
                time 0
                cmd debug_assert_canfire 1
                buttons right attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 9
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 10
                time 0
                cmd debug_assert_canfire 1
                buttons forward left attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 10
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 11
                time 0
                cmd debug_assert_canfire 1
                buttons forward attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 11
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 12
                time 0
                cmd debug_assert_canfire 1
                buttons left attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 12
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 13
                time 0
                cmd debug_assert_canfire 1
                buttons left backward jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 13
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 14
                time 0
                cmd debug_assert_canfire 1
                buttons right jump attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 14
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 15
                time 0
                cmd debug_assert_canfire 1
                buttons forward left jump attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 15
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 16
                time 0
                cmd debug_assert_canfire 1
                buttons forward jump attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 16
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 17
                time 0
                cmd debug_assert_canfire 1
                buttons left jump attack1
+               aim_random -5 5 0.05
                time 0.05
        note off 17
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 18
                time 0
                cmd debug_assert_canfire 1
                buttons forward right jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 18
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 19
                time 0
                cmd debug_assert_canfire 1
                buttons jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 19
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 21
                time 0
                cmd debug_assert_canfire 1
                buttons right jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 21
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 22
                time 0
                cmd debug_assert_canfire 1
                buttons forward left jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 22
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 23
                time 0
                cmd debug_assert_canfire 1
                buttons forward jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 23
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
        note on 24
                time 0
                cmd debug_assert_canfire 1
                buttons left jump attack2
+               aim_random -5 5 0.05
                time 0.05
        note off 24
                time -0.05
                cmd debug_assert_canfire 0
                buttons 
+               aim_random -5 5 0.05
                time 0
 
 bot tuba
@@ -444,40 +529,40 @@ bot tuba_red
        include tuba
        transpose 0
        init
-               cmd cc "color 68"
+               cmd cc color 68
                super
 
 bot tuba_blue
        include tuba
        transpose 3
        init
-               cmd cc "color 221"
+               cmd cc color 221
                super
 
 bot accordeon_red
        include accordeon
        transpose 0
        init
-               cmd cc "color 68"
+               cmd cc color 68
                super
 
 bot accordeon_blue
        include accordeon
        transpose 3
        init
-               cmd cc "color 221"
+               cmd cc color 221
                super
 
-# laser = lasershot NONE
+// laser = lasershot NONE
 bot laser
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 1
                cmd wait 0.5
                raw settemp g_balance_laser_primary_refire 0.3
-       percussion 38 # 038_Snare_1-0.wav
+       percussion 38 // 038_Snare_1-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -486,18 +571,18 @@ bot laser
                buttons
                time 0.1
                busy 0.3
-       percussion 40 # 040_Snare_2-0.wav
+       percussion 40 // 040_Snare_2-0.wav
                percussion 38
 
-# shotgun = RELOADSOUND slap
+// shotgun = RELOADSOUND slap
 bot shotgun
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 2
                cmd wait 0.5
-       percussion 74 # 074_Guiro_2_Long-0.wav
+       percussion 74 // 074_Guiro_2_Long-0.wav
                time -0.4
                cmd debug_assert_canfire 1
                buttons attack2
@@ -506,14 +591,14 @@ bot shotgun
                buttons
                time 0
                busy 1.1
-       percussion 73 # 073_Guiro_1_Short-0.wav
+       percussion 73 // 073_Guiro_1_Short-0.wav
                percussion 74
 
-# uzi = bullet BAD
+// uzi = bullet BAD
 bot uzi
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 3
                cmd wait 0.5
@@ -521,7 +606,7 @@ bot uzi
                raw settemp g_balance_uzi_first_refire 0.1
                raw settemp g_balance_uzi_sustained_refire 0.1
                raw settemp g_casings 0
-       percussion 27 # 027_High_Q-0.wav
+       percussion 27 // 027_High_Q-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -530,30 +615,30 @@ bot uzi
                buttons
                time 0.1
                busy 0.1
-       percussion 31 # 031_Sticks-0.wav
+       percussion 31 // 031_Sticks-0.wav
                percussion 27
-       percussion 37 # 037_Stick_Rim-0.wav
+       percussion 37 // 037_Stick_Rim-0.wav
                percussion 27
-       percussion 33 # 033_Metronome_Click-0.wav
+       percussion 33 // 033_Metronome_Click-0.wav
                percussion 27
-       percussion 53 # 053_Cymbal_Ride_Bell-0.wav
+       percussion 53 // 053_Cymbal_Ride_Bell-0.wav
                percussion 27
-       percussion 54 # 054_Tambourine-0.wav
+       percussion 54 // 054_Tambourine-0.wav
                percussion 27
 
-# grenadelauncher = RELOADSOUND RELOADSOUND
+// grenadelauncher = RELOADSOUND RELOADSOUND
 
-# electro = beam BADFLYSOUND
+// electro = beam BADFLYSOUND
 bot electro
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 6
                cmd wait 0.5
                raw settemp g_balance_electro_primary_refire 0.2
-       percussion 49 # 049_Cymbal_Crash_1-0.wav
+       percussion 49 // 049_Cymbal_Crash_1-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -562,20 +647,20 @@ bot electro
                buttons
                time 0.1
                busy 0.2
-       percussion 57 # 057_Cymbal_Crash_2-0.wav
+       percussion 57 // 057_Cymbal_Crash_2-0.wav
                percussion 49
 
-# crylink = big small
+// crylink = big small
 bot crylink
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 7
                cmd wait 0.5
                raw settemp g_balance_crylink_primary_refire 0.3
                raw settemp g_balance_crylink_secondary_refire 0.2
-       percussion 34 # 034_Metronome_Bell-0.wav
+       percussion 34 // 034_Metronome_Bell-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -584,7 +669,7 @@ bot crylink
                buttons
                time 0.1
                busy 0.3
-       percussion 45 # 045_Tom_Mid_2-0.wav
+       percussion 45 // 045_Tom_Mid_2-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
@@ -593,35 +678,35 @@ bot crylink
                buttons
                time 0.1
                busy 0.2
-       percussion 47 # 047_Tom_Mid_1-0.wav
+       percussion 47 // 047_Tom_Mid_1-0.wav
                percussion 45
-       percussion 48 # 048_Tom_High_2-0.wav
+       percussion 48 // 048_Tom_High_2-0.wav
                percussion 34
-       percussion 50 # 048_Tom_High_2-0.wav
+       percussion 50 // 048_Tom_High_2-0.wav
                percussion 34
-       percussion 56 # 056_Cow_Bell-0.wav
+       percussion 56 // 056_Cow_Bell-0.wav
                percussion 34
-       percussion 67 # 067_Agogo_High-0.wav
+       percussion 67 // 067_Agogo_High-0.wav
                percussion 34
-       percussion 68 # 068_Agogo_Low-0.wav
+       percussion 68 // 068_Agogo_Low-0.wav
                percussion 45
-       percussion 71 # 071_Whistle_1_High_Short-0.wav
+       percussion 71 // 071_Whistle_1_High_Short-0.wav
                percussion 34
-       percussion 72 # 072_Whistle_2_Low_Long-0.wav
+       percussion 72 // 072_Whistle_2_Low_Long-0.wav
                percussion 45
-       percussion 75 # 075_Claves-0.wav
+       percussion 75 // 075_Claves-0.wav
                percussion 34
 
-# nex is nex NONE
+// nex is nex NONE
 bot nex
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 8
                cmd wait 0.5
                raw settemp g_balance_nex_primary_refire 1.25
-       percussion 52 # 052_Cymbal_Chinese-0.wav
+       percussion 52 // 052_Cymbal_Chinese-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -631,16 +716,16 @@ bot nex
                time 0.1
                busy 1.25
 
-# minstanex is nex CLONE_OF_LASER
+// minstanex is nex CLONE_OF_LASER
 bot minstanex
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 12
                cmd wait 0.5
                raw settemp g_balance_minstanex_refire 1
-       percussion 55 # 055_Cymbal_Splash-0.wav
+       percussion 55 // 055_Cymbal_Splash-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -650,16 +735,16 @@ bot minstanex
                time 0.1
                busy 1
 
-# hagar is rocket BAD
+// hagar is rocket BAD
 bot hagar
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 9
                cmd wait 0.5
                raw settemp g_balance_hagar_primary_refire 0.2
-       percussion 35 # 035_Kick_1-0.wav
+       percussion 35 // 035_Kick_1-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -668,25 +753,25 @@ bot hagar
                buttons
                time 0.1
                busy 0.2
-       percussion 39 # 039_Clap_Hand-0.wav
+       percussion 39 // 039_Clap_Hand-0.wav
                percussion 35
-       percussion 60 # 060_Bongo_High-0.wav
+       percussion 60 // 060_Bongo_High-0.wav
                percussion 35
-       percussion 61 # 061_Bongo_Low-0.wav
+       percussion 61 // 061_Bongo_Low-0.wav
                percussion 35
 
-# TODO hookbomb would be useful for #60
+// TODO hookbomb would be useful for //60
 
-# RL is rocket NONE
+// RL is rocket NONE
 bot rocket
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 10
                cmd wait 0.5
                raw settemp g_balance_rocketlauncher_refire 1.1
-       percussion 25 # 025_Snare_Roll-0.wav
+       percussion 25 // 025_Snare_Roll-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
@@ -696,18 +781,18 @@ bot rocket
                time 0.1
                busy 1.1
 
-# hook is hook bomb
+// hook is hook bomb
 bot hook
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 13
                cmd wait 0.5
                raw settemp g_balance_hook_primary_refire 0.3
                raw settemp g_balance_hook_secondary_refire 0.9
-       percussion 62 # 062_Conga_High_1_Mute-0.wav
+       percussion 62 // 062_Conga_High_1_Mute-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack1
@@ -716,9 +801,9 @@ bot hook
                buttons
                time 0.1
                busy 0.3
-       percussion 63 # 063_Conga_High_2_Open-0.wav
+       percussion 63 // 063_Conga_High_2_Open-0.wav
                percussion 62
-       percussion 84 # 084_Belltree-0.wav
+       percussion 84 // 084_Belltree-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
@@ -727,22 +812,22 @@ bot hook
                buttons
                time 0.1
                busy 0.9
-       percussion 81 # 081_Triangle_2_Open-0.wav
+       percussion 81 // 081_Triangle_2_Open-0.wav
                percussion 62
-       percussion 80 # 081_Triangle_1_Mute-0.wav
+       percussion 80 // 081_Triangle_1_Mute-0.wav
                percussion 62
 
-# seeker is BADFLYSOUND tag
+// seeker is BADFLYSOUND tag
 bot seeker
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 18
                cmd wait 0.5
                raw settemp g_balance_seeker_tag_refire 0.2
-       percussion 41 # 041_Tom_Low_2-0.wav
+       percussion 41 // 041_Tom_Low_2-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
@@ -751,39 +836,39 @@ bot seeker
                buttons
                time 0.1
                busy 0.2
-       percussion 51 # 051_Cymbal_Ride_1-0.wav
+       percussion 51 // 051_Cymbal_Ride_1-0.wav
                percussion 41
-       percussion 43 # 043_Tom_Low_1-0.wav
+       percussion 43 // 043_Tom_Low_1-0.wav
                percussion 41
-       percussion 59 # 059_Cymbal_Ride_2-0.wav
+       percussion 59 // 059_Cymbal_Ride_2-0.wav
                percussion 41
-       percussion 46 # 046_Hi-Hat_Open-0.wav
+       percussion 46 // 046_Hi-Hat_Open-0.wav
                percussion 41
-       percussion 69 # 069_Cabasa-0.wav
+       percussion 69 // 069_Cabasa-0.wav
                percussion 41
-       percussion 82 # 069_Shaker-0.wav
+       percussion 82 // 069_Shaker-0.wav
                percussion 41
 
-# rifle is hard soft
+// rifle is hard soft
 bot rifle
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 16
                cmd wait 0.5
                raw settemp g_balance_rifle_secondary_refire 0.3
-#      percussion FIXME
-#              time 0
-#              cmd debug_assert_canfire 1
-#              buttons attack1
-#              time 0.05
-#              cmd debug_assert_canfire 0
-#              buttons
-#              time 0.1
-#              busy 1.2
-       percussion 58 # 058_Vibra-Slap-0.wav
+//     percussion FIXME
+//             time 0
+//             cmd debug_assert_canfire 1
+//             buttons attack1
+//             time 0.05
+//             cmd debug_assert_canfire 0
+//             buttons
+//             time 0.1
+//             busy 1.2
+       percussion 58 // 058_Vibra-Slap-0.wav
                time 0
                cmd debug_assert_canfire 1
                buttons attack2
@@ -797,32 +882,32 @@ bot jetpack
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                raw settemp g_jetpack_attenuation 0.5
                cmd wait 0.5
-       percussion 42 # 042_Hi-Hat_Closed-0.wav
+       percussion 42 // 042_Hi-Hat_Closed-0.wav
                time 0
                buttons hook
                time 0.05
                buttons
-       percussion 32 # 032_Square_Click-0.wav
+       percussion 32 // 032_Square_Click-0.wav
                percussion 42
-       percussion 44 # 044_Hi-Hat_Pedal-0.wav
+       percussion 44 // 044_Hi-Hat_Pedal-0.wav
                percussion 42
-       percussion 64 # 064_Conga_Low-0.wav
+       percussion 64 // 064_Conga_Low-0.wav
                percussion 42
-       percussion 70 # 070_Maracas-0.wav
+       percussion 70 // 070_Maracas-0.wav
                percussion 42
 
 bot jumper
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
-       percussion 36 # 036_Kick_2-0.wav
+       percussion 36 // 036_Kick_2-0.wav
                time -0.6666666
                buttons jump
                time -0.5
@@ -834,39 +919,39 @@ bot metaljumper
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
-       percussion 65 # 065_Timbale_High-0.wav
+       percussion 65 // 065_Timbale_High-0.wav
                time -0.6666666
                buttons jump
                time -0.5
                buttons
                time 0
                busy 0.1
-       percussion 66 # 066_Timbale_Low-0.wav
+       percussion 66 // 066_Timbale_Low-0.wav
                percussion 65
 
 bot switcher
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
-       percussion 29 # not in freepats
+       percussion 29 // not in freepats
                time 0
                cmd impulse 10
                time 0.05
                busy 0.3
-       percussion 30 # not in freepats
+       percussion 30 // not in freepats
                percussion 29
 
 bot vocals
        channels -1
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
        vocals
@@ -881,7 +966,7 @@ bot vocals
 bot common
        done
                cmd resetaim
-               cmd aim "270 0"
+               cmd aim 270 0
                cmd wait 1
                barrier
                buttons crouch
@@ -890,18 +975,18 @@ bot common
                cmd wait 1
                barrier
                buttons use
-               cmd cc "kill"
+               cmd cc kill
                cmd wait 900
 
 
-# instantiate our bots!
+// instantiate our bots!
 
 bot instance_tuba_red
        include tuba_red
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd cc teleporttotarget @places_tuba
                cmd barrier
                super
 
@@ -910,7 +995,7 @@ bot instance_tuba_blue
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd cc teleporttotarget @places_tuba
                cmd barrier
                super
 
@@ -919,7 +1004,7 @@ bot instance_accordeon_red
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd cc teleporttotarget @places_tuba
                cmd barrier
                super
 
@@ -928,7 +1013,7 @@ bot instance_accordeon_blue
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd cc teleporttotarget @places_tuba
                cmd barrier
                super
 
@@ -937,7 +1022,7 @@ bot instance_laser
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -946,7 +1031,7 @@ bot instance_shotgun
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -955,7 +1040,7 @@ bot instance_uzi
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -964,7 +1049,7 @@ bot instance_electro
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -973,7 +1058,7 @@ bot instance_crylink
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -982,7 +1067,7 @@ bot instance_nex
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -991,7 +1076,7 @@ bot instance_minstanex
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1000,7 +1085,7 @@ bot instance_hagar
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1009,7 +1094,7 @@ bot instance_rocket
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1018,7 +1103,7 @@ bot instance_hook
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1027,7 +1112,7 @@ bot instance_seeker
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1036,7 +1121,7 @@ bot instance_rifle
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1045,7 +1130,7 @@ bot instance_jetpack
        include common
        count 16
        init
-               cmd movetotarget @places_nosteps
+               cmd cc teleporttotarget @places_nosteps
                cmd barrier
                super
 
@@ -1054,7 +1139,7 @@ bot instance_jumper
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1063,7 +1148,7 @@ bot instance_metaljumper
        include common
        count 16
        init
-               cmd movetotarget @places_metalsteps
+               cmd cc teleporttotarget @places_metalsteps
                cmd barrier
                super
 
@@ -1072,7 +1157,7 @@ bot instance_switcher
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd cc teleporttotarget @places_percussion
                cmd barrier
                super
 
@@ -1081,9 +1166,9 @@ bot instance_vocals
        include common
        count 1
        init
-               cmd cc "playermodel models/player/suiseiseki.zym"
-               cmd movetotarget @places_vocals
+               cmd cc playermodel models/player/suiseiseki.zym
+               cmd cc teleporttotarget @places_vocals
                cmd barrier
                super
 
-# TODO jumping?
+// TODO jumping?