Logic and bugfixes

thezerothcat · Feb 24, 2019 · ab2b540 · ab2b540
1 parent 14a3cac
commit ab2b540
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.txt b/README.txt
@@ -4,7 +4,7 @@ https://github.com/thezerothcat/LaMulanaRandomizer/wiki
 
 2.13
 -----------------------------
-Fixed some HT logic for entrance randomizer.
+HT and other logic fixes. Fixed a bug with Twin Labyrinths poison timer disappearing in entrance rando.
 
 2.12
 -----------------------------

diff --git a/src/main/java/lmr/randomizer/update/GameDataTracker.java b/src/main/java/lmr/randomizer/update/GameDataTracker.java
@@ -3514,7 +3514,7 @@ public static void writeTransitionGate(String gateToUpdate, String gateDestinati
                     AddObject.addSkandaBlock(gameObject);
                     firstObject = false;
                 }
-                if(firstObject && gateDestination.contains("Transition: Twin ")) { //  && !gateToUpdate.contains("Transition: Twin")
+                if(firstObject && gateDestination.contains("Transition: Twin ") && !gateToUpdate.equals("Transition: Twin U2")) {
                     AddObject.addTwinLabsPoisonTimerRemoval(gameObject.getObjectContainer());
                 }
             }

diff --git a/src/main/resources/lmr/randomizer/requirement/bosses/medium_reqs.txt b/src/main/resources/lmr/randomizer/requirement/bosses/medium_reqs.txt
@@ -192,11 +192,12 @@ Event: Thunderbird Defeated => Attack: Chakram, Ring
 Event: Thunderbird Defeated => Attack: Pistol
 Event: Tiamat Angel Shield Children Defeated => State: 6-Orb HP, Chain Whip
 Event: Tiamat Angel Shield Children Defeated => State: 5-Orb HP, Axe
-Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 5, Chain Whip, Combo: Whip
-Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 4, Chain Whip, Combo: Revive Whip
+Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 5, Attack: Whip, Combo: Whip
+Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 4, Attack: Whip, Combo: Revive Whip
 Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 4, Axe, Combo: Non-Whip
 Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 3, Axe, Combo: Revive Non-Whip
 Event: Tiamat Angel Shield Children Defeated => State: 4-Orb HP, Flail Whip
+Event: Tiamat Angel Shield Children Defeated => State: 4-Orb HP, Attack: Key Sword (Empowered)
 Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 4, Chain Whip, Combo: Whip
 Event: Tiamat Angel Shield Children Defeated => Sacred Orb: 3, Chain Whip, Combo: Revive Whip
 Event: Tiamat Angel Shield Children Defeated => Setting: Subweapon Only, State: 6-Orb HP, Attack: Rolling Shuriken, Attack: Caltrops, Mode: Normal
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ https://github.com/thezerothcat/LaMulanaRandomizer/wiki @@
 .13
     -----------------------------
-    Fixed some HT logic for entrance randomizer.
+    HT and other logic fixes. Fixed a bug with Twin Labyrinths poison timer disappearing in entrance rando.
 .12
     -----------------------------
@@ Expand Down @@