summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-24 17:30:14 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-24 17:30:14 +0000
commitea1a321438e75b66b3fc8148b6eaa41d049761dd (patch)
tree80dfac0c03ba915146e52cf10fe91c4b5558da9f /npc/pre-re
parent90e5648a7865e72846c9a41754c4f71e89a1739d (diff)
downloadhercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.gz
hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.bz2
hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.tar.xz
hercules-ea1a321438e75b66b3fc8148b6eaa41d049761dd.zip
> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:
* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041). * Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042). * Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/cities/alberta.txt42
-rw-r--r--npc/pre-re/cities/izlude.txt4
-rw-r--r--npc/pre-re/cities/jawaii.txt4
-rw-r--r--npc/pre-re/scripts_athena.conf1
4 files changed, 47 insertions, 4 deletions
diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt
new file mode 100644
index 000000000..f5408b611
--- /dev/null
+++ b/npc/pre-re/cities/alberta.txt
@@ -0,0 +1,42 @@
+//===== rAthena Script =======================================
+//= Alberta Town Pre-Renewal
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Alberta town NPCs.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// cities/amatsu.txt
+//============================================================
+alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709
+
+// cities/ayothaya.txt
+//============================================================
+alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843
+
+// cities/gonryun.txt
+//============================================================
+alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776
+
+// cities/louyang.txt
+//============================================================
+alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 815
+
+// cities/moscovia.txt
+//============================================================
+alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960
+
+// quests/quests_alberta.txt
+//============================================================
+alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 709
+alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121
+
+// quests/skills/merchant_skills.txt
+//============================================================
+alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 57
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index aa820ea56..0c304adaa 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -1,5 +1,5 @@
//===== rAthena Script =======================================
-//= Izlude Town Pre-renewal
+//= Izlude Town Pre-Renewal
//===== By: ==================================================
//= Daegaladh
//===== Current Version: =====================================
@@ -7,7 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
-//= Izlude town NPCs
+//= Izlude town NPCs.
//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Added bullet NPC duplicates. [Euphy]
diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt
index 99c08fe00..1f2d0fb6a 100644
--- a/npc/pre-re/cities/jawaii.txt
+++ b/npc/pre-re/cities/jawaii.txt
@@ -1,5 +1,5 @@
//===== rAthena Script =======================================
-//= Jawaii Town Pre-renewal
+//= Jawaii Town Pre-Renewal
//===== By: ==================================================
//= Daegaladh
//===== Current Version: =====================================
@@ -7,7 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
-//= Jawaii town NPCs
+//= Jawaii town NPCs.
//===== Additional Comments: =================================
//= 1.0 First Version.
//============================================================
diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index 17cf64182..875900bda 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -6,6 +6,7 @@
npc: npc/pre-re/airports/izlude.txt
// --------------------------- Cities ---------------------------
+npc: npc/pre-re/cities/alberta.txt
npc: npc/pre-re/cities/izlude.txt
npc: npc/pre-re/cities/jawaii.txt