emik/Roland
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Buff Oops! All 7s and nerf Martingale

Browse source
This commit is contained in:
Emik 2026-02-13 20:56:57 +01:00
parent e76fee417e
commit dd7188cbae
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
localization/en-us.lua
View file

@ -169,10 +169,9 @@ return {
j_Roland_oops = { j_Roland_oops = {
name = "Oops! All 7s", name = "Oops! All 7s",
text = { text = {
"Listed {C:green,E:1}probabilities", "{X:green,C:white}X#1#{C:green,E:1} probability {}after every",
"{C:attention}increase{} for each", "{C:blue}hand {}played this round",
"{C:hand}hand played this round", "{C:inactive}(Currently {X:green,C:white}X#2#{C:inactive})",
"{C:inactive}(Currently {C:green}X#1#{C:inactive})",
}, },
}, },
j_Roland_sunny = { j_Roland_sunny = {

23
src/joker.lua
View file

@ -532,14 +532,15 @@ joker {
key = "oops", key = "oops",
pronouns = "he_they", pronouns = "he_they",
artist = "Roland_char", artist = "Roland_char",
cost = 8, cost = 7,
rarity = 3, rarity = 3,
config = {extra = {probability = 1, delta = 1}}, config = {extra = {probability = 1, probability_mult = 2, reset = 1}},
eternal_compat = true, eternal_compat = true,
blueprint_compat = false, blueprint_compat = false,
perishable_compat = true, perishable_compat = true,
loc_vars = function(_, _, card) loc_vars = function(_, _, card)
return {vars = {card.ability.extra.probability}} local extra = card.ability.extra
return {vars = {extra.probability_mult, extra.probability}}
end, end,
calculate = function(_, card, context) calculate = function(_, card, context)
if context.blueprint or not card.ability then if context.blueprint or not card.ability then
@ -552,13 +553,13 @@ joker {
return {numerator = extra.probability} return {numerator = extra.probability}
end end
if context.end_of_round and extra.probability ~= extra.delta then if context.end_of_round and extra.probability ~= extra.reset then
extra.probability = extra.delta extra.probability = extra.reset
return {message = localize "k_reset", colour = G.C.RED} return {message = localize "k_reset", colour = G.C.RED}
end end
if context.after then if context.after then
extra.probability = extra.probability + extra.delta extra.probability = extra.probability * extra.probability_mult
return {message = localize "k_upgrade_ex", colour = G.C.GREEN} return {message = localize "k_upgrade_ex", colour = G.C.GREEN}
end end
end, end,
@ -567,8 +568,8 @@ joker {
joker { joker {
key = "martingale", key = "martingale",
pronouns = "he_him", pronouns = "he_him",
config = {extra = {odds = 2, times = 0}}, config = {extra = {odds = 2}},
cost = 7, cost = 8,
rarity = 3, rarity = 3,
eternal_compat = true, eternal_compat = true,
blueprint_compat = true, blueprint_compat = true,
@ -589,11 +590,9 @@ joker {
return return
end end
local extra = card.ability.extra local extra, numerator, xmult = card.ability.extra, 1, 1
local xmult = extra.odds
local numerator = 1
for _ = 1, 63 do for _ = 1, 64 do
if SMODS.pseudorandom_probability(card, "j_Roland_martingale", 1, extra.odds, "Martingale") then if SMODS.pseudorandom_probability(card, "j_Roland_martingale", 1, extra.odds, "Martingale") then
break break
end end