From ea8bb7b0cd86321ad0f85cc7a145671c527c10f9 Mon Sep 17 00:00:00 2001 From: The Kandiman Date: Sun, 11 Sep 2011 20:33:46 -0400 Subject: Tab conversion and script formatting project. Final commit, maps 024-1 through 042-2 complete. --- world/map/npc/024-1/ched.txt | 15 ++++++--------- world/map/npc/024-1/eomie.txt | 14 +++++++++----- world/map/npc/024-1/tondar.txt | 10 +--------- 3 files changed, 16 insertions(+), 23 deletions(-) (limited to 'world/map/npc/024-1') diff --git a/world/map/npc/024-1/ched.txt b/world/map/npc/024-1/ched.txt index 4f627e08..662c6b81 100644 --- a/world/map/npc/024-1/ched.txt +++ b/world/map/npc/024-1/ched.txt @@ -7,20 +7,15 @@ mes "[Ched]"; mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\""; next; - menu - "Well, good luck with that!", L_Done, - "What spell is that?", -; - - + "Well, good luck with that!", L_Done, + "What spell is that?", -; mes "[Ched]"; mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.' It seems awfully hard to cast, somehow.\""; next; - mes "[Ched]"; mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\""; close; - mes "[Ched]"; mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\""; close; @@ -29,13 +24,15 @@ L_Done: close; L_Garden: - if (BaseLevel < 40) goto L_Warp; + if (BaseLevel < 40) + goto L_Warp; mes "[Ched]"; mes "\"Be careful of those plants. They can be dangerous,\""; close; L_Canyon: - if (BaseLevel < 40) goto L_Warp; + if (BaseLevel < 40) + goto L_Warp; mes "[Ched]"; mes "\"I'm not allowed back there.\""; close; diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt index bc785914..4de0e9c9 100644 --- a/world/map/npc/024-1/eomie.txt +++ b/world/map/npc/024-1/eomie.txt @@ -45,8 +45,10 @@ L_MakeGrass: "Ok, I will be back soon.", L_End, "I changed my mind, forget about it.", L_End; - if(countitem("GrassSeed") < 5) goto L_EasterNotEnough; - if(countitem("GrassSeed") >= 5) goto L_EasterEnough; + if(countitem("GrassSeed") < 5) + goto L_EasterNotEnough; + if(countitem("GrassSeed") >= 5) + goto L_EasterEnough; close; L_EasterNotEnough: @@ -58,8 +60,11 @@ L_EasterNotEnough: L_EasterEnough: getinventorylist; - if (@inventorylist_count == 100 && countitem("GrassSeed") > 10) goto L_EasterTooMany; - if(countitem("GrassSeed") < 5) goto L_EasterNotEnough; + if (@inventorylist_count == 100 + && countitem("GrassSeed") > 10) + goto L_EasterTooMany; + if(countitem("GrassSeed") < 5) + goto L_EasterNotEnough; delitem "GrassSeed", 5; getitem "GrassLiner", 1; set QUEST_Easter11, 6; @@ -86,5 +91,4 @@ L_SeeBunny: L_End: close; - } diff --git a/world/map/npc/024-1/tondar.txt b/world/map/npc/024-1/tondar.txt index eef42617..29041e33 100644 --- a/world/map/npc/024-1/tondar.txt +++ b/world/map/npc/024-1/tondar.txt @@ -3,9 +3,8 @@ 024-1.gat,83,51,0|script|Tondar|168,{ mes "[Tondar]"; mes "\"We're not accepting any new students right now.\""; - if (getskilllv(SKILL_MAGIC) > 0) + if (getskilllv(SKILL_MAGIC) > 0) goto L_may_ask; - close; L_may_ask: @@ -16,7 +15,6 @@ L_may_ask: "Are you sure? I can pay well...", L_nopay, "That's unfortunate.", -, "Goodbye, then.", -; - close; L_library: @@ -26,31 +24,25 @@ L_library: menu "Thank you, and goodbye.", L_end, "Nobody else is allowed inside?", -; - - mes "[Tondar]"; mes "\"Well, it is possible to get a special permit from the headmaster. But he is currently on sabbatical.\""; close; - L_askspell: mes "[Tondar]"; mes "\"We only teach spells to students.\""; next; - menu "Oh, come on... just one little spell!", L_nopay, "Pretty please?", L_spell, "I can pay you, too...", L_nopay; - L_spell: mes "[Tondar]"; mes "\"Well, all right; this one can't do much harm. Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\""; mes "\"This will release a steady flow of magic within you. Focus and try to control it; it is a good meditative practice.\""; close; - L_nopay: mes "[Tondar]"; mes "The wizard frowns angrily."; -- cgit v1.2.3-60-g2f50