diff options
Diffstat (limited to 'world/map/npc/001-1')
| -rw-r--r-- | world/map/npc/001-1/elanore.txt | 7 | ||||
| -rw-r--r-- | world/map/npc/001-1/luca.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/001-1/monster_guide.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/001-1/rewards_master.txt | 18 |
4 files changed, 12 insertions, 18 deletions
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt index 8f52e771..87ef060d 100644 --- a/world/map/npc/001-1/elanore.txt +++ b/world/map/npc/001-1/elanore.txt @@ -512,13 +512,6 @@ L_Teach_dunno: next; goto L_Main; -L_NoMagicNoTeach: - mes "[Elanore the Healer]"; - mes "Elanore shakes her head."; - mes "\"I am sorry, but you don't have any magical abilities. I can only teach those who already have the power to do magic.\""; - next; - goto L_Main; - L_Question: callfunc "MagicTalkOptionsSetup"; set @ignore, @QQ_ELANORE; diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt index 4312e822..61d27cd4 100644 --- a/world/map/npc/001-1/luca.txt +++ b/world/map/npc/001-1/luca.txt @@ -65,6 +65,7 @@ L_Next: "No.", L_Nev; L_CallExplain: callsub S_explain; + goto L_teach0_follow; L_teach0_follow: mes "[Luca the Hunter]"; diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt index eb2b10ce..d0313645 100644 --- a/world/map/npc/001-1/monster_guide.txt +++ b/world/map/npc/001-1/monster_guide.txt @@ -2,12 +2,12 @@ 001-1.gat,48,52,0|script|Aidan|102, { - if(MPQUEST == 0) goto Register; + if(MPQUEST == 0) goto L_Register; mes "[Aidan the Monster Guide]"; mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters"; close; -Register: +L_Register: mes "[Aidan the Monster Guide]"; mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?"; next; diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt index f078c62b..0e8fbe1f 100644 --- a/world/map/npc/001-1/rewards_master.txt +++ b/world/map/npc/001-1/rewards_master.txt @@ -14,7 +14,7 @@ set @i, 0; setarray @Menu$, "", "", "", "", "", "", "", "", "", "", "", ""; - callsub SUB_prep_menu; + callsub S_prep_menu; menu @Menu$[0], L_MenuItems, @@ -43,7 +43,7 @@ L_MenuItems: L_Item_Loop: if (@rec == @req || Mobpt < tvis) goto L_Item_Done; - callsub SUB_give_item; + callsub S_give_item; set @rec, @rec + 1; goto L_Item_Loop; @@ -72,7 +72,7 @@ L_Give_all_loop: set @gotocounter, @gotocounter - 1; if (@gotocounter < 1) goto L_Give_all_next; set @itemgiveerror, 0; - callsub SUB_give_item; + callsub S_give_item; if (@itemgiveerror != 0) goto L_Close; goto L_Give_all_loop; @@ -98,7 +98,7 @@ L_Close: // Subroutines ////////////////////////////////////////////////// -SUB_prep_menu: +S_prep_menu: set @pts, Mobpt; set @dif, tvis; goto L_Menu_Loop; @@ -125,11 +125,11 @@ L_Menu_Done: set @Menu$[@i], "No thanks"; return; -SUB_give_item: +S_give_item: set @itemgiveerror, 0; getinventorylist; - if (@inventorylist_count == 100) goto SUB_give_noinv; - if (Mobpt < tvis) goto SUB_give_nomobpts; + if (@inventorylist_count == 100) goto S_give_noinv; + if (Mobpt < tvis) goto S_give_nomobpts; set Mobpt, Mobpt - tvis; set tvis, tvis + 1; set @item$, @Items$[rand(getarraysize(@Items$))]; @@ -139,12 +139,12 @@ SUB_give_item: mes "You received one " + getitemname(@item$) + "!"; return; -SUB_give_noinv: +S_give_noinv: mes "Your inventory is full!"; set @itemgiveerror, 1; return; -SUB_give_nomobpts: +S_give_nomobpts: mes "It looks like your Monster Points were over estimated."; set @itemgiveerror, 1; return; |