DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes bst slider in randomizer menu when in intro

Browse Source
This commit is contained in:
infinitefusion
2022-09-24 00:07:42 -04:00
parent 34d5c77312
commit ec64343fd0
4 changed files with 112 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Map295.rxdata
View File

Binary file not shown.

220
Data/Scripts/025-Randomizer/RandomizerSettings.rb
View File

@@ -148,21 +148,22 @@ class RandomizerTrainerOptionsScene < PokemonOption_Scene
end end
def pbGetOptions(inloadscreen = false) def pbGetOptions(inloadscreen = false)
options = [ options = []
SliderOption.new(_INTL("Randomness degree"), 25, 500, 5, if !$game_switches[SWITCH_DURING_INTRO]
options << SliderOption.new(_INTL("Randomness degree"), 25, 500, 5,
proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] }, proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
proc { |value| proc { |value|
$game_variables[VAR_RANDOMIZER_TRAINER_BST]=value $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
}), })
end
options << EnumOption.new(_INTL("Custom Sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_TEAMS_CUSTOM_SPRITES] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_TEAMS_CUSTOM_SPRITES] = value == 0
},
"Use only Pokémon that have custom sprites in trainer teams"
)
EnumOption.new(_INTL("Custom Sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_TEAMS_CUSTOM_SPRITES] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_TEAMS_CUSTOM_SPRITES] = value == 0
},
"Use only Pokémon that have custom sprites in trainer teams"
)
]
return options return options
end end
end end
@@ -198,70 +199,72 @@ class RandomizerWildPokemonOptionsScene < PokemonOption_Scene
end end
def pbGetOptions(inloadscreen = false) def pbGetOptions(inloadscreen = false)
options = [ options = []
SliderOption.new(_INTL("Randomness degree"), 25, 500, 5, if !$game_switches[SWITCH_DURING_INTRO]
proc { $game_variables[VAR_RANDOMIZER_WILD_POKE_BST] }, options << SliderOption.new(_INTL("Randomness degree"), 25, 500, 5,
proc { |value| proc { $game_variables[VAR_RANDOMIZER_WILD_POKE_BST] },
$game_variables[VAR_RANDOMIZER_WILD_POKE_BST]=value proc { |value|
}), $game_variables[VAR_RANDOMIZER_WILD_POKE_BST] = value
})
end
EnumOption.new(_INTL("Type"), [_INTL("Global"), _INTL("Area")], options << EnumOption.new(_INTL("Type"), [_INTL("Global"), _INTL("Area")],
proc { proc {
if $game_switches[RANDOM_WILD_AREA] if $game_switches[RANDOM_WILD_AREA]
1 1
else else
0 0
end end
}, },
proc { |value| proc { |value|
if value == 0 if value == 0
$game_switches[RANDOM_WILD_GLOBAL] = true $game_switches[RANDOM_WILD_GLOBAL] = true
$game_switches[RANDOM_WILD_AREA] = false $game_switches[RANDOM_WILD_AREA] = false
else else
value == 1 value == 1
$game_switches[RANDOM_WILD_GLOBAL] = false $game_switches[RANDOM_WILD_GLOBAL] = false
$game_switches[RANDOM_WILD_AREA] = true $game_switches[RANDOM_WILD_AREA] = true
end end
}, },
[ [
"Randomizes Pokémon using a one-to-one mapping of the Pokedex", "Randomizes Pokémon using a one-to-one mapping of the Pokedex",
"Randomizes the encounters in each route individually" "Randomizes the encounters in each route individually"
] ]
), )
EnumOption.new(_INTL("Starters"), [_INTL("On"), _INTL("Off")], options << EnumOption.new(_INTL("Custom sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_STARTERS] ? 0 : 1 }, proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 },
proc { |value| proc { |value|
$game_switches[SWITCH_RANDOM_STARTERS] = value == 0 $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] = value == 0
}, "Randomize the selection of starters to choose from at the start of the game" }, "(For 'Fuse everything' and starters) Randomize only to Pokémon that have a custom sprite."
), )
EnumOption.new(_INTL("Static encounters"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_STATIC] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_STATIC] = value == 0
},
"Randomize Pokémon that appear in the overworld (including legendaries)"
),
EnumOption.new(_INTL("Gift Pokémon"), [_INTL("On"), _INTL("Off")], options << EnumOption.new(_INTL("Starters"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[GIFT_POKEMON] ? 0 : 1 }, proc { $game_switches[SWITCH_RANDOM_STARTERS] ? 0 : 1 },
proc { |value| proc { |value|
$game_switches[GIFT_POKEMON] = value == 0 $game_switches[SWITCH_RANDOM_STARTERS] = value == 0
}, "Randomize Pokémon that are gifted to the player" }, "Randomize the selection of starters to choose from at the start of the game"
), )
options << EnumOption.new(_INTL("Static encounters"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_STATIC] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_STATIC] = value == 0
},
"Randomize Pokémon that appear in the overworld (including legendaries)"
)
EnumOption.new(_INTL("Fuse everything"), [_INTL("On"), _INTL("Off")], options << EnumOption.new(_INTL("Gift Pokémon"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[REGULAR_TO_FUSIONS] ? 0 : 1 }, proc { $game_switches[GIFT_POKEMON] ? 0 : 1 },
proc { |value| proc { |value|
$game_switches[REGULAR_TO_FUSIONS] = value == 0 $game_switches[GIFT_POKEMON] = value == 0
}, "Include fused Pokémon in the randomize pool for wild Pokémon" }, "Randomize Pokémon that are gifted to the player"
), )
EnumOption.new(_INTL("Custom sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 }, options << EnumOption.new(_INTL("Fuse everything"), [_INTL("On"), _INTL("Off")],
proc { |value| proc { $game_switches[REGULAR_TO_FUSIONS] ? 0 : 1 },
$game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] = value == 0 proc { |value|
}, "(With fuse everything option) Randomize only to Pokémon that have a custom sprite." $game_switches[REGULAR_TO_FUSIONS] = value == 0
) }, "Include fused Pokémon in the randomize pool for wild Pokémon"
] )
return options return options
end end
end end
@@ -294,42 +297,41 @@ class RandomizerGymOptionsScene < PokemonOption_Scene
end end
def pbGetOptions(inloadscreen = false) def pbGetOptions(inloadscreen = false)
options = [ options = []
SliderOption.new(_INTL("Randomness degree"), 25, 500, 5, if !$game_switches[SWITCH_DURING_INTRO]
proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] }, options << SliderOption.new(_INTL("Randomness degree"), 25, 500, 5,
proc { |value| proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
$game_variables[VAR_RANDOMIZER_TRAINER_BST]=value proc { |value|
}), $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
})
end
options << EnumOption.new(_INTL("Custom sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_GYM_CUSTOMS] ? 0 : 1 },
proc { |value|
$game_switches[SWITCH_RANDOM_GYM_CUSTOMS] = value == 0
}, "Use only Pokémon that have custom sprites in gym trainers or gym leader teams"
)
options << EnumOption.new(_INTL("Gym types"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_GYM_TYPES] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_GYM_TYPES] = value == 0
}, "Shuffle the gym types"
)
options << EnumOption.new(_INTL("Rerandomize each battle"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE] ? 0 : 1 },
proc { |value|
$game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE] = value == 0
$game_switches[SWITCH_RANDOM_GYM_PERSIST_TEAMS] = !$game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE]
}, "Gym trainers and leaders have a new team each try instead of keeping the same one"
)
EnumOption.new(_INTL("Gym types"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[RANDOM_GYM_TYPES] ? 0 : 1 },
proc { |value|
$game_switches[RANDOM_GYM_TYPES] = value == 0
}, "Shuffle the gym types"
),
EnumOption.new(_INTL("Rerandomize each battle"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE] ? 0 : 1 },
proc { |value|
$game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE] = value == 0
$game_switches[SWITCH_RANDOM_GYM_PERSIST_TEAMS] = !$game_switches[SWITCH_GYM_RANDOM_EACH_BATTLE]
}, "Gym trainers and leaders have a new team each try instead of keeping the same one"
),
EnumOption.new(_INTL("Custom sprites only"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_GYM_CUSTOMS] ? 0 : 1 },
proc { |value|
$game_switches[SWITCH_RANDOM_GYM_CUSTOMS] = value == 0
}, "Use only Pokémon that have custom sprites in gym trainers or gym leader teams"
)
]
return options return options
end end
end end
class RandomizerItemOptionsScene < PokemonOption_Scene class RandomizerItemOptionsScene < PokemonOption_Scene
RANDOM_HELD_ITEMS = 843 RANDOM_HELD_ITEMS = 843
def initialize def initialize
@changedColor = false @changedColor = false
end end
@@ -376,12 +378,12 @@ class RandomizerItemOptionsScene < PokemonOption_Scene
}, },
[ [
"Random items are decided at the start of the game", "Random items are decided at the start of the game",
"Random items are decided as you obtain them"], "Random items are decided as you obtain them"],
# proc { $game_switches[SWITCH_RANDOM_ITEMS_FULL] ? 0 : 1 }, # proc { $game_switches[SWITCH_RANDOM_ITEMS_FULL] ? 0 : 1 },
# proc { |value| # proc { |value|
# $game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = value == 0 # $game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = value == 0
# $game_switches[SWITCH_RANDOM_ITEMS_FULL] = value == 1 # $game_switches[SWITCH_RANDOM_ITEMS_FULL] = value == 1
# }, ["Random items are decided at the start of the game", "Random items are decided as you obtain them"] # }, ["Random items are decided at the start of the game", "Random items are decided as you obtain them"]
), ),
EnumOption.new(_INTL("Found items"), [_INTL("On"), _INTL("Off")], EnumOption.new(_INTL("Found items"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_FOUND_ITEMS] ? 0 : 1 }, proc { $game_switches[SWITCH_RANDOM_FOUND_ITEMS] ? 0 : 1 },
@@ -412,7 +414,7 @@ class RandomizerItemOptionsScene < PokemonOption_Scene
}, "Randomize the TMs given by NPCs" }, "Randomize the TMs given by NPCs"
), ),
EnumOption.new(_INTL("Shops items"), [_INTL("On"), _INTL("Off")], EnumOption.new(_INTL("Shop items"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_SHOP_ITEMS] ? 0 : 1 }, proc { $game_switches[SWITCH_RANDOM_SHOP_ITEMS] ? 0 : 1 },
proc { |value| proc { |value|
$game_switches[SWITCH_RANDOM_SHOP_ITEMS] = value == 0 $game_switches[SWITCH_RANDOM_SHOP_ITEMS] = value == 0

1
Data/Scripts/049_Compatibility/Constants.rb
View File

@@ -23,6 +23,7 @@ SWITCH_GAME_DIFFICULTY_HARD = 666
SWITCH_MODERN_MODE=974 SWITCH_MODERN_MODE=974
#Game progression switches #Game progression switches
SWITCH_DURING_INTRO = 917
SWITCH_CHOOSING_STARTER=3 SWITCH_CHOOSING_STARTER=3
SWITCH_GOT_BADGE_1 = 4 SWITCH_GOT_BADGE_1 = 4
SWITCH_GOT_BADGE_2 = 5 SWITCH_GOT_BADGE_2 = 5

BIN
Data/System.rxdata
View File

Binary file not shown.