Merge pull request Ziktofel#298 from EnvyDragon/lighten-up

SC2: Adding Dawnbringer upgrades
EnvyDragon · Sep 4, 2024 · da73956 · da73956
2 parents 51c5866 + 2e2c12a
commit da73956
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py
@@ -833,6 +833,8 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.CARRIER_SKYLORD_PURGER_GRAVITON_CATAPULT: "Carriers can launch Interceptors more quickly.",
     item_names.CARRIER_SKYLORD_PURGER_HULL_OF_PAST_GLORIES: "Carriers gain +2 armour.",
     item_names.VOID_RAY_DESTROYER_WARP_RAY_DAWNBRINGER_FLUX_VANES: "Increases movement speed of Void Ray variants.",
+    item_names.DAWNBRINGER_ANTI_SURFACE_COUNTERMEASURES: "Dawnbringers take reduced damage from non-spell ground sources.",
+    item_names.DAWNBRINGER_ENHANCED_SHIELD_GENERATOR: "Increases Dawnbringer maximum shields by +50.",
     item_names.DESTROYER_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.DESTROYER),
     item_names.WARP_PRISM_GRAVITIC_DRIVE: "Increases the movement speed of Warp Prisms.",
     item_names.WARP_PRISM_PHASE_BLASTER: "Equips Warp Prisms with an auto-attack that can hit ground and air targets.",
@@ -916,7 +918,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.VOID_RAY_PRISMATIC_RANGE: "Void Ray War Council upgrade. Void Rays gain increased range as they charge their beam.",
     item_names.DESTROYER_REFORGED_BLOODSHARD_CORE: "Destroyer War Council upgrade. When fully charged, the Destroyer's Destruction Beam weapon does full damage to secondary targets.",
     # Warp Ray
-    # Dawnbringer
+    item_names.DAWNBRINGER_SOLARITE_LENS: "Dawnbringer War Council upgrade. Dawnbringers gain +2 range.",
     # Carrier
     item_names.SKYLORD_HYPERJUMP: "Skylord War Council upgrade. " + _ability_desc("Skylords", "Hyperjump", "teleports the skylord to any location on the map."),
     # Trireme

diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py
@@ -662,6 +662,8 @@
 CARRIER_SKYLORD_PURGER_GRAVITON_CATAPULT                = "Graviton Catapult (Carrier/Skylord/Purger)"
 CARRIER_SKYLORD_PURGER_HULL_OF_PAST_GLORIES             = "Hull of Past Glories (Carrier/Skylord/Purger)"
 VOID_RAY_DESTROYER_WARP_RAY_DAWNBRINGER_FLUX_VANES      = "Flux Vanes (Void Ray/Destroyer/Warp Ray/Dawnbringer)"
+DAWNBRINGER_ANTI_SURFACE_COUNTERMEASURES                = "Anti-Surface Countermeasures (Dawnbringer)"
+DAWNBRINGER_ENHANCED_SHIELD_GENERATOR                   = "Enhanced Shield Generator (Dawnbringer)"
 DESTROYER_RESOURCE_EFFICIENCY                           = "Resource Efficiency (Destroyer)"
 WARP_PRISM_GRAVITIC_DRIVE                               = "Gravitic Drive (Warp Prism)"
 WARP_PRISM_PHASE_BLASTER                                = "Phase Blaster (Warp Prism)"
@@ -747,7 +749,7 @@
 VOID_RAY_PRISMATIC_RANGE                                = "Prismatic Range (Void Ray)"
 DESTROYER_REFORGED_BLOODSHARD_CORE                      = "Reforged Bloodshard Core (Destroyer)"
 # Warp Ray
-# Dawnbringer
+DAWNBRINGER_SOLARITE_LENS                               = "Solarite Lens (Dawnbringer)"
 # Carrier
 SKYLORD_HYPERJUMP                                       = "Hyperjump (Skylord)"
 # Trireme

diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py
@@ -1773,6 +1773,8 @@ def get_full_item_list():
     item_names.DISRUPTOR_PERFECTED_POWER:  ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}),
     item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}),
     item_names.TEMPEST_INTERPLANETARY_RANGE: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, parent_item=item_names.TEMPEST),
+    item_names.DAWNBRINGER_ANTI_SURFACE_COUNTERMEASURES: ItemData(385 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 25, SC2Race.PROTOSS, parent_item=item_names.DAWNBRINGER),
+    item_names.DAWNBRINGER_ENHANCED_SHIELD_GENERATOR: ItemData(386 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 26, SC2Race.PROTOSS, parent_item=item_names.DAWNBRINGER),
 
     # War Council
     item_names.ZEALOT_WHIRLWIND: ItemData(500 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 0, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.ZEALOT),
@@ -1812,7 +1814,7 @@ def get_full_item_list():
     item_names.VOID_RAY_PRISMATIC_RANGE: ItemData(534 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 4, SC2Race.PROTOSS, parent_item=item_names.VOID_RAY),
     item_names.DESTROYER_REFORGED_BLOODSHARD_CORE: ItemData(336 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 5, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.DESTROYER),
     # 536 reserved for Warp Ray
-    # 537 reserved for Dawnbringer
+    item_names.DAWNBRINGER_SOLARITE_LENS: ItemData(537 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 7, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.DAWNBRINGER),
     # 538 reserved for Carrier
     item_names.SKYLORD_HYPERJUMP: ItemData(539 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 9, SC2Race.PROTOSS, parent_item=item_names.SKYLORD),
     # 540 reserved for Trireme