Skip to content

Commit e96c346

Browse files
Modest wip
note that these may OR may not be final. remember to give feedback and stuff for these
1 parent 416bd43 commit e96c346

File tree

2 files changed

+140
-5
lines changed

2 files changed

+140
-5
lines changed

Cryptid.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"priority": 114,
1010
"badge_colour": "708b91",
1111
"badge_text_colour": "FFFFFF",
12-
"version": "0.5.10~dev2",
12+
"version": "0.5.10~dev3",
1313
"dependencies": [
1414
"Talisman (>=2.2.0a)",
1515
"Steamodded (>=1.0.0~BETA-0614a)"

items/misc_joker.lua

Lines changed: 139 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
--[[
2+
gameset_config = {
3+
modest = {extra = {chips = 1}, center = {rarity = 1, blueprint_compat = false, immutable = true, no_dbl = false}},
4+
mainline = {center = {rarity = 2, blueprint_compat = true, immutable = true, no_dbl = true}},
5+
madness = {extra = {chips = 100}, center = {rarity = 3}},
6+
cryptid_in_2025 = {extra = {chips = 1e308}, center = {rarity = "cry_exotic"}},
7+
},
8+
]]
9+
--
10+
-- Card.get_gameset(card) ~= "modest"
111
local dropshot = {
212
object_type = "Joker",
313
dependencies = {
@@ -14,6 +24,14 @@ local dropshot = {
1424
x_mult = 1,
1525
},
1626
},
27+
gameset_config = {
28+
modest = {
29+
extra = {
30+
Xmult_mod = 0.1,
31+
x_mult = 1,
32+
},
33+
},
34+
},
1735
pos = { x = 5, y = 0 },
1836
rarity = 3,
1937
cost = 8,
@@ -468,6 +486,14 @@ local wee_fib = {
468486
mult_mod = 3,
469487
},
470488
},
489+
gameset_config = {
490+
modest = {
491+
extra = {
492+
mult = 0,
493+
mult_mod = 1,
494+
},
495+
},
496+
},
471497
pos = { x = 1, y = 5 },
472498
display_size = { w = 0.7 * 71, h = 0.7 * 95 },
473499
rarity = 3,
@@ -550,6 +576,14 @@ local whip = {
550576
x_mult = 1,
551577
},
552578
},
579+
gameset_config = {
580+
modest = {
581+
extra = {
582+
Xmult_mod = 0.1,
583+
x_mult = 1,
584+
},
585+
},
586+
},
553587
rarity = 2,
554588
cost = 8,
555589
order = 15,
@@ -672,6 +706,13 @@ local lucky_joker = {
672706
name = "cry-Lucky Joker",
673707
key = "lucky_joker",
674708
config = { extra = { dollars = 5 } },
709+
gameset_config = {
710+
modest = {
711+
extra = {
712+
dollars = 4,
713+
},
714+
},
715+
},
675716
pos = { x = 4, y = 3 },
676717
rarity = 1,
677718
cost = 4,
@@ -727,6 +768,14 @@ local cursor = {
727768
name = "cry-Cursor",
728769
key = "cursor",
729770
config = { extra = { chips = 0, chip_mod = 8 } },
771+
gameset_config = {
772+
modest = {
773+
extra = {
774+
chips = 0,
775+
chip_mod = 4,
776+
},
777+
},
778+
},
730779
pos = { x = 4, y = 1 },
731780
rarity = 1,
732781
cost = 5,
@@ -1079,6 +1128,15 @@ local chili_pepper = {
10791128
rounds_remaining = 8,
10801129
},
10811130
},
1131+
gameset_config = {
1132+
modest = {
1133+
extra = {
1134+
Xmult = 1,
1135+
Xmult_mod = 0.5,
1136+
rounds_remaining = 5,
1137+
},
1138+
},
1139+
},
10821140
pos = { x = 0, y = 1 },
10831141
rarity = 2,
10841142
cost = 6,
@@ -1257,6 +1315,13 @@ local big_cube = {
12571315
key = "big_cube",
12581316
joker_gate = "cry-Cube",
12591317
config = { extra = { x_chips = 6 }, override_x_chips_check = true },
1318+
gameset_config = {
1319+
modest = {
1320+
extra = {
1321+
x_chips = 3,
1322+
},
1323+
},
1324+
},
12601325
pos = { x = 4, y = 4 },
12611326
rarity = 1,
12621327
order = 105,
@@ -1307,7 +1372,7 @@ local eternalflame = {
13071372
pos = { x = 0, y = 4 },
13081373
config = {
13091374
extra = {
1310-
extra = 0.2,
1375+
extra = 0.1,
13111376
x_mult = 1,
13121377
},
13131378
},
@@ -1339,7 +1404,7 @@ local eternalflame = {
13391404
}
13401405
elseif
13411406
context.selling_card
1342-
and (context.card.sell_cost >= 3 or Card.get_gameset(card) ~= "modest")
1407+
and (context.card.sell_cost >= 2 or Card.get_gameset(card) ~= "modest")
13431408
and not context.blueprint
13441409
then
13451410
card.ability.extra.x_mult = lenient_bignum(to_big(card.ability.extra.x_mult) + card.ability.extra.extra)
@@ -1391,6 +1456,13 @@ local nice = {
13911456
chips = 420,
13921457
},
13931458
},
1459+
gameset_config = {
1460+
modest = {
1461+
extra = {
1462+
chips = 200,
1463+
},
1464+
},
1465+
},
13941466
pos = { x = 2, y = 3 },
13951467
pools = { ["Meme"] = true },
13961468
rarity = 3,
@@ -2208,6 +2280,11 @@ local lightupthenight = {
22082280
name = "cry-lightupthenight",
22092281
key = "lightupthenight",
22102282
config = { extra = { xmult = 1.5 } },
2283+
gameset_config = {
2284+
modest = {
2285+
cost = 9,
2286+
},
2287+
},
22112288
pos = { x = 1, y = 1 },
22122289
atlas = "atlasone",
22132290
rarity = 3,
@@ -2482,6 +2559,14 @@ local redbloon = {
24822559
rounds_remaining = 2,
24832560
},
24842561
},
2562+
gameset_config = {
2563+
modest = {
2564+
extra = {
2565+
money = 20,
2566+
rounds_remaining = 3,
2567+
},
2568+
},
2569+
},
24852570
pos = { x = 5, y = 1 },
24862571
rarity = 1,
24872572
cost = 4,
@@ -2738,6 +2823,15 @@ local magnet = {
27382823
slots = 4,
27392824
},
27402825
},
2826+
gameset_config = {
2827+
modest = {
2828+
extra = {
2829+
money = 2,
2830+
Xmoney = 3,
2831+
slots = 3,
2832+
},
2833+
},
2834+
},
27412835
rarity = 1,
27422836
cost = 6,
27432837
order = 96,
@@ -3441,6 +3535,11 @@ local happy = {
34413535
pos = { x = 2, y = 1 },
34423536
rarity = 1,
34433537
cost = 2,
3538+
gameset_config = {
3539+
modest = {
3540+
cost = 5,
3541+
},
3542+
},
34443543
order = 63,
34453544
immutable = true,
34463545
blueprint_compat = true,
@@ -7456,14 +7555,20 @@ local coin = {
74567555
return {
74577556
vars = {
74587557
number_format(center.ability.extra.money),
7459-
number_format(center.ability.extra.money * center.ability.immutable.money_mod),
7558+
number_format(
7559+
center.ability.extra.money
7560+
* (Card.get_gameset(card) ~= "modest" and center.ability.immutable.money_mod or 4)
7561+
),
74607562
},
74617563
}
74627564
end,
74637565
atlas = "atlasthree",
74647566
calculate = function(self, card, context)
74657567
if (context.selling_card and context.card.ability.set == "Joker") or context.forcetrigger then
7466-
local mod = math.floor(pseudorandom(pseudoseed("coin")) * card.ability.immutable.money_mod) + 1
7568+
local mod = math.floor(
7569+
pseudorandom(pseudoseed("coin"))
7570+
* (Card.get_gameset(card) ~= "modest" and center.ability.immutable.money_mod or 4)
7571+
) + 1
74677572
local option = lenient_bignum(to_big(card.ability.extra.money) * mod)
74687573
ease_dollars(option)
74697574
card_eval_status_text(
@@ -7694,6 +7799,13 @@ local night = {
76947799
name = "cry-night",
76957800
key = "night",
76967801
config = { extra = { mult = 3 } },
7802+
gameset_config = {
7803+
modest = {
7804+
extra = {
7805+
mult = 2,
7806+
},
7807+
},
7808+
},
76977809
pos = { x = 3, y = 1 },
76987810
rarity = 3,
76997811
cost = 6,
@@ -7965,6 +8077,14 @@ local morse = {
79658077
money = 1,
79668078
},
79678079
},
8080+
gameset_config = {
8081+
modest = {
8082+
extra = {
8083+
bonus = 1,
8084+
money = 1,
8085+
},
8086+
},
8087+
},
79688088
rarity = 1,
79698089
cost = 5,
79708090
order = 57,
@@ -8585,6 +8705,13 @@ local kidnap = {
85858705
config = {
85868706
extra = { money = 4 },
85878707
},
8708+
gameset_config = {
8709+
modest = {
8710+
extra = {
8711+
money = 1,
8712+
},
8713+
},
8714+
},
85888715
rarity = 1,
85898716
cost = 4,
85908717
blueprint_compat = false,
@@ -10090,6 +10217,14 @@ local brokenhome = { -- X11.4 Mult, 1 in 4 chance to self-destruct at end of rou
1009010217
eternal_compat = false,
1009110218
demicoloncompat = true,
1009210219
config = { extra = { Xmult = 11.4, odds = 4 } },
10220+
gameset_config = {
10221+
modest = {
10222+
extra = {
10223+
Xmult = 3,
10224+
odds = 4,
10225+
},
10226+
},
10227+
},
1009310228
loc_vars = function(self, info_queue, card) -- the humble cavendish example mod:
1009410229
return { vars = { card.ability.extra.Xmult, (G.GAME.probabilities.normal or 1), card.ability.extra.odds } }
1009510230
end,

0 commit comments

Comments
 (0)