From d70e88d8f3ce5b3c011a49ed57a47dfbf21e8015 Mon Sep 17 00:00:00 2001 From: LLCoolDave Date: Fri, 26 May 2017 18:40:04 +0200 Subject: [PATCH] Fixed some typos. --- Dungeons.py | 2 +- Items.py | 8 +++++--- Regions.py | 8 ++++---- Text.py | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dungeons.py b/Dungeons.py index ccfc6bd8..22a8e324 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -21,7 +21,7 @@ def fill_dungeons(world): freebes = ['[dungeon-A2-1F] Ganons Tower - Map Room', '[dungeon-D1-1F] Dark Palace - Spike Statue Room', '[dungeon-D1-1F] Dark Palace - Big Key Room'] # this key is in a fixed location (for now) - world.push_item(world.get_location('[dungeon - D3 - B1] Skull Woods - South of Big Chest'), ItemFactory('Small Key (Skull Woods)'), False) + world.push_item(world.get_location('[dungeon-D3-B1] Skull Woods - South of Big Chest'), ItemFactory('Small Key (Skull Woods)'), False) for dungeon_regions, big_key, small_keys, dungeon_items in [TR, ES, EP, DP, ToH, AT, PoD, TT, SW, SP, IP, MM, GT]: # this is what we need to fill diff --git a/Items.py b/Items.py index 25430683..842c2f84 100644 --- a/Items.py +++ b/Items.py @@ -17,7 +17,8 @@ def ItemFactory(items): code = [0x16, 0x2B, 0x2C, 0x2D, 0x3C, 0x3D, 0x48][random.randint(0, 6)] ret.append(Item(item, advancement, key, crystal, code, altar_hint, altar_credit, sickkid_credit, zora_credit, witch_credit, fluteboy_credit)) else: - logging.getLogger('').warning('Unknown Items: %s' % item) + logging.getLogger('').warning('Unknown Item: %s' % item) + return None if singleton: return ret[0] @@ -52,7 +53,7 @@ item_table = {'Bow': (True, False, False, 0x0B, 'You have\nchosen the\narcher cl 'Master Sword': (True, False, False, 0x50, 'I thought this\nwas meant to\nbe randomized?', None, None, None, None, None), 'Tempered Sword': (True, False, False, 0x02, 'I stole the\nblacksmith\'s\njob!', None, None, None, None, None), 'Fighter Sword': (True, False, False, 0x49, 'A pathetic\nsword rests\nhere!', None, None, None, None, None), - 'GoldenSword': (True, False, False, 0x03, 'The butter\nsword rests\nhere!', None, None, None, None, None), + 'Golden Sword': (True, False, False, 0x03, 'The butter\nsword rests\nhere!', None, None, None, None, None), 'Progressive Sword': (True, False, False, 0x5E, 'a better copy\nof your sword\nfor your time', None, None, None, None, None), 'Progressive Glove': (True, False, False, 0x61, 'a way to lift\nheavier things', None, None, None, None, None), 'Silver Arrows': (True, False, False, 0x58, 'Do you fancy\nsilver tipped\narrows?', None, None, None, None, None), @@ -145,4 +146,5 @@ item_table = {'Bow': (True, False, False, 0x0B, 'You have\nchosen the\narcher cl 'Small Key (Ganons Tower)': (False, True, False, 0x24, None, None, None, None, None, None), 'Big Key (Ganons Tower)': (False, True, False, 0x32, None, None, None, None, None, None), 'Compass (Ganons Tower)': (False, False, False, 0x25, None, None, None, None, None, None), - 'Map (Ganons Tower)': (False, False, False, 0x33, None, None, None, None, None, None)} + 'Map (Ganons Tower)': (False, False, False, 0x33, None, None, None, None, None, None), + 'Nothing': (False, False, False, 0x5A, 'Some Hot Air', None, None, None, None, None)} diff --git a/Regions.py b/Regions.py index 5284cf2d..dbc3d7f1 100644 --- a/Regions.py +++ b/Regions.py @@ -198,8 +198,8 @@ def create_regions(world): '[dungeon-D4-B2] Thieves Town - Chest next to Blind'], ['Blind Fight']), create_region('Blind Fight', ['Blind - Heart Container', 'Blind - Crystal']), create_region('Skull Woods First Section', ['[dungeon-D3-B1] Skull Woods - Compass Room', '[dungeon-D3-B1] Skull Woods - East of Big Chest', - '[dungeon-D3-B1] Skull Woods - Big Chest', '[dungeon-D3-B1] Skull Woods - Map Room', - '[dungeon - D3 - B1] Skull Woods - South of Big Chest'], ['Skull Woods First Section Exit']), + '[dungeon-D3-B1] Skull Woods - Big Chest', '[dungeon-D3-B1] Skull Woods - Push Statue Room', + '[dungeon-D3-B1] Skull Woods - South of Big Chest'], ['Skull Woods First Section Exit']), create_region('Skull Woods First Section (Right)', None, ['Skull Woods First Section (Right)']), # drop through regions for unique hole targets create_region('Skull Woods First Section (Left)', None, ['Skull Woods First Section (Left)']), create_region('Skull Woods First Section (Top)', None, ['Skull Woods First Section (Top)']), @@ -420,8 +420,8 @@ location_table = {'Mushroom': (0x180013, False, 'Light World'), '[dungeon-D3-B1] Skull Woods - Compass Room': (0xE992, False, 'Skull Woods'), '[dungeon-D3-B1] Skull Woods - East of Big Chest': (0xE99B, False, 'Skull Woods'), '[dungeon-D3-B1] Skull Woods - Big Chest': (0xE998, False, 'Skull Woods'), - '[dungeon-D3-B1] Skull Woods - Map Room': (0xE9A1, False, 'Skull Woods'), - '[dungeon - D3 - B1] Skull Woods - South of Big Chest': (0xE9C8, False, 'Skull Woods'), + '[dungeon-D3-B1] Skull Woods - Push Statue Room': (0xE9A1, False, 'Skull Woods'), + '[dungeon-D3-B1] Skull Woods - South of Big Chest': (0xE9C8, False, 'Skull Woods'), '[dungeon-D3-B1] Skull Woods - Big Key Room': (0xE99E, False, 'Skull Woods'), '[dungeon-D3-B1] Skull Woods - Final Section Entrance': (0xE9FE, False, 'Skull Woods'), 'Mothula - Heart Container': (0x180155, False, 'Skull Woods'), diff --git a/Text.py b/Text.py index 179c3a3f..34d9240d 100644 --- a/Text.py +++ b/Text.py @@ -45,7 +45,7 @@ Sanctuary_texts = ['A Priest\'s love'] Kakariko_texts = ['Shasschahshahsahahrahsashsa'] Blacksmiths_texts = ['frogs for bread'] DeathMountain_texts = ['lost again'] -LostWoods_texts = ['thieve\'s stump'] +LostWoods_texts = ['thieves\' stump'] WishingWell_texts = ['Bottle for Bottle'] DesertPalace_texts = ['literacy moves'] MountainTower_texts = ['up up and away']