Merge pull request Blizzard#222 from Cryptyc/master

Add shield battery and mothership types from 4.0 patch to the API

Author: AnthonyBrunasso

include/sc2api/sc2_typeenums.h

@@ -179,18 +179,19 @@ namespace sc2 {
         PROTOSS_INTERCEPTOR = 85,    // SMART, MOVE, PATROL, HOLDPOSITION, STOP, ATTACK
         PROTOSS_MOTHERSHIP = 10,    // SMART, MOVE, PATROL, HOLDPOSITION, EFFECT_PHOTONOVERCHARGE, EFFECT_TIMEWARP, STOP, ATTACK, EFFECT_MASSRECALL
         PROTOSS_MOTHERSHIPCORE = 488,   // SMART, MOVE, PATROL, HOLDPOSITION, MORPH_MOTHERSHIP, EFFECT_PHOTONOVERCHARGE, EFFECT_TIMEWARP, CANCEL, STOP, ATTACK, EFFECT_MASSRECALL
-        PROTOSS_NEXUS = 59,    // SMART, EFFECT_CHRONOBOOST, TRAIN_PROBE, TRAIN_MOTHERSHIPCORE, CANCEL, CANCEL_LAST, RALLY_WORKERS
+        PROTOSS_NEXUS = 59,    // SMART, EFFECT_CHRONOBOOST, TRAIN_PROBE, TRAIN_MOTHERSHIP, CANCEL, CANCEL_LAST, RALLY_WORKERS
         PROTOSS_OBSERVER = 82,    // SMART, MOVE, PATROL, HOLDPOSITION, STOP, ATTACK
         PROTOSS_ORACLE = 495,   // SMART, MOVE, PATROL, HOLDPOSITION, EFFECT_ORACLEREVELATION, BEHAVIOR_PULSARBEAMON, BEHAVIOR_PULSARBEAMOFF, BUILD_STASISTRAP, CANCEL, STOP, ATTACK
         PROTOSS_ORACLESTASISTRAP = 732,   // CANCEL
         PROTOSS_PHOENIX = 78,    // SMART, MOVE, PATROL, HOLDPOSITION, EFFECT_GRAVITONBEAM, CANCEL, STOP, ATTACK
         PROTOSS_PHOTONCANNON = 66,    // SMART, CANCEL, STOP, ATTACK
-        PROTOSS_PROBE = 84,    // SMART, MOVE, PATROL, HOLDPOSITION, BUILD_NEXUS, BUILD_PYLON, BUILD_ASSIMILATOR, BUILD_GATEWAY, BUILD_FORGE, BUILD_FLEETBEACON, BUILD_TWILIGHTCOUNCIL, BUILD_PHOTONCANNON, BUILD_STARGATE, BUILD_TEMPLARARCHIVE, BUILD_DARKSHRINE, BUILD_ROBOTICSBAY, BUILD_ROBOTICSFACILITY, BUILD_CYBERNETICSCORE, STOP, HARVEST_GATHER, HARVEST_RETURN, ATTACK, EFFECT_SPRAY
+        PROTOSS_PROBE = 84,    // SMART, MOVE, PATROL, HOLDPOSITION, BUILD_NEXUS, BUILD_PYLON, BUILD_ASSIMILATOR, BUILD_GATEWAY, BUILD_FORGE, BUILD_FLEETBEACON, BUILD_TWILIGHTCOUNCIL, BUILD_PHOTONCANNON, BUILD_SHIELDBATTERY, BUILD_STARGATE, BUILD_TEMPLARARCHIVE, BUILD_DARKSHRINE, BUILD_ROBOTICSBAY, BUILD_ROBOTICSFACILITY, BUILD_CYBERNETICSCORE, STOP, HARVEST_GATHER, HARVEST_RETURN, ATTACK, EFFECT_SPRAY
         PROTOSS_PYLON = 60,    // CANCEL
         PROTOSS_PYLONOVERCHARGED = 894,   // SMART, STOP, ATTACK
         PROTOSS_ROBOTICSBAY = 70,    // RESEARCH_GRAVITICBOOSTER, RESEARCH_GRAVITICDRIVE, RESEARCH_EXTENDEDTHERMALLANCE, CANCEL, CANCEL_LAST
         PROTOSS_ROBOTICSFACILITY = 71,    // SMART, TRAIN_WARPPRISM, TRAIN_OBSERVER, TRAIN_COLOSSUS, TRAIN_IMMORTAL, TRAIN_DISRUPTOR, CANCEL, CANCEL_LAST, RALLY_UNITS
         PROTOSS_SENTRY = 77,    // SMART, MOVE, PATROL, HOLDPOSITION, EFFECT_GUARDIANSHIELD, HALLUCINATION_ARCHON, HALLUCINATION_COLOSSUS, HALLUCINATION_HIGHTEMPLAR, HALLUCINATION_IMMORTAL, HALLUCINATION_PHOENIX, HALLUCINATION_PROBE, HALLUCINATION_STALKER, HALLUCINATION_VOIDRAY, HALLUCINATION_WARPPRISM, HALLUCINATION_ZEALOT, EFFECT_FORCEFIELD, HALLUCINATION_ORACLE, HALLUCINATION_DISRUPTOR, HALLUCINATION_ADEPT, STOP, RALLY_UNITS, ATTACK
+        PROTOSS_SHIELDBATTERY = 1910,   // SMART, EFFECT_RESTORE
         PROTOSS_STALKER = 74,    // SMART, MOVE, PATROL, HOLDPOSITION, STOP, RALLY_UNITS, ATTACK, EFFECT_BLINK
         PROTOSS_STARGATE = 67,    // SMART, TRAIN_PHOENIX, TRAIN_CARRIER, TRAIN_VOIDRAY, TRAIN_ORACLE, TRAIN_TEMPEST, CANCEL, CANCEL_LAST, RALLY_UNITS
         PROTOSS_TEMPEST = 496,   // SMART, MOVE, PATROL, HOLDPOSITION, EFFECT_TEMPESTDISRUPTIONBLAST, CANCEL, STOP, ATTACK
@@ -314,6 +315,7 @@ namespace sc2 {
         BUILD_ROBOTICSBAY = 892,   // Target: Point.
         BUILD_ROBOTICSFACILITY = 893,   // Target: Point.
         BUILD_SENSORTOWER = 326,   // Target: Point.
+        BUILD_SHIELDBATTERY = 895,   // Target: Point.
         BUILD_SPAWNINGPOOL = 1155,  // Target: Point.
         BUILD_SPINECRAWLER = 1166,  // Target: Point.
         BUILD_SPIRE = 1158,  // Target: Point.
@@ -428,6 +430,7 @@ namespace sc2 {
         EFFECT_REPAIR = 3685,  // Target: Unit.
         EFFECT_REPAIR_MULE = 78,    // Target: Unit.
         EFFECT_REPAIR_SCV = 316,   // Target: Unit.
+        EFFECT_RESTORE = 3765,      // Target: Unit.
         EFFECT_SALVAGE = 32,    // Target: None.
         EFFECT_SCAN = 399,   // Target: Point.
         EFFECT_SHADOWSTRIDE = 2700,  // Target: Point.
@@ -673,6 +676,7 @@ namespace sc2 {
         TRAIN_MARAUDER = 563,   // Target: None.
         TRAIN_MARINE = 560,   // Target: None.
         TRAIN_MEDIVAC = 620,   // Target: None.
+        TRAIN_MOTHERSHIP = 110,  // Target: None.
         TRAIN_MOTHERSHIPCORE = 1853,  // Target: None.
         TRAIN_MUTALISK = 1346,  // Target: None.
         TRAIN_OBSERVER = 977,   // Target: None.

src/sc2api/sc2_typeenums.cc

@@ -67,6 +67,7 @@ namespace sc2 {
         case UNIT_TYPEID::PROTOSS_FLEETBEACON:              return "PROTOSS_FLEETBEACON"; // 337
         case UNIT_TYPEID::PROTOSS_TWILIGHTCOUNCIL:          return "PROTOSS_TWILIGHTCOUNCIL"; // 1677
         case UNIT_TYPEID::PROTOSS_PHOTONCANNON:             return "PROTOSS_PHOTONCANNON"; // 8601
+        case UNIT_TYPEID::PROTOSS_SHIELDBATTERY:            return "PROTOSS_SHIELDBATTERY"; // 8601
         case UNIT_TYPEID::PROTOSS_STARGATE:                 return "PROTOSS_STARGATE"; // 2286
         case UNIT_TYPEID::PROTOSS_TEMPLARARCHIVE:           return "PROTOSS_TEMPLARARCHIVE"; // 342
         case UNIT_TYPEID::PROTOSS_DARKSHRINE:               return "PROTOSS_DARKSHRINE"; // 408
@@ -391,6 +392,7 @@ namespace sc2 {
         case ABILITY_ID::BUILD_FLEETBEACON:                 return "BUILD_FLEETBEACON"; // 130
         case ABILITY_ID::BUILD_TWILIGHTCOUNCIL:             return "BUILD_TWILIGHTCOUNCIL"; // 486
         case ABILITY_ID::BUILD_PHOTONCANNON:                return "BUILD_PHOTONCANNON"; // 2895
+        case ABILITY_ID::BUILD_SHIELDBATTERY:               return "BUILD_SHIELDBATTERY";
         case ABILITY_ID::BUILD_STARGATE:                    return "BUILD_STARGATE"; // 791
         case ABILITY_ID::BUILD_TEMPLARARCHIVE:              return "BUILD_TEMPLARARCHIVE"; // 167
         case ABILITY_ID::BUILD_DARKSHRINE:                  return "BUILD_DARKSHRINE"; // 165
@@ -565,6 +567,7 @@ namespace sc2 {
         case ABILITY_ID::CANCEL_MORPHMOTHERSHIP:            return "CANCEL_MORPHMOTHERSHIP"; // 5
         case ABILITY_ID::TRAIN_MOTHERSHIPCORE:              return "TRAIN_MOTHERSHIPCORE"; // 869
         case ABILITY_ID::EFFECT_MASSRECALL_MOTHERSHIPCORE:  return "EFFECT_MASSRECALL_MOTHERSHIPCORE"; // 46
+        case ABILITY_ID::TRAIN_MOTHERSHIP:                  return "TRAIN_MOTHERSHIP"; 
         case ABILITY_ID::MORPH_HELLION:                     return "MORPH_HELLION"; // 31
         case ABILITY_ID::MORPH_HELLBAT:                     return "MORPH_HELLBAT"; // 325
         case ABILITY_ID::BURROWDOWN_SWARMHOST:              return "BURROWDOWN_SWARMHOST"; // 19
@@ -654,6 +657,7 @@ namespace sc2 {
         case ABILITY_ID::EFFECT_REPAIR:                     return "EFFECT_REPAIR"; // 1
         case ABILITY_ID::EFFECT_MASSRECALL:                 return "EFFECT_MASSRECALL"; // 1
         case ABILITY_ID::EFFECT_BLINK:                      return "EFFECT_BLINK"; // 1
+        case ABILITY_ID::EFFECT_RESTORE:                    return "EFFECT_RESTORE"; // 1
         case ABILITY_ID::BEHAVIOR_HOLDFIREON:               return "BEHAVIOR_HOLDFIREON"; // 1
         case ABILITY_ID::BEHAVIOR_HOLDFIREOFF:              return "BEHAVIOR_HOLDFIREOFF"; // 1
         case ABILITY_ID::RALLY_WORKERS:                     return "RALLY_WORKERS"; // 1