(HATRED) Made it work as intended

content/joker/hatred.lua

@@ -2,7 +2,9 @@ SMODS.Joker {
   key = "hatred",
   config = {
     extra = {
-      xmult = 1.5
+      xmult = 1.5,
+      mark_new = true,
+      discarded = false
     }
   },
   attributes = {
@@ -33,8 +35,34 @@ SMODS.Joker {
   end,
 
   calculate = function(self, card, context)
+    local function mark_card()
+      -- Mark a random card that isn't already marked
+      local targets = {}
+      for _, _card in ipairs(G.hand.cards) do
+        if not card.ability.paperback_hatred_mark then
+          targets[#targets + 1] = _card
+        end
+      end
+
+      local marked = pseudorandom_element(G.hand.cards, 'hatred_mark')
+
+      if marked then
+        card.ability.extra.mark_new = false
+        marked.ability.paperback_hatred_mark = true
+        juice_card_until(marked, function() return marked.ability.paperback_hatred_mark end, true)
+        G.E_MANAGER:add_event(Event {
+          trigger = 'immediate',
+          delay = 0.5,
+          func = function()
+            save_run()
+            return true
+          end
+        })
+      end
+    end
+
     if context.individual and context.cardarea == G.play then
-      if context.other_card.paperback_hatred_mark then
+      if context.other_card.ability.paperback_hatred_mark then
         return {
           xmult = card.ability.extra.xmult
         }
@@ -44,16 +72,17 @@ SMODS.Joker {
     -- Checks for destroying the marked card
     if not context.blueprint then
       local destroyed = false
-      if context.pre_discard then
-        for i, v in ipairs(context.full_hand) do
-          if v.paperback_hatred_mark then
-            destroyed = true
-            SMODS.destroy_cards { v }
-          end
-        end
+      if context.discard and context.other_card.ability.paperback_hatred_mark then
+        card.ability.extra.mark_new = false
+        card.ability.extra.discarded = true
+        return {
+          remove = true,
+          message = localize('paperback_hatred_death_ex'),
+          colour = G.C.MULT
+        }
       end
 
-      if context.destroy_card and context.cardarea == 'unscored' and context.destroy_card.paperback_hatred_mark then
+      if context.destroy_card and context.cardarea == 'unscored' and context.destroy_card.ability.paperback_hatred_mark then
         return {
           remove = true,
           message = localize('paperback_hatred_death_ex'),
@@ -62,14 +91,26 @@ SMODS.Joker {
       end
 
       if context.after then
+        for i, v in ipairs(context.full_hand) do
+          if v.ability.paperback_hatred_mark then
+            card.ability.extra.mark_new = true
+          end
+        end
         for i, v in ipairs(G.hand.cards) do
-          if v.paperbackhatred_mark then
+          if v.ability.paperback_hatred_mark then
+            card.ability.extra.mark_new = true
+            SMODS.destroy_cards({ v })
             destroyed = true
-            SMODS.destroy_cards { v }
           end
         end
+        if card.ability.extra.discarded then
+          card.ability.extra.mark_new = true
+        end
         for i, v in ipairs(context.scoring_hand) do
-          v.paperback_hatred_mark = nil
+          v.ability.paperback_hatred_mark = nil
+        end
+        if #G.hand.cards >= G.hand.config.card_limit then
+          mark_card()
         end
       end
       if destroyed then
@@ -78,29 +119,15 @@ SMODS.Joker {
           colour = G.C.MULT
         }
       end
-    end
-
-    if (context.hand_drawn and G.GAME.current_round.hands_played == 0 and G.GAME.current_round.discards_used == 0) or context.after then
-      -- Mark a random card that isn't already marked
-      local targets = {}
-      for _, _card in ipairs(G.hand.cards) do
-        if not card.paperback_hatred_mark then
-          targets[#targets + 1] = _card
-        end
-      end
-
-      local marked = pseudorandom_element(G.hand.cards, 'hatred_mark')
-
-      if marked then
-        marked.paperback_hatred_mark = true
-        juice_card_until(marked, function() return marked.paperback_hatred_mark end, true)
+      if context.hand_drawn and (context.first_hand_drawn or card.ability.extra.mark_new) then
+        mark_card()
       end
     end
   end,
 
   remove_from_deck = function(self, card, from_debuff)
     for i, v in ipairs(G.playing_cards) do
-      v.paperback_hatred_mark = nil
+      v.ability.paperback_hatred_mark = nil
     end
   end
 }

content/joker/technology.lua

@@ -67,12 +67,6 @@ SMODS.Joker {
       }
     end
   end,
-  in_pool = function(self, args)
-    for _, playing_card in ipairs(G.playing_cards or {}) do
-      if SMODS.has_enhancement(playing_card, 'm_mult') then
-        return true
-      end
-    end
-    return false
-  end
+
+  enhancement_gate = 'm_mult'
 }

utilities/hooks.lua

@@ -359,6 +359,7 @@ G.FUNCS.toggle_shop = function(e)
 end
 
 -- if a special clip is copied, replace it with a random non-special clip
+-- also stop HATRED's marked cards from copying the mark
 local copy_card_ref = copy_card
 copy_card = function(other, new_card, card_scale, playing_card, strip_edition)
   local card = copy_card_ref(other, new_card, card_scale, playing_card, strip_edition)
@@ -368,6 +369,10 @@ copy_card = function(other, new_card, card_scale, playing_card, strip_edition)
     PB_UTIL.set_paperclip(card, PB_UTIL.poll_paperclip('plat_copy', false))
   end
 
+  if card.ability.paperback_hatred_mark then
+    card.ability.paperback_hatred_mark = nil
+  end
+
   return card
 end