Reorganize the data directory and add new codes for 17326 and 19595.

Author: GraylinKim

sc2reader/data/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from sc2reader.data.utils import DataObject
-from sc2reader.data.v110_113 import Data_110_113
-from sc2reader.data.v120_131 import Data_120_131
-from sc2reader.data.v132_136 import Data_132_136
-from sc2reader.data.v140_    import Data_140_
+from sc2reader.data.build16561 import Data_16561
+from sc2reader.data.build17326 import Data_17326
+from sc2reader.data.build18317 import Data_18317
+from sc2reader.data.build19595 import Data_19595

sc2reader/data/v110_113.py sc2reader/data/build16561.pysc2reader/data/v110_113.py renamed to sc2reader/data/build16561.py

@@ -3,7 +3,7 @@
 from sc2reader.data.base import *
 from sc2reader.data.utils import *
 
-class Data_110_113(BaseData):
+class Data_16561(BaseData):
 
     class DataObject(DataObject):
         abilities = {

sc2reader/data/v120_131.py sc2reader/data/build17326.pysc2reader/data/v120_131.py renamed to sc2reader/data/build17326.py

@@ -4,7 +4,7 @@
 from sc2reader.data.utils import *
 
 #Hell, this might even cover 1.3.2 as well. Definitely not 1.3.3 though.
-class Data_120_131(BaseData):
+class Data_17326(BaseData):
 
     class DataObject(DataObject):
         abilities = {
@@ -15,6 +15,7 @@ class DataObject(DataObject):
     class Moveable(DataObject):
         abilities = {
             0x002400: 'Stop',
+            0x002403: 'Stop',
             0x002602: 'Hold position',
             0x002610: 'Move to',
             0x002611: 'Patrol',
@@ -208,6 +209,7 @@ class Bunker(TerranBuilding):
         abilities = {
             0x032100: 'Salvage',
             0x033000: 'Stimpack', #Can bunkers really stimpack?
+            0x032f20: 'Attack',
             # I don't think these 2 are right....?
             #0x032f20: 'Attack',
             #0x033300: 'Stop'
@@ -289,8 +291,8 @@ class Flying(TerranBuilding, Moveable):
             pass
 
     @Lifts(0x020900, 0x020b10)
-    @AddOn('Techlab', start=0x020800, move=0x020810, cancel=0x02806)
-    @AddOn('Reactor', start=0x020801, move=0x020811, cancel=0x02806)
+    @AddOn('Techlab', start=0x020800, move=0x020810, cancel=0x02c806)
+    @AddOn('Reactor', start=0x020801, move=0x020811, cancel=0x02c806)
     class Starport(TerranBuilding, Production):
         abilities = {
             0x021200: 'Medivac',
@@ -326,6 +328,7 @@ class Flying(TerranBuilding, Moveable):
     class Probe(Worker):
         abilities = {
             0x012901: 'Return cargo',
+            0x012920: 'Gather Resources',
             0x021b10: 'Nexus',
             0x021b11: 'Pylon',
             0x021b13: 'Gateway',

sc2reader/data/v132_136.py sc2reader/data/build18317.pysc2reader/data/v132_136.py renamed to sc2reader/data/build18317.py

@@ -3,7 +3,7 @@
 from sc2reader.data.base import *
 from sc2reader.data.utils import *
 
-class Data_132_136(BaseData):
+class Data_18317(BaseData):
 
     class DataObject(DataObject):
         abilities = {

sc2reader/data/v140_.py sc2reader/data/build19595.pysc2reader/data/v140_.py renamed to sc2reader/data/build19595.py

@@ -3,7 +3,7 @@
 from sc2reader.data.base import *
 from sc2reader.data.utils import *
 
-class Data_140_(BaseData):
+class Data_19595(BaseData):
 
     class DataObject(DataObject):
         abilities = {
@@ -65,6 +65,7 @@ class Research(Building):
     class Production(Building):
         abilities = {
             0x5820: 'Set rally point',
+            0x5840: 'Set rally point',
             0x0: 'Set rally target',
             0x6d00: 'Cancel', # Generic ESC cancel
             0x0: 'Cancel unit', # Cancel + build id
@@ -182,8 +183,8 @@ class Battlecruiser(Moveable, Attacker):
 
     class TerranMain(TerranBuilding):
         abilities = {
-            0x0: 'Set rally point',
-            0x0: 'Set rally target',
+            0x5a20: 'Set rally point',
+            0x5a40: 'Set rally target',
             0x10d00: 'Train SCV',
         }
 
@@ -207,7 +208,7 @@ class OrbitalCommand(TerranMain, Production):
             0x7da0: 'Scanner Sweep',
         }
 
-    @UpgradeFrom(CommandCenter, 0x15000, 0x0)
+    @UpgradeFrom(CommandCenter, 0x15000, 0x15001)
     class PlanetaryFortress(TerranMain, Production):
         abilties = {
             0x0: 'Cancel (PF ONLY)', #????
@@ -637,7 +638,7 @@ class Drone(Worker):
             0x129af: 'Spore Crawler',
         }
 
-    @Burrows(0x0, 0x0)
+    @Burrows(0x14900, 0x14a00)
     class Queen(Moveable, Attacker):
         abilities = {
             0x17620: 'Creep Tumor',
@@ -683,7 +684,7 @@ class Burrowed(Moveable, Supporter):
                 0x5fa0: 'Infested Terran',
             }
 
-    @Burrows(0x0, 0x0)
+    @Burrows(0x15300, 0x15400)
     class Ultralisk(Moveable, Attacker):
         pass
 
@@ -701,7 +702,8 @@ class Corruptor(Moveable, Attacker):
     class Broodlord(Moveable, Attacker):
         pass
 
-    @Transports(0x14501, None, 0x14563, 0x14504)
+    #@Transports(0x14501, None, 0x14563, 0x14504)
+    @Transports(0x14501, None, 0x00, 0x00)
     class Overlord(Moveable, Supporter):
         abilities = {
             0x17500: 'Generate Creep',