more midi2cfg stuff

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index aa63c3366e3c4a500454f30f3665d46950d2ab9a..09b8edf6d44b08f33232b42fd58f4704b84e2293 100644 (file)
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -7,326 +7,406 @@ bot tuba
                cmd barrier
                cmd selectweapon 15
                cmd wait 0.5
-               cmd console "g_balance_tuba_attenuation 0.1"
-               cmd console "g_balance_tuba_damage 0"
+               raw settemp g_balance_tuba_attenuation 0.1
+               raw settemp g_balance_tuba_damage 0
        note on -18
                time 0
+               cmd debug_assert_canfire 1
                buttons left backward crouch attack1
                time 0.05
        note off -18
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -17
                time 0
+               cmd debug_assert_canfire 1
                buttons backward crouch attack1
                time 0.05
        note off -17
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -16
                time 0
+               cmd debug_assert_canfire 1
                buttons right backward crouch attack1
                time 0.05
        note off -16
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -13
                time 0
+               cmd debug_assert_canfire 1
                buttons forward right crouch attack1
                time 0.05
        note off -13
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -12
                time 0
+               cmd debug_assert_canfire 1
                buttons crouch attack1
                time 0.05
        note off -12
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -11
                time 0
+               cmd debug_assert_canfire 1
                buttons left backward crouch attack2
                time 0.05
        note off -11
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -10
                time 0
+               cmd debug_assert_canfire 1
                buttons right crouch attack1
                time 0.05
        note off -10
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -9
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left crouch attack1
                time 0.05
        note off -9
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -8
                time 0
+               cmd debug_assert_canfire 1
                buttons forward crouch attack1
                time 0.05
        note off -8
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -7
                time 0
+               cmd debug_assert_canfire 1
                buttons left crouch attack1
                time 0.05
        note off -7
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -6
                time 0
+               cmd debug_assert_canfire 1
                buttons left backward attack1
                time 0.05
        note off -6
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -5
                time 0
+               cmd debug_assert_canfire 1
                buttons backward attack1
                time 0.05
        note off -5
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -4
                time 0
+               cmd debug_assert_canfire 1
                buttons backward right attack1
                time 0.05
        note off -4
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -3
                time 0
+               cmd debug_assert_canfire 1
                buttons right crouch attack2
                time 0.05
        note off -3
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -2
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left crouch attack2
                time 0.05
        note off -2
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on -1
                time 0
+               cmd debug_assert_canfire 1
                buttons forward right attack1
                time 0.05
        note off -1
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 0
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
        note off 0
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 1
                time 0
+               cmd debug_assert_canfire 1
                buttons left backward attack2
                time 0.05
        note off 1
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 2
                time 0
+               cmd debug_assert_canfire 1
                buttons right attack1
                time 0.05
        note off 2
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 3
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left attack1
                time 0.05
        note off 3
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 4
                time 0
+               cmd debug_assert_canfire 1
                buttons forward attack1
                time 0.05
        note off 4
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 5
                time 0
+               cmd debug_assert_canfire 1
                buttons left attack1
                time 0.05
        note off 5
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 6
                time 0
+               cmd debug_assert_canfire 1
                buttons forward right attack2
                time 0.05
        note off 6
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 7
                time 0
+               cmd debug_assert_canfire 1
                buttons attack2
                time 0.05
        note off 7
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 8
                time 0
+               cmd debug_assert_canfire 1
                buttons backward right jump attack1
                time 0.05
        note off 8
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 9
                time 0
+               cmd debug_assert_canfire 1
                buttons right attack2
                time 0.05
        note off 9
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 10
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left attack2
                time 0.05
        note off 10
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 11
                time 0
+               cmd debug_assert_canfire 1
                buttons forward attack2
                time 0.05
        note off 11
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 12
                time 0
+               cmd debug_assert_canfire 1
                buttons left attack2
                time 0.05
        note off 12
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 13
                time 0
+               cmd debug_assert_canfire 1
                buttons left backward jump attack2
                time 0.05
        note off 13
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 14
                time 0
+               cmd debug_assert_canfire 1
                buttons right jump attack1
                time 0.05
        note off 14
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 15
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left jump attack1
                time 0.05
        note off 15
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 16
                time 0
+               cmd debug_assert_canfire 1
                buttons forward jump attack1
                time 0.05
        note off 16
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 17
                time 0
+               cmd debug_assert_canfire 1
                buttons left jump attack1
                time 0.05
        note off 17
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 18
                time 0
+               cmd debug_assert_canfire 1
                buttons forward right jump attack2
                time 0.05
        note off 18
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 19
                time 0
+               cmd debug_assert_canfire 1
                buttons jump attack2
                time 0.05
        note off 19
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 21
                time 0
+               cmd debug_assert_canfire 1
                buttons right jump attack2
                time 0.05
        note off 21
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 22
                time 0
+               cmd debug_assert_canfire 1
                buttons forward left jump attack2
                time 0.05
        note off 22
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 23
                time 0
+               cmd debug_assert_canfire 1
                buttons forward jump attack2
                time 0.05
        note off 23
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
        note on 24
                time 0
+               cmd debug_assert_canfire 1
                buttons left jump attack2
                time 0.05
        note off 24
                time -0.05
+               cmd debug_assert_canfire 0
                buttons 
                time 0
 
@@ -355,8 +435,10 @@ bot laser
                raw settemp g_balance_laser_primary_refire 0.3
        percussion 38 # 038_Snare_1-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.3
@@ -373,8 +455,10 @@ bot shotgun
                cmd wait 0.5
        percussion 74 # 074_Guiro_2_Long-0.wav
                time -0.4
+               cmd debug_assert_canfire 1
                buttons attack2
                time -0.35
+               cmd debug_assert_canfire 0
                buttons
                time 0
                busy 1.1
@@ -392,11 +476,14 @@ bot uzi
                raw settemp g_balance_uzi_sustained_refire 0.2
        percussion 27 # 027_High_Q-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.2
+               busy 0.4 # BUG: for some reason refire time is doubled :(
        percussion 31 # 031_Sticks-0.wav
                percussion 27
        percussion 37 # 037_Stick_Rim-0.wav
@@ -426,8 +513,10 @@ bot electro
                raw settemp g_balance_electro_primary_refire 0.2
        percussion 49 # 049_Cymbal_Crash_1-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.2
@@ -446,15 +535,19 @@ bot crylink
                raw settemp g_balance_crylink_secondary_refire 0.2
        percussion 34 # 034_Metronome_Bell-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.3
        percussion 45 # 045_Tom_Mid_2-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack2
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.2
@@ -478,8 +571,10 @@ bot nex
                raw settemp g_balance_nex_primary_refire 1.25
        percussion 52 # 052_Cymbal_Chinese-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 1.25
@@ -495,8 +590,10 @@ bot minstanex
                raw settemp g_balance_minstanex_refire 1
        percussion 55 # 055_Cymbal_Splash-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 1
@@ -512,8 +609,10 @@ bot hagar
                raw settemp g_balance_hagar_primary_refire 0.2
        percussion 35 # 035_Kick_1-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.2
@@ -539,8 +638,10 @@ bot rocket
                raw settemp g_balance_rocketlauncher_refire 1.1
        percussion 25 # 025_Snare_Roll-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack2
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 1.1
@@ -557,8 +658,10 @@ bot hook
                raw settemp g_balance_hook_primary_refire 0.3
        percussion 62 # 062_Conga_High_1_Mute-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack1
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.3
@@ -577,8 +680,10 @@ bot seeker
                raw settemp g_balance_seeker_tag_refire 0.2
        percussion 41 # 041_Tom_Low_2-0.wav
                time 0
+               cmd debug_assert_canfire 1
                buttons attack2
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.2
@@ -602,15 +707,19 @@ bot rifle
                cmd wait 0.5
 #      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
                time 0.05
+               cmd debug_assert_canfire 0
                buttons
                time 0.1
                busy 0.9
@@ -620,12 +729,12 @@ bot jetpack
                time -2
                cmd aimtarget "tPercussion 1"
                cmd barrier
-               cmd console "g_jetpack_attenuation 0.5"
+               raw settemp g_jetpack_attenuation 0.5
                cmd wait 0.5
        percussion 42 # 042_Hi-Hat_Closed-0.wav
                time 0
                buttons hook
-               time 0.067
+               time 0.05
                buttons
                time 0.1
        percussion 32 # 032_Square_Click-0.wav

diff --git a/misc/tools/midi2cfg/stairs-min.mid b/misc/tools/midi2cfg/stairs-min.mid
new file mode 100644 (file)
index 0000000..6cae5af
Binary files /dev/null and b/misc/tools/midi2cfg/stairs-min.mid differ