summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-05 11:20:39 -0600
committerwushin <pasekei@gmail.com>2014-11-05 11:47:24 -0600
commitb1ecb2e4f8057a5d75f9069a4bcaca613fcb6eb5 (patch)
tree7a07842da25948aec33d03fd9f23a0affbc7dabb
parentef73adbb5a21ef457e9b4da7b095d8f1ccea4d70 (diff)
downloadserverdata-b1ecb2e4f8057a5d75f9069a4bcaca613fcb6eb5.tar.gz
serverdata-b1ecb2e4f8057a5d75f9069a4bcaca613fcb6eb5.tar.bz2
serverdata-b1ecb2e4f8057a5d75f9069a4bcaca613fcb6eb5.tar.xz
serverdata-b1ecb2e4f8057a5d75f9069a4bcaca613fcb6eb5.zip
NPCs on 068-* fixed
-rw-r--r--world/map/npc/068-1/stat_reset.txt2
-rw-r--r--world/map/npc/068-1/tombstones.txt10
-rw-r--r--world/map/npc/068-2/bank.txt2
-rw-r--r--world/map/npc/068-2/hetchel.txt10
-rw-r--r--world/map/npc/068-2/inya.txt2
5 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/068-1/stat_reset.txt b/world/map/npc/068-1/stat_reset.txt
index fe54f379..73519a22 100644
--- a/world/map/npc/068-1/stat_reset.txt
+++ b/world/map/npc/068-1/stat_reset.txt
@@ -1,6 +1,6 @@
//
-068-1.gat,79,94,0|script|Malivox|103,
+068-1.gat,79,94,0|script|Malivox|103
{
// if (ResetA_charstate == 1) goto L_Multiple;
diff --git a/world/map/npc/068-1/tombstones.txt b/world/map/npc/068-1/tombstones.txt
index 2b0542a2..132be7ff 100644
--- a/world/map/npc/068-1/tombstones.txt
+++ b/world/map/npc/068-1/tombstones.txt
@@ -1,6 +1,6 @@
// Tombstones in Noble memorial
-068-1.gat,91,48,0|script|Tombstone#1|400,
+068-1.gat,91,48,0|script|Tombstone#1|400
{
mes "~ wushin ~";
@@ -8,7 +8,7 @@
close;
}
-068-1.gat,92,48,0|script|Tombstone#2|400,
+068-1.gat,92,48,0|script|Tombstone#2|400
{
mes "~ Nard ~";
@@ -16,7 +16,7 @@
close;
}
-068-1.gat,93,48,0|script|Tombstone#3|400,
+068-1.gat,93,48,0|script|Tombstone#3|400
{
mes "~ tux9th ~";
@@ -24,7 +24,7 @@
close;
}
-068-1.gat,94,48,0|script|Tombstone#4|400,
+068-1.gat,94,48,0|script|Tombstone#4|400
{
mes "~ o11c ~";
@@ -32,7 +32,7 @@
close;
}
-068-1.gat,95,48,0|script|Tombstone#5|400,
+068-1.gat,95,48,0|script|Tombstone#5|400
{
mes "~ " + strcharinfo(0) + " ~";
diff --git a/world/map/npc/068-2/bank.txt b/world/map/npc/068-2/bank.txt
index 70011c70..328d98ae 100644
--- a/world/map/npc/068-2/bank.txt
+++ b/world/map/npc/068-2/bank.txt
@@ -1,5 +1,5 @@
// Another banker
-068-2.gat,29,83,0|script|Hydusun|149,
+068-2.gat,29,83,0|script|Hydusun|149
{
set @npcname$, "Hydusun";
callfunc "Banker";
diff --git a/world/map/npc/068-2/hetchel.txt b/world/map/npc/068-2/hetchel.txt
index a14b64bd..7c20231f 100644
--- a/world/map/npc/068-2/hetchel.txt
+++ b/world/map/npc/068-2/hetchel.txt
@@ -1,5 +1,5 @@
// Hetchel the Silk Weaver
-// bh28,
+// bh28
// 2013-03, GPLv2.
//
// Hetchel is referred to by Lora Tay.
@@ -9,15 +9,15 @@
//
// @wg_state: variable indicating winter gloves status.
// Lora Tay proposes silk Robe if (@wg_state>= 11).
-// @SHEET_COCOONS_NR : Number of cocoons required per sheet.
+// @SHEET_COCOONS_NR:* Number of cocoons required per sheet.
// Might ne calculated from @ROBE_COCOONS_NR/@ROBE_SHEETS_NR
// Actually: 150∕6 = 25
-// @SHEET_ZENY : Money to pay per sheet: A sixth of 10000-2*500-6000
+// @SHEET_ZENY :* Money to pay per sheet: A sixth of 10000-2*500-6000
// @SheetCount Number of sheets to buy (variable).
//
// @silkpants_state: variable indicating silkpant quest status.
-068-2.gat,62,83,0|script|Hetchel|376,
+068-2.gat,62,83,0|script|Hetchel|376
{
set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
@@ -408,7 +408,7 @@ L_Close:
close;
}
-068-2.gat,60,83,0|script|HetchelDebug|376,
+068-2.gat,60,83,0|script|HetchelDebug|376
{
set @wg_state, ((QUEST_WG_state & BYTE_0_MASK) >> BYTE_0_SHIFT);
set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
diff --git a/world/map/npc/068-2/inya.txt b/world/map/npc/068-2/inya.txt
index f75fc2cb..b3301656 100644
--- a/world/map/npc/068-2/inya.txt
+++ b/world/map/npc/068-2/inya.txt
@@ -1,7 +1,7 @@
//Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
//The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
-068-2.gat,29,56,0|script|Inya|106,
+068-2.gat,29,56,0|script|Inya|106
{
mes "[Inya]";
mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";