Add Tyrannozor Merge and Upgrades for Tyrannozor/Ultralisk from Dehaka Co-op #217

itsjustbones · 2024-07-26T06:12:58Z

##What is this fixing or adding?

Adds Tyrannozor Merge to Ultralisk and Morphling
Barrage of Spikes Upgrade for Tyrannozor - Tyrannozors can unleash a Barrage of Spikes, dealing 100 damage to nearby enemy ground and air units.
Tyrant's Protection Upgrade for Tyrannozor - Tyrannozors grants nearby friendly units 2 armor.
Imapling Strike Upgrade for Ultralisk/Tyrannozor - Ultralisk and Tyrannozor melee attacks have a 20% chance to stun for 2 seconds.
Healing Adaption Upgrade for Ultarlisk/Tyrannozor - Ultralisks and Tyrannozors regenerate life quickly when out of combat.

Also, due to command card space, this moves 3 Passive upgrades from Ultralisk command card to behaivor icons, Anabolic Synthesis, Chitinous Plating, Monarch Blades

Tied to Ziktofel/Archipelago#251

Please note that this is my first PR for both SC2 AP and in general, so if I've messed anything up or you have recommendations, please don't hesitate to let me know.

…ozor

MatthewMarinets · 2024-07-26T07:16:00Z

Mods/ArchipelagoPlayer.SC2Mod/Preload.xml

@@ -7,7 +7,6 @@
 <Actor id="AP_SOAGravitonBombTargetSound"/>
 <Actor id="AP_SOAOrbitalStrikeTargetModel"/>
 <Actor id="AP_SOATargetingModeConfirmationSound"/>
-<Actor id="AP_Stargate"/>


Curious if the editor removed this or if you did.

I remember seeing this when resolving merge conflicts, I must have done something wrong when fixing conflicts, but I can't remember what. It did stick out to me as odd though.

MatthewMarinets · 2024-07-26T07:21:05Z

Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy

@@ -4794,6 +4794,30 @@ void libABFE498B_gf_AP_Triggers_Zerg_unlockSporeCrawler (int lp_player) {
    TechTreeUnitAllow(lp_player, "AP_SporeCrawler", true);
 }

+void libABFE498B_gf_AP_Triggers_Zerg_TyrannozorHealingAdapation (int lp_player) {


Typo -- "Adapation" -> "Adaptation"

MatthewMarinets · 2024-07-26T07:24:47Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

+    <CValidatorPlayerRequirement id="AP_HaveTyrannozorMerge">
+        <Find value="1"/>
+        <Value value="AP_HaveTyrannozorMerge"/>
+    </CValidatorPlayerRequirement>


This validator seems unused?

Yeah, no idea why I even wrote this, probably some throw it at the wall idea for fixing merges that I forgot to cleanup

MatthewMarinets · 2024-07-26T07:25:43Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

+    <CValidatorPlayerRequirement id="AP_HaveTyrannozorBarrageOfSpikes">
+        <Find value="1"/>
+        <Value value="AP_HaveTyrannozorBarrageOfSpikes"/>
+    </CValidatorPlayerRequirement>


This validator seems unused.

Yeah, stems from my misunderstanding of validators and shouldn't be necessary

MatthewMarinets · 2024-07-26T07:26:09Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

+    <CValidatorPlayerRequirement id="AP_HaveHealingAdaption">
+        <Find value="1"/>
+        <Value value="AP_HaveHealingAdaption"/>
+    </CValidatorPlayerRequirement>


This validator seems unused -- only the requirement is used.

Yeah, stems from my misunderstanding of validators and shouldn't be necessary

MatthewMarinets · 2024-07-26T07:26:28Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

+    <CValidatorPlayerRequirement id="AP_HaveMonarchBlades">
+        <Find value="1"/>
+        <Value value="AP_HaveUltraliskOrganicCarapace"/>
+    </CValidatorPlayerRequirement>


This validator is unused, and doesn't seem to be checking what the name implies

Yeah, bad copying and forgetting to remove or edit.

itsjustbones · 2024-07-26T08:37:43Z

I've retested to make sure nothing broke as well.

EnvyDragon · 2024-07-26T13:57:34Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

+        <EffectArray Operation="Subtract" Reference="Unit,AP_Tyrannozor,CostResource[Minerals]" Value="200"/>
+        <EffectArray Reference="Unit,AP_Tyrannozor,Food" Value="3"/>


You'll want to include the burrowed Tyrannozor in this too, otherwise it'll cost food to burrow

Fixed, thanks for catching

Minerals too

Ziktofel · 2024-07-26T16:33:30Z

Bug: Air attack sound doesn't play, no unit response sounds

(you might be linking a sound file from a dependency that isn't a dependency of ArchipelagoPlayer)

Ziktofel · 2024-07-26T16:35:32Z

Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt

@@ -396,6 +397,8 @@ Button/Hotkey/AP_TimeWarp=C
 Button/Hotkey/AP_TorrasqueChrysalis=Q
 Button/Hotkey/AP_TrainHERC=H
 Button/Hotkey/AP_TransportMode=T
+Button/Hotkey/AP_TyrannozorBarrageOfSpikes=Q
+Button/Hotkey/AP_TyrannozorMerge=G


I'd pick T as the hotkey (T for Tyrannozor)

For some reason I thought T was a hotkey for a default action, like patrol, and just didn't check. I've updated it.

Ziktofel · 2024-07-26T16:48:19Z

Fix the following warnings:

[7/26/2024 6:46:55 PM] Warning: XML: StarCraft II\Mods\ArchipelagoPlayer.SC2Mod\Base.SC2Data\GameData\SoundData.xml(11637,5) : Unable to find parent HoS_PrimalAck  Source: Mods/ArchipelagoPlayer.SC2Mod  Scope: CSound
[7/26/2024 6:46:55 PM] Warning: XML: StarCraft II\Mods\ArchipelagoPlayer.SC2Mod\Base.SC2Data\GameData\SoundData.xml(11709,5) : Unable to find parent HoS_PrimalAck  Source: Mods/ArchipelagoPlayer.SC2Mod  Scope: CSound
[7/26/2024 6:46:55 PM] Warning: XML: StarCraft II\Mods\ArchipelagoPlayer.SC2Mod\Base.SC2Data\GameData\SoundData.xml(11743,5) : Unable to find parent HoS_PrimalAck  Source: Mods/ArchipelagoPlayer.SC2Mod  Scope: CSound
[7/26/2024 6:46:55 PM] Warning: XML: StarCraft II\Mods\ArchipelagoPlayer.SC2Mod\Base.SC2Data\GameData\SoundData.xml(11766,5) : Unable to find parent HoS_PrimalAck  Source: Mods/ArchipelagoPlayer.SC2Mod  Scope: CSound

itsjustbones · 2024-07-26T16:49:44Z

Bug: Air attack sound doesn't play, no unit response sounds

(you might be linking a sound file from a dependency that isn't a dependency of ArchipelagoPlayer)

I did my sound checks on The reckoning, which is a hots map, so I'm guessing that map has the swarm.sc2campaign dependency, but since the mod doesn't, it breaks on other non hots maps. I'll have to upload it separately then.

Ziktofel · 2024-07-26T16:51:41Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

+        <EffectArray Reference="Unit,AP_Ultralisk,LifeRegenRate" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_UltraliskBurrowed,LifeRegenRate" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_UltraliskResourceEfficiency,LifeRegenRate" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_Ultralisk,LifeRegenDelay" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_UltraliskBurrowed,LifeRegenDelay" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_UltraliskResourceEfficiency,LifeRegenDelay" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_Tyrannozor,LifeRegenRate" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_TyrannozorBurrowed,LifeRegenRate" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_Tyrannozor,LifeRegenDelay" Value="10.000000"/>
+        <EffectArray Reference="Unit,AP_TyrannozorBurrowed,LifeRegenDelay" Value="10.000000"/>


Bug: Stops regular life regen (that works even in combat). Look into Regen Biosteel code for Infested Tanks/Banshees that allows basic regen (and increased regen while out of combat)

Fixed. Though I'll note that I just copied vanilla on this originally, which is apparently kinda dumb.

Ziktofel · 2024-07-26T16:54:49Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml

+            <LayoutButtons Face="AP_TyrannozorBarrageOfSpikes" Type="AbilCmd" AbilCmd="AP_TyrannozorBarrageOfSpikes,Execute" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_HealingAdaptation" Type="Passive" Requirements="AP_HaveHealingAdaptation" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_TyrannozorTyrantsProtection" Type="Passive" Requirements="AP_HaveTyrannozorTyrantsProtection" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_ImpalingStrike" Type="Passive" Requirements="AP_HaveImpalingStrike" Row="2" Column="3"/>


Generally we put passives on the second row

itsjustbones · 2024-07-26T17:41:07Z

Sounds should be fixed now

Ziktofel · 2024-07-26T17:56:51Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

+        <EffectArray Operation="Subtract" Reference="Unit,AP_Tyrannozor,CostResource[Minerals]" Value="200"/>
+        <EffectArray Reference="Unit,AP_Tyrannozor,Food" Value="3"/>


Minerals too

Ziktofel · 2024-07-26T18:19:02Z

Add

<CActorSplat id="AP_TyrannozorBurrowedSplat" parent="BurrowedSplat" unitName="AP_Tyrannozor"/>

to actors for correct burrow display

Ziktofel · 2024-07-28T17:06:06Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

+    <CValidatorPlayerCompareFoodAvailable id="AP_CheckTyrannozorMorphlingMergeSupplyResourceEfficiency">
+        <ResultFailed value="NotEnoughFood"/>
+        <WhichPlayer Value="Caster"/>
+        <Compare value="LT"/>
+        <Value value="3"/>
+    </CValidatorPlayerCompareFoodAvailable>


Should be 2 supply (Tyrannozor is 6 supply if upgraded, morphlings are 2 supply each)

I have enough supply available but still can't merge

Ziktofel · 2024-07-28T17:08:49Z

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml

+            <LayoutButtons Face="AP_HealingAdaptation" Type="Passive" Requirements="AP_HaveHealingAdaptation" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_TyrannozorTyrantsProtection" Type="Passive" Requirements="AP_HaveTyrannozorTyrantsProtection" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_ImpalingStrike" Type="Passive" Requirements="AP_HaveImpalingStrike" Row="1" Column="3"/>


Could you move the upgrade icons in order to start from the first column (index 0)? Frenzied should stay in place

Fixed, wasn't sure about this, I figured it just looked better to have them all next to each other, but didn't want to move frenzied

ocz added 24 commits July 23, 2024 00:57

Initial setup of of files after unit import and some refactoring

ba2b979

Initial import of unit and some refactoring

5fb6eb4

More refactoring, work on upgrades

4e37e06

More refactoring, no trigger saves yet

0e3519e

Add triggers

675df5a

typos

e3d6396

fix merge eggs missing morphling

1913692

fixing typos with burrow

ddae4a8

Fix triggers for tyrannozor and upgrades

df30617

Fixing triggers for unlocking tyrannozor

eb96c30

Fixing tyrant's protection unlock

6aa41cd

ability fixes, attempts at icon and model fixing

ebd432c

More fixes

c52365c

Fix impaling strike ultralisk, and death audio for tyrannozor

dc77999

hotkey, impaling strike, AA attack for tyrannozor fixes,

5127873

fix morphling merge

24bc43d

Fixing ultralisk morphing and behaivor icons

e2493b2

add tyrannozor to ultralisk cavern

a048bf2

Make Resource Efficicency Ultralisk affect morphling merge for tyrann…

4cb2751

…ozor

Fix behaivors showing on ultralisk when not applied

c36e68c

Move triggers id due to pending pr

a13e932

Merge branch 'add-tyrannozor' into sc2-next

095691a

fix AP ids due to pending pr

f4cd144

Merge branch 'add-tyrannozor' into sc2-next

5001601

MatthewMarinets reviewed Jul 26, 2024

View reviewed changes

EnvyDragon reviewed Jul 26, 2024

View reviewed changes

itsjustbones added 2 commits July 26, 2024 10:46

Fix burrow food cost for tyrannozor with resource efficiency

3a6af19

Fix upgrade tool tips referencing primal ultralisks

6305b66

Ziktofel reviewed Jul 26, 2024

View reviewed changes

Change hotkey for tyrannozor merge

46f29c4

Fix HoS_PrimalAck to AP_HoS_PrimalAck

6fcf94c

Ziktofel reviewed Jul 26, 2024

View reviewed changes

itsjustbones added 4 commits July 26, 2024 13:03

Move passives to second row on command card for tyrannozor

e655e73

Add missing sound files

cdcd442

fix healing adaptation disabling normal regen

e1771c5

Fix sounds and add missing sound file

12e2ffd

Fix Typo in upgradedata.xml, and remove unecessary comment

a199641

Ziktofel requested changes Jul 26, 2024

View reviewed changes

fix tyrannozor burrow cost

b4f54ec

itsjustbones added 3 commits July 26, 2024 14:29

add burrowed actor splat

6201feb

Fix morphling able to merge over supply cap.

dfaa4e4

Fix greyed out primal morphling submenu when out of food for tyrannozor

c37e327

itsjustbones requested a review from Ziktofel July 27, 2024 22:09

Ziktofel requested changes Jul 28, 2024

View reviewed changes

itsjustbones added 2 commits July 28, 2024 16:01

Fix food for morphling merge with Resource efficiency from 3 to 2

ce9fed8

shift passives to left

561ae04

itsjustbones requested a review from Ziktofel July 28, 2024 20:07

Ziktofel merged commit 561ae04 into Ziktofel:sc2-next Jul 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Tyrannozor Merge and Upgrades for Tyrannozor/Ultralisk from Dehaka Co-op #217

Add Tyrannozor Merge and Upgrades for Tyrannozor/Ultralisk from Dehaka Co-op #217

itsjustbones commented Jul 26, 2024

MatthewMarinets Jul 26, 2024

itsjustbones Jul 26, 2024

MatthewMarinets Jul 26, 2024 •

edited

Loading

itsjustbones Jul 26, 2024

MatthewMarinets Jul 26, 2024

itsjustbones Jul 26, 2024

MatthewMarinets Jul 26, 2024

itsjustbones Jul 26, 2024

MatthewMarinets Jul 26, 2024

itsjustbones Jul 26, 2024

MatthewMarinets Jul 26, 2024 •

edited

Loading

itsjustbones Jul 26, 2024

itsjustbones commented Jul 26, 2024

EnvyDragon Jul 26, 2024

itsjustbones Jul 26, 2024

Ziktofel Jul 26, 2024

itsjustbones Jul 26, 2024

Ziktofel commented Jul 26, 2024 •

edited

Loading

Ziktofel Jul 26, 2024

itsjustbones Jul 26, 2024

Ziktofel commented Jul 26, 2024

itsjustbones commented Jul 26, 2024

Ziktofel Jul 26, 2024

itsjustbones Jul 26, 2024

Ziktofel Jul 26, 2024

itsjustbones Jul 26, 2024

itsjustbones commented Jul 26, 2024

Ziktofel Jul 26, 2024

Ziktofel commented Jul 26, 2024

Ziktofel Jul 28, 2024

itsjustbones Jul 28, 2024

Ziktofel Jul 28, 2024

itsjustbones Jul 28, 2024

		<EffectArray Operation="Subtract" Reference="Unit,AP_Tyrannozor,CostResource[Minerals]" Value="200"/>
		<EffectArray Reference="Unit,AP_Tyrannozor,Food" Value="3"/>

Add Tyrannozor Merge and Upgrades for Tyrannozor/Ultralisk from Dehaka Co-op #217

Add Tyrannozor Merge and Upgrades for Tyrannozor/Ultralisk from Dehaka Co-op #217

Conversation

itsjustbones commented Jul 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatthewMarinets Jul 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatthewMarinets Jul 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsjustbones commented Jul 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ziktofel commented Jul 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ziktofel commented Jul 26, 2024

itsjustbones commented Jul 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsjustbones commented Jul 26, 2024

Choose a reason for hiding this comment

Ziktofel commented Jul 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatthewMarinets Jul 26, 2024 •

edited

Loading

MatthewMarinets Jul 26, 2024 •

edited

Loading

Ziktofel commented Jul 26, 2024 •

edited

Loading