tweaks

fixed Roxas doubling logic for Axel
Made munny give $1 at end of round

Author: cloudzXIII

content/JokerDisplay/joker_display_definitions.lua

@@ -1,4 +1,3 @@
--- Chip and Dale (TODO),
 local jd_def = JokerDisplay.Definitions
 
 -- Sora

content/cards/04_roxas.lua

@@ -5,10 +5,10 @@ SMODS.Joker {
     loc_vars = function(self, info_queue, card)
         return {
             vars = {
-                card.ability.extra.chips_gain, --1
-                card.ability.extra.discards, --2
+                card.ability.extra.chips_gain,         --1
+                card.ability.extra.discards,           --2
                 card.ability.extra.discards_remaining, --3
-                card.ability.extra.chips   --4
+                card.ability.extra.chips               --4
             }
         }
     end,
@@ -38,7 +38,6 @@ SMODS.Joker {
                 chips = card.ability.extra.chips,
             }
         elseif context.discard and not context.blueprint then
-            -- receives this context for every discarded card individually
             if card.ability.extra.discards_remaining <= 1 then
                 card.ability.extra.discards_remaining = card.ability.extra.discards
                 card.ability.extra.chips = card.ability.extra.chips + card.ability.extra.chips_gain

content/cards/06_axel.lua

@@ -198,7 +198,7 @@ SMODS.Joker {
             local name = target.ability.name
             local is_excluded = Exclude_list[name]
 
-            local joker_rules = {
+            local joker_rules = { -- do roxas
                 ["Riku"] = { keywords = { levels = true }, unkeywords = { total = true } },
                 ["Loyalty Card"] = { unkeywords = { loyalty_remaining = true, every = true } },
                 ["Caino"] = { unkeywords = { caino_xmult = true } },
@@ -208,6 +208,7 @@ SMODS.Joker {
                 ["Square Joker"] = { keywords = { chip_mod = true } },
                 ["Runner"] = { keywords = { chip_mod = true } },
                 ["Faceless Joker"] = { keywords = { dollars = true } },
+                ["Roxas"] = { unkeywords = { discards_remaining = true, discards = true, chips = true } },
             }
 
             local rules = joker_rules[name] or {

content/cards/21_munnypouch.lua

@@ -135,6 +135,7 @@ SMODS.Joker {
 
     loc_vars = function(self, info_queue, card)
         info_queue[#info_queue + 1] = { key = "kh_munnypouch_credits", set = "Other" }
+        info_queue[#info_queue + 1] = { key = "kh_munny_info", set = "Other" }
         return {
             vars = {
             }
@@ -166,6 +167,7 @@ SMODS.Joker {
     loc_vars = function(self, info_queue, card)
         return {
             vars = {
+                card.ability.extra.dollars
             }
         }
     end,
@@ -181,12 +183,17 @@ SMODS.Joker {
     perishable_compat = true,
 
     config = {
+        extra = {
+            dollars = 1
+        }
     },
 
     calculate = function(self, card, context)
 
     end,
-
+    calc_dollar_bonus = function(self, card)
+        return card.ability.extra.dollars
+    end,
     in_pool = function(self)
         return false
     end

localization/en-us.lua

@@ -51,7 +51,8 @@ return {
 			j_kh_munny = {
 				name = 'Munny',
 				text = {
-					"{C:inactive}Does nothing..?"
+					"Earn {C:money}$#1#{} at",
+					"end of round",
 				},
 			},
 
@@ -391,8 +392,15 @@ return {
 				text = {
 					"{C:attention}PoundOS{} for the idea!"
 				}
-			}
+			},
 
+			kh_munny_info = {
+				name = "Munny",
+				text = {
+					"Earn {C:money}$1{} at",
+					"end of round",
+				}
+			}
 		},
 
 		Spectral = {