summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 00:36:56 +0000
committerevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 00:36:56 +0000
commit6a124c7a16430e3f185250eb1f97c54f3008f193 (patch)
treea985e7267a9cd023f0efdcd18193147f6106884b /npc
parente558277b3d72f1a27cffb72f2cb3b8ab295f3031 (diff)
downloadhercules-6a124c7a16430e3f185250eb1f97c54f3008f193.tar.gz
hercules-6a124c7a16430e3f185250eb1f97c54f3008f193.tar.bz2
hercules-6a124c7a16430e3f185250eb1f97c54f3008f193.tar.xz
hercules-6a124c7a16430e3f185250eb1f97c54f3008f193.zip
* Added missing NPC name in text and next;'s in npc/quests/bongunsword.txt,
- npc/cities/amatsu.txt, and npc/merchants/socket_enchant.txt. (Thanks $ephiroth) [Evera] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8603 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/amatsu.txt30
-rw-r--r--npc/merchants/socket_enchant.txt14
-rw-r--r--npc/quests/bongunsword.txt5
4 files changed, 35 insertions, 16 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 36c43d9be..b2be6ab4a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,8 @@ Playtester
Date Added
======
09/03
+ * Added missing NPC name in text and next;'s in npc/quests/bongunsword.txt,
+ - npc/cities/amatsu.txt, and npc/merchants/socket_enchant.txt. (Thanks $ephiroth) [Evera]
* Added some Juperos maps to nosave.txt due to an upcoming update. [MasterOfMuppets]
09/02
* Updated Kiel spawns [Playtester]
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 70eee2ec0..a4542edc3 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -3,23 +3,24 @@
//===== By: ==================================================
//= Some people & eAthena Dev Team
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any eAthena Version; Niflheim Required
//===== Description: =========================================
-// Amatsu Town NPCs : Revision 2 (Fox quest fix)
-// Translated by Makenshi and dj
-// Revisions and edits by Valaris and Darkchild
-// 1.01 event_sushi -> ama_sushi fixed
-// and other fixes, thanks to Shinomori
-// 1.02 Fixed & Spell Checked [massdriller]
-// 1.03 Fixed 2 NPC names, slight optimization [Lupus]
-// 1.04 Fixed a few typo's [Nexon]
-// 1.05 Changed all breaks to ends. [Skotlex]
-// 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
-// 1.07 Implemented a missing NPC [MasterOfMuppets]
-// 1.08 Removed Duplicates [Silent]
-// 1.1 Split quests into quests/quests_amatsu.txt [Evera]
+//= Amatsu Town NPCs : Revision 2 (Fox quest fix)
+//= Translated by Makenshi and dj
+//= Revisions and edits by Valaris and Darkchild
+//= 1.01 event_sushi -> ama_sushi fixed
+//= and other fixes, thanks to Shinomori
+//= 1.02 Fixed & Spell Checked [massdriller]
+//= 1.03 Fixed 2 NPC names, slight optimization [Lupus]
+//= 1.04 Fixed a few typo's [Nexon]
+//= 1.05 Changed all breaks to ends. [Skotlex]
+//= 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
+//= 1.07 Implemented a missing NPC [MasterOfMuppets]
+//= 1.08 Removed Duplicates [Silent]
+//= 1.1 Split quests into quests/quests_amatsu.txt [Evera]
+//= 1.2 Fixed missing name [Evera]
//=====================================================================
alberta.gat,245,93,4 script Sea Captain#01 709,{
mes "[Walter Moers]";
@@ -68,6 +69,7 @@ alberta.gat,245,93,4 script Sea Captain#01 709,{
mes "Amatsu, and spread copies of this";
mes "map.";
next;
+ mes "[Walter Moers]";
mes "Many Brave and adventurous";
mes "sea captains took the";
mes "challenge. Great fortune could";
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 35a62d77d..bdb21076b 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Sousuke_PL
//===== Current Version: =====================================
-//= 0.1b
+//= 0.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 0.1a added missing L_No: to 2 funcs [Lupus]
//= 0.1b Removed duplicates [Toms]
+//= 0.2 Added missing next;'s [Evera]
//============================================================
@@ -53,6 +54,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Trident[2]",Trident,"Rope[3]",Rope,"Violin[3]",Violin,"Chain[2]",Chain,"Gladius[2]",Gladius,"Gakkung Bow[1]",Gakkung_Bow,"Next",L_Weapon2,"Jump to page...",L_WaepJump;
L_Weapon2:
@@ -60,6 +62,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Pike[3]",Pike,"Haedonggum[1]",Haedonggum,"Lute[2]",Lute,"Wire Whip[2]",Wire_Whip,"Waghnak[3]",Waghnak,"Arbalest[1]",Arbalest,"Next",L_Weapon3,"Jump to page...",L_WaepJump;
L_Weapon3:
@@ -67,6 +70,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Hunter Bow",Hunter_Bow,"(Int) Survivor's Rod",Int_Survivors_Rod,"Zweihander",Zweihander,"Flamberge",Flamberge,"Infiltrator",Infiltrator,"Ballista",Ballista,"Next",L_Weapon4,"Jump to page...",L_WaepJump;
L_Weapon4:
@@ -74,6 +78,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Stunner",Stunner,"Berserk",Berserk,"Claymore",Claymore,"Gungnir",Gungnir,"Poison Knife",Poison_Knife,"Sucsamad",Sucsamad,"Next",L_Weapon5,"Jump to page...",L_WaepJump;
L_Weapon5:
@@ -81,6 +86,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Ginnungagap",Ginnungagap,"Cutlus",Cutlus,"Crescent Scythe",Crescent_Scythe,"Ice Pick",Ice_Pick,"(Dex) Survivor's Rod",Dex_Survivors_Rod,"Next",L_Weapon1,"Jump to page...",L_WaepJump;
@@ -255,6 +261,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Mantle",Mantle,"Coat",Coat,"Circlet",Circlet,"Biretta",Biretta,"Mirror Shield",Mirror_Shield,"Chain Mail",Chain_Mail,"Shield",Shield,"Bongun Hat",Bongun_Hat,"Next",L_Armor2,"Jump to page...",L_ArmorJump;
L_Armor2:
@@ -262,6 +269,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Saint's Robe",Saints_Robe,"Silk Robe",Silk_Robe,"Boots",Boots,"Shoes",Shoes,"Muffler",Muffler,"Guard",Guard,"Buckler",Buckler,"Munak Hat",Munak_Hat,"Next",L_Armor3,"Jump to page...",L_ArmorJump;
L_Armor3:
@@ -269,6 +277,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Gemmed Sallet",Gemmed_Sallet,"Bucket Hat",Bucket_Hat,"Memory Book",Memory_Book,"Tights",Tights,"Legion Plate Armor",Legion_Plate_Armor,"Full Plate",Full_Plate,"Thief Clothes",Thief_Clothes,"Next",L_Armor4,"Jump to page...",L_ArmorJump;
L_Armor4:
@@ -276,6 +285,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Greaves",Greaves,"Coif",Coif,"Manteau",Manteau,"Helm",Helm,"Ninja Suit",Ninja_Suit,"Orc Helm",Orc_Helm,"Ancient Cape",Ancient_Cape,"Next",L_Armor5,"Jump to page...",L_ArmorJump;
L_Armor5:
@@ -283,6 +293,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Monk Hat",Monk_Hat,"Golden Gear",Golden_Gear,"Brooch",Brooch,"Tiara",Tiara,"Sphinx Hat",Sphinx_Hat,"Robe of Cast",Robe_of_Cast,"Earring",Earring,"Next",L_Armor6,"Jump to page...",L_ArmorJump;
L_Armor6:
@@ -290,6 +301,7 @@ lhz_in02.gat,281,35,5 script Socket Enchant 84,{
close2;
mes "[Socket Enchant]";
mes "Please choose your item:";
+ next;
menu "Ring",Ring,"Bow Thimble",Bow_Thimble,"Majestic Goat",Majestic_Goat,"Spiky Band",Spiky_Band,"Bone Helm",Bone_Helm,"Corsair",Corsair,"Crown",Crown,"Next",L_Armor1,"Jump to page...",L_ArmorJump;
diff --git a/npc/quests/bongunsword.txt b/npc/quests/bongunsword.txt
index 70517b468..837c00788 100644
--- a/npc/quests/bongunsword.txt
+++ b/npc/quests/bongunsword.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= eAthena Team
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
//= Quest itms:Sword o'Chinese Exorcist,No Recipient,Her Heart
//===== Additional Comments: =================================
//= 1.0. merged 3 sep. files, fixed exploits [Lupus]
+//= 1.1 Added missing next;'s [Evera]
//============================================================
@@ -28,6 +29,7 @@ comodo.gat,135,227,5 script Sherri 93,{
next;
mes "[Sherri]";
mes "Can you please help me?";
+ next;
menu "What do I need again?",-,"Here! I got what you need!",ExCreate,"Sorry, I can't help you.",ExEnd;
@@ -82,6 +84,7 @@ izlude_in.gat,115,76,5 script Evan 47,{
next;
mes "[Evan]";
mes "Whaddaya say? ..pal?";
+ next;
menu "What do I need again?",-,"Here! I got what you need!",ExCreate,"Sorry, I can't help you.",ExEnd;