From 15c4e48fbbd5af698c76e84dfd7a564c1adf0944 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 5 Nov 2014 11:14:20 -0600
Subject: NPCs on 020-* fixed
---
world/map/npc/020-1/KrickKrackKrock.txt | 2 +-
world/map/npc/020-1/dock.txt | 2 +-
world/map/npc/020-1/rockscissor.txt | 4 ++--
world/map/npc/020-1/soul-menhir.txt | 2 +-
world/map/npc/020-1/traveler.txt | 2 +-
world/map/npc/020-1/well.txt | 4 ++--
world/map/npc/020-2/baktar.txt | 2 +-
world/map/npc/020-2/banker.txt | 4 ++--
world/map/npc/020-2/furquest.txt | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt
index 14a23bb9..cd0b7c3e 100644
--- a/world/map/npc/020-1/KrickKrackKrock.txt
+++ b/world/map/npc/020-1/KrickKrackKrock.txt
@@ -3,7 +3,7 @@
//To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt
-// 020-1.gat,82,82,0|script|Criker|192,
+// 020-1.gat,82,82,0|script|Criker|192
// {
// L_Main:
// //Var
diff --git a/world/map/npc/020-1/dock.txt b/world/map/npc/020-1/dock.txt
index e0528e23..ce7807e8 100644
--- a/world/map/npc/020-1/dock.txt
+++ b/world/map/npc/020-1/dock.txt
@@ -1,5 +1,5 @@
// Ferry Sign
-020-1.gat,81,76,0|script|Ferry Schedule#7|398,
+020-1.gat,81,76,0|script|Ferry Schedule#7|398
{
callfunc "FerryManifest";
end;
diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt
index a4ca909e..1bfbf62c 100644
--- a/world/map/npc/020-1/rockscissor.txt
+++ b/world/map/npc/020-1/rockscissor.txt
@@ -11,7 +11,7 @@
//To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt
-// 020-1.gat,74,78,0|script|Gobmel|189,
+// 020-1.gat,74,78,0|script|Gobmel|189
// {
// //var
// set @NPC_name$, "[Gobmel]";
@@ -20,7 +20,7 @@
// set @gamblerun, 0;
// setarray @CHOOSE_PC$, "Scissors", "Paper", "Rock";
// setarray @CHOSE_ID, 0, 1, 2;
-// //0 : scissors; 1: Paper; 2: Rock;
+// //0:* scissors; 1: Paper; 2: Rock;
// // 0 cut 1 and 1 cover 3 and break 0 ...
// //var ends
diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt
index 6a53b8cd..5cd3c7e3 100644
--- a/world/map/npc/020-1/soul-menhir.txt
+++ b/world/map/npc/020-1/soul-menhir.txt
@@ -1,6 +1,6 @@
//
-020-1.gat,63,89,0|script|Soul Menhir#nivalis|346,
+020-1.gat,63,89,0|script|Soul Menhir#nivalis|346
{
callfunc "ClearVariables";
set @map$, "020-1.gat";
diff --git a/world/map/npc/020-1/traveler.txt b/world/map/npc/020-1/traveler.txt
index 95efd4cf..65bacdbc 100644
--- a/world/map/npc/020-1/traveler.txt
+++ b/world/map/npc/020-1/traveler.txt
@@ -1,4 +1,4 @@
-020-1.gat,57,123,0|script|Knox the Traveler|103,
+020-1.gat,57,123,0|script|Knox the Traveler|103
{
set @NpcName$, "Knox";
set @NpcTravelBit, $@nivalis_bit;
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index 05db5265..9aa70d32 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -14,7 +14,7 @@
//# used variables: QUEST_Nivalis_state Nibble4
//############################################
-020-1.gat,99,83,0|script|#Well|400,
+020-1.gat,99,83,0|script|#Well|400
{
set @Q_MASK, NIBBLE_4_MASK;
set @Q_SHIFT, NIBBLE_4_SHIFT;
@@ -98,7 +98,7 @@ S_Update_Var:
return;
}
-020-2.gat,100,28,0|script|Miler|100,
+020-2.gat,100,28,0|script|Miler|100
{
set @Q_MASK, NIBBLE_4_MASK;
set @Q_SHIFT, NIBBLE_4_SHIFT;
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 33bae946..1c6e3202 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -31,7 +31,7 @@
//# bit 0 knows the name/location of the opponent
//# bit 1 killed the ugly opponent
//#=========================
-020-2.gat,70,61,0|script|Baktar|191,
+020-2.gat,70,61,0|script|Baktar|191
{
set @npcname$, "[Baktar]";
diff --git a/world/map/npc/020-2/banker.txt b/world/map/npc/020-2/banker.txt
index 7fb3b511..ac3b29df 100644
--- a/world/map/npc/020-2/banker.txt
+++ b/world/map/npc/020-2/banker.txt
@@ -1,4 +1,4 @@
-020-2.gat,122,64,0|script|Ben|193,
+020-2.gat,122,64,0|script|Ben|193
{
callfunc "ClearVariables";
set @npcname$, "Ben";
@@ -6,7 +6,7 @@
close;
}
-020-2.gat,127,63,0|script|Maria|190,
+020-2.gat,127,63,0|script|Maria|190
{
mes "[Maria]";
mes "\"Hello!";
diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 1fd7fa09..9e45b87e 100644
--- a/world/map/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
@@ -3,7 +3,7 @@
//#################################################################################
// Tulimshar Crafting Workshop - Agostine, The Legendary Tailor
-020-2.gat,27,26,0|script|Agostine|137,
+020-2.gat,27,26,0|script|Agostine|137
{
set @CUTFUR_EXP, 10;
set @FINEDRESS_COTTON_CLOTHS, 20;
--
cgit v1.2.3-70-g09d2