Merge Unstable changes

BaseClasses.py

@@ -131,7 +131,7 @@ class World(object):
             set_player_attr('treasure_hunt_total', 0)
             set_player_attr('potshuffle', False)
             set_player_attr('pot_contents', None)
-            set_player_attr('fakeboots', False)
+            set_player_attr('pseudoboots', False)
 
             set_player_attr('shopsanity', False)
             set_player_attr('keydropshuffle', False)

CLI.py

@@ -97,7 +97,7 @@ def parse_cli(argv, no_defaults=False):
                          'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
                          'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
                          'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
-                         'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'fakeboots',
+                         'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
                          'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
                          'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
                          'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep',
@@ -144,7 +144,7 @@ def parse_settings():
         "shuffleganon": True,
         "shuffle": "vanilla",
         "shufflelinks": False,
-        "fakeboots": False,
+        "pseudoboots": False,
 
         "shufflepots": False,
         "shuffleenemies": "none",

Main.py

@@ -90,7 +90,7 @@ def main(args, seed=None, fish=None):
     world.treasure_hunt_count = args.triforce_goal.copy()
     world.treasure_hunt_total = args.triforce_pool.copy()
     world.shufflelinks = args.shufflelinks.copy()
-    world.fakeboots = args.fakeboots.copy()
+    world.pseudoboots = args.pseudoboots.copy()
 
     world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
 

Mystery.py

@@ -143,7 +143,7 @@ def roll_settings(weights):
         ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off'
 
     ret.shufflelinks = get_choice('shufflelinks') == 'on'
-    ret.fakeboots = get_choice('fakeboots') == 'on'
+    ret.pseudoboots = get_choice('pseudoboots') == 'on'
     ret.shopsanity = get_choice('shopsanity') == 'on'
     ret.keydropshuffle = get_choice('keydropshuffle') == 'on'
     ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'

RELEASENOTES.md

@@ -12,11 +12,23 @@ Links house can now be shuffled in different ER settings. It will be limited to
 
 Thanks to qadan, cheuer, & compiling
 
+## Pseudo Boots
+
+Thanks to Bonta. You can now start with pseudo boots that let you move fast, but have no other logical uses (bonking open things, hovering, etc)
+
+## Pendant/Crystal Indicator
+
+For accessibility, you now get a C or P indicator to the left of the magic bar on the HUD when instead a Crystal or Pendant. Requires ownership of the map of that dungeon for display. Thanks to kan. 
+
 # Bug Fixes and Notes.
 
+* 0.4.0.10
+	* Renamed to pseudoboots
+	* Some release note updates
 * 0.4.0.9
 	* Fixes for stats and P/C indicator (thanks Kara)
 	* Swamp lobby fixes (thanks Catobat)
+	* Fix for --hints flag on CLI
 * 0.4.0.8
 	* Ganon jokes added for when silvers aren't available
 	* Some text updated (Blind jokes, uncle text)
@@ -37,7 +49,7 @@ Thanks to qadan, cheuer, & compiling
 		* Chest turn tracking (not yet in credits)
 		* Damaged and magic stats in credits (gt bk removed)
 		* Fix for infinite bombs
-		* Fake boots option
+		* Pseudo boots option
 		* Always allowed medallions for swordless (no option yet)
 * 0.4.0.7
 	* Reduce flashing option added

Rom.py

@@ -1162,7 +1162,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
     rom.write_byte(0x18017E, 0x01) # Fairy fountains only trade in bottles
 
     # Starting equipment
-    if world.fakeboots[player]:
+    if world.pseudoboots[player]:
         rom.write_byte(0x18008E, 0x01)
 
     equip = [0] * (0x340 + 0x4F)

resources/app/cli/args.json

@@ -247,7 +247,7 @@
     ]
   },
   "hints": {
-    "action": "store_false",
+    "action": "store_true",
     "type": "bool"
   },
   "no_hints": {
@@ -310,7 +310,7 @@
     "action": "store_true",
     "type": "bool"
   },
-  "fakeboots": {
+  "pseudoboots": {
     "action": "store_true",
     "type": "bool"
   },

resources/app/cli/lang/en.json

@@ -262,7 +262,7 @@
       "Keys are universal, shooting arrows costs rupees,",
       "and a few other little things make this more like Zelda-1. (default: %(default)s)"
     ],
-    "fakeboots": [ " Players starts with fake boots that allow dashing but no item checks (default: %(default)s"],
+    "pseudoboots": [ " Players starts with pseudo boots that allow dashing but no item checks (default: %(default)s"],
     "startinventory": [ "Specifies a list of items that will be in your starting inventory (separated by commas). (default: %(default)s)" ],
     "usestartinventory": [ "Toggle usage of Starting Inventory." ],
     "custom": [ "Not supported." ],

resources/app/gui/lang/en.json

@@ -189,7 +189,7 @@
 
     "randomizer.item.hints": "Include Helpful Hints",
     "randomizer.item.retro": "Retro mode (universal keys)",
-    "randomizer.item.fakeboots": "Start with Fake Boots",
+    "randomizer.item.pseudoboots": "Start with Pseudo Boots",
 
     "randomizer.item.worldstate": "World State",
     "randomizer.item.worldstate.standard": "Standard",

resources/app/gui/randomize/item/widgets.json

@@ -5,7 +5,7 @@
     "hints": {
       "type": "checkbox"
     },
-    "fakeboots": { "type": "checkbox" }
+    "pseudoboots": { "type": "checkbox" }
   },
   "leftItemFrame": {
     "worldstate": {

source/classes/constants.py

@@ -58,7 +58,7 @@ SETTINGSTOPROCESS = {
       "hints": "hints",
       "retro": "retro",
       "shopsanity": "shopsanity",
-      "fakeboots": "fakeboots",
+      "pseudoboots": "pseudoboots",
       "worldstate": "mode",
       "logiclevel": "logic",
       "goal": "goal",