Merge pull request #61 from lord-ruby/dev

fix some stuff

Author: lord-ruby

items/jokers/misc_jokers.lua

@@ -314,7 +314,7 @@ local solar_dagger = {
                         return true
                     end,
                 }))
-                SMODS.scale_card(card, {ref_table = card.ability, ref_value = "plus_asc", scalar_table = {sell_cost = sliced_card.sell_cost * 0.1}, scalar_value = "sell_cost"})
+                SMODS.scale_card(card, {ref_table = card.ability, ref_value = "x_asc", scalar_table = {sell_cost = sliced_card.sell_cost * 0.1}, scalar_value = "sell_cost"})
             end
         end
         if context.joker_main then
@@ -467,7 +467,7 @@ local chocolate_egg = {
                 { message = localize("entr_opened"), colour = G.C.GREEN }
             )
             card.ability.no_destroy = true
-            local c = create_card("Joker", G.jokers, nil, "cry_epic")
+            local c = create_card("Joker", G.jokers, nil, (SMODS.Mods["Cryptid"] or {}).can_load and "cry_epic" or 3)
             c:add_to_deck()
             G.jokers:emplace(c)
             c:set_edition("e_entr_sunny")
@@ -491,7 +491,12 @@ local chocolate_egg = {
     entr_credits = {
         idea = {"cassknows"},
         art = {"missingnumber"}
-    }
+    },
+    loc_vars = function()
+        return {
+            key = (SMODS.Mods["Cryptid"] or {}).can_load and "j_entr_chocolate_egg" or "j_entr_chocolate_egg_cryptidless"
+        }
+    end
 }
 
 local lotteryticket = {

lib/hooks.lua

@@ -2324,7 +2324,7 @@ end
 local create_cardref = create_card_for_shop
 function create_card_for_shop(area)
     local card = create_cardref(area)
-    if card.ability.set == "Joker" and next(SMODS.find_card("j_entr_ieros")) then
+    if card and card.ability.set == "Joker" and next(SMODS.find_card("j_entr_ieros")) then
         for i, v2 in pairs(G.jokers.cards) do
             if v2.config.center.key == "j_entr_ieros" then
                 while pseudorandom("ieros") < 0.33 do

localization/en-us.lua

@@ -445,6 +445,13 @@ local decs = {
 					"when this Joker is {C:red}banished{}"
 				}
 			},
+			j_entr_chocolate_egg_cryptidless = {
+				name = "Chocolate Egg",
+				text = {
+					"Create a random {C:dark_edition}Sunny{} {C:red}Rare{} Joker",
+					"when this joker is destroyed",
+				}
+			},
 			j_entr_antireal = {
 				name = "Antireal Joker",
 				text = {
@@ -5777,4 +5784,4 @@ for i, v in pairs(G.localization.descriptions.Blind) do
 	}
 end
 decs.descriptions.CBlind = CBlind
-return decs
+return decs