Skip to content

Commit 8cd0b50

Browse files
committed
Revert "Merge pull request #758 from SpectralPack/temp"
This reverts commit 510b22e, reversing changes made to 508ada1.
1 parent 510b22e commit 8cd0b50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1763
-2889
lines changed

Cryptid.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,23 @@ function SMODS.injectItems(...)
238238
Cryptid.inject_pointer_aliases()
239239

240240
--this has to be here because the colors dont exist earlier then this
241+
Cryptid.circus_rarities = Cryptid.circus_rarities or {}
241242
Cryptid.circus_rarities["rare"] = { rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare }
242243
Cryptid.circus_rarities["epic"] = { rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic }
243244
Cryptid.circus_rarities["legendary"] = { rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary }
244245
Cryptid.circus_rarities["exotic"] =
245246
{ rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic }
246247

247248
Cryptid.reload_localization()
249+
local keys = {}
250+
local a_keys = {}
251+
for i, v in pairs(SMODS.calculation_keys) do
252+
if not keys[v] then
253+
a_keys[#a_keys + 1] = v
254+
end
255+
keys[v] = true
256+
end
257+
SMODS.calculation_keys = a_keys
248258
end
249259

250260
local old_repitions = SMODS.calculate_repetitions

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# Cryptid
33
An unbalanced Balatro mod.
44

5-
Note: Cryptid requires [Steamodded](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip) and [Talisman](https://github.com/SpectralPack/Talisman/archive/refs/heads/main.zip).
5+
Note: Cryptid requires [Steamodded](https://github.com/Steamopollys/Steamodded/archive/refs/heads/main.zip)
6+
[Talisman](https://github.com/SpectralPack/Talisman/archive/refs/heads/main.zip) may be used to increase the score cap but isnt required.
7+
68

79
Cryptid currently adds:
810

@@ -17,13 +19,13 @@ Cryptid currently adds:
1719

1820
### Frequently asked questions
1921
* Credit to @jenwalter666 for creating this FAQ (forwarded from Cryptid Discord)
22+
* Edits to reflect some changed made by @lord.ruby
2023

2124
## General
2225

2326
> *My game is crashing on startup/something doesn't appear to be loading!*
2427
2528
Make sure everything is properly installed.
26-
For Talisman, the folder that contains Talisman should be named `Talisman`. If you've downloaded the source code from GitHub (by clicking on [Code] and then [Download ZIP]), the folder within the ZIP may be called `Talisman-main`, which will cause a problem. Simply rename the folder(s) so that the `-main` part of the name is removed, so that the folder is just called `Talisman`.
2729
Whenever you are manually updating Talisman or Cryptid, or any other mod for that matter, it's a good approach to instead delete the contents of the folder, then install the contents of the folder from the ZIP into the existing folder to avoid having to constantly rename the folder over and over.
2830
For automatic updates, try using the [automatic update script](https://discord.com/channels/1264429948970733782/1268911536638787625).
2931
It could also be that Steamodded is out of date, sometimes mods may use features of a new version that's absent in an older version, but don't change the version that they ask for.
@@ -43,7 +45,7 @@ If they show up red, that means there's a problem. Hover over the mod icon (whic
4345
You can disable some features of the mod by opening your Mods, clicking [Cryptid], going over to the Config tab, and clicking Thematic Sets. There, you can toggle various Cryptid additions on or off as you see fit.
4446
You can also enable/disable certain music tracks in the Music tab. If you're a streamer, consider disabling the Jimball music for your safety!
4547

46-
> *I'm hitting infinity very often, is there any way to raise the limit of the scoring system?*
48+
> *I'm hitting "naneinf"/"Infinity" very often, is there any way to raise the limit of the scoring system?*
4749
4850
Talisman may be configured to be on **BigNum** mode, which has a maximum limit of ee308. You can make the limit virtually disappear by changing it to **OmegaNum**, which can handle e10##1000. You can configure it by going into Mods, then clicking Talisman, and changing the Score Limit under Config. Be careful; if you have a saved run that was on a different number system, you won't be able to load it (unless if you switch back)!
4951

assets/1x/atlasepic.png

-25 KB
Loading

assets/1x/atlasexotic.png

-20.3 KB
Loading

assets/1x/atlastwo.png

-18.2 KB
Loading

assets/1x/stake_cry.png

-9.52 KB
Loading

assets/2x/atlasepic.png

-41.2 KB
Loading

assets/2x/atlasexotic.png

-10.4 KB
Loading

assets/2x/atlastwo.png

-43.3 KB
Loading

assets/2x/stake_cry.png

-10.6 KB
Loading

0 commit comments

Comments
 (0)