Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ MP.load_mp_dir("objects/jokers/sandbox")
MP.load_mp_dir("objects/jokers/sandbox/extra-credit")
MP.load_mp_dir("objects/jokers/standard")
MP.load_mp_dir("objects/jokers/experimental")
MP.load_mp_dir("objects/jokers/release")
MP.load_mp_dir("objects/stakes")
MP.load_mp_dir("objects/tags")
MP.load_mp_dir("objects/consumables")
Expand Down
3 changes: 1 addition & 2 deletions layers/experimental.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ MP.Layer("experimental", {
"j_bloodstone",
"c_ouija",
"j_todo_list",
"j_idol",
},
banned_jokers = {
"j_mp_speedrun",
Expand All @@ -25,7 +24,7 @@ MP.Layer("experimental", {
"j_mp_seltzer",
"j_mp_todo_list",
"j_mp_bloodstone",
"j_mp_idol_rare",
"j_idol",
},
reworked_consumables = {
"c_mp_ouija_standard",
Expand Down
6 changes: 4 additions & 2 deletions layers/release.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
--[[
-- The 1.0.0-release rebalance layer. Still WIP (most of its center reworks live
-- commented in rulesets/release.lua), but the layer itself is defined so reworks
-- can target it by name. No live ruleset composes it yet, so enabling it here
-- changes nothing in shipped play.
MP.Layer("release", {
multiplayer_content = false,
-- Allan please add details
})
]]
9 changes: 0 additions & 9 deletions localization/en-us.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ return {
"{s:0.8}Card changes every round",
},
},
j_mp_idol_rare = {
name = "The Idol",
text = {
"Each played {C:attention}#2#",
"of {V:1}#3#{} gives",
"{X:mult,C:white} X#1# {} Mult when scored",
"{s:0.8}Card changes every round",
},
},
j_mp_ticket = {
name = "Golden Ticket",
text = {
Expand Down
9 changes: 0 additions & 9 deletions localization/ru.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,6 @@ return {
"{s:0.8}Карта меняется каждый раунд",
},
},
j_mp_idol_rare = {
name = "Идол",
text = {
"Каждая сыгранная {C:attention}#2#",
"{V:1}#3#{} даёт",
"{X:mult,C:white} X#1# {} множ. при подсчёте",
"{s:0.8}Карта меняется каждый раунд",
},
},
j_mp_ticket = {
name = "Золотой билет",
text = {
Expand Down
37 changes: 4 additions & 33 deletions objects/jokers/experimental/idol_rare.lua
Original file line number Diff line number Diff line change
@@ -1,36 +1,7 @@
SMODS.Joker({
key = "idol_rare",
unlocked = true,
discovered = true,
blueprint_compat = true,
perishable_compat = true,
eternal_compat = true,
MP.ReworkCenter("j_idol", {
layers = "experimental",
rarity = 3,
cost = 8,
pos = { x = 6, y = 7 },
no_collection = true,
config = { extra = { xmult = 2 }, mp_balanced = true },
loc_vars = function(self, info_queue, card)
local idol_card = G.GAME.current_round.idol_card or { rank = "Ace", suit = "Spades" }
return {
vars = {
card.ability.extra.xmult,
localize(idol_card.rank, "ranks"),
localize(idol_card.suit, "suits_plural"),
colours = { G.C.SUITS[idol_card.suit] },
},
}
end,
calculate = function(self, card, context)
if
context.individual
and context.cardarea == G.play
and context.other_card:get_id() == G.GAME.current_round.idol_card.id
and context.other_card:is_suit(G.GAME.current_round.idol_card.suit)
then
return {
xmult = card.ability.extra.xmult,
}
end
end,
unlocked = true,
discovered = true,
})
Loading