1.0.0k compatiblity, bugfixes

MathIsFun0 · MathIsFun0 · commit 3a899240652b · 2024-02-23T20:10:10.000-05:00
diff --git a/filters/double_legendary.cl b/filters/double_legendary.cl
@@ -1,5 +1,5 @@
 // Searches for a first shop buffoon pack with the four jokers that give increased mult to suits.
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     int score = 0;
     for (int i = 1; i <= 2; i++) {
@@ -12,5 +12,5 @@ long filter(instance* inst) {
             }
         };
     }
-    return score;
+    return score/2;
 }
diff --git a/filters/emperor_fool.cl b/filters/emperor_fool.cl
@@ -1,14 +1,14 @@
 // Emperor-Fool Chains
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     int bestAnte = 0;
     long bestScore = 0;
     // Because of ante-based RNG, we check every ante and store the best ante as the result
     for (int ante = 1; ante <= 6; ante++) {
         long score = 0;
         while (true) {
-            item tarot1 = next_tarot(inst, S_Emperor, ante);
-            item tarot2 = next_tarot(inst, S_Emperor, ante);
+            item tarot1 = next_tarot(inst, S_Emperor, ante, false);
+            item tarot2 = next_tarot(inst, S_Emperor, ante, false);
             if (tarot1 == The_Fool || tarot2 == The_Fool) score++;
             else break;
         }
diff --git a/filters/four_deadly_jokers.cl b/filters/four_deadly_jokers.cl
@@ -1,5 +1,5 @@
 // Searches for a first shop buffoon pack with the four jokers that give increased mult to suits.
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     // Buffoon Pack of Size 4
     bool suitablePack = false;
diff --git a/filters/high_score_demo.cl b/filters/high_score_demo.cl
@@ -1,5 +1,5 @@
 // Searches for a seed with a good setup for high score world record runs
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     int passedFilters = 0;
 
@@ -30,7 +30,7 @@ long filter(instance* inst) {
     bool hasRedPoly = 0;
     for (int c = 1; c <= standardCards; c++) {
         item edi = standard_edition(inst, 1);
-        item seal = standard_seal(inst);
+        item seal = standard_seal(inst, 1);
         item _rank = rank(standard_base(inst, 1));
         if (edi == Polychrome && seal == Red_Seal && _rank <= _5) {
             hasRedPoly = true;
@@ -46,7 +46,7 @@ long filter(instance* inst) {
     bool hasEcto = false;
     bool extraFilterPassed = false;
     for (int i = 0; i < spectralCards; i++) {
-        item spectral = next_spectral(inst, S_Spectral, 1);
+        item spectral = next_spectral(inst, S_Spectral, 1, true);
         if (spectral == Ankh) hasAnkh = true;
         if (spectral == Ectoplasm) hasEcto = true;
     }
diff --git a/filters/low_percent.cl b/filters/low_percent.cl
@@ -1,5 +1,5 @@
 // Searches for a seed that can be beaten with 6 hands and 0 discards
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     init_locks(inst, 1, false, true);
     int passedFilters = 0;
diff --git a/filters/max_cash_ante_1.cl b/filters/max_cash_ante_1.cl
@@ -1,5 +1,5 @@
 // Maximum cash out possible in Ante 1
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
     
@@ -20,8 +20,8 @@ long filter(instance* inst) {
     }
     if (hasHermit + hasEmperor != 2) return passedFilters;
     passedFilters++;
-    item empTarot1 = next_tarot(inst, S_Emperor, 1);
-    item empTarot2 = next_tarot(inst, S_Emperor, 1);
+    item empTarot1 = next_tarot(inst, S_Emperor, 1, false);
+    item empTarot2 = next_tarot(inst, S_Emperor, 1, false);
     if (empTarot1 != The_Hermit && empTarot2 != The_Hermit) return passedFilters;
     passedFilters++;
     bool bonusPoints = false;
diff --git a/filters/purchaseless.cl b/filters/purchaseless.cl
@@ -1,5 +1,5 @@
 // Purchaseless runs
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
     init_locks(inst, 2, false, true);
diff --git a/filters/red_poly_glass.cl b/filters/red_poly_glass.cl
@@ -1,5 +1,5 @@
-// Red Poly Glass Hack-Compatible Cards
-#include "lib/immolate.cl"
+// Red Poly Glass Cards
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     int numCards = 0;
     // Check if either pack is a Standard Pack - and which has the most cards
@@ -17,7 +17,6 @@ long filter(instance* inst) {
         if (_card.enhancement != Glass_Card) found = false;
         if (_card.edition != Polychrome) found = false;
         if (_card.seal != Red_Seal) found = false;
-        if (rank(_card.base) > _5) found = false;
         if (found) return 1;
     }
     return 0;
diff --git a/filters/speedrun.cl b/filters/speedrun.cl
@@ -1,5 +1,5 @@
 // Speedrunning seeds for Set Seed Skips
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
 
diff --git a/filters/speedrun_skipless.cl b/filters/speedrun_skipless.cl
@@ -1,5 +1,5 @@
 // Speedrunning seeds for Set Seed Skips
-#include "lib/immolate.cl"
+#include "./lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
     /*
diff --git a/immolate.c b/immolate.c
@@ -2,7 +2,7 @@
 int main(int argc, char **argv) {
     
     // Print version
-    printf_s("Immolate Beta v1.0.0i.2\n");
+    printf_s("Immolate Beta v1.0.0k.0\n");
 
     // Handle CLI arguments
     unsigned int platformID = 0;
diff --git a/lib/cache.cl b/lib/cache.cl
@@ -26,6 +26,7 @@ typedef enum RandomType {
     R_Ouija,
     R_Wheel_of_Fortune,
     R_Gros_Michel,
+    R_Cavendish,
     R_Voucher,
     R_Voucher_Tag,
     R_Soul,
@@ -91,6 +92,7 @@ text type_str(int x) {
         case R_Ouija:                    return init_text("ouija", 5);
         case R_Wheel_of_Fortune:         return init_text("wheel_of_fortune", 16);
         case R_Gros_Michel:              return init_text("gros_michel", 11);
+        case R_Cavendish:                return init_text("cavendish", 9);
         case R_Voucher:                  return init_text("Voucher", 7);
         case R_Voucher_Tag:              return init_text("Voucher_fromtag", 15);
         case R_Soul:                     return init_text("soul_", 5);
diff --git a/lib/functions.cl b/lib/functions.cl
@@ -14,11 +14,17 @@ typedef struct Card {
     item edition;
     item seal;
 } card;
-
+#if V_AT_MOST(1,0,0,10)
 item standard_enhancement(instance* inst, int ante) {
     if (random_simple(inst, R_Standard_Has_Enhancement) <= 0.6) return No_Enhancement;
     return randchoice_common(inst, R_Enhancement, S_Standard, ante, ENHANCEMENTS);
 }
+#else
+item standard_enhancement(instance* inst, int ante) {
+    if (random(inst, (__private ntype[]){N_Type, N_Ante}, (__private int[]){R_Standard_Has_Enhancement, ante}, 2) <= 0.6) return No_Enhancement;
+    return randchoice_common(inst, R_Enhancement, S_Standard, ante, ENHANCEMENTS);
+}
+#endif
 item standard_base(instance* inst, int ante) {
     return randchoice_common(inst, R_Card, S_Standard, ante, CARDS);
 }
@@ -39,6 +45,7 @@ item standard_edition(instance* inst, int ante) {
     return No_Edition;
 }
 #endif
+#if V_AT_MOST(1,0,0,10)
 item standard_seal(instance* inst) {
     if (random_simple(inst, R_Standard_Has_Seal) <= 0.8) return No_Seal;
     double val = random_simple(inst, R_Standard_Seal);
@@ -47,6 +54,16 @@ item standard_seal(instance* inst) {
     if (val > 0.25) return Gold_Seal;
     return Purple_Seal;
 }
+#else
+item standard_seal(instance* inst, int ante) {
+    if (random(inst, (__private ntype[]){N_Type, N_Ante}, (__private int[]){R_Standard_Has_Seal, ante}, 2) <= 0.8) return No_Seal;
+    double val = random(inst, (__private ntype[]){N_Type, N_Ante}, (__private int[]){R_Standard_Seal, ante}, 2);
+    if (val > 0.75) return Red_Seal;
+    if (val > 0.5) return Blue_Seal;
+    if (val > 0.25) return Gold_Seal;
+    return Purple_Seal;
+}
+#endif
 card standard_card(instance* inst, int ante) {
     card out;
     out.enhancement = standard_enhancement(inst, ante);
@@ -56,7 +73,11 @@ card standard_card(instance* inst, int ante) {
     #else
     out.edition = standard_edition(inst, ante);
     #endif
+    #if V_AT_MOST(1,0,0,10)
     out.seal = standard_seal(inst);
+    #else
+    out.seal = standard_seal(inst, ante);
+    #endif
     return out;
 }
 
@@ -81,7 +102,7 @@ item next_planet(instance* inst, rsrc src, int ante) {
 item next_spectral(instance* inst, rsrc src, int ante) {
     return randchoice_common(inst, R_Spectral, src, ante, SPECTRALS);
 }
-#else
+#elif V_AT_MOST(1,0,0,10)
 item next_tarot(instance* inst, rsrc src, int ante, bool soulable) {
     if (soulable && !inst->locked[The_Soul] && random(inst, (__private ntype[]){N_Type, N_Type}, (__private int[]){R_Soul, R_Tarot}, 2) > 0.997) {
         return The_Soul;
@@ -107,6 +128,32 @@ item next_spectral(instance* inst, rsrc src, int ante, bool soulable) {
     }
     return randchoice_common(inst, R_Spectral, src, ante, SPECTRALS);
 }
+#else
+item next_tarot(instance* inst, rsrc src, int ante, bool soulable) {
+    if (soulable && !inst->locked[The_Soul] && random(inst, (__private ntype[]){N_Type, N_Type, N_Ante}, (__private int[]){R_Soul, R_Tarot, ante}, 3) > 0.997) {
+        return The_Soul;
+    }
+    return randchoice_common(inst, R_Tarot, src, ante, TAROTS);
+}
+item next_planet(instance* inst, rsrc src, int ante, bool soulable) {
+    if (soulable && !inst->locked[Black_Hole] && random(inst, (__private ntype[]){N_Type, N_Type, N_Ante}, (__private int[]){R_Soul, R_Planet, ante}, 3) > 0.997) {
+        return Black_Hole;
+    }
+    return randchoice_common(inst, R_Planet, src, ante, PLANETS);
+}
+item next_spectral(instance* inst, rsrc src, int ante, bool soulable) {
+    if (soulable) {
+        item forcedKey = RETRY;
+        if (!inst->locked[The_Soul] && random(inst, (__private ntype[]){N_Type, N_Type, N_Ante}, (__private int[]){R_Soul, R_Spectral, ante}, 3) > 0.997) {
+            forcedKey = The_Soul;
+        }
+        if (!inst->locked[Black_Hole] && random(inst, (__private ntype[]){N_Type, N_Type, N_Ante}, (__private int[]){R_Soul, R_Spectral, ante}, 3) > 0.997) {
+            forcedKey = Black_Hole;
+        }
+        if (forcedKey != RETRY) return forcedKey;
+    }
+    return randchoice_common(inst, R_Spectral, src, ante, SPECTRALS);
+}
 #endif
 
 item next_joker(instance* inst, rsrc src, int ante) {
@@ -166,8 +213,6 @@ item next_tag(instance* inst, int ante) {
     return randchoice_common(inst, R_Tags, S_Null, ante, TAGS);
 }
 
-//Todo: account for Black Hole and Soul spawn mechanics
-//Checked separately for each card spawned, both can appear in spectrals
 #ifdef DEMO
 void arcana_pack(item out[], int size, instance* inst, int ante) {
     randlist(out, size, inst, R_Tarot, S_Arcana, ante, TAROTS);
@@ -228,10 +273,15 @@ void buffoon_pack_editions(item out[], int size, instance* inst, int ante) {
 }
 
 // More specific RNG types
-
+#ifdef DEMO
 int misprint(instance* inst) {
     return (int)randint(inst, (__private ntype[]){N_Type}, (__private int[]){R_Misprint}, 1, 0, 20);
 }
+#else
+int misprint(instance* inst) {
+    return (int)randint(inst, (__private ntype[]){N_Type}, (__private int[]){R_Misprint}, 1, 0, 23);
+}
+#endif
 bool lucky_mult(instance* inst) {
     return random_simple(inst, R_Lucky_Mult) < 1.0/5;
 }
@@ -266,9 +316,18 @@ item wheel_of_fortune_edition(instance* inst) {
     } else return No_Edition;
 }
 #endif
+#ifdef DEMO
 bool gros_michel_extinct(instance* inst) {
     return random_simple(inst, R_Gros_Michel) < 1.0/15;
 }
+#else
+bool gros_michel_extinct(instance* inst) {
+    return random_simple(inst, R_Gros_Michel) < 1.0/4;
+}
+#endif
+bool cavendish_extinct(instance* inst) {
+    return random_simple(inst, R_Cavendish) < 1.0/1000;
+}
 #ifdef DEMO
 item next_voucher(instance* inst, int ante) {
     item i = randchoice(inst, (__private ntype[]){N_Type, N_Ante}, (__private int[]){R_Voucher, ante}, 2, VOUCHERS);
diff --git a/lib/immolate.cl b/lib/immolate.cl
@@ -4,13 +4,13 @@
     #define VER1 1
     #define VER2 0
     #define VER3 0
-    #define VER4 9 //1.0.0i
+    #define VER4 11 //1.0.0k
     #define GAME_VERSION
 #endif
-#include "util.cl" // Contains utility functions
-#include "seed.cl" // Contains seed/seed list info
-#include "items.cl" // Contains item enums, lists, helper functions
-#include "debug.cl" // Debug printing functions
-#include "cache.cl" // Contains RNG Cache implementation
-#include "instance.cl" // Contains random instance implementation and core functions
+#include "./lib/util.cl" // Contains utility functions
+#include "./lib/seed.cl" // Contains seed/seed list info
+#include "./lib/items.cl" // Contains item enums, lists, helper functions
+#include "./lib/debug.cl" // Debug printing functions
+#include "./lib/cache.cl" // Contains RNG Cache implementation
+#include "./lib/instance.cl" // Contains random instance implementation and core functions
 #include "functions.cl" // Contains utility functions for searching seeds - what the user would interact with
diff --git a/search.cl b/search.cl
@@ -1,4 +1,4 @@
-#include "filters/double_legendary.cl"
+#include "./filters/double_legendary.cl"
 
 // Search
 __kernel void search(char8 starting_seed, long num_seeds, long filter_cutoff) {
@@ -17,19 +17,4 @@ __kernel void search(char8 starting_seed, long num_seeds, long filter_cutoff) {
         }
         s_skip(&_seed,get_global_size(0));
     }
-}
-
-// Filter for fixing shuffler
-/*long filter(instance* inst) {
-    int start_id = 1;
-    // Code for fixing shuffler
-    item deck[52];
-    for (int i = 1; i <= 52; i++) {
-        deck[i-1] = i;
-    }
-    i_shuffle_deck(inst, deck, 1);
-    if (deck[43] == start_id && deck[42] == start_id+1 && deck[41] == start_id+2 && deck[40] == start_id+3 && deck[39] == start_id+4) {
-        return 1;
-    }
-    return 0;
-}*/
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// Searches for a first shop buffoon pack with the four jokers that give increased mult to suits.`
`2`		`-#include "lib/immolate.cl"`
	`2`	`+#include "./lib/immolate.cl"`
`3`	`3`	`long filter(instance* inst) {`
`4`	`4`	`int score = 0;`
`5`	`5`	`for (int i = 1; i <= 2; i++) {`
`@@ -12,5 +12,5 @@ long filter(instance* inst) {`
`12`	`12`	`}`
`13`	`13`	`};`
`14`	`14`	`}`
`15`		`- return score;`
	`15`	`+ return score/2;`
`16`	`16`	`}`