Skip to content

Commit c481790

Browse files
JevonnissocoolmanJevonnissocoolman
authored
Switch Obsidian Orb to whitelist
1 parent bae7517 commit c481790

File tree

2 files changed

+65
-15
lines changed

2 files changed

+65
-15
lines changed

‎items/blind.lua‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ local oldox = {
1111
boss = {
1212
min = 2,
1313
max = 10,
14+
yes_orb = true,
1415
},
1516
atlas = "nostalgia",
1617
order = 4,
@@ -36,6 +37,7 @@ local oldhouse = {
3637
boss = {
3738
min = 3,
3839
max = 10,
40+
yes_orb = true,
3941
},
4042
atlas = "nostalgia",
4143
order = 5,
@@ -64,6 +66,7 @@ local oldarm = {
6466
boss = {
6567
min = 3,
6668
max = 10,
69+
yes_orb = true,
6770
},
6871
atlas = "nostalgia",
6972
order = 6,
@@ -92,6 +95,7 @@ local oldfish = {
9295
boss = {
9396
min = 2,
9497
max = 10,
98+
yes_orb = true,
9599
},
96100
atlas = "nostalgia",
97101
order = 7,
@@ -117,6 +121,7 @@ local oldmanacle = {
117121
boss = {
118122
min = 1,
119123
max = 10,
124+
yes_orb = true,
120125
},
121126
atlas = "nostalgia",
122127
order = 8,
@@ -142,6 +147,7 @@ local oldserpent = {
142147
boss = {
143148
min = 5,
144149
max = 10,
150+
yes_orb = true,
145151
},
146152
atlas = "nostalgia",
147153
order = 9,
@@ -167,6 +173,7 @@ local oldpillar = {
167173
boss = {
168174
min = 3,
169175
max = 10,
176+
yes_orb = true,
170177
},
171178
atlas = "nostalgia",
172179
order = 10,
@@ -195,6 +202,7 @@ local oldflint = {
195202
boss = {
196203
min = 3,
197204
max = 10,
205+
yes_orb = true,
198206
},
199207
atlas = "nostalgia",
200208
order = 11,
@@ -223,6 +231,7 @@ local oldmark = {
223231
boss = {
224232
min = 4,
225233
max = 10,
234+
yes_orb = true,
226235
},
227236
atlas = "nostalgia",
228237
order = 12,
@@ -251,6 +260,7 @@ local tax = {
251260
boss = {
252261
min = 2,
253262
max = 10,
263+
yes_orb = true,
254264
},
255265
atlas = "blinds",
256266
order = 2,
@@ -303,6 +313,7 @@ local box = {
303313
boss = {
304314
min = 1,
305315
max = 10,
316+
yes_orb = true,
306317
},
307318
atlas = "blinds",
308319
order = 13,
@@ -329,6 +340,7 @@ local clock = {
329340
boss = {
330341
min = 2,
331342
max = 10,
343+
yes_orb = true,
332344
},
333345
config = {
334346
tw_bl = {
@@ -368,6 +380,7 @@ local trick = {
368380
boss = {
369381
min = 1,
370382
max = 10,
383+
yes_orb = true,
371384
},
372385
atlas = "blinds",
373386
order = 14,
@@ -404,6 +417,7 @@ local joke = {
404417
boss = {
405418
min = 1,
406419
max = 10,
420+
yes_orb = true,
407421
},
408422
atlas = "blinds",
409423
order = 15,
@@ -451,6 +465,7 @@ local hammer = {
451465
boss = {
452466
min = 2,
453467
max = 10,
468+
yes_orb = true,
454469
},
455470
atlas = "blinds",
456471
order = 19,
@@ -487,6 +502,7 @@ local magic = {
487502
boss = {
488503
min = 2,
489504
max = 10,
505+
yes_orb = true,
490506
},
491507
atlas = "blinds",
492508
order = 20,
@@ -523,6 +539,7 @@ local windmill = {
523539
boss = {
524540
min = 4,
525541
max = 10,
542+
yes_orb = true,
526543
},
527544
atlas = "blinds",
528545
order = 16,
@@ -547,6 +564,7 @@ local striker = {
547564
boss = {
548565
min = 4,
549566
max = 10,
567+
yes_orb = true,
550568
},
551569
atlas = "blinds",
552570
order = 1,
@@ -571,6 +589,7 @@ local shackle = {
571589
boss = {
572590
min = 1,
573591
max = 10,
592+
yes_orb = true,
574593
},
575594
atlas = "blinds",
576595
order = 18,
@@ -605,6 +624,7 @@ local pin = {
605624
boss = {
606625
min = 4,
607626
max = 10,
627+
yes_orb = true,
608628
},
609629
atlas = "blinds",
610630
order = 17,
@@ -648,6 +668,7 @@ local scorch = {
648668
boss = {
649669
min = 1,
650670
max = 10,
671+
yes_orb = true,
651672
},
652673
atlas = "blinds",
653674
order = 21,
@@ -699,6 +720,7 @@ local greed = {
699720
boss = {
700721
min = 1,
701722
max = 10,
723+
yes_orb = true,
702724
},
703725
atlas = "blinds",
704726
order = 22,
@@ -764,6 +786,7 @@ local decision = {
764786
boss = {
765787
min = 4,
766788
max = 666666,
789+
yes_orb = true,
767790
},
768791
atlas = "blinds",
769792
order = 23,
@@ -848,6 +871,7 @@ local repulsor = {
848871
boss = {
849872
min = 4,
850873
max = 666666,
874+
yes_orb = true,
851875
},
852876
atlas = "blinds_two",
853877
order = 24,
@@ -899,6 +923,7 @@ local chromatic = {
899923
boss = {
900924
min = 1,
901925
max = 666666,
926+
yes_orb = true,
902927
},
903928
atlas = "blinds_two",
904929
order = 25,
@@ -927,6 +952,7 @@ local landlord = {
927952
boss = {
928953
min = 4,
929954
max = 666666,
955+
yes_orb = true,
930956
},
931957
atlas = "blinds_two",
932958
order = 26,
@@ -970,6 +996,7 @@ local lavender_loop = {
970996
min = 3,
971997
max = 10,
972998
showdown = true,
999+
yes_orb = true,
9731000
},
9741001
atlas = "blinds",
9751002
order = 91,
@@ -1071,6 +1098,7 @@ local vermillion_virus = {
10711098
min = 3,
10721099
max = 10,
10731100
showdown = true,
1101+
yes_orb = true,
10741102
},
10751103
atlas = "blinds",
10761104
order = 90,
@@ -1122,6 +1150,7 @@ local sapphire_stamp = {
11221150
min = 3,
11231151
max = 10,
11241152
showdown = true,
1153+
yes_orb = true,
11251154
},
11261155
atlas = "blinds",
11271156
order = 92,

‎lib/overrides.lua‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,45 @@ local dft = Blind.defeat
152152
function Blind:defeat(s)
153153
dft(self, s)
154154
local obj = self.config.blind
155-
-- Ignore blinds with loc_vars because orb does not properly work with them yet
156-
if obj.boss and (obj.boss.no_orb or obj.loc_vars) then
155+
if
156+
(obj.boss and obj.boss.yes_orb)
157+
or (
158+
obj.name == "The Hook"
159+
or obj.name == "The Ox"
160+
or obj.name == "The House"
161+
or obj.name == "The Wall"
162+
or obj.name == "The Wheel"
163+
or obj.name == "The Arm"
164+
or obj.name == "The Club"
165+
or obj.name == "The Fish"
166+
or obj.name == "The Psychic"
167+
or obj.name == "The Goad"
168+
or obj.name == "The Water"
169+
or obj.name == "The Window"
170+
or obj.name == "The Manacle"
171+
or obj.name == "The Eye"
172+
or obj.name == "The Mouth"
173+
or obj.name == "The Plant"
174+
or obj.name == "The Serpent"
175+
or obj.name == "The Pillar"
176+
or obj.name == "The Needle"
177+
or obj.name == "The Head"
178+
or obj.name == "The Tooth"
179+
or obj.name == "The Flint"
180+
or obj.name == "The Mark"
181+
or obj.name == "Amber Acorn"
182+
or obj.name == "Verdant Leaf"
183+
or obj.name == "Violet Vessel"
184+
or obj.name == "Crimsion Heart"
185+
or obj.name == "Cerulean Bell"
186+
)
187+
then
188+
else
157189
return
158190
end
159191
if
160-
self.name ~= "cry-Obsidian Orb"
161192
--Stop impossible blind combinations from happening
162-
and self.name ~= "The Sink"
163-
and (self.name ~= "cry-oldarm" or not G.GAME.defeated_blinds["bl_psychic"])
193+
(self.name ~= "cry-oldarm" or not G.GAME.defeated_blinds["bl_psychic"])
164194
and (self.name ~= "The Psychic" or not G.GAME.defeated_blinds["bl_cry_oldarm"])
165195
and (self.name ~= "cry-oldarm" or not G.GAME.defeated_blinds["bl_cry_scorch"])
166196
and (self.name ~= "cry-scorch" or not G.GAME.defeated_blinds["bl_cry_oldarm"])
@@ -248,10 +278,7 @@ local rcc = reset_castle_card
248278
function reset_castle_card()
249279
rcc()
250280
G.GAME.current_round.cry_nb_card = { rank = "Ace" }
251-
if not G.GAME.current_round.cry_dropshot_card then
252-
G.GAME.current_round.cry_dropshot_card = {}
253-
end
254-
G.GAME.current_round.cry_dropshot_card.suit = "Spades"
281+
G.GAME.current_round.cry_dropshot_card = { suit = "Spades" }
255282
local valid_castle_cards = {}
256283
for k, v in ipairs(G.playing_cards) do
257284
if not SMODS.has_no_suit(v) and not SMODS.has_enhancement(v, "m_cry_abstract") then
@@ -261,16 +288,10 @@ function reset_castle_card()
261288
if valid_castle_cards[1] then
262289
--Dropshot
263290
local castle_card = pseudorandom_element(valid_castle_cards, pseudoseed("cry_dro" .. G.GAME.round_resets.ante))
264-
if not G.GAME.current_round.cry_dropshot_card then
265-
G.GAME.current_round.cry_dropshot_card = {}
266-
end
267291
G.GAME.current_round.cry_dropshot_card.suit = castle_card.base.suit
268292
--Number Blocks
269293
local castle_card_two =
270294
pseudorandom_element(valid_castle_cards, pseudoseed("cry_nb" .. G.GAME.round_resets.ante))
271-
if not G.GAME.current_round.cry_nb_card then
272-
G.GAME.current_round.cry_nb_card = {}
273-
end
274295
G.GAME.current_round.cry_nb_card.rank = castle_card_two.base.value
275296
G.GAME.current_round.cry_nb_card.id = castle_card_two.base.id
276297
end

0 commit comments

Comments
 (0)