summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/alberta.txt12
-rw-r--r--npc/cities/aldebaran.txt47
-rw-r--r--npc/jobs/1-1e/gunslinger.txt8
-rw-r--r--npc/merchants/ammo_dealer.txt5
-rw-r--r--npc/merchants/old_pharmacist.txt5
-rw-r--r--npc/quests/gunslinger_quests.txt7
-rw-r--r--npc/quests/quests_alberta.txt5
-rw-r--r--npc/quests/quests_lighthalzen.txt4
-rw-r--r--npc/warps/fields/abyss_warper.txt11
10 files changed, 57 insertions, 49 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d4045ecfc..00fcef94b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2007/05/17
+ * Removed .GAT -s from some recent scripts. Please, don't add them in the scripts [Lupus]
2007/05/16
* Rev. 10548 Kiel Hyre Quest fix. Fixed the missing spaces in some of the enablenpc commands. [L0ne_W0lf]
* Renamed Grandpa Pharmacist to Old Pharmacist, updated dialogs [DZeroX]
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index c6c60354f..61b7565b5 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,14 +3,14 @@
//===== By: ==================================================
//= DZeroX
//===== Current Version: =====================================
-//= 1.01
+//= 1.02
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
//= Town-specific Alberta NPCs
//===== Additional Comments: =================================
//= 1.0 Converted from Aegis 10.4 [DZeroX]
-//= 1.01 Optimized, missing next, etc [Lupus]
+//= 1.02 Optimized, missing next, REMOVED .GATs! again [Lupus]
//============================================================
alberta,97,51,0 script Fabian 84,{
@@ -95,7 +95,7 @@ alberta,189,151,5 script Fisk 100,{
close;
}
set Zeny,Zeny - 250;
- warp "alb2trea.gat",43,53;
+ warp "alb2trea",43,53;
end;
case 2:
next;
@@ -106,7 +106,7 @@ alberta,189,151,5 script Fisk 100,{
close;
}
set Zeny,Zeny - 500;
- warp "izlude.gat",176,182;
+ warp "izlude",176,182;
end;
case 3:
next;
@@ -122,7 +122,7 @@ alb2trea,39,50,6 script Fisk#a2t 100,{
mes "So you wanna head back to the";
mes "mainland in Alberta, eh?";
if(select("Yes please.","I changed my mind.")==1)
- warp "alberta.gat",192,169;
+ warp "alberta",192,169;
close;
}
@@ -367,7 +367,7 @@ alberta,195,151,2 script Paul 86,{
close;
} else {
set Zeny,Zeny - 200;
- warp "alb2trea.gat",62,69;
+ warp "alb2trea",62,69;
close;
}
case 2:
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 0072382f2..399edf732 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 2.0
+//= 2.01
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -24,9 +24,10 @@
//= 1.9a Now Pavianne doesn't sell Kafra Passes. She refunds them [Lupus]
//= 2.0 Re-made all the dialog-only NPCs with official dialogs.
//= Kafra and Clock Tower NPCs pending remake. [DZeroX]
+//= 2.01 removed all .GATs [Lupus]
//============================================================
-aldebaran.gat,113,70,4 script Forger Munster 48,{
+aldebaran,113,70,4 script Forger Munster 48,{
mes "[Munster]";
mes "My family used to live in Geffen.";
mes "So I guess it was natural that we";
@@ -76,7 +77,7 @@ aldebaran.gat,113,70,4 script Forger Munster 48,{
}
}
-aldebaran.gat,64,104,4 script Smithing Guy 55,{
+aldebaran,64,104,4 script Smithing Guy 55,{
mes "[Quatro]";
mes "Have you heard that a famous";
mes "Blacksmith moved here from Geffen?";
@@ -121,7 +122,7 @@ aldebaran.gat,64,104,4 script Smithing Guy 55,{
}
}
-aldebaran.gat,49,93,4 script Young Man 83,{
+aldebaran,49,93,4 script Young Man 83,{
mes "[Miller]";
mes "Aren't level 4 weapons cool!";
mes "I can't believe such powerful";
@@ -135,7 +136,7 @@ aldebaran.gat,49,93,4 script Young Man 83,{
close;
}
-aldebaran.gat,81,61,4 script Shell Gathering Lady 101,{
+aldebaran,81,61,4 script Shell Gathering Lady 101,{
mes "[Joanne]";
mes "I enjoy gathering shells from the";
mes "sea. It's really fun and relaxing~";
@@ -172,7 +173,7 @@ aldebaran.gat,81,61,4 script Shell Gathering Lady 101,{
}
}
-aldebaran.gat,46,129,4 script Canal Guy 97,{
+aldebaran,46,129,4 script Canal Guy 97,{
mes "[Panama]";
mes "Al De Baran is known world wide as";
mes "the City of Canals. The waterways";
@@ -198,7 +199,7 @@ aldebaran.gat,46,129,4 script Canal Guy 97,{
}
}
-aldebaran.gat,67,154,4 script Forest Guy 98,{
+aldebaran,67,154,4 script Forest Guy 98,{
mes "[Isenberg]";
mes "Mt. Mjolnir and Payon Forest.";
mes "Both of those places are tough";
@@ -252,7 +253,7 @@ aldebaran.gat,67,154,4 script Forest Guy 98,{
}
}
-aldebaran.gat,90,170,4 script Slot Guy 47,{
+aldebaran,90,170,4 script Slot Guy 47,{
mes "[Epthiel]";
mes "Some weapons or armour have Slots";
mes "where you can insert Cards obtained";
@@ -342,7 +343,7 @@ aldebaran.gat,90,170,4 script Slot Guy 47,{
}
}
-aldebaran.gat,117,181,4 script Phracon Guy 48,{
+aldebaran,117,181,4 script Phracon Guy 48,{
mes "[Joy]";
mes "Level 1 weapons, which are the";
mes "lowest grade, need a metal named";
@@ -389,7 +390,7 @@ aldebaran.gat,117,181,4 script Phracon Guy 48,{
}
}
-aldebaran.gat,121,231,4 script Alchemy Guy 49,{
+aldebaran,121,231,4 script Alchemy Guy 49,{
mes "[Chemirre]";
mes "Alchemists, one of the 2nd Jobs,";
mes "are able to create items out of";
@@ -442,7 +443,7 @@ aldebaran.gat,121,231,4 script Alchemy Guy 49,{
}
}
-aldebaran.gat,86,228,4 script Little Kid 62,{
+aldebaran,86,228,4 script Little Kid 62,{
mes "[Bebe]";
mes "A whil ago I went out for a walk";
mes "toward Mt. Mjolnir with my pet";
@@ -497,7 +498,7 @@ aldebaran.gat,86,228,4 script Little Kid 62,{
}
}
-aldebaran.gat,159,242,4 script Insect Guy 119,{
+aldebaran,159,242,4 script Insect Guy 119,{
mes "[Stromme]";
mes "Even to a strong Swordman, the";
mes "Insects of Mt. Mjolnir pose a";
@@ -540,7 +541,7 @@ aldebaran.gat,159,242,4 script Insect Guy 119,{
}
}
-aldeba_in.gat,232,241,4 script Reynolds 48,{
+aldeba_in,232,241,4 script Reynolds 48,{
mes "[Reynolds]";
mes "Hello,";
mes "can I Help you?";
@@ -665,7 +666,7 @@ aldeba_in.gat,232,241,4 script Reynolds 48,{
}
}
-aldeba_in.gat,223,121,4 script Harold 63,{
+aldeba_in,223,121,4 script Harold 63,{
mes "[Harold]";
mes "You...";
mes "You remind me of myself when I was";
@@ -683,7 +684,7 @@ aldeba_in.gat,223,121,4 script Harold 63,{
close;
}
-aldeba_in.gat,219,61,4 script Cipriano 109,{
+aldeba_in,219,61,4 script Cipriano 109,{
mes "[Cipriano]";
mes "Welcome...";
mes "Allow me to introduce myself.";
@@ -721,7 +722,7 @@ aldeba_in.gat,219,61,4 script Cipriano 109,{
close;
}
-aldeba_in.gat,152,47,4 script Lionel 97,{
+aldeba_in,152,47,4 script Lionel 97,{
mes "[Lionel]";
mes "Have you heard about the Super";
mes "Novice Society? Their headquarters";
@@ -749,7 +750,7 @@ aldeba_in.gat,152,47,4 script Lionel 97,{
close;
}
-aldeba_in.gat,156,179,4 script Master 61,{
+aldeba_in,156,179,4 script Master 61,{
mes "[Master]";
mes "The Kafra Corporation Headquaters";
mes "is located here in Al De Baran.";
@@ -879,7 +880,7 @@ aldeba_in.gat,156,179,4 script Master 61,{
}
}
-aldebaran.gat,60,70,4 script Sylvia 69,{
+aldebaran,60,70,4 script Sylvia 69,{
mes "[Sylvia]";
mes "I came all the way here from";
mes "Prontera because I heard the Kafra";
@@ -934,7 +935,7 @@ aldebaran.gat,60,70,4 script Sylvia 69,{
}
}
-aldebaran.gat,93,80,4 script Issei 48,{
+aldebaran,93,80,4 script Issei 48,{
mes "[Issei]";
mes "Al De Baran is such a wonderful";
mes "place with its romantic canals and";
@@ -976,7 +977,7 @@ aldebaran.gat,93,80,4 script Issei 48,{
}
}
-aldebaran.gat,180,46,4 script Joo Jahk 88,{
+aldebaran,180,46,4 script Joo Jahk 88,{
mes "[Joo Jahk]";
mes "I'm a tourist";
mes "from Payon,";
@@ -1021,7 +1022,7 @@ aldebaran.gat,180,46,4 script Joo Jahk 88,{
}
}
-aldebaran.gat,212,122,4 script Citizen 97,{
+aldebaran,212,122,4 script Citizen 97,{
mes "[Gavin]";
mes "Welcome!";
mes "The town of";
@@ -1071,7 +1072,7 @@ aldebaran.gat,212,122,4 script Citizen 97,{
}
}
-aldebaran.gat,146,124,4 script Town Girl 101,{
+aldebaran,146,124,4 script Town Girl 101,{
mes "[Nastasia]";
mes "Somewhere in the world there is an";
mes "^3355FFAssassin Guild^000000, where they teach";
@@ -1114,7 +1115,7 @@ aldebaran.gat,146,124,4 script Town Girl 101,{
}
}
-aldebaran.gat,143,136,4 script Bell Keeper 89,{
+aldebaran,143,136,4 script Bell Keeper 89,{
mes "[Bell Keeper]";
mes "I have been charged by the";
mes "Committee of 'Heaven on Earth' to";
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index fdaa58995..800b8920d 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -7,7 +7,7 @@
//= DON'T REMOVE THIS! (by request of him, he provided all
//= the info regarding the quests and shops.)
//===== Current Version: =====================================
-//= 1.10a
+//= 1.10b
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,10 +24,10 @@
//= 1.8 Fixed the reward you can get [Playtester]
//= 1.9 Removed some 'clever' script constructs [ultramage]
//= 1.10 Updated to official version - Thanks to Omega for
-//= his first try [SinSloth]
+//= his first try [SinSloth] 1.10b - removed .GATs [Lupus]
//============================================================
-que_ng.gat,152,167,3 script Master Miller 901,{
+que_ng,152,167,3 script Master Miller 901,{
mes "[Master Miller]";
if(Class == Job_Novice && JobLevel > 9)
@@ -226,7 +226,7 @@ que_ng.gat,152,167,3 script Master Miller 901,{
}
}
-payon.gat,184,65,3 script The Wise Bull Horn 866,{
+payon,184,65,3 script The Wise Bull Horn 866,{
switch(GUNS_Q)
{
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 017cc4f7e..e90d05327 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,15 +3,16 @@
//===== By ================================================
//= Legionaire
//===== Version ===========================================
-//= 1.0
+//= 1.01
//===== Compatible With ===================================
//= eAthena SVN with jAthena scripting engine and . variables.
//===== Description =======================================
//= Bullet trader.
//===== Comments ==========================================
//= Converted from Aegis 10.4
+//= 1.01 Removed .GATs [Lupus]
//=========================================================
-que_ng.gat,187,156,3 script Bullet Merchant Tony 86,{
+que_ng,187,156,3 script Bullet Merchant Tony 86,{
if(BaseJob != Job_Gunslinger){
mes "[Tony]";
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 2b4df2798..8bbfb4945 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= DZeroX
//===== Current Version: =====================================
-//= 1.1
+//= 1.1a
//===== Compatible With: =====================================
//= eAthena SVN Trunk
//===== Description: =========================================
@@ -18,9 +18,10 @@
//= 1.0a - Minor fixes [Lupus]
//= 1.1 - Added changed the dialogs and name to fit the
//= the official information. [DZeroX]
+//= 1.1a Removed .GATs [Lupus]
//============================================================
-alberta_in.gat,16,28,4 script Old Pharmacist 61,{
+alberta_in,16,28,4 script Old Pharmacist 61,{
mes "[Old Pharmacist]";
mes "Err....Are you a customer...?";
switch(select("Make Potion","Talk.","Instruction of making potions","Cancel")) {
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index 28f23c453..c3c73ce38 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -1,7 +1,7 @@
//===== By: ==================================================
//= Playtester
//===== Current Version: =====================================
-//= 1.6
+//= 1.6a
//===== Compatible With: =====================================
//= SVN eA
//===== Description: =========================================
@@ -16,12 +16,13 @@
//= 1.5 Updated Inferno Quest to official version [SinSloth]
//= 1.6 Updated Garrison Quest - Credits to Lazarus^ for
//= making the first official version. [SinSloth]
+//= 1.6a Removed .GATs [Lupus]
//============================================================
//===================== Garrison =====================================================
-que_ng.gat,182,85,3 script Garrison 109,{
+que_ng,182,85,3 script Garrison 109,{
if(BaseJob != Job_Gunslinger)
{
@@ -376,7 +377,7 @@ SubGarrison_:
}
}
-lighthalzen.gat,322,247,6 script Ravey 86,{
+lighthalzen,322,247,6 script Ravey 86,{
if(gun_gs == 2)
{
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 074efd62e..e05bc09a4 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.8
+//= 1.8a
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -22,6 +22,7 @@
//= Condition if done: (MISC_QUEST & 2) [Lupus]
//= 1.7 Moved quest from cities/albera.txt [Evera]
//= 1.8 Re-made the Doll Quest, now with official dialogs. [DZeroX]
+//= 1.8a Removed .GATs [Lupus]
//============================================================
@@ -29,7 +30,7 @@
//=======================================================================================================//
// Doll Quest
//=======================================================================================================//
-alberta.gat,117,135,0 script Elin 96,{
+alberta,117,135,0 script Elin 96,{
set .@weight,MaxWeight-Weight;
if ((.@weight) < 10000) {
mes "[Elin]";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 43e6a05f3..3452fd2ea 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -7561,7 +7561,7 @@ OnTouch:
}
}
-aldebaran,58,225,4 script Kafra Employee 116,{
+aldebaran,58,225,4 script Kafra Employee#l1 116,{
if(lhz_boss != 17)
{
@@ -7631,7 +7631,7 @@ aldebaran,58,225,4 script Kafra Employee 116,{
}
}
-aldeba_in,155,240,5 script Kafra Employee 859,{
+aldeba_in,155,240,5 script Kafra Employee#l2 859,{
if(checkweight(7343,1) != 1)
{
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index ef56a5ce3..77573d261 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.1 Removed Duplicates [Silent]
//= 1.2 Fixed tab - missing pillar's appeared [Lupus]
//= 1.3 Updated Abyss Lake entrance based on official [SinSloth]
+//= 1.3a Removed .GATs [Lupus]
//============================================================
hu_fild05,168,304,0 script Column 111,{
@@ -61,7 +62,7 @@ hu_fild05,168,304,0 script Column 111,{
delitem 1036,1;
delitem 1037,1;
close2;
- warp "hu_fild05.gat",184,204;
+ warp "hu_fild05",184,204;
end;
case 2:
@@ -117,7 +118,7 @@ hu_fild05,171,211,0 script Column 111,1,1,{
specialeffect 73;
specialeffect2 36;
close2;
- warp "hu_fild05.gat",169,305;
+ warp "hu_fild05",169,305;
end;
case 2:
@@ -139,7 +140,7 @@ hu_fild05,171,211,0 script Column 111,1,1,{
specialeffect 73;
specialeffect2 36;
close2;
- warp "hu_fild05.gat",157,284;
+ warp "hu_fild05",157,284;
end;
}
}
@@ -151,7 +152,7 @@ OnInit:
end;
OnTouch:
- warp "abyss_01.gat",260,268;
+ warp "abyss_01",260,268;
end;
OnWarp:
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-13 17:31:30 +0000