Change Peppino rarity, improve compatibility, remove redundant assets
This commit is contained in:
parent
956bab043d
commit
ec4dd25b36
6 changed files with 8 additions and 12 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB |
|
|
@ -17,5 +17,5 @@
|
||||||
"conflicts": [
|
"conflicts": [
|
||||||
"Jen"
|
"Jen"
|
||||||
],
|
],
|
||||||
"version": "1.7.8"
|
"version": "1.7.9"
|
||||||
}
|
}
|
||||||
|
|
@ -757,8 +757,8 @@ SMODS.Joker {
|
||||||
pos = {x = 0, y = 0},
|
pos = {x = 0, y = 0},
|
||||||
soul_pos = {x = 1, y = 0},
|
soul_pos = {x = 1, y = 0},
|
||||||
config = {extra = {base = 2}},
|
config = {extra = {base = 2}},
|
||||||
rarity = 3,
|
cost = Cryptid and 20 or 8,
|
||||||
cost = 8,
|
rarity = Cryptid and 4 or 3,
|
||||||
blueprint_compat = true,
|
blueprint_compat = true,
|
||||||
loc_vars = function(_, _, card)
|
loc_vars = function(_, _, card)
|
||||||
return {vars = {card.ability.extra.base ^ food_jokers_count()}}
|
return {vars = {card.ability.extra.base ^ food_jokers_count()}}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,3 @@
|
||||||
SMODS.Atlas {
|
|
||||||
key = "janertarots",
|
|
||||||
px = 71,
|
|
||||||
py = 95,
|
|
||||||
path = Jane.config.texture_pack .. "/c_jane_reversetarots.png",
|
|
||||||
}
|
|
||||||
|
|
||||||
SMODS.Sound({key = "draw", path = "draw.ogg"})
|
SMODS.Sound({key = "draw", path = "draw.ogg"})
|
||||||
|
|
||||||
local function conjure(card, number)
|
local function conjure(card, number)
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,9 @@ local function on_token_use(id)
|
||||||
add_tag(t)
|
add_tag(t)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local gourmand = G.P_TAGS.j_cry_gourmand and "j_cry_gourmand" or
|
||||||
|
(G.P_TAGS.j_cry_gourmond and "j_cry_gourmond" or nil)
|
||||||
|
|
||||||
local vowels = {A = true, E = true, I = true, O = true, U = true}
|
local vowels = {A = true, E = true, I = true, O = true, U = true}
|
||||||
|
|
||||||
for _, v in pairs({
|
for _, v in pairs({
|
||||||
|
|
@ -52,7 +55,7 @@ for _, v in pairs({
|
||||||
{"tag_uncommon", "Uncommon", 2, 1, 3},
|
{"tag_uncommon", "Uncommon", 2, 1, 3},
|
||||||
{"tag_rare", "Rare", 3, 1, 5},
|
{"tag_rare", "Rare", 3, 1, 5},
|
||||||
{"tag_cry_epic", "Epic", 4, 1, 8},
|
{"tag_cry_epic", "Epic", 4, 1, 8},
|
||||||
{"tag_cry_gourmand", "Gourmand", 5, 1, 4},
|
{gourmand, "Gourmand", 5, 1, 4},
|
||||||
{"tag_double", "Double", 0, 2, 6},
|
{"tag_double", "Double", 0, 2, 6},
|
||||||
{"tag_cry_triple", "Triple", 1, 2, 8},
|
{"tag_cry_triple", "Triple", 1, 2, 8},
|
||||||
{"tag_cry_quadruple", "Quadruple", 2, 2, 10},
|
{"tag_cry_quadruple", "Quadruple", 2, 2, 10},
|
||||||
|
|
@ -90,7 +93,7 @@ for _, v in pairs({
|
||||||
{"tag_cry_scope", "Scope", 5, 7, 3},
|
{"tag_cry_scope", "Scope", 5, 7, 3},
|
||||||
{"tag_cry_banana", "Banana", 0, 8, 4},
|
{"tag_cry_banana", "Banana", 0, 8, 4},
|
||||||
}) do
|
}) do
|
||||||
if Cryptid or v[1]:sub(1, 7) ~= "tag_cry" then
|
if v[1] and Cryptid or v[1]:sub(1, 7) ~= "tag_cry" then
|
||||||
SMODS.Consumable {
|
SMODS.Consumable {
|
||||||
key = "token_" .. v[1],
|
key = "token_" .. v[1],
|
||||||
set = "jane_tokens",
|
set = "jane_tokens",
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue