Support for The Soul and Black Hole

Author: MathIsFun0

enum_to_printf.py

@@ -18,7 +18,11 @@ def convert_enum(enum_code):
         "Mr Bones": "Mr. Bones",
         "Oops All 6s": "Oops! All 6s",
         "Drivers License": "Driver's License",
-        "Directors Cut": "Director's Cut"
+        "Directors Cut": "Director's Cut",
+        "On a Knifes Edge": "On a Knife's Edge",
+        "X ray Vision": "X-ray Vision",
+        "Non Perishable": "Non-Perishable",
+        "Five Card Draw": "Five-Card Draw"
     }
 
     # Helper function to format enum item names
@@ -54,66 +58,198 @@ def format_enum_item(enum_item):
     Lusty_Joker,
     Wrathful_Joker,
     Gluttonous_Joker,
+    Jolly_Joker,
+    Zany_Joker,
+    Mad_Joker,
+    Crazy_Joker,
+    Droll_Joker,
     Sly_Joker,
     Wily_Joker,
+    Clever_Joker,
     Devious_Joker,
     Crafty_Joker,
-    Gift_Card,
+    Half_Joker,
+    Credit_Card,
+    Banner,
+    Mystic_Summit,
+    _8_Ball,
+    Misprint,
+    Raised_Fist,
+    Chaos_the_Clown,
+    Scary_Face,
+    Abstract_Joker,
+    Delayed_Gratification,
     Gros_Michel,
     Even_Steven,
     Odd_Todd,
-    Misprint,
+    Scholar,
+    Business_Card,
+    Supernova,
+    Ride_the_Bus,
+    Egg,
+    Runner,
+    Ice_Cream,
+    Splash,
+    Blue_Joker,
+    Faceless_Joker,
     Green_Joker,
+    Superposition,
+    To_Do_List,
+    Cavendish,
+    Red_Card,
+    Square_Joker,
+    Riff_raff,
     Photograph,
+    Mail_In_Rebate,
+    Hallucination,
     Fortune_Teller,
+    Juggler,
     Drunkard,
+    Golden_Joker,
     Popcorn,
+    Walkie_Talkie,
+    Smiley_Face,
+    Golden_Ticket,
     Swashbuckler,
-    Credit_Card,
-    Superposition,
-    Raised_Fist,
+    Hanging_Chad,
+    Shoot_the_Moon,
     J_C_END,
 
     J_U_BEGIN,
+    Joker_Stencil,
     Four_Fingers,
-    Banner,
+    Mime,
+    Ceremonial_Dagger,
+    Marble_Joker,
+    Loyalty_Card,
+    Dusk,
     Fibonacci,
+    Steel_Joker,
     Hack,
+    Pareidolia,
+    Space_Joker,
+    Burglar,
+    Blackboard,
+    Constellation,
+    Hiker,
+    Card_Sharp,
+    Madness,
+    Vampire,
     Shortcut,
     Hologram,
     Vagabond,
-    Ramen,
+    Cloud_9,
+    Rocket,
+    Midas_Mask,
+    Luchador,
+    Gift_Card,
+    Turtle_Bean,
+    Erosion,
     Reserved_Parking,
+    To_the_Moon,
+    Stone_Joker,
+    Lucky_Cat,
     Bull,
-    Throwback,
-    Flower_Pot,
-    Trading_Card,
     Diet_Cola,
+    Trading_Card,
+    Flash_Card,
     Spare_Trousers,
+    Ramen,
+    Seltzer,
+    Castle,
+    Mr_Bones,
+    Acrobat,
+    Sock_and_Buskin,
+    Troubadour,
+    Certificate,
+    Smeared_Joker,
+    Throwback,
+    Rough_Gem,
+    Bloodstone,
+    Arrowhead,
+    Onyx_Agate,
+    Glass_Joker,
+    Showman,
+    Flower_Pot,
+    Merry_Andy,
+    Oops_All_6s,
+    The_Idol,
+    Seeing_Double,
+    Matador,
+    Stuntman,
+    Satellite,
+    Cartomancer,
+    Astronomer,
+    Burnt_Joker,
+    Bootstraps,
     J_U_END,
 
     J_R_BEGIN,
+    DNA,
+    Sixth_Sense,
     Seance,
+    Baron,
+    Obelisk,
     Baseball_Card,
+    Ancient_Joker,
+    Campfire,
+    Blueprint,
+    Wee_Joker,
     Hit_the_Road,
+    The_Duo,
     The_Trio,
+    The_Family,
+    The_Order,
+    The_Tribe,
     Invisible_Joker,
     Brainstorm,
-    Obelisk,
+    Drivers_License,
     J_R_END,
 
+    J_L_BEGIN,
+    Canio,
+    Triboulet,
+    Yorick,
+    Chicot,
+    Perkeo,
+    J_L_END,
+
     J_END,
 
     // Vouchers
     V_BEGIN,
     Overstock,
+    Overstock_Plus,
+    Clearance_Sale,
+    Liquidation,
     Hone,
+    Glow_Up,
+    Reroll_Surplus,
+    Reroll_Glut,
     Crystal_Ball,
+    Omen_Globe,
+    Telescope,
+    Observatory,
     Grabber,
+    Nacho_Tong,
+    Wasteful,
+    Recyclomancy,
     Tarot_Merchant,
+    Tarot_Tycoon,
     Planet_Merchant,
+    Planet_Tycoon,
     Seed_Money,
+    Money_Tree,
+    Blank,
+    Antimatter,
+    Magic_Trick,
+    Illusion,
+    Hieroglyph,
+    Petroglyph,
+    Directors_Cut,
+    Retcon,
     Paint_Brush,
+    Palette,
     V_END,
 
     // Tarots
@@ -192,6 +328,8 @@ def format_enum_item(enum_item):
     Trance,
     Medium,
     Cryptid,
+    The_Soul,
+    Black_Hole,
     S_END,
 
     // Enhancements
@@ -280,12 +418,29 @@ def format_enum_item(enum_item):
     The_Ox,
     The_House,
     The_Wall,
+    The_Wheel,
+    The_Arm,
     The_Club,
     The_Fish,
+    The_Psychic,
+    The_Goad,
+    The_Water,
+    The_Window,
     The_Manacle,
+    The_Eye,
     The_Mouth,
+    The_Plant,
+    The_Serpent,
+    The_Pillar,
+    The_Needle,
+    The_Head,
     The_Tooth,
+    The_Flint,
     The_Mark,
+    Amber_Acorn,
+    Verdant_Leaf,
+    Violet_Vessel,
+    Crimson_Heart,
     Cerulean_Bell,
     B_END,
 
@@ -370,7 +525,51 @@ def format_enum_item(enum_item):
     S_T,
     C_END,
 
-    ITEMS_END,
+    // Decks
+    D_BEGIN,
+    Red_Deck,
+    Blue_Deck,
+    Yellow_Deck,
+    Green_Deck,
+    Black_Deck,
+    Magic_Deck,
+    Nebula_Deck,
+    Ghost_Deck,
+    Abandoned_Deck,
+    Checkered_Deck,
+    Zodiac_Deck,
+    Painted_Deck,
+    Anaglyph_Deck,
+    Plasma_Deck,
+    Erratic_Deck,
+    Challenge_Deck,
+    D_END,
+
+    // Challenges
+    CHAL_BEGIN,
+    The_Omelette,
+    _15_Minute_City,
+    Rich_get_Richer,
+    On_a_Knifes_Edge,
+    X_ray_Vision,
+    Mad_World,
+    Luxury_Tax,
+    Non_Perishable,
+    Medusa,
+    Double_or_Nothing,
+    Typecast,
+    Inflation,
+    Bram_Poker,
+    Fragile,
+    Monolith,
+    Blast_Off,
+    Five_Card_Draw,
+    Golden_Needle,
+    Cruelty,
+    Jokerless,
+    CHAL_END,
+
+    ITEMS_END
 } item;
 """
 

immolate.c

@@ -2,7 +2,7 @@
 int main(int argc, char **argv) {
 
     // Print version
-    printf_s("Immolate Beta v1.0.0i.1\n");
+    printf_s("Immolate Beta v1.0.0i.2\n");
 
     // Handle CLI arguments
     unsigned int platformID = 0;

lib/cache.cl

@@ -3,6 +3,7 @@ typedef enum RandomType {
     R_Joker_Common,
     R_Joker_Uncommon,
     R_Joker_Rare,
+    R_Joker_Legendary,
     R_Joker_Rarity,
     R_Joker_Edition,
     R_Misprint,
@@ -27,6 +28,7 @@ typedef enum RandomType {
     R_Gros_Michel,
     R_Voucher,
     R_Voucher_Tag,
+    R_Soul,
     R_END
 } rtype;
 
@@ -48,6 +50,7 @@ typedef enum RNGSource {
     S_Rare_Tag,
     S_Uncommon_Tag,
     S_Blue_Seal,
+    S_Soul,
     S_Null,
     SOURCE_END
 } rsrc;
@@ -65,6 +68,7 @@ text type_str(int x) {
         case R_Joker_Common:             return init_text("Joker1", 6);
         case R_Joker_Uncommon:           return init_text("Joker2", 6);
         case R_Joker_Rare:               return init_text("Joker3", 6);
+        case R_Joker_Legendary:          return init_text("Joker4", 6);
         case R_Joker_Rarity:             return init_text("rarity", 6);
         case R_Joker_Edition:            return init_text("edi", 3);
         case R_Misprint:                 return init_text("misprint", 8);
@@ -89,6 +93,7 @@ text type_str(int x) {
         case R_Gros_Michel:              return init_text("gros_michel", 11);
         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);
         default:                         return init_text("", 0);
     }
 }
@@ -111,6 +116,7 @@ text source_str(int x) {
         case S_Rare_Tag:       return init_text("rta", 3);
         case S_Uncommon_Tag:   return init_text("uta", 3);
         case S_Blue_Seal:      return init_text("blusl", 5);
+        case S_Soul:           return init_text("sou", 3);
         default:               return init_text("", 0);
     }
 }