From a5e971eb69f5df3360ad86bc7d8310427e890342 Mon Sep 17 00:00:00 2001 From: Playtester Date: Sat, 21 Apr 2007 18:37:39 +0000 Subject: * Official Rachel Sanctuary warps - had to move the current quest to another position * Fixed up some item_db entries git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10299 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/cities/rachel.txt | 34 ++++++++++++----------------- npc/quests/quests_rachel.txt | 4 ++-- npc/warps/dungeons/rachel_dun.txt | 45 +++++++++++++++++++++++++-------------- 4 files changed, 47 insertions(+), 38 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 6c0eac9c1..b039ee141 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2007/04/22 + * Official Rachel Sanctuary warps [Playtester] + - had to move the current quest to another position * Official Rachel warps [Playtester] 2007/04/21 * Fixed a small scripts_custom.conf typo [ultramage] diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index 84d6c89a1..7a6c49dbe 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -586,36 +586,30 @@ rachel,155,243,3 script Guard#Ra02 934,{ ra_temple,119,180,3 script #door1 45,2,2,{ OnTouch: - mes "** The door is locked. **"; + mes " == The Door is locked. =="; next; - menu "Kick it",-,"Take out your weapon",L_weap,"Pray to the goddess",L_enter; + menu "Kick it open with your foot.",-,"Take it down with your weapons.",-; - emotion 23; - mes "[Bishop Nema]"; - mes "Please stop!"; - close; - -L_weap: - emotion 23; + doEvent "Cleric Nema::OnEmotion"; + mes "[Cleric Nema]"; + mes "Please, don't do that!"; close; - -L_enter: - mes "** The door opens. **"; - close2; - warp "ra_temin",169,23; - end; } -ra_temple,116,174,3 script Bishop Nema 920,{ +ra_temple,116,174,3 script Cleric Nema 920,{ - mes "[Bishop Nema]"; + mes "[Cleric Nema]"; mes "I need to get in somehow..."; - mes "Previously, another Bishop told me that there was"; + mes "Previously, another Cleric told me that there was"; mes "a couple that snuck in the temple as a joke, but"; mes "I'm not sure how."; next; - mes "[Bishop Nema]"; + mes "[Cleric Nema]"; mes "Hmm.. and who were they?"; mes "Oh, what do I do.."; close; -} \ No newline at end of file + +OnEmotion: + emotion 23; + end; +} diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index d34347cca..ff9688ea5 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -19,7 +19,7 @@ //It's all in one NPC for now because I don't know location // //and sprite ids of related NPCs. - Playtester // ////////////////////////////////////////////////////////////// -ra_temin,276,326,0 script Statue#Rachel 111,{ +ra_temple,119,157,0 script Statue#Rachel 111,{ if($rachel_donate < 10000){ mes "-A sign on the statue reads-"; @@ -87,7 +87,7 @@ ra_temin,276,326,0 script Statue#Rachel 111,{ if(select("No.", "Yes.") == 2){ mes "-The door to Rachel Sanctuary opens-"; close2; - warp "ra_san01",139,14; + warp "ra_san01",139,139; end; } mes "[Voice]"; diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt index f74e097d7..abbb101a4 100644 --- a/npc/warps/dungeons/rachel_dun.txt +++ b/npc/warps/dungeons/rachel_dun.txt @@ -3,7 +3,7 @@ //==== By ================================================ //= Playtester //==== Current Version :================================== -//= 1.2 +//= 1.3 //==== Compatible With :================================== //= Any Athena Version //==== Description :====================================== @@ -11,20 +11,33 @@ //==== Additional Comment:================================ //= 1.1 Added $ephiroth's warps [Playtester] //= 1.2 Replaced old versions with jAthena's [Playtester] +//= 1.3 Official warps [Playtester] //======================================================== -// Rachel Sanctuary Dungeon -ra_san01,140,6,0 warp rachelwarp4000 1,1,ra_temin,276,318 -ra_san01,140,140,0 warp rachelwarp4001 1,1,ra_san02,32,21 -ra_san02,30,21,0 warp rachelwarp4002 1,1,ra_san01,140,138 -ra_san02,291,149,0 warp rachelwarp4003 1,1,ra_san03,4,149 -ra_san03,2,149,0 warp rachelwarp4004 1,1,ra_san02,289,149 -ra_san02,214,2,0 warp rachelwarp4005 1,1,ra_san04,36,221 -ra_san04,36,223,0 warp rachelwarp4006 1,1,ra_san02,214,4 -ra_san03,86,14,0 warp rachelwarp4007 1,1,ra_san04,204,220 -ra_san04,204,222,0 warp rachelwarp4008 1,1,ra_san03,86,16 -ra_san04,120,50,0 warp rachelwarp4009 1,1,ra_san05,150,9 -ra_san05,150,7,0 warp rachelwarp4010 1,1,ra_san04,120,48 -ra_san02,214,278,0 warp rachelwarp4011 1,1,ra_san01,140,138 -ra_san03,124,283,0 warp rachelwarp4012 1,1,ra_san01,140,138 -ra_san04,120,104,0 warp rachelwarp4013 1,1,ra_san01,140,138 \ No newline at end of file +ra_san01,139,13,0 script sanctuary01 45,1,1,{ + switch(rand(3)){ + case 1: + warp "ra_san02",213,275; + break; + case 2: + warp "ra_san03",119,283; + break; + default: + warp "ra_san04",119,110; + break; + } +} + +ra_san02,213,280,0 warp sanctuary02 1,1,ra_san01,140,19 +ra_san03,123,283,0 warp sanctuary03 1,1,ra_san01,140,19 +ra_san04,119,104,0 warp sanctuary04 1,1,ra_san01,140,19 +ra_san03,279,21,0 warp sanctuary05 1,1,ra_san05,282,149 +ra_san03,85,15,0 warp sanctuary06 1,1,ra_san04,203,216 +ra_san04,203,221,0 warp sanctuary07 1,1,ra_san03,85,20 +ra_san04,120,48,0 warp sanctuary08 1,1,ra_san05,150,282 +ra_san05,150,7,0 warp sanctuary09 1,1,ra_temple,119,153 +ra_san02,289,149,0 warp sanctuary10 1,1,ra_san03,10,149 +ra_san03,5,149,0 warp sanctuary11 1,1,ra_san02,284,149 +ra_san02,213,4,0 warp sanctuary12 1,1,ra_san04,35,216 +ra_san04,35,221,0 warp sanctuary13 1,1,ra_san02,213,9 +ra_san02,30,21,0 warp sanctuary14 1,1,ra_san05,14,149 -- cgit v1.2.3-60-g2f50