From ec230d1eb8212f4c5b8e551e4fb4cd0b638ed637 Mon Sep 17 00:00:00 2001 From: brianluau Date: Thu, 9 Aug 2012 18:01:21 +0000 Subject: - Added svn:eol-style=native property on some recently added text files. - Renamed upgrade_svn16517.sql to the correct SVN revision it was added in (r16518). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16614 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/re/kafras/kafras_brasilis.txt | 62 ++++++++++++++++----------------- npc/re/mobs/dungeons/yggdrasil.txt | 70 +++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 66 deletions(-) (limited to 'npc/re') diff --git a/npc/re/kafras/kafras_brasilis.txt b/npc/re/kafras/kafras_brasilis.txt index 45309717d..2c0da8bcb 100644 --- a/npc/re/kafras/kafras_brasilis.txt +++ b/npc/re/kafras/kafras_brasilis.txt @@ -1,31 +1,31 @@ -//===== rAthena Script ======================================= -//= Brasilis Kafra -//===== By: ========================= -//= L0ne_W0lf -//===== Current Version: =================== -//= 1.2 -//===== Compatible With: ===================== -//= rAthena 1.0 -//===== Description: ============================================ -//= Description of argument settings for callfunc "F_Kafra". -//= arg(0): When set at 0 the default Kafra message is displayed. -//= When set to 1 the Niflhiem Kafra message is displayed. -//= When set to 2 the Guild Kafra message is displayed. -//= arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0. -//= arg(2): Set to 1 to disable info menu. Otherwise set to 0. -//= arg(3): Cost of Storage service -//= arg(4): Cost of Rent a Pushcart service -//===== Additional Comments: ========================================== -//= 1.0 First version. -//= 1.1 Updated save point coordinates. -//= 1.2 Removed custom text. [Daegaladh] -//===================================================================== - -brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ - cutin "kafra_01",2; - callfunc "F_Kafra",0,3,0,80,700; - - M_Save: - savepoint "brasilis",195,259; - callfunc "F_KafEnd",0,1,"in the city of Brasilis"; -} +//===== rAthena Script ======================================= +//= Brasilis Kafra +//===== By: ========================= +//= L0ne_W0lf +//===== Current Version: =================== +//= 1.2 +//===== Compatible With: ===================== +//= rAthena 1.0 +//===== Description: ============================================ +//= Description of argument settings for callfunc "F_Kafra". +//= arg(0): When set at 0 the default Kafra message is displayed. +//= When set to 1 the Niflhiem Kafra message is displayed. +//= When set to 2 the Guild Kafra message is displayed. +//= arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0. +//= arg(2): Set to 1 to disable info menu. Otherwise set to 0. +//= arg(3): Cost of Storage service +//= arg(4): Cost of Rent a Pushcart service +//===== Additional Comments: ========================================== +//= 1.0 First version. +//= 1.1 Updated save point coordinates. +//= 1.2 Removed custom text. [Daegaladh] +//===================================================================== + +brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ + cutin "kafra_01",2; + callfunc "F_Kafra",0,3,0,80,700; + + M_Save: + savepoint "brasilis",195,259; + callfunc "F_KafEnd",0,1,"in the city of Brasilis"; +} diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt index 6955fe221..b3d401ac5 100644 --- a/npc/re/mobs/dungeons/yggdrasil.txt +++ b/npc/re/mobs/dungeons/yggdrasil.txt @@ -1,35 +1,35 @@ -//===== rAthena Script ======================================= -//= Yggdrasil Tree Monster Spawn Script -//===== By: ================================================== -//= Athena (1.0) -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Additional Comments: ================================= -//= 1.0 Splitted from Nifflheim fields [DracoRPG] -//= 1.1 Official kRO 10.1 spawns [Playtester] -//============================================================ - -//================================================== -// yggdrasil01 - Hvergelmir's Fountain (Trunk of Yggdrasil) -//================================================== -yggdrasil01,234,256,10,10 monster Blue Plant 1079,5,1800000,600000,0 -yggdrasil01,273,234,3,3 monster Shining Plant 1083,1,1800000,600000,0 -yggdrasil01,143,257,20,10 monster Shining Plant 1083,5,1200000,600000,0 -yggdrasil01,98,238,20,15 monster Yellow Plant 1081,5,1200000,600000,0 -yggdrasil01,98,238,20,15 monster White Plant 1082,5,1200000,600000,0 -yggdrasil01,47,207,20,20 monster Blue Plant 1079,5,1200000,600000,0 -yggdrasil01,61,258,3,3 monster Shining Plant 1083,1,1800000,600000,0 -yggdrasil01,132,199,20,5 monster Blue Plant 1079,5,1200000,600000,0 -yggdrasil01,209,218,2,2 monster Shining Plant 1083,1,1200000,600000,0 -yggdrasil01,192,186,2,2 monster Shining Plant 1083,1,1800000,1200000,0 -yggdrasil01,169,176,3,3 monster Shining Plant 1083,1,1200000,600000,0 -yggdrasil01,169,176,3,3 monster Green Plant 1080,1,60000,30000,0 -yggdrasil01,94,111,5,2 monster Shining Plant 1083,1,1200000,600000,0 -yggdrasil01,51,118,10,3 monster Shining Plant 1083,1,1200000,600000,0 -yggdrasil01,133,54,3,3 monster Shining Plant 1083,1,1200000,600000,0 -yggdrasil01,257,63,10,10 monster Shining Plant 1083,3,1800000,1200000,0 -yggdrasil01,0,0,0,0 monster Shining Plant 1083,10,3600000,2300000,0 -yggdrasil01,0,0,0,0 monster Green Plant 1080,25,60000,30000,0 -yggdrasil01,0,0,0,0 monster Red Plant 1078,15,60000,30000,0 +//===== rAthena Script ======================================= +//= Yggdrasil Tree Monster Spawn Script +//===== By: ================================================== +//= Athena (1.0) +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Additional Comments: ================================= +//= 1.0 Splitted from Nifflheim fields [DracoRPG] +//= 1.1 Official kRO 10.1 spawns [Playtester] +//============================================================ + +//================================================== +// yggdrasil01 - Hvergelmir's Fountain (Trunk of Yggdrasil) +//================================================== +yggdrasil01,234,256,10,10 monster Blue Plant 1079,5,1800000,600000,0 +yggdrasil01,273,234,3,3 monster Shining Plant 1083,1,1800000,600000,0 +yggdrasil01,143,257,20,10 monster Shining Plant 1083,5,1200000,600000,0 +yggdrasil01,98,238,20,15 monster Yellow Plant 1081,5,1200000,600000,0 +yggdrasil01,98,238,20,15 monster White Plant 1082,5,1200000,600000,0 +yggdrasil01,47,207,20,20 monster Blue Plant 1079,5,1200000,600000,0 +yggdrasil01,61,258,3,3 monster Shining Plant 1083,1,1800000,600000,0 +yggdrasil01,132,199,20,5 monster Blue Plant 1079,5,1200000,600000,0 +yggdrasil01,209,218,2,2 monster Shining Plant 1083,1,1200000,600000,0 +yggdrasil01,192,186,2,2 monster Shining Plant 1083,1,1800000,1200000,0 +yggdrasil01,169,176,3,3 monster Shining Plant 1083,1,1200000,600000,0 +yggdrasil01,169,176,3,3 monster Green Plant 1080,1,60000,30000,0 +yggdrasil01,94,111,5,2 monster Shining Plant 1083,1,1200000,600000,0 +yggdrasil01,51,118,10,3 monster Shining Plant 1083,1,1200000,600000,0 +yggdrasil01,133,54,3,3 monster Shining Plant 1083,1,1200000,600000,0 +yggdrasil01,257,63,10,10 monster Shining Plant 1083,3,1800000,1200000,0 +yggdrasil01,0,0,0,0 monster Shining Plant 1083,10,3600000,2300000,0 +yggdrasil01,0,0,0,0 monster Green Plant 1080,25,60000,30000,0 +yggdrasil01,0,0,0,0 monster Red Plant 1078,15,60000,30000,0 -- cgit v1.2.3-70-g09d2