1.0.1o
25
card.lua
@@ -146,11 +146,12 @@ end
|
||||
|
||||
function Card:set_sprites(_center, _front)
|
||||
if _front then
|
||||
local _atlas, _pos = get_front_spriteinfo(_front)
|
||||
if self.children.front then
|
||||
self.children.front.atlas = G.ASSET_ATLAS[_front.atlas] or G.ASSET_ATLAS["cards_"..(G.SETTINGS.colourblind_option and 2 or 1)]
|
||||
self.children.front:set_sprite_pos(self.config.card.pos)
|
||||
self.children.front.atlas = _atlas
|
||||
self.children.front:set_sprite_pos(_pos)
|
||||
else
|
||||
self.children.front = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, _front.atlas and G.ASSET_ATLAS[_front.atlas] or G.ASSET_ATLAS["cards_"..(G.SETTINGS.colourblind_option and 2 or 1)], self.config.card.pos)
|
||||
self.children.front = Sprite(self.T.x, self.T.y, self.T.w, self.T.h, _atlas, _pos)
|
||||
self.children.front.states.hover = self.states.hover
|
||||
self.children.front.states.click = self.states.click
|
||||
self.children.front.states.drag = self.states.drag
|
||||
@@ -224,6 +225,7 @@ function Card:set_ability(center, initial, delay_sprites)
|
||||
|
||||
local old_center = self.config.center
|
||||
self.config.center = center
|
||||
self.sticker_run = nil
|
||||
for k, v in pairs(G.P_CENTERS) do
|
||||
if center == v then self.config.center_key = k end
|
||||
end
|
||||
@@ -940,8 +942,7 @@ function Card:generate_UIBox_ability_table()
|
||||
end
|
||||
if self.ability.rental then badges[#badges + 1] = 'rental' end
|
||||
if self.pinned then badges[#badges + 1] = 'pinned_left' end
|
||||
|
||||
if self.sticker then loc_vars = loc_vars or {}; loc_vars.sticker=self.sticker end
|
||||
if self.sticker or ((self.sticker_run and self.sticker_run~='NONE') and G.SETTINGS.run_stake_stickers) then loc_vars = loc_vars or {}; loc_vars.sticker=(self.sticker or self.sticker_run) end
|
||||
|
||||
return generate_card_ui(self.config.center, nil, loc_vars, card_type, badges, hide_desc, main_start, main_end)
|
||||
end
|
||||
@@ -4146,6 +4147,10 @@ function Card:update(dt)
|
||||
end
|
||||
|
||||
self:update_alert()
|
||||
if self.ability.set == 'Joker' and not self.sticker_run then
|
||||
self.sticker_run = get_joker_win_sticker(self.config.center) or 'NONE'
|
||||
end
|
||||
|
||||
if self.ability.consumeable and self.ability.consumeable.max_highlighted then
|
||||
self.ability.consumeable.mod_num = math.min(5, self.ability.consumeable.max_highlighted)
|
||||
end
|
||||
@@ -4434,9 +4439,10 @@ function Card:draw(layer)
|
||||
if self.ability.name == 'Invisible Joker' and (self.config.center.discovered or self.bypass_discovery_center) then
|
||||
self.children.center:draw_shader('voucher', nil, self.ARGS.send_to_shader)
|
||||
end
|
||||
|
||||
|
||||
--If the card has any edition/seal, add that here
|
||||
if self.edition or self.seal or self.ability.eternal or self.ability.rental or self.ability.perishable or self.sticker or self.ability.set == 'Spectral' or self.debuff or self.greyed or self.ability.name == 'The Soul' or self.ability.set == 'Voucher' or self.ability.set == 'Booster' or self.config.center.soul_pos or self.config.center.demo then
|
||||
if self.edition or self.seal or self.ability.eternal or self.ability.rental or self.ability.perishable or self.sticker or ((self.sticker_run and self.sticker_run ~= 'NONE') and G.SETTINGS.run_stake_stickers) or (self.ability.set == 'Spectral') or self.debuff or self.greyed or (self.ability.name == 'The Soul') or (self.ability.set == 'Voucher') or (self.ability.set == 'Booster') or self.config.center.soul_pos or self.config.center.demo then
|
||||
|
||||
if (self.ability.set == 'Voucher' or self.config.center.demo) and (self.ability.name ~= 'Antimatter' or not (self.config.center.discovered or self.bypass_discovery_center)) then
|
||||
self.children.center:draw_shader('voucher', nil, self.ARGS.send_to_shader)
|
||||
end
|
||||
@@ -4488,6 +4494,10 @@ function Card:draw(layer)
|
||||
G.shared_stickers[self.sticker].role.draw_major = self
|
||||
G.shared_stickers[self.sticker]:draw_shader('dissolve', nil, nil, nil, self.children.center)
|
||||
G.shared_stickers[self.sticker]:draw_shader('voucher', nil, self.ARGS.send_to_shader, nil, self.children.center)
|
||||
elseif (self.sticker_run and G.shared_stickers[self.sticker_run]) and G.SETTINGS.run_stake_stickers then
|
||||
G.shared_stickers[self.sticker_run].role.draw_major = self
|
||||
G.shared_stickers[self.sticker_run]:draw_shader('dissolve', nil, nil, nil, self.children.center)
|
||||
G.shared_stickers[self.sticker_run]:draw_shader('voucher', nil, self.ARGS.send_to_shader, nil, self.children.center)
|
||||
end
|
||||
|
||||
if self.ability.name == 'The Soul' and (self.config.center.discovered or self.bypass_discovery_center) then
|
||||
@@ -4652,6 +4662,7 @@ function Card:load(cardTable, other_card)
|
||||
self.config.center_key = cardTable.save_fields.center
|
||||
self.config.center = G.P_CENTERS[self.config.center_key]
|
||||
self.params = cardTable.params
|
||||
self.sticker_run = nil
|
||||
|
||||
local H = G.CARD_H
|
||||
local W = G.CARD_W
|
||||
|
@@ -865,6 +865,16 @@ G.FUNCS.change_crt_bloom = function(args)
|
||||
G:save_settings()
|
||||
end
|
||||
|
||||
G.FUNCS.change_collab = function(args)
|
||||
G.SETTINGS.CUSTOM_DECK.Collabs[args.cycle_config.curr_suit] = G.COLLABS.options[args.cycle_config.curr_suit][args.to_key] or 'default'
|
||||
for k, v in pairs(G.I.CARD) do
|
||||
if v.config and v.config.card and v.children.front and v.ability.effect ~= 'Stone Card' then
|
||||
v:set_sprites(nil, v.config.card)
|
||||
end
|
||||
end
|
||||
G:save_settings()
|
||||
end
|
||||
|
||||
--||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
-- TEXT ENTRY
|
||||
--||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
@@ -1251,6 +1261,21 @@ G.FUNCS.RUN_SETUP_check_stake2 = function(e)
|
||||
end
|
||||
end
|
||||
|
||||
G.FUNCS.change_viewed_collab = function(args)
|
||||
G.viewed_collab = args.to_val
|
||||
end
|
||||
|
||||
G.FUNCS.CREDITS_check_collab = function(e)
|
||||
if (G.viewed_collab ~= e.config.id) then
|
||||
e.config.object:remove()
|
||||
e.config.object = UIBox{
|
||||
definition = G.UIDEF.viewed_collab_option(),
|
||||
config = {offset = {x=0,y=0}, align = 'cm', parent = e}
|
||||
}
|
||||
e.config.id = G.viewed_collab
|
||||
end
|
||||
end
|
||||
|
||||
G.FUNCS.RUN_SETUP_check_back_stake_column= function(e)
|
||||
if G.GAME.viewed_back.name ~= e.config.id then
|
||||
--removes the UI from the previously selected back and adds the new one
|
||||
@@ -1528,6 +1553,13 @@ G.FUNCS.high_scores = function(e)
|
||||
}
|
||||
end
|
||||
|
||||
G.FUNCS.customize_deck = function(e)
|
||||
G.SETTINGS.paused = true
|
||||
G.FUNCS.overlay_menu{
|
||||
definition = create_UIBox_customize_deck(),
|
||||
}
|
||||
end
|
||||
|
||||
G.FUNCS.usage = function(e)
|
||||
G.SETTINGS.paused = true
|
||||
G.FUNCS.overlay_menu{
|
||||
@@ -1721,6 +1753,19 @@ G.FUNCS.reset_achievements = function(e)
|
||||
G.FUNCS.exit_overlay_menu()
|
||||
end
|
||||
|
||||
G.FUNCS.refresh_contrast_mode = function()
|
||||
local new_colour_proto = G.C["SO_"..(G.SETTINGS.colourblind_option and 2 or 1)]
|
||||
G.C.SUITS.Hearts = new_colour_proto.Hearts
|
||||
G.C.SUITS.Diamonds = new_colour_proto.Diamonds
|
||||
G.C.SUITS.Spades = new_colour_proto.Spades
|
||||
G.C.SUITS.Clubs = new_colour_proto.Clubs
|
||||
for k, v in pairs(G.I.CARD) do
|
||||
if v.config and v.config.card and v.children.front and v.ability.effect ~= 'Stone Card' then
|
||||
v:set_sprites(nil, v.config.card)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
G.FUNCS.warn_lang = function(e)
|
||||
local _infotip_object = G.OVERLAY_MENU:get_UIE_by_ID('overlay_menu_infotip')
|
||||
if (_infotip_object.config.set ~= e.config.ref_table.label) and (not G.F_NO_ACHIEVEMENTS) then
|
||||
|
@@ -1831,6 +1831,19 @@ function get_stake_sprite(_stake, _scale)
|
||||
return stake_sprite
|
||||
end
|
||||
|
||||
function get_front_spriteinfo(_front)
|
||||
if _front and _front.suit and (_front.value == 'Jack' or _front.value == 'Queen' or _front.value == 'King') then
|
||||
if G.SETTINGS.CUSTOM_DECK and G.SETTINGS.CUSTOM_DECK.Collabs[_front.suit] then
|
||||
local _collab = G.SETTINGS.CUSTOM_DECK.Collabs[_front.suit]
|
||||
if (_collab == 'default') or (not G.ASSET_ATLAS[_collab..'_'..(G.SETTINGS.colourblind_option and 2 or 1)]) then
|
||||
else
|
||||
return G.ASSET_ATLAS[_collab..'_'..(G.SETTINGS.colourblind_option and 2 or 1)], G.COLLABS.pos[_front.value]
|
||||
end
|
||||
end
|
||||
end
|
||||
return G.ASSET_ATLAS[_front.atlas] or G.ASSET_ATLAS["cards_"..(G.SETTINGS.colourblind_option and 2 or 1)], _front.pos
|
||||
end
|
||||
|
||||
function get_stake_col(_stake)
|
||||
G.C.STAKES = G.C.STAKES or {
|
||||
G.C.WHITE,
|
||||
|
@@ -26,6 +26,10 @@ function win_game()
|
||||
G.E_MANAGER:add_event(Event({
|
||||
trigger = 'immediate',
|
||||
func = (function()
|
||||
for k, v in pairs(G.I.CARD) do
|
||||
v.sticker_run = nil
|
||||
end
|
||||
|
||||
play_sound('win')
|
||||
G.SETTINGS.paused = true
|
||||
|
||||
|
@@ -1,4 +1,5 @@
|
||||
function live_test()
|
||||
|
||||
end
|
||||
|
||||
function do_action(action)
|
||||
|
74
game.lua
@@ -948,7 +948,7 @@ function Game:set_language()
|
||||
['id'] = {font = 1, label = "Bahasa Indonesia", key = 'id', beta = true, button = "Umpan Balik Bahasa", warning = {'Bahasa ini masih dalam tahap Beta. Untuk membantu','kami meningkatkannya, silakan klik tombol umpan balik.', "Klik lagi untuk mengonfirmasi"}},
|
||||
['it'] = {font = 1, label = "Italiano", key = 'it', beta = nil, button = "Feedback traduzione", warning = {'Questa traduzione è ancora in Beta. Per','aiutarci a migliorarla, clicca il tasto feedback', "Fai clic di nuovo per confermare"}},
|
||||
['ja'] = {font = 5, label = "日本語", key = 'ja', beta = nil, button = "提案する", warning = {'この翻訳は現在ベータ版です。提案があった場合、','ボタンをクリックしてください。', "もう一度クリックして確認"}},
|
||||
['ko'] = {font = 4, label = "한국어", key = 'ko', beta = true, button = "번역 피드백", warning = {'이 언어는 아직 베타 단계에 있습니다. ','번역을 도와주시려면 피드백 버튼을 눌러주세요.', "다시 클릭해서 확인하세요"}},
|
||||
['ko'] = {font = 4, label = "한국어", key = 'ko', beta = nil, button = "번역 피드백", warning = {'이 언어는 아직 베타 단계에 있습니다. ','번역을 도와주시려면 피드백 버튼을 눌러주세요.', "다시 클릭해서 확인하세요"}},
|
||||
['nl'] = {font = 1, label = "Nederlands", key = 'nl', beta = nil, button = "Taal suggesties", warning = {'Deze taal is nog in de Beta fase. Help ons het te ','verbeteren door op de suggestie knop te klikken.', "Klik opnieuw om te bevestigen"}},
|
||||
['pl'] = {font = 1, label = "Polski", key = 'pl', beta = nil, button = "Wyślij uwagi do tłumaczenia", warning = {'Polska wersja językowa jest w fazie Beta. By pomóc nam poprawić',' jakość tłumaczenia, kliknij przycisk i podziel się swoją opinią i uwagami.', "Kliknij ponownie, aby potwierdzić"}},
|
||||
['pt_BR'] = {font = 1, label = "Português", key = 'pt_BR', beta = nil, button = "Feedback de Tradução", warning = {'Esta tradução ainda está em Beta. Se quiser nos ajudar','a melhorá-la, clique no botão de feedback por favor', "Clique novamente para confirmar"}},
|
||||
@@ -1025,7 +1025,59 @@ function Game:set_render_settings()
|
||||
{name = 'icons', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/icons.png",px=66,py=66},
|
||||
{name = 'tags', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/tags.png",px=34,py=34},
|
||||
{name = 'stickers', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/stickers.png",px=71,py=95},
|
||||
{name = 'chips', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/chips.png",px=29,py=29}
|
||||
{name = 'chips', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/chips.png",px=29,py=29},
|
||||
|
||||
{name = 'collab_AU_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_AU_1.png",px=71,py=95},
|
||||
{name = 'collab_AU_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_AU_2.png",px=71,py=95},
|
||||
{name = 'collab_TW_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_TW_1.png",px=71,py=95},
|
||||
{name = 'collab_TW_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_TW_2.png",px=71,py=95},
|
||||
{name = 'collab_VS_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_VS_1.png",px=71,py=95},
|
||||
{name = 'collab_VS_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_VS_2.png",px=71,py=95},
|
||||
{name = 'collab_DTD_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DTD_1.png",px=71,py=95},
|
||||
{name = 'collab_DTD_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DTD_2.png",px=71,py=95},
|
||||
|
||||
{name = 'collab_CYP_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CYP_1.png",px=71,py=95},
|
||||
{name = 'collab_CYP_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CYP_2.png",px=71,py=95},
|
||||
{name = 'collab_STS_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_STS_1.png",px=71,py=95},
|
||||
{name = 'collab_STS_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_STS_2.png",px=71,py=95},
|
||||
{name = 'collab_TBoI_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_TBoI_1.png",px=71,py=95},
|
||||
{name = 'collab_TBoI_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_TBoI_2.png",px=71,py=95},
|
||||
{name = 'collab_SV_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_SV_1.png",px=71,py=95},
|
||||
{name = 'collab_SV_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_SV_2.png",px=71,py=95},
|
||||
|
||||
{name = 'collab_SK_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_SK_1.png",px=71,py=95},
|
||||
{name = 'collab_SK_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_SK_2.png",px=71,py=95},
|
||||
{name = 'collab_DS_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DS_1.png",px=71,py=95},
|
||||
{name = 'collab_DS_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DS_2.png",px=71,py=95},
|
||||
{name = 'collab_CL_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CL_1.png",px=71,py=95},
|
||||
{name = 'collab_CL_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CL_2.png",px=71,py=95},
|
||||
{name = 'collab_D2_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_D2_1.png",px=71,py=95},
|
||||
{name = 'collab_D2_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_D2_2.png",px=71,py=95},
|
||||
{name = 'collab_PC_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_PC_1.png",px=71,py=95},
|
||||
{name = 'collab_PC_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_PC_2.png",px=71,py=95},
|
||||
{name = 'collab_WF_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_WF_1.png",px=71,py=95},
|
||||
{name = 'collab_WF_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_WF_2.png",px=71,py=95},
|
||||
{name = 'collab_EG_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_EG_1.png",px=71,py=95},
|
||||
{name = 'collab_EG_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_EG_2.png",px=71,py=95},
|
||||
{name = 'collab_XR_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_XR_1.png",px=71,py=95},
|
||||
{name = 'collab_XR_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_XR_2.png",px=71,py=95},
|
||||
|
||||
{name = 'collab_CR_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CR_1.png",px=71,py=95},
|
||||
{name = 'collab_CR_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_CR_2.png",px=71,py=95},
|
||||
{name = 'collab_BUG_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_BUG_1.png",px=71,py=95},
|
||||
{name = 'collab_BUG_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_BUG_2.png",px=71,py=95},
|
||||
{name = 'collab_FO_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_FO_1.png",px=71,py=95},
|
||||
{name = 'collab_FO_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_FO_2.png",px=71,py=95},
|
||||
{name = 'collab_DBD_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DBD_1.png",px=71,py=95},
|
||||
{name = 'collab_DBD_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_DBD_2.png",px=71,py=95},
|
||||
{name = 'collab_C7_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_C7_1.png",px=71,py=95},
|
||||
{name = 'collab_C7_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_C7_2.png",px=71,py=95},
|
||||
{name = 'collab_R_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_R_1.png",px=71,py=95},
|
||||
{name = 'collab_R_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_R_2.png",px=71,py=95},
|
||||
{name = 'collab_AC_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_AC_1.png",px=71,py=95},
|
||||
{name = 'collab_AC_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_AC_2.png",px=71,py=95},
|
||||
{name = 'collab_STP_1', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_STP_1.png",px=71,py=95},
|
||||
{name = 'collab_STP_2', path = "resources/textures/"..self.SETTINGS.GRAPHICS.texture_scaling.."x/collabs/collab_STP_2.png",px=71,py=95},
|
||||
}
|
||||
self.asset_images = {
|
||||
{name = "playstack_logo", path = "resources/textures/1x/playstack-logo.png", px=1417,py=1417},
|
||||
@@ -2613,6 +2665,22 @@ function Game:update(dt)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if G.DEBUG then
|
||||
local text_count,uie_count, card_count, uib_count, all = 0,0, 0, 0,0
|
||||
for k, v in pairs(G.STAGE_OBJECTS[G.STAGE]) do
|
||||
all = all + 1
|
||||
if v:is(DynaText) then text_count = text_count + 1 end
|
||||
if v:is(Card) then card_count = card_count + 1 end
|
||||
if v:is(UIElement) then uie_count = uie_count + 1 end
|
||||
if v:is(UIBox) then uib_count = uib_count + 1 end
|
||||
end
|
||||
|
||||
G.DEBUG_VALUE = 'text: '..text_count..'\n'..
|
||||
'uie: '..uie_count..'\n'..
|
||||
'card: '..card_count..'\n'..
|
||||
'uib: '..uib_count..'\n'..'all: '..all
|
||||
end
|
||||
|
||||
--Save every 10 seconds, unless forced or paused/unpaused
|
||||
if G.FILE_HANDLER and G.FILE_HANDLER and G.FILE_HANDLER.update_queued and (
|
||||
@@ -2900,7 +2968,7 @@ love.graphics.pop()
|
||||
|
||||
timer_checkpoint('canvas', 'draw')
|
||||
|
||||
if not _RELEASE_MODE and not G.video_control and G.F_VERBOSE then
|
||||
if not _RELEASE_MODE and G.DEBUG and not G.video_control and G.F_VERBOSE then
|
||||
love.graphics.push()
|
||||
love.graphics.setColor(0, 1, 1,1)
|
||||
local fps = love.timer.getFPS( )
|
||||
|
53
globals.lua
@@ -1,4 +1,4 @@
|
||||
VERSION = '1.0.1f'
|
||||
VERSION = '1.0.1o'
|
||||
VERSION = VERSION..'-FULL'
|
||||
--check_version
|
||||
|
||||
@@ -156,6 +156,7 @@ function Game:set_globals()
|
||||
colourblind_option = false,
|
||||
language = 'en-us',
|
||||
screenshake = true,
|
||||
run_stake_stickers = false,
|
||||
rumble = self.F_RUMBLE,
|
||||
play_button_pos = 2,
|
||||
GAMESPEED = 1,
|
||||
@@ -177,6 +178,14 @@ function Game:set_globals()
|
||||
}
|
||||
},
|
||||
},
|
||||
CUSTOM_DECK = {
|
||||
Collabs = {
|
||||
Spades = 'default',
|
||||
Hearts = 'default',
|
||||
Clubs = 'default',
|
||||
Diamonds = 'default',
|
||||
}
|
||||
},
|
||||
GRAPHICS = {
|
||||
texture_scaling = 2,
|
||||
shadows = 'On',
|
||||
@@ -185,6 +194,48 @@ function Game:set_globals()
|
||||
},
|
||||
}
|
||||
|
||||
self.COLLABS = {
|
||||
pos = { Jack = {x=0,y=0}, Queen = {x=1,y=0}, King = {x=2,y=0} },
|
||||
options = {
|
||||
Spades = {
|
||||
'default',
|
||||
'collab_TW',
|
||||
'collab_CYP',
|
||||
'collab_SK',
|
||||
'collab_DS',
|
||||
'collab_AC',
|
||||
'collab_STP',
|
||||
},
|
||||
Hearts = {
|
||||
'default',
|
||||
'collab_AU',
|
||||
'collab_TBoI',
|
||||
'collab_CL',
|
||||
'collab_D2',
|
||||
'collab_CR',
|
||||
'collab_BUG',
|
||||
},
|
||||
Clubs = {
|
||||
'default',
|
||||
'collab_VS',
|
||||
'collab_STS',
|
||||
'collab_PC',
|
||||
'collab_WF',
|
||||
'collab_FO',
|
||||
'collab_DBD'
|
||||
},
|
||||
Diamonds = {
|
||||
'default',
|
||||
'collab_DTD',
|
||||
'collab_SV',
|
||||
'collab_EG',
|
||||
'collab_XR',
|
||||
'collab_C7',
|
||||
'collab_R'
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
self.METRICS = {
|
||||
cards = {
|
||||
used = {},
|
||||
|
7958
localization/de.lua
7933
localization/fr.lua
7935
localization/id.lua
7935
localization/it.lua
8011
localization/ja.lua
8042
localization/ko.lua
7933
localization/nl.lua
8019
localization/pl.lua
8021
localization/ru.lua
BIN
resources/textures/1x/collabs/collab_AC_1.png
Normal file
After Width: | Height: | Size: 8.2 KiB |
BIN
resources/textures/1x/collabs/collab_AC_2.png
Normal file
After Width: | Height: | Size: 8.1 KiB |
BIN
resources/textures/1x/collabs/collab_AU_1.png
Normal file
After Width: | Height: | Size: 4.9 KiB |
BIN
resources/textures/1x/collabs/collab_AU_2.png
Normal file
After Width: | Height: | Size: 7.1 KiB |
BIN
resources/textures/1x/collabs/collab_BUG_1.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/1x/collabs/collab_BUG_2.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resources/textures/1x/collabs/collab_C7_1.png
Normal file
After Width: | Height: | Size: 9.6 KiB |
BIN
resources/textures/1x/collabs/collab_C7_2.png
Normal file
After Width: | Height: | Size: 9.5 KiB |
BIN
resources/textures/1x/collabs/collab_CL_1.png
Normal file
After Width: | Height: | Size: 6.3 KiB |
BIN
resources/textures/1x/collabs/collab_CL_2.png
Normal file
After Width: | Height: | Size: 8.1 KiB |
BIN
resources/textures/1x/collabs/collab_CR_1.png
Normal file
After Width: | Height: | Size: 8.0 KiB |
BIN
resources/textures/1x/collabs/collab_CR_2.png
Normal file
After Width: | Height: | Size: 8.8 KiB |
BIN
resources/textures/1x/collabs/collab_CYP_1.png
Normal file
After Width: | Height: | Size: 7.1 KiB |
BIN
resources/textures/1x/collabs/collab_CYP_2.png
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
resources/textures/1x/collabs/collab_D2_1.png
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
resources/textures/1x/collabs/collab_D2_2.png
Normal file
After Width: | Height: | Size: 8.6 KiB |
BIN
resources/textures/1x/collabs/collab_DBD_1.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
BIN
resources/textures/1x/collabs/collab_DBD_2.png
Normal file
After Width: | Height: | Size: 8.9 KiB |
BIN
resources/textures/1x/collabs/collab_DS_1.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
resources/textures/1x/collabs/collab_DS_2.png
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
resources/textures/1x/collabs/collab_DTD_1.png
Normal file
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/textures/1x/collabs/collab_DTD_2.png
Normal file
After Width: | Height: | Size: 5.8 KiB |
BIN
resources/textures/1x/collabs/collab_EG_1.png
Normal file
After Width: | Height: | Size: 4.6 KiB |
BIN
resources/textures/1x/collabs/collab_EG_2.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
resources/textures/1x/collabs/collab_FO_1.png
Normal file
After Width: | Height: | Size: 9.0 KiB |
BIN
resources/textures/1x/collabs/collab_FO_2.png
Normal file
After Width: | Height: | Size: 9.3 KiB |
BIN
resources/textures/1x/collabs/collab_PC_1.png
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
resources/textures/1x/collabs/collab_PC_2.png
Normal file
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/textures/1x/collabs/collab_R_1.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/1x/collabs/collab_R_2.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resources/textures/1x/collabs/collab_SK_1.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resources/textures/1x/collabs/collab_SK_2.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/1x/collabs/collab_STP_1.png
Normal file
After Width: | Height: | Size: 8.2 KiB |
BIN
resources/textures/1x/collabs/collab_STP_2.png
Normal file
After Width: | Height: | Size: 8.2 KiB |
BIN
resources/textures/1x/collabs/collab_STS_1.png
Normal file
After Width: | Height: | Size: 8.9 KiB |
BIN
resources/textures/1x/collabs/collab_STS_2.png
Normal file
After Width: | Height: | Size: 9.9 KiB |
BIN
resources/textures/1x/collabs/collab_SV_1.png
Normal file
After Width: | Height: | Size: 7.7 KiB |
BIN
resources/textures/1x/collabs/collab_SV_2.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
resources/textures/1x/collabs/collab_TBoI_1.png
Normal file
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/textures/1x/collabs/collab_TBoI_2.png
Normal file
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/textures/1x/collabs/collab_TW_1.png
Normal file
After Width: | Height: | Size: 7.4 KiB |
BIN
resources/textures/1x/collabs/collab_TW_2.png
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
resources/textures/1x/collabs/collab_VS_1.png
Normal file
After Width: | Height: | Size: 4.9 KiB |
BIN
resources/textures/1x/collabs/collab_VS_2.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
resources/textures/1x/collabs/collab_WF_1.png
Normal file
After Width: | Height: | Size: 6.5 KiB |
BIN
resources/textures/1x/collabs/collab_WF_2.png
Normal file
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/textures/1x/collabs/collab_XR_1.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resources/textures/1x/collabs/collab_XR_2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_AC_1.png
Normal file
After Width: | Height: | Size: 9.7 KiB |
BIN
resources/textures/2x/collabs/collab_AC_2.png
Normal file
After Width: | Height: | Size: 9.6 KiB |
BIN
resources/textures/2x/collabs/collab_AU_1.png
Normal file
After Width: | Height: | Size: 7.8 KiB |
BIN
resources/textures/2x/collabs/collab_AU_2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_BUG_1.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
resources/textures/2x/collabs/collab_BUG_2.png
Normal file
After Width: | Height: | Size: 14 KiB |
BIN
resources/textures/2x/collabs/collab_C7_1.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/2x/collabs/collab_C7_2.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
resources/textures/2x/collabs/collab_CL_1.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_CL_2.png
Normal file
After Width: | Height: | Size: 9.5 KiB |
BIN
resources/textures/2x/collabs/collab_CR_1.png
Normal file
After Width: | Height: | Size: 9.6 KiB |
BIN
resources/textures/2x/collabs/collab_CR_2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_CYP_1.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/2x/collabs/collab_CYP_2.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/2x/collabs/collab_D2_1.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_D2_2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_DBD_1.png
Normal file
After Width: | Height: | Size: 9.9 KiB |
BIN
resources/textures/2x/collabs/collab_DBD_2.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
resources/textures/2x/collabs/collab_DS_1.png
Normal file
After Width: | Height: | Size: 9.4 KiB |
BIN
resources/textures/2x/collabs/collab_DS_2.png
Normal file
After Width: | Height: | Size: 9.4 KiB |
BIN
resources/textures/2x/collabs/collab_DTD_1.png
Normal file
After Width: | Height: | Size: 9.3 KiB |
BIN
resources/textures/2x/collabs/collab_DTD_2.png
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
resources/textures/2x/collabs/collab_EG_1.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
resources/textures/2x/collabs/collab_EG_2.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
BIN
resources/textures/2x/collabs/collab_FO_1.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/2x/collabs/collab_FO_2.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
resources/textures/2x/collabs/collab_PC_1.png
Normal file
After Width: | Height: | Size: 8.9 KiB |
BIN
resources/textures/2x/collabs/collab_PC_2.png
Normal file
After Width: | Height: | Size: 8.8 KiB |
BIN
resources/textures/2x/collabs/collab_R_1.png
Normal file
After Width: | Height: | Size: 14 KiB |