Skip to content

Commit 9cb39b4

Browse files
An-dzAn-dz
committed
Changes to latest release
Added factory animation Removed factory smoke time Removed outputGood Moved inputSupplier from string to number
1 parent 4aedfe0 commit 9cb39b4

3 files changed

Lines changed: 46 additions & 41 deletions

File tree

‎simutrans_dat.sublime-completions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
{ "trigger": "runningcost", "contents": "runningcost=${1:number}" },
105105
{ "trigger": "seasons", "contents": "seasons=${1:number}" },
106106
{ "trigger": "smokespeed", "contents": "smokespeed=${1:number}" },
107+
{ "trigger": "sound_interval", "contents": "sound_interval=${1:number}" },
107108
{ "trigger": "sound_nr", "contents": "sound_nr=${1:number}" },
108109
{ "trigger": "speed", "contents": "speed=${1:number}" },
109110
{ "trigger": "speed_bonus", "contents": "speed_bonus=${1:number}" },

‎simutrans_dat.tmLanguage‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<key>comment</key>
4848
<string>
4949
parameters with any numeric values
50-
animation_time, animation_time_open, animation_time_closed, axle_load, build_time, capacity, catg, chance, clusters, cost, dims, distributionweight, electricity_amount, electricity_boost, electricity_demand, expand_minimum, expand_probability, expand_range, expand_times, fixed_cost, gear, hq_level, intro_year, level, length, loading_time, mail_boost, mail_demand, maintenance, max_fields, max_height, max_length, max_lenght, max_weight, min_fields, min_speed, offset_left, passengers, passenger_boost, passenger_demand, payload, pax_level, pillar_distance, power, probability_to_spawn, productivity, range, retire_year, runningcost, smokeoffset, smoketile, smokespeed, sound_nr, speed_bonus, start_fields, station_capacity, station_maintenance, station_price, system_type, topspeed, value, weight, weight_per_unit
50+
animation_time, animation_time_open, animation_time_closed, axle_load, build_time, capacity, catg, chance, clusters, cost, dims, distributionweight, electricity_amount, electricity_boost, electricity_demand, expand_minimum, expand_probability, expand_range, expand_times, fixed_cost, gear, hq_level, intro_year, level, length, loading_time, mail_boost, mail_demand, maintenance, max_fields, max_height, max_length, max_lenght, max_weight, min_fields, min_speed, offset_left, passengers, passenger_boost, passenger_demand, payload, pax_level, pillar_distance, power, probability_to_spawn, productivity, range, retire_year, runningcost, smokeoffset, smoketile, sound_interval, sound_nr, speed_bonus, start_fields, station_capacity, station_maintenance, station_price, system_type, topspeed, value, weight, weight_per_unit
5151
</string>
5252
<key>match</key>
53-
<string>(^(([mM]ax_[lL]enght)|([sS]tation_([cC]apacity|maintenance))|([sS]tation_[pP]rice)|([eE]lectricity_[aA]mount)|[aA](xle_[lL]oad|nimation_[tT]ime(_([oO]pen|[cC]losed))?)|[bB]uild_[tT]ime|[cC](apacity|atg|hance|lusters)|([fF]ixed_|[rR]unning)?[cC]ost|[dD](ims|istribution[wW]eight)|[eE]xpand_([pP]robability|[mM]inimum|[rR]ange|[tT]imes)|([eE]lectricity|[pP]assenger|[mM]ail)_([bB]oost|[dD]emand)|[gG]ear|([hH][qQ]_)?[lL]evel|([iI]ntro|[rR]etire)_year|[lL](ength|oading_[tT]ime)|[mM](aintenance|ax_([fF]ields|[hH]eight|[lL]ength|[wW]eight)|in_([fF]ields|[sS]peed))|[oO]ffset_[lL]eft|[pP](assengers|ay[lL]oad|ax_[lL]evel|illar_[dD]istance|ower|robability_[tT]o_[sS]pawn|roductivity)|[sS](moke([oO]ffset|[tT]ile|[sS]peed)|peed_[bB]onus|ound_[nN]r|tart_[fF]ields|ystem_[tT]ype)|[rR]ange|[tT]op[sS]peed|[vV]alue|[wW]eight(_per_unit)?))\b([ \t]*=[ \t]*[-]?(\d+)\b)?</string>
53+
<string>(^(([mM]ax_[lL]enght)|([sS]tation_([cC]apacity|maintenance))|([sS]tation_[pP]rice)|([eE]lectricity_[aA]mount)|[aA](xle_[lL]oad|nimation_[tT]ime(_([oO]pen|[cC]losed))?)|[bB]uild_[tT]ime|[cC](apacity|atg|hance|lusters)|([fF]ixed_|[rR]unning)?[cC]ost|[dD](ims|istribution[wW]eight)|[eE]xpand_([pP]robability|[mM]inimum|[rR]ange|[tT]imes)|([eE]lectricity|[pP]assenger|[mM]ail)_([bB]oost|[dD]emand)|[gG]ear|([hH][qQ]_)?[lL]evel|([iI]ntro|[rR]etire)_year|[lL](ength|oading_[tT]ime)|[mM](aintenance|ax_([fF]ields|[hH]eight|[lL]ength|[wW]eight)|in_([fF]ields|[sS]peed))|[oO]ffset_[lL]eft|[pP](assengers|ay[lL]oad|ax_[lL]evel|illar_[dD]istance|ower|robability_[tT]o_[sS]pawn|roductivity)|[sS](moke([oO]ffset|[tT]ile)|peed_[bB]onus|ound_([iI]nterval|[nN]r)|tart_[fF]ields|ystem_[tT]ype)|[rR]ange|[tT]op[sS]peed|[vV]alue|[wW]eight(_per_unit)?))\b([ \t]*=[ \t]*[-]?(\d+)\b)?</string>
5454
<key>captures</key>
5555
<dict>
5656
<key>1</key>
@@ -78,7 +78,7 @@
7878
<key>name</key>
7979
<string>invalid.deprecated.parameter.use-electricity_demand.simutrans_dat</string>
8080
</dict>
81-
<key>28</key>
81+
<key>29</key>
8282
<dict>
8383
<key>name</key>
8484
<string>constant.numeric.value.simutrans_dat</string>
@@ -136,22 +136,22 @@
136136
</dict>
137137
<dict>
138138
<key>comment</key>
139-
<string>fields, freightimagetype, inputgood, inputsupplier, outputgood, outputsupplier parameter</string>
139+
<string>fields, freightimagetype, inputgood, inputsupplier, outputgood parameters</string>
140140
<key>match</key>
141-
<string>(^([fF](ields|reight[iI]mage[tT]ype)|([iI]n|[oO]ut)put([gG]ood|[sS]upplier))(\[(\d+)\])?)([ \t]*=[ \t]*([ -.+\w]+))?</string>
141+
<string>(^([fF](ields|reight[iI]mage[tT]ype)|([iI]n|[oO]ut)put[gG]ood)(\[(\d+)\])?)([ \t]*=[ \t]*([ -.+\w]+))?</string>
142142
<key>captures</key>
143143
<dict>
144144
<key>1</key>
145145
<dict>
146146
<key>name</key>
147147
<string>entity.name.tag.parameter.simutrans_dat</string>
148148
</dict>
149-
<key>7</key>
149+
<key>6</key>
150150
<dict>
151151
<key>name</key>
152152
<string>constant.numeric.value.simutrans_dat</string>
153153
</dict>
154-
<key>9</key>
154+
<key>8</key>
155155
<dict>
156156
<key>name</key>
157157
<string>string.value.simutrans_dat</string>
@@ -162,7 +162,7 @@
162162
<key>comment</key>
163163
<string>inputcapacity, inputfactor, outputcapacity, outputfactor, production_per_field, spawn_weight, storage_capacity parameter</string>
164164
<key>match</key>
165-
<string>(^(([iI]n|[oO]ut)put([cC]apacity|[fF]actor)|[pP]roduction_[pP]er_[fF]ield|[sS](pawn_[wW]eight|torage_[cC]apacity))(\[(\d+)\])?)([ \t]*=[ \t]*(\d+)\b)?</string>
165+
<string>(^(([iI]n|[oO]ut)put([cC]apacity|[fF]actor)|[iI]nput[sS]upplier|[pP]roduction_[pP]er_[fF]ield|[sS](pawn_[wW]eight|torage_[cC]apacity))(\[(\d+)\])?)([ \t]*=[ \t]*(\d+)\b)?</string>
166166
<key>captures</key>
167167
<dict>
168168
<key>1</key>

‎snippets/obj_factory.sublime-snippet‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,48 @@
22
<content><![CDATA[obj=factory
33
name=${2:string}
44
copyright=${3:author}
5-
inputGood[0]=${4:number}
5+
inputGood[0]=${4:string}
66
inputSupplier[0]=${5:number}
77
inputCapacity[0]=${6:number}
88
inputFactor[0]=${7:number}
9-
outputGood[0]=${8:number}
10-
outputSupplier[0]=${9:number}
11-
outputCapacity[0]=${10:number}
12-
outputFactor[0]=${11:number}
13-
productivity=${12:number}
14-
range=${13:number}
15-
pax_level=${14:number}
16-
electricity_demand=${15:number}
17-
passenger_demand=${16:number}
18-
mail_demand=${17:number}
19-
electricity_boost=${18:number}
20-
passenger_boost=${19:number}
21-
mail_boost=${20:number}
22-
expand_probability=${21:number}
23-
expand_minimum=${22:number}
24-
expand_range=${23:number}
25-
expand_times=${24:number}
26-
fields=${25:string}
27-
max_fields=${26:number}
28-
min_fields=${27:number}
29-
start_fields=${28:number}
30-
production_per_field=${29:number}
31-
storage_capacity=${30:number}
32-
has_snow=${31:1}
33-
spawn_weight=${32:number}
34-
probability_to_spawn=${33:number}
35-
location=${34:string}
36-
distributionWeight=${35:number}
37-
smoke=${36:string}
38-
smokeTile=${37:number},${38:number}
39-
smokeOffset=${39:number},${40:number}
40-
smokeSpeed=${41:number}
9+
outputGood[0]=${8:string}
10+
outputCapacity[0]=${9:number}
11+
outputFactor[0]=${10:number}
12+
productivity=${11:number}
13+
range=${12:number}
14+
pax_level=${13:number}
15+
electricity_demand=${14:number}
16+
passenger_demand=${15:number}
17+
mail_demand=${16:number}
18+
electricity_boost=${17:number}
19+
passenger_boost=${18:number}
20+
mail_boost=${19:number}
21+
expand_probability=${20:number}
22+
expand_minimum=${21:number}
23+
expand_range=${22:number}
24+
expand_times=${23:number}
25+
fields=${24:string}
26+
max_fields=${25:number}
27+
min_fields=${26:number}
28+
start_fields=${27:number}
29+
production_per_field=${28:number}
30+
storage_capacity=${29:number}
31+
has_snow=${30:1}
32+
spawn_weight=${31:number}
33+
probability_to_spawn=${32:number}
34+
location=${33:string}
35+
distributionWeight=${34:number}
36+
smoke=${35:string}
37+
smokeTile=${36:number},${37:number}
38+
smokeOffset=${38:number},${39:number}
39+
sound=${40:string}
40+
sound_interval=${41:number}
4141
climates=${42:stringarray}
4242
mapColor=${43:number}
43+
intro_year=${44:number}
44+
intro_month=${45:number}
45+
retire_year=${46:number}
46+
retire_month=${47:number}
4347
$0]]></content>
4448
<tabTrigger>obj=factory</tabTrigger>
4549
<scope>text.simutrans_dat</scope>

0 commit comments

Comments
 (0)