summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-28 12:07:44 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-28 12:07:44 +0000
commit981d0299cb0a66ba0f2363c6d9f1c35038689a63 (patch)
tree0b58a158de4d4d1b0482794fe5345663474c37b1
parent382f25a1e0d40399f84dfa82c9a686740fc97f62 (diff)
downloadhercules-981d0299cb0a66ba0f2363c6d9f1c35038689a63.tar.gz
hercules-981d0299cb0a66ba0f2363c6d9f1c35038689a63.tar.bz2
hercules-981d0299cb0a66ba0f2363c6d9f1c35038689a63.tar.xz
hercules-981d0299cb0a66ba0f2363c6d9f1c35038689a63.zip
- Added Header to Rune Knight Job change Quest. bugreport:5834
- Fixed weapon distribution in Paradise Gear Quests. bugreport:5849 - Fixed wrong warp location inside Paradise Head Quarters. bugreport:5847 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16160 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/jobs/3-1/rune_knight.txt17
-rw-r--r--npc/quests/eden/eden_quests.txt4
-rw-r--r--npc/warps/other/paradise.txt2
3 files changed, 20 insertions, 3 deletions
diff --git a/npc/jobs/3-1/rune_knight.txt b/npc/jobs/3-1/rune_knight.txt
index def9ecd64..c2720d30a 100644
--- a/npc/jobs/3-1/rune_knight.txt
+++ b/npc/jobs/3-1/rune_knight.txt
@@ -1,3 +1,20 @@
+//===== rAthena Script =======================================
+//= Rune Knight Job Quest
+//===== By: ==================================================
+//= L0ne_W0lf
+//= Credits: Gepard, Muad_Dib
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Job change Quest from Knight / Lord Knight -> Rune Knight.
+//= Does not entirely support changing to Baby Third Class.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//= 1.1 Added forgoten Header. [Masao]
+//============================================================
+
prt_in,162,24,3 script Splendid-Looking Knight 470,{
if (Upper == 4) {
// custom translation
diff --git a/npc/quests/eden/eden_quests.txt b/npc/quests/eden/eden_quests.txt
index e1919f7d0..5b79c9f16 100644
--- a/npc/quests/eden/eden_quests.txt
+++ b/npc/quests/eden/eden_quests.txt
@@ -2330,7 +2330,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{
mes "Make enough space.";
close;
case 2:
- if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader)
+ if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader){
mes "[Michael]";
mes "What kind of weapon do you want?";
mes "We have one and Two-handed swords.";
@@ -2413,7 +2413,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{
mes "This is what we strive for.";
close;
}
- if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
+ } if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
mes "[Michael]";
mes "We only have 1 weapon for you.";
next;
diff --git a/npc/warps/other/paradise.txt b/npc/warps/other/paradise.txt
index 3a1af4342..543bdbbfa 100644
--- a/npc/warps/other/paradise.txt
+++ b/npc/warps/other/paradise.txt
@@ -20,6 +20,6 @@ moc_para01,107,12,0 warp #warp_2_din_2 1,1,moc_para01,47,37
moc_para01,100,27,0 warp #warp_2_gym 1,1,moc_para01,47,85
moc_para01,49,86,0 warp #warp_2_pass_1 1,1,moc_para01,103,27
moc_para01,113,32,0 warp #warp_2_ware 1,1,moc_para01,105,92
-moc_para01,102,92,0 warp #warp_2_pass_2 1,1,moc_para01,29,185
+moc_para01,102,92,0 warp #warp_2_pass_2 1,1,moc_para01,109,33
moc_para01,41,187,0 warp #warp_2_room2 1,1,moc_para01,179,93
moc_para01,179,90,0 warp #warp_2_2fhall_3 1,1,moc_para01,41,185