Skip to content

Commit 13d6eb6

Browse files
ViTeXFTWViTeXFTW
authored
Merge pull request #41 from ViTeXFTW/Development_ViTeX
Fixed Issues
2 parents b7f120b + 8015616 commit 13d6eb6

File tree

1 file changed

+113
-6
lines changed

1 file changed

+113
-6
lines changed

‎syntaxes/ini.tmLanguage.json‎

Lines changed: 113 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"repository": {
1313
"class": {
1414
"patterns": [
15+
{"include": "#damagefx-class"},
1516
{"include": "#fxlist-class"},
1617
{"include": "#particlesystem-class"},
1718
{"include": "#audio-class"},
@@ -29,9 +30,35 @@
2930
{"include": "#ocl-class"},
3031
{"include": "#mappedimage-class"},
3132
{"include": "#locomotor-class"},
33+
{"include": "#objectreskin-class"},
3234
{"include": "#object-class"}
3335
]
3436
},
37+
"damagefx-class": {
38+
"begin": "\\s*\\b([Dd]amage[Ff][Xx])\\s+([a-zA-Z]\\w+)",
39+
"beginCaptures": {
40+
"1": {
41+
"name": "keyword.control.ini"
42+
},
43+
"2": {
44+
"name": "entity.name.type"
45+
}
46+
},
47+
"end": "\\b([Ee]nd|END)\\s*",
48+
"endCaptures": {
49+
"1": {
50+
"name": "keyword.control.ini"
51+
}
52+
},
53+
"patterns":[
54+
{
55+
"include": "#assignment"
56+
},
57+
{
58+
"include": "#inline-comment"
59+
}
60+
]
61+
},
3562
"fxlist-class": {
3663
"begin": "\\s*\\b([Ff][Xx][Ll]ist)\\s+([a-zA-Z]\\w+)",
3764
"beginCaptures": {
@@ -805,6 +832,58 @@
805832
}
806833
]
807834
},
835+
"objectreskin-class": {
836+
"begin": "\\s*\\b(ObjectReskin)\\s+([a-zA-Z]\\w+)\\s+([a-zA-Z]\\w+)",
837+
"beginCaptures": {
838+
"1": {
839+
"name": "keyword.control.ini"
840+
},
841+
"2": {
842+
"name": "entity.name.type.ini"
843+
},
844+
"3": {
845+
"name": "entity.name.type.ini"
846+
}
847+
},
848+
"end": "\\s*\\b([Ee]nd|END)",
849+
"endCaptures": {
850+
"1": {
851+
"name": "keyword.control.ini"
852+
}
853+
},
854+
"patterns": [
855+
{
856+
"include": "#Object-WeaponSet"
857+
},
858+
{
859+
"include": "#Object-ArmorSet"
860+
},
861+
{
862+
"include": "#Object-Prerequisites"
863+
},
864+
{
865+
"include": "#UnitSpecificSounds"
866+
},
867+
{
868+
"include": "#UnitSpecificFX"
869+
},
870+
{
871+
"include": "#modules"
872+
},
873+
{
874+
"include": "#AddModule-block"
875+
},
876+
{
877+
"include": "#inline-removemodule"
878+
},
879+
{
880+
"include": "#assignment"
881+
},
882+
{
883+
"include": "#inline-comment"
884+
}
885+
]
886+
},
808887
"object-class": {
809888
"begin": "\\s*\\b(Object)\\s+([a-zA-Z]\\w+)",
810889
"beginCaptures": {
@@ -1118,6 +1197,9 @@
11181197
{
11191198
"include": "#behavior-turret"
11201199
},
1200+
{
1201+
"include": "#behavior-altturret"
1202+
},
11211203
{
11221204
"include": "#behavior-attackareadecal"
11231205
},
@@ -1160,6 +1242,31 @@
11601242
}
11611243
]
11621244
},
1245+
"behavior-altturret": {
1246+
"begin": "\\s*\\b(AltTurret)\\b",
1247+
"beginCaptures": {
1248+
"1": {
1249+
"name": "keyword.control.ini"
1250+
}
1251+
},
1252+
"end": "\\s*\\b([Ee]nd|END)",
1253+
"endCaptures": {
1254+
"1": {
1255+
"name": "keyword.control.ini"
1256+
}
1257+
},
1258+
"patterns": [
1259+
{
1260+
"include": "#weapon-types-turret"
1261+
},
1262+
{
1263+
"include": "#assignment"
1264+
},
1265+
{
1266+
"include": "#inline-comment"
1267+
}
1268+
]
1269+
},
11631270
"behavior-attackareadecal": {
11641271
"begin": "\\s*\\b(AttackAreaDecal)\\b",
11651272
"beginCaptures": {
@@ -1343,7 +1450,7 @@
13431450
},
13441451
"patterns": [
13451452
{
1346-
"match": "\\b(NONE|USER_1|USER_2|JAMMED|ATTACKING|WEAPONSET_CRATEUPGRADE_ONE|WEAPONSET_CRATEUPGRADE_TWO|ARMORSET_CRATEUPGRADE_TWO|ARMORSET_CRATEUPGRADE_ONE|PREORDER|STUNNED|STUNNED_FLAILING|EXPLODED_BOUNCING|EXPLODED_FLAILING|CAPTURED|RAISING_FLAG|CONTINUOUS_FIRE_SLOW|CONTINUOUS_FIRE_FAST|CONTINUOUS_FIRE_MEAN|SPECIAL_CHEERING|ARMED|RAPELLING|PARACHUTING|CLIMBING|SPLATTED|BURNED|AFLAME|SMOLDERING|POWER_PLANT_UPGRADING|POWER_PLANT_UPGRADED|OVER_WATER|MOVING|DEPLOYED|UNPACKING|PACKING|JETEXHAUST|JETAFTERBURNER|LOADED|CARRYING|DOCKING_ENDING|DOCKING_ACTIVE|DOCKING_BEGINNING|DOCKING|PANICKING|RADAR_UPGRADED|RADAR_EXTENDED|CONSTRUCTION_COMPLETE|ACTIVELY_CONSTRUCTING|ACTIVELY_BEING_CONSTRUCTED|PARTIALLY_CONSTRUCTED|AWAITING_CONSTRUCTION|DYING|PRONE|FREEFALL|POST_COLLAPSE|TOPPLED|TURRET_ROTATE|RELOADING_A|BETWEEN_FIRING_SHOTS_A|FIRING_A|PREATTACK_A|USING_WEAPON_A|RELOADING_B|BETWEEN_FIRING_SHOTS_B|FIRING_B|PREATTACK_B|USING_WEAPON_B|RELOADING_C|BETWEEN_FIRING_SHOTS_C|FIRING_C|PREATTACK_C|USING_WEAPON_C|DOOR_4_WAITING_TO_CLOSE|DOOR_4_WAITING_OPEN|DOOR_4_CLOSING|DOOR_4_OPENING|DOOR_3_WAITING_TO_CLOSE|DOOR_3_WAITING_OPEN|DOOR_3_CLOSING|DOOR_3_OPENING|DOOR_2_WAITING_TO_CLOSE|DOOR_2_WAITING_OPEN|DOOR_2_CLOSING|DOOR_2_OPENING|DOOR_1_WAITING_TO_CLOSE|DOOR_1_WAITING_OPEN|DOOR_1_CLOSING|DOOR_1_OPENING|WEAPONSET_PLAYER_UPGRADE|WEAPONSET_HERO|WEAPONSET_ELITE|WEAPONSET_VETERAN|ENEMYNEAR|REALLYDAMAGED|RUBBLE|DAMAGED|SNOW|SOLD|DISGUISED|NIGHT|SPECIAL_DAMAGED|BACKCRUSHED|FRONTCRUSHED|SECOND_LIFE|RIDER1|RIDER2|RIDER3|RIDER4|RIDER5|RIDER6|RIDER7|RIDER8|PRISTINE|RIGHT_TO_CENTER|CENTER_TO_RIGHT|LEFT_TO_CENTER|CENTER_TO_LEFT)+",
1453+
"match": "\\b(NONE|USER_1|USER_2|JAMMED|ATTACKING|WEAPONSET_CRATEUPGRADE_ONE|WEAPONSET_CRATEUPGRADE_TWO|ARMORSET_CRATEUPGRADE_TWO|ARMORSET_CRATEUPGRADE_ONE|PREORDER|STUNNED|STUNNED_FLAILING|EXPLODED_BOUNCING|EXPLODED_FLAILING|CAPTURED|RAISING_FLAG|CONTINUOUS_FIRE_SLOW|CONTINUOUS_FIRE_FAST|CONTINUOUS_FIRE_MEAN|SPECIAL_CHEERING|ARMED|RAPELLING|PARACHUTING|CLIMBING|SPLATTED|BURNED|AFLAME|SMOLDERING|POWER_PLANT_UPGRADING|POWER_PLANT_UPGRADED|OVER_WATER|MOVING|DEPLOYED|UNPACKING|PACKING|JETEXHAUST|JETAFTERBURNER|LOADED|CARRYING|DOCKING_ENDING|DOCKING_ACTIVE|DOCKING_BEGINNING|DOCKING|PANICKING|RADAR_UPGRADED|RADAR_EXTENDED|CONSTRUCTION_COMPLETE|ACTIVELY_CONSTRUCTING|ACTIVELY_BEING_CONSTRUCTED|PARTIALLY_CONSTRUCTED|AWAITING_CONSTRUCTION|DYING|PRONE|FREEFALL|POST_COLLAPSE|TOPPLED|TURRET_ROTATE|RELOADING_A|BETWEEN_FIRING_SHOTS_A|FIRING_A|PREATTACK_A|USING_WEAPON_A|RELOADING_B|BETWEEN_FIRING_SHOTS_B|FIRING_B|PREATTACK_B|USING_WEAPON_B|RELOADING_C|BETWEEN_FIRING_SHOTS_C|FIRING_C|PREATTACK_C|USING_WEAPON_C|DOOR_4_WAITING_TO_CLOSE|DOOR_4_WAITING_OPEN|DOOR_4_CLOSING|DOOR_4_OPENING|DOOR_3_WAITING_TO_CLOSE|DOOR_3_WAITING_OPEN|DOOR_3_CLOSING|DOOR_3_OPENING|DOOR_2_WAITING_TO_CLOSE|DOOR_2_WAITING_OPEN|DOOR_2_CLOSING|DOOR_2_OPENING|DOOR_1_WAITING_TO_CLOSE|DOOR_1_WAITING_OPEN|DOOR_1_CLOSING|DOOR_1_OPENING|WEAPONSET_PLAYER_UPGRADE|WEAPONSET_HERO|WEAPONSET_ELITE|WEAPONSET_VETERAN|ENEMYNEAR|REALLYDAMAGED|RUBBLE|DAMAGED|SNOW|SOLD|DISGUISED|NIGHT|SPECIAL_DAMAGED|BACKCRUSHED|FRONTCRUSHED|SECOND_LIFE|RIDER1|RIDER2|RIDER3|RIDER4|RIDER5|RIDER6|RIDER7|RIDER8|PRISTINE|RIGHT_TO_CENTER|CENTER_TO_RIGHT|LEFT_TO_CENTER|CENTER_TO_LEFT|[Nn]one|[Uu]ser_1|[Uu]ser_2|[Jj]ammed|[Aa]ttacking|[Ww]eaponset_[Cc]rateupgrade_[Oo]ne|[Ww]eaponset_[Cc]rateupgrade_[Tt]wo|[Aa]rmorset_[Cc]rateupgrade_[Tt]wo|[Aa]rmorset_[Cc]rateupgrade_[Oo]ne|[Pp]reorder|[Ss]tunned|[Ss]tunned_[Ff]lailing|[Ee]xploded_[Bb]ouncing|[Ee]xploded_[Ff]lailing|[Cc]aptured|[Rr]aising_[Ff]lag|[Cc]ontinuous_[Ff]ire_[Ss]low|[Cc]ontinuous_[Ff]ire_[Ff]ast|[Cc]ontinuous_[Ff]ire_[Mm]ean|[Ss]pecial_[Cc]heering|[Aa]rmed|[Rr]apelling|[Pp]arachuting|[Cc]limbing|[Ss]platted|[Bb]urned|[Aa]flame|[Ss]moldering|[Pp]ower_[Pp]lant_[Uu]pgrading|[Pp]ower_[Pp]lant_[Uu]pgraded|[Oo]ver_[Ww]ater|[Mm]oving|[Dd]eployed|[Uu]npacking|[Pp]acking|[Jj]etexhaust|[Jj]etafterburner|[Ll]oaded|[Cc]arrying|[Dd]ocking_[Ee]nding|[Dd]ocking_[Aa]ctive|[Dd]ocking_[Bb]eginning|[Dd]ocking|[Pp]anicking|[Rr]adar_[Uu]pgraded|[Rr]adar_[Ee]xtended|[Cc]onstruction_[Cc]omplete|[Aa]ctively_[Cc]onstructing|[Aa]ctively_[Bb]eing_[Cc]onstructed|[Pp]artially_[Cc]onstructed|[Aa]waiting_[Cc]onstruction|[Dd]ying|[Pp]rone|[Ff]reefall|[Pp]ost_[Cc]ollapse|[Tt]oppled|[Tt]urret_[Rr]otate|[Rr]eloading_[Aa]|[Bb]etween_[Ff]iring_[Ss]hots_[Aa]|[Ff]iring_[Aa]|[Pp]reattack_[Aa]|[Uu]sing_[Ww]eapon_[Aa]|[Rr]eloading_[Bb]|[Bb]etween_[Ff]iring_[Ss]hots_[Bb]|[Ff]iring_[Bb]|[Pp]reattack_[Bb]|[Uu]sing_[Ww]eapon_[Bb]|[Rr]eloading_[Cc]|[Bb]etween_[Ff]iring_[Ss]hots_[Cc]|[Ff]iring_[Cc]|[Pp]reattack_[Cc]|[Uu]sing_[Ww]eapon_[Cc]|[Dd]oor_4_[Ww]aiting_[Tt]o_[Cc]lose|[Dd]oor_4_[Ww]aiting_[Oo]pen|[Dd]oor_4_[Cc]losing|[Dd]oor_4_[Oo]pening|[Dd]oor_3_[Ww]aiting_to_[Cc]lose|[Dd]oor_3_[Ww]aiting_[Oo]pen|[Dd]oor_3_[Cc]losing|[Dd]oor_3_[Oo]pening|[Dd]oor_2_[Ww]aiting_[Tt]o_[Cc]lose|[Dd]oor_2_[Ww]aiting_[Oo]pen|[Dd]oor_2_[Cc]losing|[Dd]oor_2_[Oo]pening|[Dd]oor_1_[Ww]aiting_[Tt]o_[Cc]lose|[Dd]oor_1_[Ww]aiting_[Oo]pen|[Dd]oor_1_[Cc]losing|[Dd]oor_1_[Oo]pening|[Ww]eaponset_[Pp]layer_[Uu]pgrade|[Ww]eaponset_[Hh]ero|[Ww]eaponset_[Ee]lite|[Ww]eaponset_[Vv]eteran|[Ee]nemynear|[Rr]eally[Dd]amaged|[Rr]ubble|[Dd]amaged|[Ss]now|[Ss]old|[Dd]isguised|[Nn]ight|[Ss]pecial_[Dd]amaged|[Bb]ack[Cc]rushed|[Ff]ront[Cc]rushed|[Ss]econd_[Ll]ife|[Rr]ider1|[Rr]ider2|[Rr]ider3|[Rr]ider4|[Rr]ider5|[Rr]ider6|[Rr]ider7|[Rr]ider8|[Pp]ristine|[Rr]ight_[Tt]o_[Cc]enter|[Cc]enter_[Tt]o_[Rr]ight|[Ll]eft_[Tt]o_[Cc]enter|[Cc]enter_[Tt]o_[Ll]eft)+",
13471454
"name": "variable.other.constant.ini"
13481455
},
13491456
{
@@ -1462,13 +1569,13 @@
14621569
"include": "#boolean"
14631570
},
14641571
{
1465-
"include": "#string"
1572+
"include": "#numbers"
14661573
},
14671574
{
1468-
"include": "#doublequoted-strings"
1575+
"include": "#string"
14691576
},
14701577
{
1471-
"include": "#numbers"
1578+
"include": "#doublequoted-strings"
14721579
},
14731580
{
14741581
"include": "#inline-comment"
@@ -1546,7 +1653,7 @@
15461653
]
15471654
},
15481655
"numbers": {
1549-
"begin": "(^[ \\t]+)?(?=-?\\d)",
1656+
"begin": "(^[ \\t]+)?(?=(-|\\.){0,2}\\d)",
15501657
"beginCaptures": {
15511658
"1": {
15521659
"name": "punctuation.whitespace.ini"
@@ -1560,7 +1667,7 @@
15601667
]
15611668
},
15621669
"double": {
1563-
"match": "-?\\d[\\.\\d%fF]*( \\d[\\.\\d%fF]*)*",
1670+
"match": "-?( |\\d+\\.|\\.|\\d+|\\d+\\.\\d+|0|%)+",
15641671
"name": "constant.numeric.ini"
15651672
},
15661673
"boolean": {

0 commit comments

Comments
 (0)