start dr house joker
This commit is contained in:
parent
e3f210d2bc
commit
5902432b84
@ -56,13 +56,8 @@ SMODS.Joker {
|
|||||||
cost = 6,
|
cost = 6,
|
||||||
calculate = function(self, card, context)
|
calculate = function(self, card, context)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- TODO: Handle Fortune Teller (maybe need to use a lovely injection to force the updated values to be added)
|
-- TODO: Handle Fortune Teller (maybe need to use a lovely injection to force the updated values to be added)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if context.end_of_round and not context.game_over and context.main_eval then
|
if context.end_of_round and not context.game_over and context.main_eval then
|
||||||
for _, joker in ipairs(G.jokers.cards) do
|
for _, joker in ipairs(G.jokers.cards) do
|
||||||
|
|
||||||
@ -70,7 +65,7 @@ SMODS.Joker {
|
|||||||
|
|
||||||
print("type of value attached to field "..i.." on joker "..joker.ability.name.. " is "..type(v))
|
print("type of value attached to field "..i.." on joker "..joker.ability.name.. " is "..type(v))
|
||||||
|
|
||||||
if type(v) == "number" and ((v>0) or ((i=="x_mult") and v~=0) or ((i=="h_x_mult") and v~=0)) and (i ~= "order") and (i ~= "cost") then
|
if type(v) == "number" and ((v>0) or (((i=="x_mult")or(i=="xmult")) and v~=0) or ((i=="h_x_mult") and v~=0)) and (i ~= "order") and (i ~= "cost") then
|
||||||
G.jokers.cards[_].ability[i] = v + card.ability.extra.increment
|
G.jokers.cards[_].ability[i] = v + card.ability.extra.increment
|
||||||
print("incremented field "..i.." to "..v)
|
print("incremented field "..i.." to "..v)
|
||||||
elseif type(v) == "table" then
|
elseif type(v) == "table" then
|
||||||
@ -92,3 +87,31 @@ SMODS.Joker {
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- SMODS.Joker {
|
||||||
|
-- key = "mimic",
|
||||||
|
-- name = "Mimic",
|
||||||
|
-- atlas = "jokers_atlas",
|
||||||
|
-- pos = { x = 2, y = 0 },
|
||||||
|
-- unlocked = true,
|
||||||
|
-- discovered = true,
|
||||||
|
|
||||||
|
-- }
|
||||||
|
|
||||||
|
SMODS.Joker {
|
||||||
|
key = "dr_house",
|
||||||
|
name = "Dr. House",
|
||||||
|
atlas = "jokers_atlas",
|
||||||
|
pos = { x = 3, y = 0 },
|
||||||
|
unlocked = true,
|
||||||
|
discovered = true,
|
||||||
|
config = { extra = { x_mult = 1, increase = 1 } },
|
||||||
|
loc_vars = function(self, info_queue, card)
|
||||||
|
return { vars = { card.ability.extra.x_mult, card.ability.extra.increase } }
|
||||||
|
end,
|
||||||
|
rarity = 2,
|
||||||
|
cost = 8,
|
||||||
|
calculate = function(self, card, context)
|
||||||
|
|
||||||
|
end,
|
||||||
|
}
|
@ -17,7 +17,7 @@ return {
|
|||||||
name = "Inflation Joker",
|
name = "Inflation Joker",
|
||||||
text = {
|
text = {
|
||||||
"Increases {C:green}every value{} on each",
|
"Increases {C:green}every value{} on each",
|
||||||
"held joker by {C:money}#1#{} at the end of the round.",
|
"held joker by {C:money}#1#{} at the end of each round.",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user