add chapter 6 challenge achievement

joshraphael · Feb 7, 2025 · 222063a · 222063a
1 parent f5d9956
commit 222063a
Showing 1 changed file with 21 additions and 39 deletions.
diff --git a/18190.rascript b/18190.rascript
@@ -202,44 +202,6 @@ function InGame() {
     )
 }
 
-// function AllInTree( hasBrownPowerUp, hasOrangePowerUp, hasBlackPowerUp ) {
-//     cond = BrownState() == 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000007
-//     if( hasBrownPowerUp ) {
-//         cond = ( baseCond ) || ( BrownState() == 0x00000008 && BrownPoweredUpState() == 0x00000007 )
-//     }
-//     if( hasOrangePowerUp ) {
-//         cond = BrownState() == 0x00000007 && BlackState() == 0x00000007 && ( ( OrangeState() == 0x00000007 ) || ( OrangeState() == 0x00000008 && OrangePoweredUpState() == 0x00000007 ) )
-//     }
-//     if( hasBlackPowerUp ) {
-//         cond = BrownState() == 0x00000007 && OrangeState() == 0x00000007 && ( ( BlackState() == 0x00000007 ) || ( BlackState() == 0x00000008 && BlackPoweredUpState() == 0x00000007 ) )
-//     }
-//     return cond
-// }
-
-// function LastPlayerEntersTree( hasBrownPowerUp, hasOrangePowerUp, hasBlackPowerUp ) {
-//     brown = prev( BrownState() ) != 0x00000007 && BrownState() == 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000007
-//     orange = BrownState() == 0x00000007 && prev( OrangeState() ) != 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000007
-//     black = BrownState() == 0x00000007 && OrangeState() == 0x00000007 && prev( BlackState() ) != 0x00000007 && BlackState() == 0x00000007
-//     conds = ( brown ) || ( orange ) || ( black )
-//     if( hasBrownPowerUp ) {
-//         brownPowerUp = BrownState() == 0x00000008 && prev( BrownPoweredUpState() ) != 0x00000007 && BrownPoweredUpState() == 0x00000007
-//         conds = conds || ( brownPowerUp )
-//     }
-//     if( hasOrangePowerUp ) {
-//         orangeNewBrown = prev( BrownState() ) != 0x00000007 && BrownState() == 0x00000007 && OrangeState() == 0x00000008 && OrangePoweredUpState() == 0x00000007 && BlackState() == 0x00000007
-//         orangeNewOrange = BrownState() == 0x00000007 && OrangeState() == 0x00000008 && prev( OrangePoweredUpState() ) != 0x00000007 && OrangePoweredUpState() == 0x00000007 && BlackState() == 0x00000007
-//         orangeNewBlack = BrownState() == 0x00000007 && OrangeState() == 0x00000008 && OrangePoweredUpState() == 0x00000007 && prev( BlackState() ) != 0x00000007 && BlackState() == 0x00000007
-//         conds = conds || ( orangeNewBrown ) || ( orangeNewOrange ) || ( orangeNewBlack )
-//     }
-//     if( hasBlackPowerUp ) {
-//         blackNewBrown = prev( BrownState() ) != 0x00000007 && BrownState() == 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000008 && BlackPoweredUpState() == 0x00000007
-//         blackNewOrange = BrownState() == 0x00000007 && prev( OrangeState() ) != 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000008 && BlackPoweredUpState() == 0x00000007
-//         blackNewBlack = BrownState() == 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000008 && prev( BlackPoweredUpState() ) != 0x00000007 && BlackPoweredUpState() == 0x00000007
-//         conds = conds || ( blackNewBrown ) || ( blackNewOrange ) || ( blackNewBlack )
-//     }
-//     return conds
-// }
-
 function UpgradeChapter( isChallenge, hasBrownPowerUp, hasOrangePowerUp, hasBlackPowerUp ) {
     brown = prev( BrownState() ) != 0x00000007 && BrownState() == 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000007
     orange = BrownState() == 0x00000007 && prev( OrangeState() ) != 0x00000007 && OrangeState() == 0x00000007 && BlackState() == 0x00000007
@@ -425,7 +387,7 @@ achievement(
         until = GameReset()
     ) &&
     disable_when(
-        prev( DarkHeartsCollected() ) == DarkHeartsCollected() - 1,
+        DarkHeartsCollected() - prev( DarkHeartsCollected() ) == 1,
         until = GameReset()
     ),
     type = "missable"
@@ -451,6 +413,26 @@ achievement(
     type = "missable"
 )
 
+achievement(
+    title = "Test",
+    description = "Collect 2 hearts in no more than 1 world rotationn then complete chapter 6",
+    points = 2,
+    trigger = (
+        InGame() &&
+        Chapter() == CHAPTER6 &&
+        HeartsCollected() >= 2 &&
+        UpgradeChapter( true, false, true, false )
+    ) &&
+    disable_when(
+        tally(
+            2,
+            OrangeRotating()
+        ),
+        until = GameReset()
+    ),
+    type = "missable"
+)
+
 for index in range( 1, length( chapterConfigs ) ) {
     chapter = chapterConfigs[index - 1]