Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11a583e31b | |||
| f01fdf150a |
4 changed files with 8 additions and 10 deletions
|
|
@ -17,5 +17,5 @@
|
||||||
"conflicts": [
|
"conflicts": [
|
||||||
"Jen"
|
"Jen"
|
||||||
],
|
],
|
||||||
"version": "1.5.34"
|
"version": "1.5.36"
|
||||||
}
|
}
|
||||||
|
|
@ -692,8 +692,6 @@ back {
|
||||||
G.GAME.mysterious = nil
|
G.GAME.mysterious = nil
|
||||||
|
|
||||||
if Jane.is_end_of_ante(context) then
|
if Jane.is_end_of_ante(context) then
|
||||||
add_rain_world_joker()
|
|
||||||
|
|
||||||
Jane.q(function()
|
Jane.q(function()
|
||||||
Jane.empowered()
|
Jane.empowered()
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ SMODS.Edition({
|
||||||
},
|
},
|
||||||
sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
|
sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
|
||||||
weight = 10,
|
weight = 10,
|
||||||
extra_cost = 4,
|
extra_cost = 2,
|
||||||
in_shop = true,
|
in_shop = true,
|
||||||
shader = "polygloss",
|
shader = "polygloss",
|
||||||
apply_to_float = false,
|
apply_to_float = false,
|
||||||
|
|
@ -177,7 +177,7 @@ SMODS.Edition({
|
||||||
config = {e_chips = Cryptid and 0.8 or 0.9, e_mult = Cryptid and 1.2 or 1.1},
|
config = {e_chips = Cryptid and 0.8 or 0.9, e_mult = Cryptid and 1.2 or 1.1},
|
||||||
sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
|
sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
|
||||||
weight = 2,
|
weight = 2,
|
||||||
extra_cost = 6,
|
extra_cost = 10,
|
||||||
in_shop = true,
|
in_shop = true,
|
||||||
shader = "moire",
|
shader = "moire",
|
||||||
in_pool = allow_moire,
|
in_pool = allow_moire,
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ SMODS.Joker {
|
||||||
|
|
||||||
info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_empowered or G.P_CENTERS.c_soul
|
info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_empowered or G.P_CENTERS.c_soul
|
||||||
local rounds_left = card.ability.extra.rounds_left
|
local rounds_left = card.ability.extra.rounds_left
|
||||||
local sold = rounds_left - hunter[3]
|
local sold = rounds_left - hunter[5]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
vars = {
|
vars = {
|
||||||
|
|
@ -221,7 +221,7 @@ SMODS.Joker {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if context.selling_self and card.ability.extra.rounds_left <= hunter[3] then
|
if context.selling_self and card.ability.extra.rounds_left <= hunter[5] then
|
||||||
spawn_rot()
|
spawn_rot()
|
||||||
elseif not context.individual and not context.repetition and not context.retrigger_joker then
|
elseif not context.individual and not context.repetition and not context.retrigger_joker then
|
||||||
if G.GAME.round_resets.hands <= 0 then
|
if G.GAME.round_resets.hands <= 0 then
|
||||||
|
|
@ -469,7 +469,7 @@ function Card:set_debuff(should_debuff)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function attunement()
|
local function attunement()
|
||||||
return (G.GAME or {}).weeckweeck and 2 or (Cryptid and 1.002 or 1.2)
|
return (G.GAME or {}).weeckweeck and 2 or (Cryptid and 1.002 or 1.25)
|
||||||
end
|
end
|
||||||
|
|
||||||
SMODS.Joker {
|
SMODS.Joker {
|
||||||
|
|
@ -615,9 +615,9 @@ SMODS.Joker {
|
||||||
e_jane_moire = {
|
e_jane_moire = {
|
||||||
colour = G.C.jane_RGB,
|
colour = G.C.jane_RGB,
|
||||||
sound = "talisman_eeechip",
|
sound = "talisman_eeechip",
|
||||||
[Cryptid and "EEchip_mod" or "Echip_mod"] = attune,
|
EEchip_mod = Cryptid and attune or nil,
|
||||||
[Cryptid and "EEmult_mod" or "Emult_mod"] = attune,
|
[Cryptid and "EEmult_mod" or "Emult_mod"] = attune,
|
||||||
message = (Cryptid and "^^" or "^") .. attune .. " Chips & Mult",
|
message = (Cryptid and "^^" or "^") .. attune .. (Cryptid and " Chips & Mult" or ""),
|
||||||
},
|
},
|
||||||
})[Cryptid and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
|
})[Cryptid and "e_jane_moire" or ((context.other_card or context.other_joker or {}).edition or {}).key]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue