diff options
Diffstat (limited to 'world/map/npc/011-1')
| -rw-r--r-- | world/map/npc/011-1/alchemist.txt | 10 | ||||
| -rw-r--r-- | world/map/npc/011-1/auldsbel.txt | 202 | ||||
| -rw-r--r-- | world/map/npc/011-1/oscar.txt | 4 |
3 files changed, 108 insertions, 108 deletions
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt index e4eade06..ade035dd 100644 --- a/world/map/npc/011-1/alchemist.txt +++ b/world/map/npc/011-1/alchemist.txt @@ -84,13 +84,13 @@ L_certain_condition: L_post_sulphur_option: if (!@wants_ironpowder) - goto L_post_ironpowder_option; + goto L_post_ironpwd_option; set @menuitems$[@c], "Can you make iron powder?"; set @menuID[@c], @CHOICE_IRON_POWDER; set @c, @c + 1; - goto L_post_ironpowder_option; + goto L_post_ironpwd_option; -L_post_ironpowder_option: +L_post_ironpwd_option: if (@Q_status == @SETZER_INITIAL) goto L_post_monster_oil; set @menuitems$[@c], "Can you make monster oil?"; @@ -958,7 +958,7 @@ L_MenuItems3: goto L_dark_green_q_toomuch; if (@guess_accumulator + @QUEST_GUESS_BASE < QUEST_clothdyer_knowsdye) - goto L_dark_green_q_toolittle; + goto L_dark_green_q_little; // otherwise correct guess @@ -979,7 +979,7 @@ L_dark_green_q_toomuch: mes "\"That was too much... you need fewer than " + @guess_accumulator + " thousandths, I think."; goto L_dark_green_q_again; -L_dark_green_q_toolittle: +L_dark_green_q_little: mes "Almost instantaneously, the mixture loses its colour and turns transparent. Rauk sighs."; mes "\"That was too little. Next time, try more than " + @guess_accumulator + " thousandths."; goto L_dark_green_q_again; diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt index a99eef70..f8315c18 100644 --- a/world/map/npc/011-1/auldsbel.txt +++ b/world/map/npc/011-1/auldsbel.txt @@ -191,7 +191,7 @@ L_sulphur: menu "No, thank you.", L_Close, "I will see what I can find.", L_Close, - "Can you teach me how to make it myself?", L_sulphur_teach_spell, + "Can you teach me how to make it myself?", L_Sul_t_s, "Here you are.", L_sulphur_buy; menu "No, thank you.", L_Close, @@ -235,9 +235,9 @@ L_sulphur_noroom: next; goto L_main_menu; -L_sulphur_teach_spell: +L_Sul_t_s: if (@Q_component_quest <= 4) - goto L_sulphur_teach_spell_no; + goto L_Sul_t_s_no; mes "[Auldsbel the Wizard]"; mes "\"Very well, then. You have been quite helpful with my experiments, after all. As you may have noticed, the spell takes a pile of volcanic ashes. Close your hands around it, then whisper the invocation.\""; next; @@ -249,7 +249,7 @@ L_sulphur_teach_spell: next; goto L_main_menu; -L_sulphur_teach_spell_no: +L_Sul_t_s_no: mes "[Auldsbel the Wizard]"; mes "\"Hmm... how about this: you help me with a few of my experiments, and I tell you?\""; next; @@ -270,23 +270,23 @@ L_about_magic: mes "[Auldsbel the Wizard]"; mes "\"Most spells are claimed by one of the five schools of magic. To properly use them, a magic user need not only have sufficient prowess in magic overall, but also in the specifics of that particular school.\""; next; - goto L_about_magic_minimenu; + goto L_a_m_minimenu; -L_about_magic_minimenu: +L_a_m_minimenu: menu - "What are the five schools?", L_about_magic_schools, - "How can I advance in magic?", L_about_magic_advance, - "How do spells work?", L_about_magic_spells, - "Where can I learn spells?", L_about_magic_learn, + "What are the five schools?", L_a_m_schools, + "How can I advance in magic?", L_a_m_advance, + "How do spells work?", L_a_m_spells, + "Where can I learn spells?", L_a_m_learn, "Never mind.", L_main_menu; -L_about_magic_schools: +L_a_m_schools: mes "[Auldsbel the Wizard]"; mes "\"With few exceptions, all spells belong to one of the five schools of magic: Transmutation, War, Astral, Life, and Nature.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; -L_about_schools_minimenu: +L_a_s_minimenu: menu "What's Transmutation magic?", L_about_transmutation, "What's War magic?", L_about_war, @@ -294,7 +294,7 @@ L_about_schools_minimenu: "What's Life magic?", L_about_life, "What's Nature magic?", L_about_nature, "Are there other spells?", L_about_other_spells, - "Thank you.", L_about_magic_minimenu; + "Thank you.", L_a_m_minimenu; L_about_transmutation: mes "[Auldsbel the Wizard]"; @@ -304,7 +304,7 @@ L_about_transmutation: mes "He smiles."; mes "\"Transmutation magic is the engine of human civilization. By allowing us to shape buildings, tools, and other items according to the power of our imagination, it gives us mastery over nature.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; L_about_astral: mes "[Auldsbel the Wizard]"; @@ -313,7 +313,7 @@ L_about_astral: mes "[Auldsbel the Wizard]"; mes "\"There are also some more direct uses of powers of the Astral World; mainly spells that affect other spells.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; L_about_war: mes "[Auldsbel the Wizard]"; @@ -322,27 +322,27 @@ L_about_war: mes "[Auldsbel the Wizard]"; mes "\"If you use War magic, you better have a Transmuter around for the aftermath, to clear up your collateral damage.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; L_about_life: mes "[Auldsbel the Wizard]"; mes "\"Life magic deals with healing. Not much of a surprise there.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; L_about_nature: mes "[Auldsbel the Wizard]"; mes "\"Nature magic is a rather subtle (and, in my eyes, rather weak) kind of magic that deals with manipulating nature as it is. Think of it as Transmutation magic without being able to actually shape things the way you want.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; L_about_other_spells: mes "[Auldsbel the Wizard]"; mes "\"A few spells are not claimed by any particular school of magic. In practice, this means that anyone can cast them if they just have sufficient magical power. The most prominent example is the 'detect magic' spell, '" + getspellinvocation("detect-magic") + "'.\""; next; - goto L_about_schools_minimenu; + goto L_a_s_minimenu; -L_about_magic_advance: +L_a_m_advance: mes "[Auldsbel the Wizard]"; mes "\"Advancing in your magical powers must come from two sources: from within and from a person who can guide you in whichever school of magic you wish to advance.\""; next; @@ -358,9 +358,9 @@ L_about_magic_advance: mes "[Auldsbel the Wizard]"; mes "\"I myself am a Transmutation Wizard. Of course I know some spells from the other schools, but my focus is on Transmutation. Theoretically speaking, I can advance you in this school.\""; next; - goto L_about_magic_minimenu; + goto L_a_m_minimenu; -L_about_magic_learn: +L_a_m_learn: mes "[Auldsbel the Wizard]"; mes "\"Finding and learning new spells is of course important in a magic user's quest towards becoming a full-fledged wizard.\""; next; @@ -373,9 +373,9 @@ L_about_magic_learn: mes "[Auldsbel the Wizard]"; mes "\"If you decide to hunt for spells, make sure to keep a journal with you. Some spell invocations may only cross your path once in your lifetime; you must not allow them to get away!\""; next; - goto L_about_magic_minimenu; + goto L_a_m_minimenu; -L_about_magic_spells: +L_a_m_spells: mes "[Auldsbel the Wizard]"; mes "\"Magical spells are shortcuts, true magic bound to a word. No-one today remembers how they were created at the beginning of time, though many have tried to find it out, and failed...\""; next; @@ -388,17 +388,17 @@ L_about_magic_spells: mes "[Auldsbel the Wizard]"; mes "\"Some spells require catalysts on top of components, others vary in power depending on whom they are cast on or under what conditions. However, all spells are affected by the caster's astral power.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; -L_about_spells_minimenu: +L_a_sp_minimenu: menu "What is this 'astral power'?", L_about_astral_power, "What is a catalyst?", L_about_catalysts, "What is a component?", L_about_components, - "What other prerequisites are there?", L_about_other_prerequisites, - "Where can I learn spells?", L_about_magic_learn, + "What other prerequisites are there?", L_a_oth_prereq, + "Where can I learn spells?", L_a_m_learn, "How often can I cast spells?", L_about_speed, - "Never mind.", L_about_magic_minimenu; + "Never mind.", L_a_m_minimenu; L_about_astral_power: mes "[Auldsbel the Wizard]"; @@ -410,31 +410,31 @@ L_about_astral_power: mes "[Auldsbel the Wizard]"; mes "\"The worst offenders are metal items, particularly shields and body armour. Helmets and gloves get in the way, too. Still, a few special or enchanted items may even increase magical power.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; L_about_catalysts: mes "[Auldsbel the Wizard]"; mes "\"A catalyst is a material prerequisite to a spell that is not consumed as part of the spell. For example, the Transmuter's Tablet is required to properly perform many of the more powerful transmutation spells, but it is never consumed.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; L_about_components: mes "[Auldsbel the Wizard]"; mes "\"A material component is an item that is consumed as part of the spells magic. For example, when transmuting wood into arrows, you must consume a raw log to shape the arrows out of it.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; -L_about_other_prerequisites: +L_a_oth_prereq: mes "[Auldsbel the Wizard]"; mes "\"Some spells have additional requirements – they can only be cast underground, or when you are standing very close to the person you are casting them on, or only when you are wearing a particular enchanted item. Spells are quirky, so read their descriptions carefully – if you do find a description.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; L_about_speed: mes "[Auldsbel the Wizard]"; mes "\"Most spells are effective immediately, unless they require some complex astral connection – summoning or teleporting can take a while to take effect, for example. Still, after casting a spell you usually need a moment to recover before casting the next.\""; next; - goto L_about_spells_minimenu; + goto L_a_sp_minimenu; L_about_auldsbel: mes "[Auldsbel the Wizard]"; @@ -615,7 +615,7 @@ L_Q_manaseed: if (MAGIC_FLAGS & MFLAG_DRANK_POTION) goto L_Q_manaseed_prepared; if (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED) - goto L_Q_manaseed_touched; + goto L_Q_ms_tou; mes "\"You have found an actual Mana Seed? That's impossible! Well, very unlikely... Then again, some others have told me similar rumours. I find it hard to believe that...\""; next; mes "[Auldsbel the Wizard]"; @@ -623,20 +623,20 @@ L_Q_manaseed: next; goto L_main_menu; -L_Q_manaseed_touched: +L_Q_ms_tou: if (MAGIC_FLAGS & MFLAG_DRANK_POTION) goto L_Q_manaseed_prepared; mes "\"So you touched the Mana Seed, and its power flowed right through you? You are lucky – it is willing to share – but you are also unlucky, in that you lack the discipline and control needed to contain this power.\""; next; if (MAGIC_FLAGS & MFLAG_KNOWS_MANAPOTION) - goto L_Q_manaseed_touched_short; + goto L_Q_ms_tou_short; mes "[Auldsbel the Wizard]"; mes "\"Legend has it that you can substitute for such control by imbibing a Mana Potion. I am not sure whether that legend is true, but for you it might be worth trying it out.\""; next; set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_MANAPOTION; - goto L_Q_manaseed_touched_short; + goto L_Q_ms_tou_short; -L_Q_manaseed_touched_short: +L_Q_ms_tou_short: menu "Where can I get a Mana Potion?", L_where_mana_potion, "Can you make a Mana Potion?", L_make_mana_potion, @@ -646,7 +646,7 @@ L_where_mana_potion: mes "[Auldsbel the Wizard]"; mes "\"Well, quite a few alchemists should be able to brew one for you. Or maybe the village witch, even, though I personally would recommend seeing an alchemist.\""; next; - goto L_Q_manaseed_touched_short; + goto L_Q_ms_tou_short; L_make_mana_potion: mes "[Auldsbel the Wizard]"; @@ -655,19 +655,19 @@ L_make_mana_potion: menu "Here you are.", L_Next1, "I will look for those items.", L_main_menu, - "I'm not interested.", L_Q_manaseed_touched_short; + "I'm not interested.", L_Q_ms_tou_short; L_Next1: if (Zeny < 10000) - goto L_make_mana_potion_missing; + goto L_make_mp_miss; if (countitem("GambogeHerb") < 10) - goto L_make_mana_potion_missing; + goto L_make_mp_miss; if (countitem("MauveHerb") < 20) - goto L_make_mana_potion_missing; + goto L_make_mp_miss; if (countitem("Pearl") < 1) - goto L_make_mana_potion_missing; + goto L_make_mp_miss; if (countitem("BottleOfWater") < 1) - goto L_make_mana_potion_missing; + goto L_make_mp_miss; getinventorylist; if (@inventorylist_count == 100 && countitem("GambogeHerb") > 10 @@ -707,7 +707,7 @@ L_mana_potion_toomuch: next; goto L_main_menu; -L_make_mana_potion_missing: +L_make_mp_miss: mes "[Auldsbel the Wizard]"; mes "\"No, I need one pearl, 10,000 GP, 20 Mauve leaves, 10 Gamboge leaves, and one bottle of water.\""; next; @@ -732,23 +732,23 @@ L_Q_manaseed_maxedout: L_quest: if (@Q_component_quest == 0) - goto L_component_quest_0; + goto L_c_quest_0; if (@Q_component_quest == 1) - goto L_component_quest_1; + goto L_c_quest_1; if (@Q_component_quest == 2) - goto L_component_quest_2; + goto L_c_quest_2; if (@Q_component_quest == 3) - goto L_component_quest_3; + goto L_c_quest_3; if (@Q_component_quest == 4) - goto L_component_quest_4; + goto L_c_quest_4; if (@Q_component_quest == 5) - goto L_component_quest_5; + goto L_c_quest_5; mes "[Auldsbel the Wizard]"; mes "\"You have been very helpful, but at this point I have everything I need. Except perhaps for a Wumpus Egg, though I have no idea where you could find one... If you ever come across one, I will give you a special reward for it, though.\""; next; goto L_main_menu; -L_component_quest_0: +L_c_quest_0: mes "[Auldsbel the Wizard]"; mes "Auldsbel is visibly delighted."; mes "\"Ah, indeed, indeed! I can often use help with my experiments, and you just happen to be arriving at a particularly opportune time. See, I found this...\""; @@ -766,7 +766,7 @@ L_component_quest_0: L_Next3: if (countitem ("MauveHerb") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "MauveHerb", 20; set Zeny, Zeny + 2500; mes "[Auldsbel the Wizard]"; @@ -778,7 +778,7 @@ L_Next3: next; goto L_main_menu; -L_component_quest_1: +L_c_quest_1: mes "[Auldsbel the Wizard]"; mes "\"Good, good... I am trying to come up with a way to best use the Mauve leaves you brought me, but it seems that I will need further components. I am not sure about the exact composition yet, but I will need a few potions.\""; next; @@ -792,13 +792,13 @@ L_component_quest_1: L_Next4: if (countitem ("SmallHealingPotion") < 3) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("MediumHealingPotion") < 3) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("IronPotion") < 1) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("ConcentrationPotion") < 1) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "SmallHealingPotion", 3; delitem "MediumHealingPotion", 3; delitem "IronPotion", 1; @@ -813,7 +813,7 @@ L_Next4: next; goto L_main_menu; -L_component_quest_2: +L_c_quest_2: mes "[Auldsbel the Wizard]"; mes "\"Ah! Excellent! Yes, yes, indeed I need help. I have managed to transmute the components you brought me into a liquid that I believe to be a demetamorphosis stock, but it seems that the details still need some fine-tuning, and I am out of silk cocoons...\""; next; @@ -826,7 +826,7 @@ L_component_quest_2: L_Next5: if (countitem ("SilkCocoon") < 100) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "SilkCocoon", 100; set Zeny, Zeny + 5000; mes "[Auldsbel the Wizard]"; @@ -839,7 +839,7 @@ L_Next5: next; goto L_main_menu; -L_component_quest_3: +L_c_quest_3: mes "[Auldsbel the Wizard]"; mes "\"Yes... I'm actually not certain that my demetamorphosis stock will not drain the life out of these little creatures. Perhaps an alchemical revitalization tincture would be called for. Fortunately this one is easy, I can make it myself.\""; next; @@ -852,9 +852,9 @@ L_component_quest_3: L_Next6: if (countitem ("RedScorpionStinger") < 25) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("MaggotSlime") < 25) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "RedScorpionStinger", 25; delitem "MaggotSlime", 25; set Zeny, Zeny + 5000; @@ -868,7 +868,7 @@ L_Next6: next; goto L_main_menu; -L_component_quest_4: +L_c_quest_4: mes "[Auldsbel the Wizard]"; mes "\"Hmm, yes... See, the thing is that transmuting living beings is not normally something that transmutation magic can do. It seems that the beings' life force must be overcome to transmute them, but that in turn kills them.\""; next; @@ -887,11 +887,11 @@ L_component_quest_4: L_Next7: if (countitem ("SnakeTongue") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("CaveSnakeTongue") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; if (countitem ("MountainSnakeTongue") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "SnakeTongue", 20; delitem "CaveSnakeTongue", 20; delitem "MountainSnakeTongue", 20; @@ -918,7 +918,7 @@ L_Next7: next; goto L_main_menu; -L_component_quest_5: +L_c_quest_5: mes "[Auldsbel the Wizard]"; mes "\"I do have another assignment for you, but this one will be tricky. I will need fifty grass snake tongues. I believe that this may be just enough life force to return the silkworm back to its original shape.\""; next; @@ -928,7 +928,7 @@ L_component_quest_5: L_Next8: if (countitem ("GrassSnakeTongue") < 50) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "GrassSnakeTongue", 50; set Zeny, Zeny + 10000; mes "[Auldsbel the Wizard]"; @@ -957,7 +957,7 @@ OnSnakeDeath: message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS + "."; end; -L_component_quest_missing: +L_c_quest_missing: mes "[Auldsbel the Wizard]"; mes "\"No, you are missing some items. Come back later when you have everything!\""; next; @@ -967,19 +967,19 @@ L_learn_spell: if (@Q_main_status == @Q_STATUS_INITIATION) goto L_initiation; if (@Q_main_status == @Q_STATUS_STUDENT) - goto L_student_start; + goto L_stu_start; if (@Q_main_status == @Q_STATUS_STUDENT0) - goto L_student_0; + goto L_stu_0; if (@Q_main_status == @Q_STATUS_STUDENT1) - goto L_student_1; + goto L_stu_1; if (@Q_main_status == @Q_STATUS_STUDENT2) - goto L_student_2; + goto L_stu_2; if (@Q_main_status == @Q_STATUS_STUDENT3) - goto L_student_3; + goto L_stu_3; if (@Q_main_status == @Q_STATUS_STUDENT4) - goto L_student_4; + goto L_stu_4; if (@Q_main_status == @Q_STATUS_STUDENT5) - goto L_student_5; + goto L_stu_5; mes "[Auldsbel the Wizard]"; mes "\"Wellll.... you do seem to have some magical abilities. But do you possess the talent and diligence needed for a true wizard?\""; @@ -1070,7 +1070,7 @@ L_initiation_check: next; goto L_main_menu; -L_student_start: +L_stu_start: if (@mexp < 200) goto L_notready; mes "[Auldsbel the Wizard]"; mes "\"Next, I shall teach you a higher-level transmutation spell.\""; @@ -1086,7 +1086,7 @@ L_student_start: L_Next9: if (countitem("BugLeg") < 10) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "BugLeg", 10; getexp 1000, 0; set @Q_main_status, @Q_STATUS_STUDENT0; @@ -1111,7 +1111,7 @@ L_notready: next; goto L_main_menu; -L_student_0: +L_stu_0: if (@mexp < 350) goto L_notready; mes "[Auldsbel the Wizard]"; @@ -1126,7 +1126,7 @@ L_student_0: L_Next10: if (countitem("MauveHerb") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "MauveHerb", 20; getexp 1000, 0; set @Q_main_status, @Q_STATUS_STUDENT1; @@ -1141,7 +1141,7 @@ L_Next10: next; goto L_main_menu; -L_student_1: +L_stu_1: if (@mexp < 425) goto L_notready; mes "[Auldsbel the Wizard]"; @@ -1156,7 +1156,7 @@ L_student_1: L_Next11: if (countitem("ScorpionStinger") < 10) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "ScorpionStinger", 10; getexp 1000, 0; set @Q_main_status, @Q_STATUS_STUDENT2; @@ -1171,7 +1171,7 @@ L_Next11: next; goto L_main_menu; -L_student_2: +L_stu_2: if (@mexp < 500) goto L_notready; mes "[Auldsbel the Wizard]"; @@ -1186,7 +1186,7 @@ L_student_2: L_Next12: if (countitem("RawLog") < 20) - goto L_component_quest_missing; + goto L_c_quest_missing; delitem "RawLog", 20; getexp 1000, 0; set @Q_main_status, @Q_STATUS_STUDENT3; @@ -1201,15 +1201,15 @@ L_Next12: next; goto L_main_menu; -L_student_3: +L_stu_3: if (getskilllv(SKILL_MAGIC) < 3) - goto L_magic_skill_insufficient; + goto L_mag_skill_ins; mes "[Auldsbel the Wizard]"; mes "\"I believe that you may be ready for the next level of transmutation magic! Let me teach you one last spell that you can handle before your promotion, and if you can cast this one, I will advance you.\""; next; - goto L_student_3_repeat; + goto L_stu_3_repeat; -L_student_3_repeat: +L_stu_3_repeat: mes "[Auldsbel the Wizard]"; mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'. Put two cobalt leaves and two pink flower petals into a bottle of water, hold it up, and speak that phrase.\""; next; @@ -1223,20 +1223,20 @@ L_student_3_repeat: callsub S_update_var; goto L_main_menu; -L_student_4: +L_stu_4: mes "[Auldsbel the Wizard]"; mes "\"Did you manage to transmute a concentration potion?\""; next; menu - "What was the invocation again?", L_student_3_repeat, + "What was the invocation again?", L_stu_3_repeat, "No, still working on it...", L_main_menu, "Yes.", L_Next13; L_Next13: if (countitem("ConcentrationPotion") < 1) - goto L_student_4_no_potion; + goto L_stu_4_no_potion; if (!(MAGIC_FLAGS & MFLAG_MADE_CONC_POTION)) - goto L_student_4_wrong_potion; + goto L_stu_4_wrong_potion; mes "[Auldsbel the Wizard]"; mes "Auldsbel examines your potion and nods."; mes "\"Good work! You are ready for a promotion!\""; @@ -1257,25 +1257,25 @@ L_Next13: next; goto L_main_menu; -L_student_4_wrong_potion: +L_stu_4_wrong_potion: mes "[Auldsbel the Wizard]"; mes "Auldsbell examines your potion, then shakes his head."; mes "\"This doesn't look quite right, though I can't quite point at what the problem is. You will have to continue trying.\""; next; goto L_main_menu; -L_student_4_no_potion: +L_stu_4_no_potion: mes "[Auldsbel the Wizard]"; mes "\"You seem to be rather lacking the concentration potion you need to justify your claim, my dear fellow.\""; next; goto L_main_menu; -L_student_5: +L_stu_5: mes "[Auldsbel the Wizard]"; mes "\"Hmm. Come back some other time, please; I still haven't figured out what to teach you next.\""; close; -L_magic_skill_insufficient: +L_mag_skill_ins: mes "[Auldsbel the Wizard]"; mes "\"No, not at this time. You will have to advance in your overall magic skill before I can teach you more.\""; next; diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt index 3cc5c1e3..5a0994cc 100644 --- a/world/map/npc/011-1/oscar.txt +++ b/world/map/npc/011-1/oscar.txt @@ -340,7 +340,7 @@ L_TimerFunction: npctalk "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!"; // 7 mins max if ($@HalloweenQuest_PumpkinsTimer > 420) - goto L_PumpkinsRuinedEverything; + goto L_PumpkinsRuined; if (getnpctimer(0) >= 2900) goto L_TrySpawnPumpkin; @@ -407,7 +407,7 @@ L_KillBadHunter: percentheal -100, 0; end; -L_PumpkinsRuinedEverything: +L_PumpkinsRuined: npctalk "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!"; goto L_Fail; |