summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/comodo.txt82
-rw-r--r--npc/cities/jawaii.txt6
2 files changed, 22 insertions, 66 deletions
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 5dbf99f89..38d7731ba 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -1,13 +1,13 @@
//===== rAthena Script =======================================
//= Comodo Town
//===== By: ==================================================
-//= rAthena dev team
+//= rAthena Dev Team
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Comodo Town NPCs
//===== Additional Comments: =================================
//= Not complete.
@@ -21,6 +21,7 @@
//= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 1.8 Fixed a small bug. (close -> close2) [L0ne_W0lf]
//= 1.9 Added a missing Kafra NPC. [L0ne_W0lf]
+//= 2.0 Added Izlude RE coordinates. [Euphy]
//============================================================
// Inside Comodo
@@ -339,7 +340,8 @@ cmd_fild07,52,280,4 script Hallosu#cmd 100,{
}
cmd_fild07,299,83,4 script Zain#cmd 100,{
- mes "[Zain]";
+ set .@n$,"["+strnpcinfo(1)+"]";
+ mes .@n$;
mes "Would you like to";
mes "board a ship on the";
mes "Reudelus route? You";
@@ -348,71 +350,20 @@ cmd_fild07,299,83,4 script Zain#cmd 100,{
next;
switch(select("Alberta - 600 Zeny:Izlude - 800 Zeny:Cancel")) {
case 1:
- if (Zeny < 600) {
- mes "[Zain]";
- mes "I'm sorry, but you";
- mes "don't have enough";
- mes "zeny for the boarding fare.";
- close;
- }
+ if (Zeny < 600) break;
set zeny,zeny-600;
warp "alberta",192,169;
end;
case 2:
- if (Zeny < 800) {
- mes "[Zain]";
- mes "I'm sorry, but you";
- mes "don't have enough";
- mes "zeny for the boarding fare.";
- close;
- }
+ if (Zeny < 800) break;
set zeny,zeny-800;
- warp "izlude",176,182;
+ if(checkre(0))
+ warp "izlude",195,212;
+ else
+ warp "izlude",176,182;
end;
case 3:
- mes "[Zain]";
- mes "Travel by ship is";
- mes "still one of the safest and";
- mes "dependable methods of";
- mes "transportation. I invite you";
- mes "to try Reudelus travel soon~";
- close;
- }
-}
-
-cmd_fild07,94,134,4 script Sarumane#cmd 100,{
- mes "[Sarumane]";
- mes "Would you like to";
- mes "board a ship on the";
- mes "Reudelus route? You";
- mes "can travel on Reudelus";
- mes "to Alberta or Izlude.";
- next;
- switch(select("Alberta - 600 Zeny:Izlude - 800 Zeny:Cancel")) {
- case 1:
- if (Zeny < 600) {
- mes "[Sarumane]";
- mes "I'm sorry, but you";
- mes "don't have enough";
- mes "zeny for the boarding fare.";
- close;
- }
- set zeny,zeny-600;
- warp "alberta",192,169;
- end;
- case 2:
- if (Zeny < 800) {
- mes "[Sarumane]";
- mes "I'm sorry, but you";
- mes "don't have enough";
- mes "zeny for the boarding fare.";
- close;
- }
- set zeny,zeny-800;
- warp "izlude",176,182;
- end;
- case 3:
- mes "[Sarumane]";
+ mes .@n$;
mes "Travel by ship is";
mes "still one of the safest and";
mes "dependable methods of";
@@ -420,8 +371,13 @@ cmd_fild07,94,134,4 script Sarumane#cmd 100,{
mes "to try Reudelus travel soon~";
close;
}
+ mes .@n$;
+ mes "I'm sorry, but you";
+ mes "don't have enough";
+ mes "zeny for the boarding fare.";
+ close;
}
-
+cmd_fild07,94,134,4 duplicate(Zain#cmd) Sarumane#cmd 100
cmd_in02,146,180,4 script Kafra Employee::kaf_comodo2 721,{
cutin "kafra_07",2;
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index dd7ebb28a..e6706df4a 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1,5 +1,5 @@
//===== rAthena Script =======================================
-//= Jawaii (The Lovers' Paradise) Town script
+//= Jawaii (The Lovers' Paradise) Town
//===== By: ==================================================
//= jAthena (1.0)
//= DNett123 (1.1 - 1.5)
@@ -9,8 +9,8 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
-//= [Aegis OCnversion]
-//= Jawaii Town Npcs
+//= [Official Conversion]
+//= Jawaii Town NPCs
//===== Additional Comments: =================================
//= 1.0 Done By jAthena
//= 1.1 Rough Translation [DNett123]