monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LADX: combine warp options (#4325) 

* combine warp options

* fix

* fix typo

* mark old options as removed
This commit is contained in:
threeandthreee 2024-12-03 00:59:55 -05:00 committed by GitHub
parent 6896d631db
commit ac8a206d46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/ladx/LADXR/generator.py
View File

@ -58,7 +58,7 @@ from . import hints
from .patches import bank34
from .utils import formatText
from ..Options import TrendyGame, Palette
from ..Options import TrendyGame, Palette, Warps
from .roomEditor import RoomEditor, Object
from .patches.aesthetics import rgb_to_bin, bin_to_rgb
@ -416,8 +416,8 @@ def generateRom(args, world: "LinksAwakeningWorld"):
for channel in range(3):
color[channel] = color[channel] * 31 // 0xbc
if world.options.warp_improvements:
patches.core.addWarpImprovements(rom, world.options.additional_warp_points)
if world.options.warps != Warps.option_vanilla:
patches.core.addWarpImprovements(rom, world.options.warps == Warps.option_improved_additional)
palette = world.options.palette
if palette != Palette.option_normal:

30
worlds/ladx/Options.py
View File

@ -3,7 +3,7 @@ from dataclasses import dataclass
import os.path
import typing
import logging
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup, Removed
from collections import defaultdict
import Utils
@ -486,21 +486,18 @@ class Music(Choice, LADXROption):
return self.ladxr_name, s
class WarpImprovements(DefaultOffToggle):
class Warps(Choice):
"""
[On] Adds remake style warp screen to the game. Choose your warp destination on the map after jumping in a portal and press B to select.
[Off] No change
[Improved] Adds remake style warp screen to the game. Choose your warp destination on the map after jumping in a portal and press B to select.
[Improved Additional] Improved warps, and adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower.
"""
display_name = "Warp Improvements"
display_name = "Warps"
option_vanilla = 0
option_improved = 1
option_improved_additional = 2
default = option_vanilla
class AdditionalWarpPoints(DefaultOffToggle):
"""
[On] (requires warp improvements) Adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower
[Off] No change
"""
display_name = "Additional Warp Points"
ladx_option_groups = [
OptionGroup("Goal Options", [
Goal,
@ -515,8 +512,7 @@ ladx_option_groups = [
ShuffleStoneBeaks
]),
OptionGroup("Warp Points", [
WarpImprovements,
AdditionalWarpPoints,
Warps,
]),
OptionGroup("Miscellaneous", [
TradeQuest,
@ -562,8 +558,7 @@ class LinksAwakeningOptions(PerGameCommonOptions):
# 'bowwow': Bowwow,
# 'overworld': Overworld,
link_palette: LinkPalette
warp_improvements: WarpImprovements
additional_warp_points: AdditionalWarpPoints
warps: Warps
trendy_game: TrendyGame
gfxmod: GfxMod
palette: Palette
@ -579,3 +574,6 @@ class LinksAwakeningOptions(PerGameCommonOptions):
nag_messages: NagMessages
ap_title_screen: APTitleScreen
boots_controls: BootsControls
warp_improvements: Removed
additional_warp_points: Removed