Skip to content

Commit

Permalink
some pampa improv + loc update + music update + betmma voucher packs
Browse files Browse the repository at this point in the history
pampa:
 the dream bunco compat (might add mod detection)
black star message implementation (gon test it)
  • Loading branch information
ChromaPIE committed Jun 10, 2024
1 parent 656b9d7 commit af8ccce
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
mv $RPATH/assets/2x/Tarots_dx2x.png $RPATH/assets/2x/Tarots_dx.png
echo "DX-Tarots Done."
rm -rf Mods/Betmma-mods/{Betmma_Voucher_Pack,5_legendary_challenges}
rm -rf Mods/Betmma-mods/5_legendary_challenges
echo "Betmma-mods Done."
- name: Universal unwanted files/directories removal
Expand Down
2 changes: 1 addition & 1 deletion Mods/Cardsauce
Submodule Cardsauce updated 1 files
+15 −17 main.lua
2 changes: 1 addition & 1 deletion Mods/MikasBalatro
27 changes: 19 additions & 8 deletions Mods/PampaJokers/PampaJokers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -690,19 +690,20 @@ function SMODS.INIT.MtlJokers()
}
},
j_open = {
name = "Grand Slam",
name = "大满贯",
text = {
"{X:mult,C:white}x#1#{} Mult for each",
"unique flush suit played this round ",
"{C:inactive}(Played suits: #3# ){}",
"{C:inactive}(Currently {X:mult,C:white}x#2#{} Mult){}"
"本回合内",
"每打出一种花色的同花",
"本牌获得{X:mult,C:white}X#1#{}倍率",
"{C:inactive}(已打出花色:#3#)",
"{C:inactive}(当前为{X:mult,C:white}X#2#{}倍率)"
}
},
j_thedream = {
name = "The Dream",
name = "",
text = {
"{C:attention}Level Up{} secret poker hands",
"when played"
"打出秘密牌型时",
"{C:attention}提升{}其等级"
}
},
j_ishihara = {
Expand Down Expand Up @@ -1323,6 +1324,16 @@ function Card.calculate_joker(self, context)
level_up_hand(self, "Five of a Kind", false)
end
end
if next(context.poker_hands["Spectrum"]) then
if next(context.poker_hands["Spectrum House"]) then
level_up_hand(self, "Spectrum House", false)
elseif next(context.poker_hands["Spectrum Five"]) then
level_up_hand(self, "Spectrum Five", false)
elseif next(context.poker_hands["Straight Spectrum"]) then
level_up_hand(self, "Straight Spectrum", false)
else level_up_hand(self, "Spectrum", false)
end
end
end

if self.ability.name == 'Jazz Trio' then
Expand Down
Binary file modified resources/sounds/music1.ogg
Binary file not shown.
Binary file modified resources/sounds/music2.ogg
Binary file not shown.
Binary file modified resources/sounds/music3.ogg
Binary file not shown.
Binary file modified resources/sounds/music4.ogg
Binary file not shown.
Binary file modified resources/sounds/music5.ogg
Binary file not shown.

0 comments on commit af8ccce

Please sign in to comment.