Skip to content

Commit 69edac9

Browse files
committed
Change beam options that are invisible in caves without the candle
Perhaps in the future we'll add options in the UI so the user can choose this for themselves. For now, just remove those colors before someone gets trolled.
1 parent 68ac304 commit 69edac9

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

RandomizerCore/EnumTypes.cs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ public enum BeamPalette
541541
Flashing = -1,
542542
Link = 0,
543543
Orange = 1,
544-
Red = 2,
545-
Blue = 3,
544+
Red = 2, // bad idea to use since this palette is not visible in caves without the candle
545+
Blue = 3, // ^
546546
}
547547

548548
public enum BeamRotation
@@ -588,38 +588,35 @@ public enum BeamSprites
588588
[Description("Fire"), BeamSpriteMeta(BeamPalette = BeamPalette.Orange, Rotate = BeamRotation.FlipVertical)]
589589
FIRE,
590590

591-
[Description("Blue Fire"), BeamSpriteMeta(BeamPalette = BeamPalette.Blue, FirePalette = BeamPalette.Red, Rotate = BeamRotation.FlipVertical)]
592-
BLUE_FIRE,
593-
594-
[Description("Bubble"), BeamSpriteMeta(ChrAddress = 0xaa0, BeamPalette = BeamPalette.Flashing)]
591+
[Description("Bubble"), BeamSpriteMeta(ChrAddress = 0xaa0)]
595592
BUBBLE,
596593

597-
[Description("Rock"), BeamSpriteMeta(ChrAddress = 0x2ae0, BeamPalette = BeamPalette.Red)]
594+
[Description("Rock"), BeamSpriteMeta(ChrAddress = 0x2ae0)]
598595
ROCK,
599596

600-
[Description("Energy Ball"), BeamSpriteMeta(ChrAddress = 0x0ce0, BeamPalette = BeamPalette.Flashing)]
597+
[Description("Energy Ball"), BeamSpriteMeta(ChrAddress = 0x0ce0)]
601598
ENERGY_BALL,
602599

603-
[Description("Wizard Beam"), BeamSpriteMeta(ChrAddress = 0x14dc0, BeamPalette = BeamPalette.Flashing)]
600+
[Description("Wizard Beam"), BeamSpriteMeta(ChrAddress = 0x14dc0)]
604601
WIZARD_BEAM,
605602

606603
// (Red Daira's axe projectile switches between sprite f6 and fa for smoother rotation, we can't emulate that)
607-
[Description("Daira Axe"), BeamSpriteMeta(ChrAddress = 0x2f60, BeamPalette = BeamPalette.Red, Rotate = BeamRotation.Rotate90)]
604+
[Description("Daira Axe"), BeamSpriteMeta(ChrAddress = 0x2f60, BeamPalette = BeamPalette.Orange, Rotate = BeamRotation.Rotate90)]
608605
AXE,
609606

610-
[Description("Doomknocker Mace"), BeamSpriteMeta(ChrAddress = 0x12ee0, BeamPalette = BeamPalette.Blue, FirePalette = BeamPalette.Red, Rotate = BeamRotation.Rotate90)]
607+
[Description("Doomknocker Mace"), BeamSpriteMeta(ChrAddress = 0x12ee0, Rotate = BeamRotation.Rotate90)]
611608
HAMMER,
612609

613-
[Description("Geru Mace"), BeamSpriteMeta(ChrAddress = 0x5260, BeamPalette = BeamPalette.Blue, FirePalette = BeamPalette.Red, Rotate = BeamRotation.Rotate90)]
610+
[Description("Geru Mace"), BeamSpriteMeta(ChrAddress = 0x5260, Rotate = BeamRotation.Rotate90)]
614611
GERU_MACE,
615612

616-
[Description("Guma Mace"), BeamSpriteMeta(ChrAddress = 0xaee0, BeamPalette = BeamPalette.Red, Rotate = BeamRotation.Rotate90)]
613+
[Description("Guma Mace"), BeamSpriteMeta(ChrAddress = 0xaee0, Rotate = BeamRotation.Rotate90)]
617614
GUMA_MACE,
618615

619616
[Description("Boomerang"), BeamSpriteMeta(ChrAddress = 0x30c0, Rotate = BeamRotation.Rotate90)]
620617
BOOMERANG,
621618

622-
[Description("Spicy Chicken Fire"), BeamSpriteMeta(ChrAddress = 0xd3e0, BeamPalette =BeamPalette.Red, Rotate = BeamRotation.Rotate90)]
619+
[Description("Spicy Chicken Fire"), BeamSpriteMeta(ChrAddress = 0xd3e0, BeamPalette = BeamPalette.Orange, Rotate = BeamRotation.Rotate90)]
623620
SPICY_CHICKEN,
624621

625622
[Description("Random")]

0 commit comments

Comments
 (0)