Skip to content

Commit 4c5fda3

Browse files
dsjoergdsjoerg
committed
a few more codes. now we can parse NASL S2 Regular Season replays
1 parent c805b59 commit 4c5fda3

File tree

1 file changed

+44
-25
lines changed

1 file changed

+44
-25
lines changed

‎sc2reader/data/v140_.py‎

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ class Thor(Moveable, Attacker):
148148

149149
#This mode change cannot be cancelled
150150
@Mode('Assault',('Assult Mode', 0x7f00, None),('Fighter Mode', 0x8000, None))
151+
@Mode('Assault',('Assult Mode', 0x0, None),('Fighter Mode', 0x10000, None))
151152
class Viking(Moveable, Attacker):
152153
pass
153154

@@ -167,6 +168,7 @@ class Raven(Moveable, Supporter):
167168
0x4b40: 'Seeker Missile',
168169

169170
0x17ca0: 'Auto Turret',
171+
0x3fa0: 'Point Defense Drone',
170172
}
171173

172174
@Cloaks(0x7b00, 0x7b01)
@@ -193,14 +195,15 @@ class CommandCenter(TerranMain, Production):
193195

194196
@Lifts(0x15800, 0x15920)
195197
@Lifts(0x0, 0x159a0)
196-
@UpgradeFrom(CommandCenter, 0x15500, 0x0)
198+
@UpgradeFrom(CommandCenter, 0x15500, 0x15501)
197199
class OrbitalCommand(TerranMain, Production):
198200
abilities = {
199201
0x4c40: 'MULE (Target)',
200202
0x4c20: 'MULE (Location)',
201203
0x6340: 'Extra Supplies',
202204
0x7d20: 'Scanner Sweep',
203205

206+
0x4ca0: 'MULE (Location)',
204207
0x7da0: 'Scanner Sweep',
205208
}
206209

@@ -241,7 +244,7 @@ class Bunker(TerranBuilding):
241244
0x16200: 'Salvage',
242245
0x17100: 'Stimpack',
243246
0x17040: 'Attack',
244-
#0x0: 'Stop'
247+
0x17400: 'Stop'
245248
}
246249

247250
class Armory(TerranBuilding, Research):
@@ -268,11 +271,12 @@ class FusionCore(TerranBuilding, Research):
268271

269272
@Lifts(0x10600, 0x10e20)
270273
@Lifts(0x0, 0x10ea0)
271-
@AddOn('Techlab', start=0x10500, move=0x0, cancel=0x0)
272-
@AddOn('Techlab', start=0x10520, move=0x0, cancel=0x0)
273-
@AddOn('Techlab', start=0x105a0, move=0x0, cancel=0x0)
274-
@AddOn('Reactor', start=0x10501, move=0x0, cancel=0x0)
275-
@AddOn('Reactor', start=0x10521, move=0x0, cancel=0x0)
274+
@AddOn('Techlab', start=0x10500, move=0x0, cancel=0x1850e)
275+
@AddOn('Techlab', start=0x10520, move=0x0, cancel=0x1850e)
276+
@AddOn('Techlab', start=0x105a0, move=0x0, cancel=0x1850e)
277+
@AddOn('Reactor', start=0x10501, move=0x0, cancel=0x1850e)
278+
@AddOn('Reactor', start=0x10521, move=0x0, cancel=0x1850e)
279+
@AddOn('Reactor', start=0x105a1, move=0x0, cancel=0x1850e)
276280
class Barracks(TerranBuilding, Production):
277281
abilities = {
278282
0x11100: 'Marine',
@@ -294,22 +298,23 @@ class Techlab(Research):
294298
class Reactor(TerranBuilding):
295299
pass
296300

297-
@AddOn('Techlab', start=0x10500, move=0x0, cancel=0x0)
298-
@AddOn('Techlab', start=0x10520, move=0x0, cancel=0x0)
299-
@AddOn('Techlab', start=0x105a0, move=0x0, cancel=0x0)
300-
@AddOn('Reactor', start=0x10501, move=0x0, cancel=0x0)
301-
@AddOn('Reactor', start=0x10521, move=0x0, cancel=0x0)
301+
@AddOn('Techlab', start=0x10500, move=0x0, cancel=0x1850e)
302+
@AddOn('Techlab', start=0x10520, move=0x0, cancel=0x1850e)
303+
@AddOn('Techlab', start=0x105a0, move=0x0, cancel=0x1850e)
304+
@AddOn('Reactor', start=0x10501, move=0x0, cancel=0x1850e)
305+
@AddOn('Reactor', start=0x10521, move=0x0, cancel=0x1850e)
306+
@AddOn('Reactor', start=0x105a1, move=0x0, cancel=0x1850e)
302307
class Flying(TerranBuilding, Moveable):
303308
pass
304309

305310
@Lifts(0x10800,0x10b20)
306311
@Lifts(0x0,0x10ba0)
307-
@AddOn('Techlab', start=0x10700, move=0x0, cancel=0x0)
308-
@AddOn('Techlab', start=0x10720, move=0x0, cancel=0x0)
309-
@AddOn('Techlab', start=0x107a0, move=0x0, cancel=0x0)
310-
@AddOn('Reactor', start=0x10701, move=0x0, cancel=0x0)
311-
@AddOn('Reactor', start=0x10721, move=0x0, cancel=0x0)
312-
@AddOn('Reactor', start=0x107a1, move=0x0, cancel=0x0)
312+
@AddOn('Techlab', start=0x10700, move=0x0, cancel=0x1870e)
313+
@AddOn('Techlab', start=0x10720, move=0x0, cancel=0x1870e)
314+
@AddOn('Techlab', start=0x107a0, move=0x0, cancel=0x1870e)
315+
@AddOn('Reactor', start=0x10701, move=0x0, cancel=0x1870e)
316+
@AddOn('Reactor', start=0x10721, move=0x0, cancel=0x1870e)
317+
@AddOn('Reactor', start=0x107a1, move=0x0, cancel=0x1870e)
313318
class Factory(TerranBuilding, Production):
314319
abilities = {
315320
0x11201: 'Siege Tank',
@@ -330,16 +335,23 @@ class Reactor(TerranBuilding):
330335

331336
pass
332337

333-
@AddOn('Techlab', start=0x10700, move=0x0, cancel=0x0)
334-
@AddOn('Reactor', start=0x10701, move=0x0, cancel=0x0)
338+
@AddOn('Techlab', start=0x10700, move=0x0, cancel=0x1870e)
339+
@AddOn('Techlab', start=0x10720, move=0x0, cancel=0x1870e)
340+
@AddOn('Techlab', start=0x107a0, move=0x0, cancel=0x1870e)
341+
@AddOn('Reactor', start=0x10701, move=0x0, cancel=0x1870e)
342+
@AddOn('Reactor', start=0x10721, move=0x0, cancel=0x1870e)
343+
@AddOn('Reactor', start=0x107a1, move=0x0, cancel=0x1870e)
335344
class Flying(TerranBuilding, Moveable):
336345
pass
337346

338347
@Lifts(0x10a00, 0x10c20)
339348
@Lifts(0x0, 0x10ca0)
340-
@AddOn('Techlab', start=0x10900, move=0x0, cancel=0x0)
341-
@AddOn('Reactor', start=0x10901, move=0x0, cancel=0x0)
342-
@AddOn('Techlab', start=0x109a0, move=0x0, cancel=0x0)
349+
@AddOn('Techlab', start=0x10900, move=0x0, cancel=0x1890e)
350+
@AddOn('Techlab', start=0x10920, move=0x0, cancel=0x1890e)
351+
@AddOn('Techlab', start=0x109a0, move=0x0, cancel=0x1890e)
352+
@AddOn('Reactor', start=0x10901, move=0x0, cancel=0x1890e)
353+
@AddOn('Reactor', start=0x10921, move=0x0, cancel=0x1890e)
354+
@AddOn('Reactor', start=0x109a1, move=0x0, cancel=0x1890e)
343355
class Starport(TerranBuilding, Production):
344356
abilities = {
345357
0x11300: 'Medivac',
@@ -363,8 +375,12 @@ class Techlab(Research):
363375
class Reactor(TerranBuilding):
364376
pass
365377

366-
@AddOn('Techlab', start=0x10900, move=0x0, cancel=0x0)
367-
@AddOn('Reactor', start=0x10901, move=0x0, cancel=0x0)
378+
@AddOn('Techlab', start=0x10900, move=0x0, cancel=0x1890e)
379+
@AddOn('Techlab', start=0x10920, move=0x0, cancel=0x1890e)
380+
@AddOn('Techlab', start=0x109a0, move=0x0, cancel=0x1890e)
381+
@AddOn('Reactor', start=0x10901, move=0x0, cancel=0x1890e)
382+
@AddOn('Reactor', start=0x10921, move=0x0, cancel=0x1890e)
383+
@AddOn('Reactor', start=0x109a1, move=0x0, cancel=0x1890e)
368384
class Flying(TerranBuilding, Moveable):
369385
pass
370386

@@ -375,6 +391,7 @@ class Flying(TerranBuilding, Moveable):
375391
class Probe(Worker):
376392
abilities = {
377393
0x6a01: 'Return cargo',
394+
0x6a40: 'Gather resources',
378395
0x11c20: 'Nexus',
379396
0x11ca0: 'Nexus',
380397
0x11c21: 'Pylon',
@@ -445,6 +462,8 @@ class Archon(Moveable, Attacker):
445462
#Phasing mode changes cannot be cancelled
446463
@Mode('Phasing', ('Phase Mode', 0x15b00, None), ('Transport Mode', 0x15c00, None))
447464
@Transports(0x11d42, None, 0x11d63, 0x11d40)
465+
@Transports(0x11d22, None, 0x0, 0x0)
466+
@Transports(0x11da2, None, 0x0, 0x0)
448467
class WarpPrism(Moveable, Supporter):
449468
pass
450469

0 commit comments

Comments
 (0)