Adjust challenges
This commit is contained in:
parent
c9f282bdf2
commit
b1c7ffffbe
4 changed files with 16 additions and 9 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "Roland",
|
"id": "Roland",
|
||||||
"name": "Roland",
|
"name": "Roland",
|
||||||
"prefix": "Roland",
|
"prefix": "Roland",
|
||||||
"version": "2.9.18",
|
"version": "2.9.19",
|
||||||
"badge_colour": "8BE9FD",
|
"badge_colour": "8BE9FD",
|
||||||
"display_name": "Roland",
|
"display_name": "Roland",
|
||||||
"main_file": "src/main.lua",
|
"main_file": "src/main.lua",
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ SMODS.Challenge {
|
||||||
SMODS.Challenge {
|
SMODS.Challenge {
|
||||||
key = "Eternally_Amber",
|
key = "Eternally_Amber",
|
||||||
rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}},
|
rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}},
|
||||||
jokers = {{id = "j_joker"}, {id = "j_Roland_amber"}},
|
jokers = {{id = "j_Roland_amber"}},
|
||||||
restrictions = amber,
|
restrictions = amber,
|
||||||
pronouns = "they_them",
|
pronouns = "they_them",
|
||||||
calculate = function(_, context)
|
calculate = function(_, context)
|
||||||
|
|
@ -152,7 +152,7 @@ SMODS.Challenge {
|
||||||
SMODS.Challenge {
|
SMODS.Challenge {
|
||||||
key = "Eternally_Cerulean",
|
key = "Eternally_Cerulean",
|
||||||
rules = {custom = {{id = "Roland_Eternally_Cerulean"}, {id = "Roland_Showdown_Cerulean"}}},
|
rules = {custom = {{id = "Roland_Eternally_Cerulean"}, {id = "Roland_Showdown_Cerulean"}}},
|
||||||
jokers = {{id = "j_joker"}, {id = "j_Roland_cerulean"}},
|
jokers = {{id = "j_Roland_cerulean"}},
|
||||||
restrictions = cerulean,
|
restrictions = cerulean,
|
||||||
pronouns = "she_her",
|
pronouns = "she_her",
|
||||||
calculate = function(_, context)
|
calculate = function(_, context)
|
||||||
|
|
@ -179,7 +179,7 @@ SMODS.Challenge {
|
||||||
SMODS.Challenge {
|
SMODS.Challenge {
|
||||||
key = "Eternally_Crimson",
|
key = "Eternally_Crimson",
|
||||||
rules = {custom = {{id = "Roland_Eternally_Crimson"}, {id = "Roland_Showdown_Crimson"}}},
|
rules = {custom = {{id = "Roland_Eternally_Crimson"}, {id = "Roland_Showdown_Crimson"}}},
|
||||||
jokers = {{id = "j_joker"}, {id = "j_Roland_crimson"}},
|
-- jokers = {{id = "j_Roland_crimson"}},
|
||||||
restrictions = crimson,
|
restrictions = crimson,
|
||||||
pronouns = "she_her",
|
pronouns = "she_her",
|
||||||
calculate = function(_, context)
|
calculate = function(_, context)
|
||||||
|
|
@ -239,7 +239,7 @@ SMODS.Challenge {
|
||||||
SMODS.Challenge {
|
SMODS.Challenge {
|
||||||
key = "Eternally_Verdant",
|
key = "Eternally_Verdant",
|
||||||
rules = {custom = {{id = "Roland_Eternally_Verdant"}, {id = "Roland_Showdown_Verdant"}}},
|
rules = {custom = {{id = "Roland_Eternally_Verdant"}, {id = "Roland_Showdown_Verdant"}}},
|
||||||
jokers = {{id = "j_joker"}, {id = "j_Roland_verdant"}},
|
jokers = {{id = "j_Roland_verdant"}},
|
||||||
restrictions = verdant,
|
restrictions = verdant,
|
||||||
pronouns = "she_her",
|
pronouns = "she_her",
|
||||||
calculate = function(_, context)
|
calculate = function(_, context)
|
||||||
|
|
|
||||||
|
|
@ -688,11 +688,13 @@ joker {
|
||||||
right.config.center.key == "j_Roland_crimson"
|
right.config.center.key == "j_Roland_crimson"
|
||||||
|
|
||||||
if debuffed_by_crimson and v.ability.Roland_crimson == nil then
|
if debuffed_by_crimson and v.ability.Roland_crimson == nil then
|
||||||
v.ability.Roland_crimson = not not v.debuff
|
local debuff = not not v.debuff
|
||||||
v:set_debuff(true)
|
v:set_debuff(true)
|
||||||
|
v.ability.Roland_crimson = debuff
|
||||||
elseif not debuffed_by_crimson and v.ability.Roland_crimson ~= nil then
|
elseif not debuffed_by_crimson and v.ability.Roland_crimson ~= nil then
|
||||||
v:set_debuff(v.ability.Roland_crimson)
|
local debuff = v.ability.Roland_crimson
|
||||||
v.ability.Roland_crimson = nil
|
v.ability.Roland_crimson = nil
|
||||||
|
v:set_debuff(debuff)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,16 @@ local f, q = (... or require "lib.shared")[1], (... or require "lib.shared")[2]
|
||||||
SMODS.Joker:take_ownership("joker", {cost = 1}, true)
|
SMODS.Joker:take_ownership("joker", {cost = 1}, true)
|
||||||
local orig_set_debuff = Card.set_debuff
|
local orig_set_debuff = Card.set_debuff
|
||||||
|
|
||||||
function Card:set_debuff(...)
|
function Card:set_debuff(should_debuff, ...)
|
||||||
|
if self.ability.Roland_crimson ~= nil then
|
||||||
|
self.ability.Roland_crimson = not not should_debuff
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
if SMODS.get_enhancements(self).m_wild and SMODS.Mods.Roland.config.no_wild_debuff then
|
if SMODS.get_enhancements(self).m_wild and SMODS.Mods.Roland.config.no_wild_debuff then
|
||||||
self.debuff = false
|
self.debuff = false
|
||||||
else
|
else
|
||||||
orig_set_debuff(self, ...)
|
orig_set_debuff(self, should_debuff, ...)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue