Skip to content

Commit d165bf4

Browse files
committed
Revert "Merge branch 'balance-things' into probability-stuff"
This reverts commit d39633a, reversing changes made to ba9159d.
1 parent cb21e8e commit d165bf4

Some content is hidden

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

74 files changed

+3992
-6843
lines changed

Cryptid.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
"priority": 114,
1010
"badge_colour": "708b91",
1111
"badge_text_colour": "FFFFFF",
12-
"version": "0.5.10",
12+
"version": "0.5.10~dev",
1313
"dependencies": [
14+
"Talisman (>=2.2.0a)",
1415
"Steamodded (>=1.0.0~BETA-0614a)"
1516
],
1617
"conflicts": [

Cryptid.lua

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -226,35 +226,7 @@ function SMODS.injectItems(...)
226226
G.P_CENTERS.j_burnt.immutable = true
227227
G.P_CENTERS.j_chicot.immutable = true
228228
G.P_CENTERS.j_perkeo.immutable = true
229-
G.P_CENTERS.j_hanging_chad.misprintize_caps = { extra = 40 }
230-
G.P_CENTERS.c_high_priestess.misprintize_caps = { planets = 100 }
231-
G.P_CENTERS.c_emperor.misprintize_caps = { tarots = 100 }
232-
G.P_CENTERS.c_familiar.misprintize_caps = { extra = 100 }
233-
G.P_CENTERS.c_grim.misprintize_caps = { extra = 100 }
234-
G.P_CENTERS.c_incantation.misprintize_caps = { extra = 100 }
235-
G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
236-
G.P_CENTERS.c_cryptid.misprintize_caps = { extra = 100, max_highlighted = 100 }
237-
G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
238229
Cryptid.inject_pointer_aliases()
239-
240-
--this has to be here because the colors dont exist earlier then this
241-
Cryptid.circus_rarities = Cryptid.circus_rarities or {}
242-
Cryptid.circus_rarities["rare"] = { rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare }
243-
Cryptid.circus_rarities["epic"] = { rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic }
244-
Cryptid.circus_rarities["legendary"] = { rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary }
245-
Cryptid.circus_rarities["exotic"] =
246-
{ rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic }
247-
248-
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
258230
end
259231

260232
local old_repitions = SMODS.calculate_repetitions

README.md

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

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-
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).
86

97
Cryptid currently adds:
108

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

2018
### Frequently asked questions
2119
* Credit to @jenwalter666 for creating this FAQ (forwarded from Cryptid Discord)
22-
* Edits to reflect some changed made by @lord.ruby
2320

2421
## General
2522

2623
> *My game is crashing on startup/something doesn't appear to be loading!*
2724
2825
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`.
2927
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.
3028
For automatic updates, try using the [automatic update script](https://discord.com/channels/1264429948970733782/1268911536638787625).
3129
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.
@@ -45,7 +43,7 @@ If they show up red, that means there's a problem. Hover over the mod icon (whic
4543
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.
4644
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!
4745

48-
> *I'm hitting "naneinf"/"Infinity" very often, is there any way to raise the limit of the scoring system?*
46+
> *I'm hitting infinity very often, is there any way to raise the limit of the scoring system?*
4947
5048
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)!
5149

assets/1x/atlasnotjokers.png

-3.28 KB
Loading

assets/1x/atlasone.png

-11.7 KB
Loading

assets/1x/atlasspooky.png

-1.92 KB
Loading

assets/1x/bl_cry_two.png

-7.09 KB
Binary file not shown.
-3.17 KB
Binary file not shown.

assets/1x/intercept_sprite.png

-318 Bytes
Binary file not shown.

assets/1x/shinyc.png

995 Bytes
Loading

0 commit comments

Comments
 (0)