From 0fd6015fde83916d35502a2a879a03a34227ac24 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Thu, 23 Jul 2015 15:23:29 -0700 Subject: [PATCH] lemon-scented cleanup --- Lua/data/scene names.lua | 53 ++++++++++++++++++++-------------------- Lua/exit calculator.lua | 6 ++++- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Lua/data/scene names.lua b/Lua/data/scene names.lua index bbc3463..04a41f5 100644 --- a/Lua/data/scene names.lua +++ b/Lua/data/scene names.lua @@ -1,21 +1,22 @@ -- entrance order, not scene order. i know it's confusing. +local bad="[crash]" return { [0]="Southern Swamp (Clean)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", + bad, + bad, + bad, + bad, + bad, + bad, "Grottos", "Intro Map", - "(crash)", + bad, "Magic Hags' Potion Shop", "Majora", "Beneath the Graveyard", "Curiosity Shop", - "(crash)", - "(crash)", + bad, + bad, "Mama's House / Barn", "Honey & Darling's Shop", "Mayor's Residence", @@ -49,7 +50,7 @@ return { "Post Office", "Marine Research Lab", "Beneath the Graveyard (Dampe)", - "(crash)", + bad, "Goron Shrine", "Zora Hall", "Trading Post", @@ -58,7 +59,7 @@ return { "Great Bay Coast (Lab Area)", "Great Bay Coast (Zora Area)", "Lottery Shop", - "(crash)", + bad, "Pirates' Fortress (Outside)", "Fisherman's Hut", "Goron Shop", @@ -113,19 +114,19 @@ return { "North Clock Town", "South Clock Town", "Laundry Pool", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", - "(crash)", + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, + bad, } diff --git a/Lua/exit calculator.lua b/Lua/exit calculator.lua index 978f23c..bc1e811 100644 --- a/Lua/exit calculator.lua +++ b/Lua/exit calculator.lua @@ -34,7 +34,11 @@ function calc_dump(a) return end print(scene_names[scene_id]) - print(t[entrance]) + if t[entrance] then + print(t[entrance]) + else + print("[unknown entrance]") + end end function calc(exit)