From ea1a321438e75b66b3fc8148b6eaa41d049761dd Mon Sep 17 00:00:00 2001 From: euphyy Date: Mon, 24 Dec 2012 17:30:14 +0000 Subject: > 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 --- npc/cities/moscovia.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'npc/cities/moscovia.txt') diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index bb88d641f..e05a4a755 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -11,11 +11,12 @@ //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Removed villagers (they are part of a quest). [Kisuka] +//= 1.2 Moved Alberta NPC to pre-re/re paths. [Euphy] //============================================================ // Moscovia Transportation //============================================================ -alberta,246,51,4 script Moscovia P.R. Officer#1 960,{ +- script ::PR_Officer_moscovia -1,{ mes "[Moscovia P.R. Officer]"; mes "Moscovia! Do you know Moscovia?"; mes "the paradise spreading on the endless seas..."; @@ -108,7 +109,10 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 960,{ mes "Please come and visit soon."; mes "Ok then, Let's get going."; close2; - warp "alberta",244,52; + if (checkre(0)) + warp "alberta",244,52; + else + warp "alberta",243,67; end; } -- cgit v1.2.3-60-g2f50