Additional ability code fixes.

Author: issackelly

sc2reader/data/build16561.py

@@ -87,6 +87,8 @@ class MULE(Worker):
         abilities = {
             0x0: 'Toggle Auto-Repair',
             0x0: 'Repair',
+            0x0: 'Return Cargo',
+            0x0: 'Gather',
         }
 
     class Marine(Moveable, Attacker):
@@ -466,7 +468,7 @@ class TwilightCouncil(Research):
 
     class FleetBeacon(Research):
         abilities = {
-            0x0: 'Graviton Catapult',
+            0x0: 'Graviton Catapult'
         }
 
     class TemplarArchive(Research):

sc2reader/data/build17326.py

@@ -89,6 +89,8 @@ class MULE(Worker):
         abilities = {
             0x003900: 'Toggle Auto-Repair',
             0x003920: 'Repair',
+            0x0: 'Return Cargo',
+            0x0: 'Gather',
         }
 
     class Marine(Moveable, Attacker):
@@ -475,7 +477,7 @@ class TwilightCouncil(Research):
 
     class FleetBeacon(Research):
         abilities = {
-            0x003601: 'Graviton Catapult',
+            0x003601: 'Graviton Catapult'
         }
 
     class TemplarArchive(Research):

sc2reader/data/build18317.py

@@ -87,6 +87,8 @@ class MULE(Worker):
         abilities = {
             0x0: 'Toggle Auto-Repair',
             0x0: 'Repair',
+            0x0: 'Return Cargo',
+            0x0: 'Gather',
         }
 
     class Marine(Moveable, Attacker):
@@ -466,7 +468,7 @@ class TwilightCouncil(Research):
 
     class FleetBeacon(Research):
         abilities = {
-            0x0: 'Graviton Catapult',
+            0x0: 'Graviton Catapult'
         }
 
     class TemplarArchive(Research):

sc2reader/data/build19595.py

@@ -114,6 +114,8 @@ class MULE(Worker):
         abilities = {
             0x3a00: 'Toggle Auto-Repair',
             0x3a40: 'Repair',
+            0x4a01: 'Return Cargo',
+            0x4a40: 'Gather',
         }
 
     class Marine(Moveable, Attacker):
@@ -143,7 +145,7 @@ class Ghost(Moveable, Attacker):
     class SiegeTank(Moveable, Attacker):
         pass
 
-    @Channels('250mm Strike Cannons',0x11802,None)
+    @Channels('250mm Strike Cannons', 0x6440, 0x6401)
     class Thor(Moveable, Attacker):
         pass
 
@@ -211,7 +213,8 @@ class OrbitalCommand(TerranMain, Production):
     @UpgradeFrom(CommandCenter, 0x15000, 0x15001)
     class PlanetaryFortress(TerranMain, Production):
         abilties = {
-            0x0: 'Cancel (PF ONLY)', #????
+            0x6f61: 'Cancel (PF ONLY)',
+            0x6f00: 'Cancel (PF ONLY)',
         }
 
     @Lowers(0x10f00, 0x11000)
@@ -293,7 +296,7 @@ class Techlab(Research):
                 0x11701: 'Combat Shields',
                 0x11702: 'Concussive Shells',
                 0x0: 'Cancel Research',
-                0x0: 'Cancel specific Research',
+                0x7061: 'Cancel Specific Research',
             }
 
         class Reactor(TerranBuilding):
@@ -329,7 +332,7 @@ class Techlab(Research):
                 0x11801: 'Infernal Pre-igniter',
                 0x11802: '250mm Strike Cannons',
                 0x0: 'Cancel Research',
-                0x0: 'Cancel specific Research',
+                0x7061: 'Cancel Specific Research',
             }
 
         class Reactor(TerranBuilding):
@@ -370,7 +373,7 @@ class Techlab(Research):
                 0x11906: 'Seeker Missile',
                 0x11907: 'Durable Materials',
                 0x0: 'Cancel Research',
-                0x0: 'Cancel specific Research',
+                0x7061: 'Cancel Specific Research',
             }
 
         class Reactor(TerranBuilding):
@@ -567,6 +570,7 @@ class TwilightCouncil(Research):
     class FleetBeacon(Research):
         abilities = {
             0x3701: 'Graviton Catapult',
+            0x3702: 'Anion Crystals'
         }
 
     class TemplarArchive(Research):

sc2reader/data/utils.py

@@ -190,6 +190,12 @@ def Cloaks(cls, cloak, decloak):
 
 @Wrapped
 def Channels(cls, ability, start, cancel):
+    """
+    A Channel is an ability that can be canceled
+    """
+    if not hasattr(cls, 'abilities'):
+        cls.__dict__['abilities'] = dict()
+
     cls.abilities[start] = ability
     cls.abilities[cancel] = "Cancel "+ability
 
@@ -279,4 +285,4 @@ def MorphedFrom(cls, source, start, cancel):
     if not hasattr(cocoon, 'abilities'): cls.Cocoon.abilities = dict()
 
     source.abilities[start] = 'Morph to {0}'.format(cls.__name__)
-    cocoon.abilities[cancel] = 'Cancel Morph to {0}'.format(cls.__name__)
+    cocoon.abilities[cancel] = 'Cancel Morph to {0}'.format(cls.__name__)