diff options
Diffstat (limited to 'npc/001-1_Tulimshar')
| -rw-r--r-- | npc/001-1_Tulimshar/elanore.txt | 42 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/guide.txt | 2 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/rewards_master.txt | 8 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/sandra.txt | 14 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/vincent.txt | 4 |
5 files changed, 31 insertions, 39 deletions
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt index a303af19..5179760b 100644 --- a/npc/001-1_Tulimshar/elanore.txt +++ b/npc/001-1_Tulimshar/elanore.txt @@ -10,14 +10,6 @@ set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT; set @Q_heal_exp, MAGIC_EXPERIENCE >> 24; - set @BUGLEG, 518; - set @MAGGOTSLIME, 505; - set @MAUVE, 680; - set @GAMBOGE, 681; - set @COBALT, 682; - set @ALIZARIN, 683; - set @LIFESTONE, 730; - set @STATUS_INITIAL, 0; set @STATUS_LEARNED_LIGHT_HEAL, 1; set @STATUS_MASTERED_LIGHT_HEAL, 2; @@ -161,22 +153,22 @@ L_Lifestones: close; L_Lifestones_Trade: - if (countitem(@MAUVE) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@GAMBOGE) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@ALIZARIN) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@COBALT) < 10) goto L_Lifestones_Trade_Missing; + if (countitem("MauveHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("GambogeHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("AlizarinHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("CobaltHerb") < 10) goto L_Lifestones_Trade_Missing; getinventorylist; - if (@inventorylist_count == 100 && countitem(@LIFESTONE) == 0 - && countitem(@MAUVE) > 10 - && countitem(@GAMBOGE) > 10 - && countitem(@ALIZARIN) > 10 - && countitem(@COBALT) > 10) goto L_Lifestones_NoRoom; - - delitem @MAUVE, 10; - delitem @GAMBOGE, 10; - delitem @ALIZARIN, 10; - delitem @COBALT, 10; - getitem @LIFESTONE, 5; + if (@inventorylist_count == 100 && countitem("Lifestone") == 0 + && countitem("MauveHerb") > 10 + && countitem("GambogeHerb") > 10 + && countitem("AlizarinHerb") > 10 + && countitem("CobaltHerb") > 10) goto L_Lifestones_NoRoom; + + delitem "MauveHerb", 10; + delitem "GambogeHerb", 10; + delitem "AlizarinHerb", 10; + delitem "CobaltHerb", 10; + getitem "LifeStone", 5; getexp 200, 1; mes "[Elanore the Healer]"; mes "Elanore carefully goes over your leaves, then smiles."; @@ -262,10 +254,10 @@ L_Teach_Initial: next; getinventorylist; - if ((@inventorylist_count == 100) && (countitem(@LIFESTONE) == 0)) + if ((@inventorylist_count == 100) && (countitem("LifeStone") == 0)) goto L_Teach_Initial_Noroom; - getitem @LIFESTONE, 1; + getitem "LifeStone", 1; set @Q_status, @STATUS_LEARNED_LIGHT_HEAL; callsub S_update_var; diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index d4367616..30a9cb51 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -153,7 +153,7 @@ S_Grad: mes "[Ian the Guide]"; mes "\"Hey, you've been doing good, let me give you this.\""; - getitem 675, 1; + getitem "GraduationCap", 1; set TUT_var, TUT_var | 2; next; diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt index 657b82f4..cc64da8c 100644 --- a/npc/001-1_Tulimshar/rewards_master.txt +++ b/npc/001-1_Tulimshar/rewards_master.txt @@ -5,7 +5,7 @@ if (tvis == 0) set tvis, 1; if (Mobpt < tvis) goto L_NotEnough; - setarray @Items, 502, 502, 503, 504, 505, 506, 507, 508, 509, 510, 586, 512, 513, 514, 515, 516, 517, 518, 519, 520; + setarray @Items$, "CactusPotion", "CactusPotion", "CasinoCoins", "DecorCandy", "MaggotSlime", "CandyCane", "ScorpionStinger", "XmasCake", "ChocolateBar", "Candy", "GingerBreadMan", "Cake", "XmasCandyCane", "PurplePresentBox", "BluePresentBox", "RedScorpionStinger", "BugLeg", "CherryCake", "EasterEgg", "CottonShirt", "CottonShorts"; mes "[Ishi the Rewards Master]"; mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\""; @@ -79,11 +79,11 @@ L_Menu_Done: SUB_give_item: set Mobpt, Mobpt - tvis; set tvis, tvis + 1; - set @ID, @Items[rand(getarraysize(@Items))]; + set @item$, @Items$[rand(getarraysize(@Items$))]; - getitem @ID, 1; + getitem @item$, 1; - mes "You received one " + getitemname(@ID) + "!"; + mes "You received one " + getitemname(@item$) + "!"; return; } diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt index 314e009a..e1e2f652 100644 --- a/npc/001-1_Tulimshar/sandra.txt +++ b/npc/001-1_Tulimshar/sandra.txt @@ -70,17 +70,17 @@ L_Set: close; L_Progress: - if (countitem(507) < 5) goto L_NotEnough; - if (countitem(517) < 1) goto L_NotEnough; + if (countitem("ScorpionStinger") < 5) goto L_NotEnough; + if (countitem("RedScorpionStinger") < 1) goto L_NotEnough; mes "[Sandra]"; mes "\"Excellent!"; mes "You brought me 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger]!\""; getinventorylist; - if ((@inventorylist_count - (countitem(507) == 5) - (countitem(517) == 1)) > 99 - (countitem(1199) == 0)) goto L_TooMany; - delitem 507, 5; - delitem 517, 1; - getitem 1200, 1; - getitem 1199, 100; + if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("RedScorpionStinger") == 1)) > 99 - (countitem("Arrow") == 0)) goto L_TooMany; + delitem "ScorpionStinger", 5; + delitem "RedScorpionStinger", 1; + getitem "Bow", 1; + getitem "Arrow", 100; set Scorp, 2; close; diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt index b0412517..b8997e8f 100644 --- a/npc/001-1_Tulimshar/vincent.txt +++ b/npc/001-1_Tulimshar/vincent.txt @@ -80,13 +80,13 @@ L_Wait: close; L_Progress: - if(countitem(518) >= 30) goto L_Have; + if(countitem("BugLeg") >= 30) goto L_Have; mes "[Vincent]"; mes "\"Please help me collect 30 [Bug Legs]!\""; close; L_Have: - delitem 518, 30; + delitem "BugLeg", 30; mes "[Vincent]"; mes "\"Excellent! Finally I can complete the model!!\""; next; |