use // for comments instead

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index aa7c3fb40e52d9d5a8c590e3f38ef267db6ffc4e..1555088bcff866405dfc851dcd3dfb28addafddc 100644 (file)
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -548,7 +548,7 @@ bot accordeon_blue
                cmd cc "color 221"
                super
 
-# laser = lasershot NONE
+// laser = lasershot NONE
 bot laser
        channels 10
        init
@@ -557,7 +557,7 @@ bot laser
                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
@@ -566,10 +566,10 @@ 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
@@ -577,7 +577,7 @@ bot shotgun
                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
@@ -586,10 +586,10 @@ 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
@@ -601,7 +601,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
@@ -610,20 +610,20 @@ 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
@@ -633,7 +633,7 @@ bot electro
                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
@@ -642,10 +642,10 @@ 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
@@ -655,7 +655,7 @@ bot crylink
                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
@@ -664,7 +664,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
@@ -673,26 +673,26 @@ 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
@@ -701,7 +701,7 @@ bot nex
                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
@@ -711,7 +711,7 @@ 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
@@ -720,7 +720,7 @@ bot minstanex
                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
@@ -730,7 +730,7 @@ bot minstanex
                time 0.1
                busy 1
 
-# hagar is rocket BAD
+// hagar is rocket BAD
 bot hagar
        channels 10
        init
@@ -739,7 +739,7 @@ bot hagar
                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
@@ -748,16 +748,16 @@ 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
@@ -766,7 +766,7 @@ bot rocket
                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
@@ -776,7 +776,7 @@ bot rocket
                time 0.1
                busy 1.1
 
-# hook is hook bomb
+// hook is hook bomb
 bot hook
        channels 10
        init
@@ -787,7 +787,7 @@ bot hook
                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
@@ -796,9 +796,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
@@ -807,12 +807,12 @@ 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
@@ -822,7 +822,7 @@ bot seeker
                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
@@ -831,20 +831,20 @@ 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
@@ -854,16 +854,16 @@ bot rifle
                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
@@ -881,18 +881,18 @@ bot jetpack
                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
@@ -902,7 +902,7 @@ bot jumper
                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
@@ -917,14 +917,14 @@ bot metaljumper
                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
@@ -934,12 +934,12 @@ bot switcher
                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
@@ -974,7 +974,7 @@ bot common
                cmd wait 900
 
 
-# instantiate our bots!
+// instantiate our bots!
 
 bot instance_tuba_red
        include tuba_red
@@ -1166,4 +1166,4 @@ bot instance_vocals
                cmd barrier
                super
 
-# TODO jumping?
+// TODO jumping?

diff --git a/misc/tools/midi2cfg-ng.pl b/misc/tools/midi2cfg-ng.pl
index 35ade35920db7a1e0a19363726ff73f484d6c678..b2114f16b47ad1c2c3a8ab72dc41bc1c385014a1 100755 (executable)
--- a/misc/tools/midi2cfg-ng.pl
+++ b/misc/tools/midi2cfg-ng.pl
@@ -90,7 +90,7 @@ sub botconfig_read($)
        while(<$fh>)
        {
                chomp;
-               s/\s*#.*//;
+               s/\s*\/\/.*//;
                next if /^$/;
                if(s/^\t\t//)
                {