Skip to content

M invasion! (content update) #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MathIsFun0 merged 7 commits into from
Jun 27, 2024
Merged

M invasion! (content update) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de85e1d
Add files via upload
Jevonnissocoolman Jun 26, 2024
2384485
Delete Items/Items directory
Jevonnissocoolman Jun 26, 2024
179de35
Add files via upload
Jevonnissocoolman Jun 26, 2024
6255561
Update yEpicJokers.lua
Jevonnissocoolman Jun 26, 2024
13d515d
Add files via upload
Jevonnissocoolman Jun 26, 2024
4b75e3d
Add files via upload
Jevonnissocoolman Jun 26, 2024
bb02823
Add files via upload
Jevonnissocoolman Jun 26, 2024
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
190 changes: 95 additions & 95 deletions Items/Blinds.lua
View file
Open in desktop

Large diffs are not rendered by default.

509 changes: 488 additions & 21 deletions Items/MiscJokers.lua
View file
Open in desktop

Large diffs are not rendered by default.

231 changes: 224 additions & 7 deletions Items/yEpicJokers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ local error_joker = {
pos = {x = 0, y = 0},
config = {extra = {sell_rounds = 0, active = false}},
loc_txt = {
name = 'ERROR',
name = '{C:red}ERR{}{C:dark_edition}O{}{C:red}R{}',
text = {
""
}
Expand Down Expand Up @@ -250,7 +250,7 @@ local m = {
end
if context.selling_card and context.card.ability.name == "Jolly Joker" and not context.blueprint then
card.ability.extra.x_mult = card.ability.extra.x_mult + card.ability.extra.extra
card_eval_status_text(self, 'extra', nil, nil, nil, {message = localize{type = 'variable', key = 'a_xmult', vars = {card.ability.extra.x_mult}}})
card_eval_status_text(card, 'extra', nil, nil, nil, {message = localize{type = 'variable', key = 'a_xmult', vars = {card.ability.extra.x_mult}}})
return {calculated = true}
end
end
Expand All @@ -272,7 +272,7 @@ local M = {
loc_txt = {
name = 'M',
text = {
"When any Blind is selected,",
"When {C:attention}Blind{} is selected,",
"create a {C:dark_edition}Negative{}",
"{C:attention}Jolly Joker{}"
}
Expand All @@ -282,6 +282,7 @@ local M = {
discovered = true,
blueprint_compat = true,loc_vars = function(self, info_queue, center)
info_queue[#info_queue+1] = { set = 'Joker', key = 'j_jolly', specific_vars = {self.config.jolly.t_mult, self.config.jolly.type} }
info_queue[#info_queue+1] = G.P_CENTERS.e_negative
end,
atlas = "M",
calculate = function(self, card, context)
Expand Down Expand Up @@ -314,7 +315,7 @@ local boredom = {
text = {
"{C:green}#1# in #2#{} chance to",
"{C:attention}retrigger{} each {C:attention}Joker{}",
"{C:attention}or played card{}",
"or {C:attention}played card{}",
"{C:inactive,s:0.8}(Excludes itself){}"
}
},
Expand Down Expand Up @@ -408,7 +409,7 @@ local double_scale = {
loc_txt = {
name = 'Double Scale',
text = {
"Scaling jokers",
"Scaling {C:attention}Jokers{}",
"scale {C:attention}quadratically",
"{C:inactive,s:0.8}(ex. +1, +3, +6, +10)",
"{C:inactive,s:0.8}(grows by +1, +2, +3)"
Expand Down Expand Up @@ -716,7 +717,223 @@ local caramel_sprite = {
px = 71,
py = 95
}
G.P_JOKER_RARITY_POOLS["cry_epic"] = {googol_play, sync_catalyst, negative, canvas, error_joker, M, m, boredom, double_scale, number_blocks, oldcandy, caramel}

local curse = {
object_type = "Joker",
name = "cry_curse",
key = "curse",
pos = {x = 0, y = 0},
loc_txt = {
name = 'Sob',
text = {
"{C:edition,E:1}you cannot{} {C:dark_edition,E:1}run...{}",
"{C:edition,E:1}you cannot{} {C:dark_edition,E:1}hide...{}",
"{C:edition,E:1}you cannot{} {C:dark_edition,E:1}escape...{}",
"{C:inactive}(Must have room){}"
}
},
rarity = "cry_epic",
cost = 4,
discovered = true,
perishable_compat = true,
atlas = "curse",
calculate = function(self, card, context)
if context.selling_self and #G.jokers.cards + G.GAME.joker_buffer <= G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.discard and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.pre_discard and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.reroll_shop and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.destroying_card and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.buying_card and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.skip_blind and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.cardarea == G.jokers and context.before and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.using_consumable and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.selling_card and context.card.ability.name ~= "Obelisk" and #G.jokers.cards + G.GAME.joker_buffer <= G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.setting_blind and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
if context.skipping_booster and #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit and not context.retrigger_joker and not context.blueprint then
local createjoker = math.min(1, G.jokers.config.card_limit - (#G.jokers.cards + G.GAME.joker_buffer))
G.GAME.joker_buffer = G.GAME.joker_buffer + createjoker
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:add_to_deck()
G.jokers:emplace(card)
G.GAME.joker_buffer = 0
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.FILTER,
})
}
end
end,
add_to_deck = function(self, card, from_debuff)
local card = create_card('Joker', G.jokers, nil, nil, nil, nil, 'j_obelisk')
card:set_edition({
negative = true
})
card:set_eternal(true)
card:add_to_deck()
G.jokers:emplace(card)
return {
card_eval_status_text(card, 'extra', nil, nil, nil, {
message = "Curse!",
colour = G.C.DARK_EDITION,
})
}
end
}

local curse_sprite = {
object_type = "Atlas",
key = "curse",
path = "j_cry_curse.png",
px = 71,
py = 95
}


G.P_JOKER_RARITY_POOLS["cry_epic"] = {googol_play, sync_catalyst, negative, canvas, error_joker, M, m, boredom, double_scale, number_blocks, oldcandy, caramel, curse}


return {name = "Epic Jokers",
Expand Down Expand Up @@ -806,4 +1023,4 @@ return {name = "Epic Jokers",
loc_txt = {}
})
end,
items = {googol_play_sprite, sync_catalyst_sprite, negative_sprite, canvas_sprite, error_sprite, M_sprite, m_sprite, boredom_sprite, double_scale_sprite, number_blocks_sprite, oldcandy_sprite, caramel_sprite, googol_play, sync_catalyst, negative, canvas, error_joker, M, m, boredom, double_scale, number_blocks, oldcandy, caramel}}
items = {googol_play_sprite, sync_catalyst_sprite, negative_sprite, canvas_sprite, error_sprite, M_sprite, m_sprite, boredom_sprite, double_scale_sprite, number_blocks_sprite, oldcandy_sprite, caramel_sprite, curse_sprite, googol_play, sync_catalyst, negative, canvas, error_joker, M, m, boredom, double_scale, number_blocks, oldcandy, caramel, curse}}
14 changes: 6 additions & 8 deletions Items/zExotic.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ local speculo = {
text = {
"Creates a {C:dark_edition}Negative{} copy",
"of a random {C:attention}Joker{}",
"in your possession",
"at the end of the {C:attention}shop",
}
},
Expand Down Expand Up @@ -280,8 +279,8 @@ local tenebris = {
loc_txt = {
name = 'Tenebris',
text = {
"{C:dark_edition}+#1#{C:attention} Joker{} slots,",
"gives {C:money}$#2#{} at end of round"
"{C:dark_edition}+#1#{C:attention} Joker{} slots",
"Earn {C:money}$#2#{} at end of round"
}
},
rarity = "cry_exotic",
Expand Down Expand Up @@ -320,9 +319,8 @@ local effarcire = {
loc_txt = {
name = 'Effarcire',
text = {
"Always draw your",
"{C:green}entire deck{} to hand",
"at start of round"
"Always draw {C:green}full deck{} to hand",
"when {C:attention}Blind{} is selected"
}
},
rarity = 3,
Expand Down Expand Up @@ -358,8 +356,8 @@ local crustulum = {
loc_txt = {
name = 'Crustulum',
text = {
"This Joker gains",
"{C:chips}+#2#{} Chips per reroll,",
"This Joker gains {C:chips}+#2#{} Chips",
"per {C:attention}reroll{} in the shop,",
"{C:green}all rerolls are free{}",
"{C:inactive}(Currently {C:chips}+#1#{C:inactive} chips)"
}
Expand Down
Binary file added assets/1x/j_cry_apjoker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/j_cry_big_m.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_bubblem.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_curse.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/j_cry_double_scale.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_jollysus.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_labyrinth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/1x/j_cry_m.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_mstack.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/1x/j_cry_redbloon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_apjoker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/j_cry_big_m.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_bubblem.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_curse.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/j_cry_double_scale.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_jollysus.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_labyrinth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/2x/j_cry_m.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_mstack.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/2x/j_cry_redbloon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.