Skip to content

Commit c542b8b

Browse files
shenefshenef
committed
rename config.yaml variables/options
1 parent 5256c74 commit c542b8b

File tree

6 files changed

+207
-198
lines changed

6 files changed

+207
-198
lines changed

Diff for: ‎config.yaml.example

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Main gamestate and step to load
22
# "none", "Baaj", "Besaid", "Boat1", "Kilika", "Luca", "Miihen", "MRR"
3-
# "Djose", "Moonflow", "Guadosalam", "Macalania", "Home", "rescueYuna"
3+
# "Djose", "Moonflow", "Guadosalam", "Macalania", "Home", "rescue_yuna"
44
# "Gagazet", "Zanarkand", "Sin", "Nem_Farm"
55
gamestate : "none" # valid values listed above
66
step_counter : 1 # valid step_counter values are dependent on gamestate
@@ -10,22 +10,22 @@ verbosity : DEBUG # Verbosity of log messages in the console.
1010
# These are the valid levels: DEBUG, INFO, WARNING, ERROR, CRITICAL
1111
# Full log will always be available in a file.
1212

13-
# RNG Seed (requires setting vars.setSeed: True)
14-
rngSeedNum : 160 # If starting a new run and using setSeed, use this RNG seed
15-
useFavoredSeed: False # If starting a new run and not using setSeed, use a curated array of seeds
13+
# RNG Seed (requires setting vars.set_seed: True)
14+
rng_seed_num : 160 # If starting a new run and using set_seed, use this RNG seed
15+
use_favored_seed: False # If starting a new run and not using set_seed, use a curated array of seeds
1616

1717
# Run configuration variables in vars.py
1818
vars:
1919
# Important Values
20-
artificialPauses : False # Set depending on hardware. True == less powerful hardware.
21-
csrValue : True # Set automatically on new game. For testing (loading a save file) set for your environment.
22-
nemesisValue : False # Set based on if you're doing any% (False) or Nemesis% (True)
23-
forceLoop : False # After game is finished, start again on next seed.
24-
setSeed : False # If you are using Rossy's patch, set to True. Otherwise set to False
25-
kilikaSkip : True # True == Tidus OD on Evrae instead of Seymour. New strat.
26-
perfectAeonKills : False # Before YuYevon, True is slower but more swag.
27-
attemptDjose : False # Try Djose skip? (not likely to succeed)
28-
legacySoundtrack : True # use the original Soundtrack instead of arranged
20+
artificial_pauses : False # Set depending on hardware. True == less powerful hardware.
21+
csr_value : True # Set automatically on new game. For testing (loading a save file) set for your environment.
22+
nemesis_value : False # Set based on if you're doing any% (False) or Nemesis% (True)
23+
force_loop : False # After game is finished, start again on next seed.
24+
set_seed : False # If you are using Rossy's patch, set to True. Otherwise set to False
25+
kilika_skip : True # True == Tidus OD on Evrae instead of Seymour. New strat.
26+
perfect_aeon_kills : False # Before YuYevon, True is slower but more swag.
27+
attempt_djose : False # Try Djose skip? (not likely to succeed)
28+
legacy_soundtrack : True # use the original Soundtrack instead of arranged
2929
do_not_skip_cutscenes : False # - Missing documentation -
3030

3131
# Accessibility for blind
@@ -37,44 +37,44 @@ vars:
3737

3838
# Blitzball
3939
force_blitz_win : False # - Missing documentation -
40-
blitzLoop : False # Loop on the same seed immediately after Blitzball.
41-
blitzLossForceReset : True # True == reset after blitz loss
42-
blitzWinValue : True # No default value required
43-
blitzOvertime : False # Set to False, no need to change ever.
44-
blitzFirstShotVal : False # - Missing documentation -
45-
oblitzAttackVal : "255" # Used for RNG manip tracking
40+
blitz_loop : False # Loop on the same seed immediately after Blitzball.
41+
blitz_loss_force_reset : True # True == reset after blitz loss
42+
blitz_win_value : True # No default value required
43+
blitz_overtime : False # Set to False, no need to change ever.
44+
blitz_first_shot_val : False # - Missing documentation -
45+
oblitz_attack_val : "255" # Used for RNG manip tracking
4646

4747
# Sphere grid
48-
fullKilikMenu : False # Default to False
49-
earlyTidusGridVal : False # Default False
50-
earlyHasteVal : 1 # Default -1
51-
wakkaLateMenuVal : False # Default False
52-
endGameVersionVal : 1 # Default 0
48+
full_kilik_menu : False # Default to False
49+
early_tidus_grid_val : False # Default False
50+
early_haste_val : 1 # Default -1
51+
wakka_late_menu_val : False # Default False
52+
end_game_version_val : 1 # Default 0
5353

5454
# Equipment
55-
zombieWeaponVal : 255 # Default 255
55+
zombie_weapon_val : 255 # Default 255
5656
l_strike_count : 1 # Default 0
5757

5858
# RNG Manip
5959
yellows : 0 # - Missing documentation -
60-
confirmedSeedNum : 999 # - Missing documentation -
61-
skipZanLuck : False # - Missing documentation -
60+
confirmed_seed_num : 999 # - Missing documentation -
61+
skip_zan_luck : False # - Missing documentation -
6262

6363
# Other
64-
newGame : False # - Missing documentation -
64+
new_game : False # - Missing documentation -
6565
self_destruct : False # Default False
66-
YTKFarm : 0 # Default to 0
67-
rescueCount : 0 # Default to 0
68-
fluxOverkillVar : False # Default to False
69-
tryNEVal : True # Based on
70-
# firstHits is still in vars.py
71-
neArmorVal : 255 # Default 255
72-
neBattles : 0 # Default to 0
73-
neaZone : 0 # Decides in which zone we charge Rikku OD after reaching Zanarkand.
66+
ytk_farm : 0 # Default to 0
67+
rescue_count : 0 # Default to 0
68+
flux_overkill_var : False # Default to False
69+
try_ne_val : True # Based on
70+
# first_hits is still in vars.py
71+
ne_armor_val : 255 # Default 255
72+
ne_battles : 0 # Default to 0
73+
nea_zone : 0 # Decides in which zone we charge Rikku OD after reaching Zanarkand.
7474

7575
# Nemesis variables, unused in any%
76-
nemAPVal : 1 # Default to 1
77-
# areaResults is still in vars.py
78-
# speciesResults is still in vars.py
79-
# originalResults is still in vars.py
80-
yojimboIndex : 1 # - Missing documentation -
76+
nem_ap_val : 1 # Default to 1
77+
# area_results is still in vars.py
78+
# species_results is still in vars.py
79+
# original_results is still in vars.py
80+
yojimbo_index : 1 # - Missing documentation -

Diff for: ‎load_game.py

+15-14
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
import os
33
from pathlib import Path
44

5+
import area.dream_zan
6+
import logs
57
import memory.main
68
import pathing
79
import screen
810
import vars
9-
from gamestate import game
1011
import xbox
1112
import zz_airship_path
12-
import area.dream_zan
13-
import logs
13+
from gamestate import game
1414

1515
# This file is intended to load the game to a saved file.
1616
# This assumes that the save is the first non-auto-save in the list of saves.
@@ -19,7 +19,7 @@
1919
game_vars = vars.vars_handle()
2020

2121

22-
def load_into_game(gamestate:str, step_counter:str):
22+
def load_into_game(gamestate: str, step_counter: str):
2323
if not (gamestate == "Luca" and step_counter == 3):
2424
area.dream_zan.new_game(gamestate)
2525
game.start_time = logs.time_stamp()
@@ -65,7 +65,7 @@ def load_into_game(gamestate:str, step_counter:str):
6565
load_miihen_start_laugh()
6666
if gamestate == "Miihen" and step_counter == 2: # Agency
6767
load_save_num(28)
68-
returnArray = [False, 0, 0, False]
68+
return_array = [False, 0, 0, False]
6969
if gamestate == "MRR" and step_counter == 1: # Mi'ihen North after meeting Seymour
7070
load_save_num(38)
7171
memory.main.set_gil_value(4000) # Fixes a low gil state for this save file.
@@ -98,17 +98,17 @@ def load_into_game(gamestate:str, step_counter:str):
9898
load_save_num(60)
9999
if gamestate == "Home" and step_counter == 2:
100100
load_save_num(11)
101-
if gamestate == "rescueYuna" and step_counter == 1: # Airship, first movement.
101+
if gamestate == "rescue_yuna" and step_counter == 1: # Airship, first movement.
102102
# Blitz Win, save less speed/power spheres
103103
load_save_num(56)
104-
if gamestate == "rescueYuna" and step_counter == 2: # Bevelle trials
104+
if gamestate == "rescue_yuna" and step_counter == 2: # Bevelle trials
105105
load_save_num(15)
106-
if gamestate == "rescueYuna" and step_counter == 4: # Altana
106+
if gamestate == "rescue_yuna" and step_counter == 4: # Altana
107107
load_save_num(12)
108108
# memory.main.setEncounterRate(setVal=0)
109109
# memory.main.setGameSpeed(setVal=1)
110110
# Highbridge before Seymour Natus
111-
if gamestate == "rescueYuna" and step_counter == 5:
111+
if gamestate == "rescue_yuna" and step_counter == 5:
112112
load_save_num(42) # Regular
113113
# loadGame.loadSaveNum(67) #Nemesis
114114
if gamestate == "Gagazet" and step_counter == 1: # Just before Calm Lands
@@ -198,14 +198,14 @@ def load_into_game(gamestate:str, step_counter:str):
198198
if gamestate == "Nem_Farm" and step_counter == 8:
199199
load_save_num(73)
200200
if gamestate == "Nem_Farm" and step_counter == 9:
201-
#Start of Nemesis farm
202-
#import nemesis.menu
203-
#import memory.main
201+
# Start of Nemesis farm
202+
# import nemesis.menu
203+
# import memory.main
204204
load_save_num(19)
205205
game_vars.set_nem_checkpoint_ap(27) # See nemesis.menu
206206
game_vars.end_game_version_set(4)
207-
#memory.main.arena_array_nines()
208-
#while not memory.main.get_tidus_slvl() >= 70:
207+
# memory.main.arena_array_nines()
208+
# while not memory.main.get_tidus_slvl() >= 70:
209209
# nemesis.menu.perform_next_grid()
210210
# memory.main.set_tidus_slvl(memory.main.get_tidus_slvl()+1)
211211
if gamestate == "Nem_Farm" and step_counter == 11:
@@ -253,6 +253,7 @@ def load_into_game(gamestate:str, step_counter:str):
253253
memory.main.check_nea_armor()
254254
memory.main.check_nea_armor()
255255

256+
256257
def get_saved_files():
257258
saveFilesFull = sorted(
258259
Path(game_vars.game_save_path()).iterdir(), key=os.path.getmtime

0 commit comments

Comments
 (0)