summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/item_db.txt4
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/rachel.txt34
-rw-r--r--npc/quests/quests_rachel.txt4
-rw-r--r--npc/warps/dungeons/rachel_dun.txt45
5 files changed, 49 insertions, 40 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 57585c217..7662dcecd 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1550,7 +1550,7 @@
4361,Whitesmith_Card,Whitesmith Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBreakWeaponRate,1000; bonus bBreakArmorRate,700; },{},{}
4362,Harword_Card,Howard Alt-Eisen Card,6,,10,10,,,,,,,,2,,,,,{ bonus bAspdRate,-5; bonus bHit,30; },{},{}
4363,High_Priest_Card,High Priest Card,6,,10,10,,,,,,,,16,,,,,{ bonus5 bAutoSpellWhenHit,361,1,10,BF_WEAPON|BF_MAGIC|BF_SHORT|BF_LONG|BF_SKILL|BF_NORMAL,0; },{},{}
-4364,Magaleta_Card,Margaretha Solin Card,6,,10,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus5 bAutoSpellWhenHit,76,5,150,BF_MAGIC|BF_LONG|BF_SHORT|BF_SKILL|BF_NORMAL,1; },{},{}
+4364,Magaleta_Card,Margaretha Solin Card,6,,10,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus5 bAutoSpellWhenHit,76,5,150,BF_MAGIC|BF_SHORT|BF_LONG|BF_SKILL|BF_NORMAL,1; },{},{}
4365,High_Wizard_Card,High Wizard Card,6,,10,10,,,,,,,,769,,,,,{ bonus bIgnoreMDefRace,RC_NonBoss; bonus bCastrate,100; bonus bSPrecovRate,-100; },{},{ heal 0,-2000; }
4366,Katrinn_Card,Kathryne Keyron Card,6,,10,10,,,,,,,,769,,,,,{ bonus bCastrate,getrefine()*-1; if(getrefine()>=9) { bonus bMatkRate,2; } },{},{}
4367,Sniper_Card,Sniper Card,6,,10,10,,,,,,,,2,,,,,{ bonus bNoRegen,1; bonus2 bHpDrainRate,50,20; },{},{}
@@ -1572,7 +1572,7 @@
4383,Novus_Card,Red Novus Card,6,,10,10,,,,,,,,16,,,,,{ bonus3 bAddEffWhenHit,Eff_Confusion,3000,2; },{},{}
4384,Hydro_Card,Hydro Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,277,1,100; },{},{}
4385,Dragon_Egg_Card,Dragon Egg Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12048,RC_Dragon,300; },{},{}
-4386,Detale_Card,Detale Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMdef,-20; bonus2 bResEff,Eff_Freeze,10000; bonus5 bAutoSpellWhenHit,288,1,50,BF_MAGIC|BF_LONG|BF_SHORT,0; },{},{}
+4386,Detale_Card,Detale Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMdef,-20; bonus2 bResEff,Eff_Freeze,10000; bonus5 bAutoSpellWhenHit,288,1,50,BF_MAGIC|BF_SHORT|BF_LONG|BF_SKILL|BF_NORMAL,0; },{},{}
4387,Ancient_Mimic_Card,Ancient Mimic Card,6,,10,10,,,,,,,,16,,,,,{ bonus bAgi,readparam(bLuk)/18; },{},{}
4388,Deathword_Card,Deathword Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSkillAtk,11,5; bonus2 bSkillAtk,13,5; bonus2 bSkillAtk,400,5; },{},{ heal 0,-50; }
4389,Plasma_Card,Plasma Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Resist,1200; },{},{}
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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 10:29:35 +0000