summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-18 18:40:59 -0800
committerStreusel <advance_me@hotmail.de>2013-02-18 18:40:59 -0800
commit3859c4ffe1759526fd64d8f0bc08279870a1c26f (patch)
treeb4bef6abfe89268b729fc04ceb2fa0726314aacc
parent412efb9b05da518341236c29f51f66f727b28d9b (diff)
downloadhercules-3859c4ffe1759526fd64d8f0bc08279870a1c26f.tar.gz
hercules-3859c4ffe1759526fd64d8f0bc08279870a1c26f.tar.bz2
hercules-3859c4ffe1759526fd64d8f0bc08279870a1c26f.tar.xz
hercules-3859c4ffe1759526fd64d8f0bc08279870a1c26f.zip
-Updated more Izlude related stuff
Signed-off-by: Streusel
-rw-r--r--npc/pre-re/quests/doomed_swords.txt64
-rw-r--r--npc/pre-re/quests/skills/swordman_skills.txt148
-rw-r--r--npc/pre-re/scripts_athena.conf3
-rw-r--r--npc/quests/doomed_swords.txt47
-rw-r--r--npc/quests/skills/swordman_skills.txt141
-rw-r--r--npc/re/warps/cities/izlude.txt11
6 files changed, 225 insertions, 189 deletions
diff --git a/npc/pre-re/quests/doomed_swords.txt b/npc/pre-re/quests/doomed_swords.txt
new file mode 100644
index 000000000..9d27d588b
--- /dev/null
+++ b/npc/pre-re/quests/doomed_swords.txt
@@ -0,0 +1,64 @@
+//===== Hercules Script =======================================
+//= Doomed Swords Quest
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Hercules GIT
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Doomed Swords Quest:
+//= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner.
+//= Although this quest is enabled on iRO, the Mysteltainn
+//= portion is NOT completable as the item "Young Twig" does
+//= not drop.
+//= - Variable in use: event_magum (max 6)
+//= - Variable in use: dmdswrd_Q2 (bits 1 - 32)
+//===== Additional Comments: =================================
+//= 1.0 Moved from main folder [Streusel]
+//============================================================
+
+izlude_in,173,88,2 script Nain#magum 102,{
+ if (dmdswrd_Q2 == 4) {
+ mes "[Nain]";
+ mes "It doesn't matter how";
+ mes "powerful the Executioner";
+ mes "is: if it were to end up in";
+ mes "my hands, I would get rid";
+ mes "of it right away. I'd never risk losing my mind to that curse...";
+ close;
+ }
+ mes "[Nain]";
+ mes "Long ago, one sword";
+ mes "was used to behead all";
+ mes "the criminals that had been";
+ mes "sentenced to death. That";
+ mes "accursed blade is known";
+ mes "as the Executioner.";
+ next;
+ mes "[Nain]";
+ mes "As the Executioner slayed";
+ mes "more criminals, the rage and";
+ mes "bloodlust of its victims began";
+ mes "to accumulate upon the blade.";
+ mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil.";
+ next;
+ mes "[Nain]";
+ mes "The last person to wield";
+ mes "the Executioner almost lost";
+ mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented";
+ mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul.";
+ next;
+ mes "[Nain]";
+ mes "This mysterious blacksmith";
+ mes "was never seen again in the";
+ mes "city of Prontera, but rumor has";
+ mes "it that if you can find him, he";
+ mes "can forge that accursed";
+ mes "Executioner anew...";
+ if (event_magum == 1)
+ set event_magum,5;
+ set dmdswrd_Q2,dmdswrd_Q2 | 4;
+ close;
+} \ No newline at end of file
diff --git a/npc/pre-re/quests/skills/swordman_skills.txt b/npc/pre-re/quests/skills/swordman_skills.txt
new file mode 100644
index 000000000..7a4aa2ff3
--- /dev/null
+++ b/npc/pre-re/quests/skills/swordman_skills.txt
@@ -0,0 +1,148 @@
+//===== Hercules Script =======================================
+//= Swordsman Skills Quests
+//===== By: ==================================================
+//= kobra_k88
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Hercules GIT
+//===== Description: =========================================
+//= Quests for skills: Fatal Blow, Mobile HP Recovery,
+// Auto-Berserk
+//===== Additional Comments: =================================
+//= 1.0 Moved from main folder. [Streusel]
+//============================================================
+
+izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
+ if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
+ mes "[De Thomas]";
+ mes "Oh, no! You must have been hurt! Are you ok?";
+ mes "You must have fought hard to get such serious injuries..";
+ mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
+ next;
+ mes "[De Thomas]";
+ if (Sex == 0) {
+ mes "For these swordsmen and knights, there is a wonderful skill.";
+ }
+ else {
+ mes "For these swordswomen and knights, there is a wonderful skill young lady.";
+ }
+ mes "I present to you - HP Recovery While Moving!";
+ mes "Body moving is a splendid skill";
+ mes "that allows you to regain strength(HP)";
+ mes "while you are moving!";
+ next;
+ mes "[De Thomas]";
+ mes "It is currently under development";
+ mes "so it may not recover that much,";
+ mes "but it will help a little.";
+ mes "What do you think? Would you like to learn this skill?";
+ next;
+ switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
+ case 1:
+ mes "[De Thomas]";
+ mes "Very well. I will tell you what you need to learn this skill.";
+ mes "First, your job level must be higher than ^00880035^000000.";
+ mes "You will also need ^008800200 empty bottles^000000.";
+ mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
+ next;
+ mes "[De Thomas]";
+ mes "Also, the armor you used in battle.";
+ mes "This is also proof of an experienced fighter.";
+ mes "For the armor... your armor is perfect!";
+ mes "Bring your armor!";
+ mes "Last but not least... bring me one ^008800Moth Wing^000000.";
+ next;
+ menu "Eh? You need that, too?",-;
+ mes "[De Thomas]";
+ mes "Not really.. I don't really NEED it.";
+ mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
+ mes "Of course! It would be much easier for me to get it myself.";
+ mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
+ next;
+ mes "[De Thomas]";
+ mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
+ mes "Please, find me one...*sniffsniff*";
+ mes "If you don't...";
+ set sm_movingrecovery_x,1;
+ mes "You won't get anything! Muahahaha.";
+ close;
+ case 2:
+ mes "[De Thomas]";
+ mes "...";
+ close;
+ }
+ }
+ else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
+ mes "[De Thomas]";
+ mes "Oh, it's you?";
+ mes "Long time no see!";
+ mes "You seem healthier than before.";
+ mes "Hahahaha!";
+ mes "Take care! See you again!";
+ close;
+ }
+ else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
+ mes "[De Thomas]";
+ mes "Welcome back...";
+ mes "are you ready to learn Body Movin'?";
+ next;
+ switch (select("Yes.:No, I'm not ready yet.")) {
+ case 1:
+ if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+ mes "[De Thomas]";
+ mes "Let's see.....";
+ next;
+ mes "[De Thomas]";
+ mes "Ok! I shall now teach you...";
+ mes "...The Body Movin' skill!";
+ next;
+ delitem 713,200; //Empty_Bottle
+ delitem 1058,1; //Wing_Of_Moth
+ skill "SM_MOVINGRECOVERY",1,0;
+ set sm_movingrecovery_x,2;
+ mes "[De Thomas]";
+ mes "There you go!";
+ mes "Try it yourself.";
+ mes "But don't overdo it.";
+ next;
+ mes "[De Thomas]";
+ mes "Oh yeah, I won't be needing your";
+ mes "armor so you can keep it.";
+ mes "Good luck now!";
+ close;
+ }
+ else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
+ mes "[De Thomas]";
+ mes "Wait a second, your Job level isn't above ^00880035^000000!";
+ mes "Come back when it is.";
+ close;
+ }
+ else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
+ mes "[De Thomas]";
+ mes "You do not have all the items I asked for.";
+ next;
+ mes "[De Thomas]";
+ mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+ close;
+ }
+ mes "[De Thomas]";
+ mes "You do not have all the items I asked for.";
+ next;
+ mes "[De Thomas]";
+ mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+ close;
+ case 2:
+ mes "[De Thomas]";
+ mes "Is that so?";
+ mes "Then come when you are prepared.";
+ close;
+ }
+ }
+ mes "[De Thomas]";
+ mes "My name is De Thomas Carlos.";
+ mes "Knight of Prontera's 3rd Calvary.";
+ mes "I have a certain duty these days.";
+ mes "Ehem! Need I say more.";
+ close;
+} \ No newline at end of file
diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index fa2d6de8f..29e39f1f2 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -81,4 +81,5 @@ npc: npc/pre-re/quests/quests_izlude.txt
npc: npc/pre-re/quests/quests_lighthalzen.txt
npc: npc/pre-re/quests/monstertamers.txt
npc: npc/pre-re/quests/quests_nameless.txt
-npc: npc/pre-re/quests/quests_13_1.txt \ No newline at end of file
+npc: npc/pre-re/quests/quests_13_1.txt
+npc: npc/pre-re/quests/skills/swordman_skills.txt \ No newline at end of file
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 6a5ecc20f..e911abf20 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.6
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= Moved all non-related NPCs to their repsective files.
//= 1.5 Added missing checkweight. [L0ne_W0lf]
+//= 1.6 Removed Nain [Streusel]
//============================================================
prt_in,162,11,2 script Ghatu#magum 86,{
@@ -210,50 +211,6 @@ morocc,281,178,2 script Cetsu#magum 97,{
close;
}
-izlude_in,173,88,2 script Nain#magum 102,{
- if (dmdswrd_Q2 == 4) {
- mes "[Nain]";
- mes "It doesn't matter how";
- mes "powerful the Executioner";
- mes "is: if it were to end up in";
- mes "my hands, I would get rid";
- mes "of it right away. I'd never risk losing my mind to that curse...";
- close;
- }
- mes "[Nain]";
- mes "Long ago, one sword";
- mes "was used to behead all";
- mes "the criminals that had been";
- mes "sentenced to death. That";
- mes "accursed blade is known";
- mes "as the Executioner.";
- next;
- mes "[Nain]";
- mes "As the Executioner slayed";
- mes "more criminals, the rage and";
- mes "bloodlust of its victims began";
- mes "to accumulate upon the blade.";
- mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil.";
- next;
- mes "[Nain]";
- mes "The last person to wield";
- mes "the Executioner almost lost";
- mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented";
- mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul.";
- next;
- mes "[Nain]";
- mes "This mysterious blacksmith";
- mes "was never seen again in the";
- mes "city of Prontera, but rumor has";
- mes "it that if you can find him, he";
- mes "can forge that accursed";
- mes "Executioner anew...";
- if (event_magum == 1)
- set event_magum,5;
- set dmdswrd_Q2,dmdswrd_Q2 | 4;
- close;
-}
-
pay_fild08,218,283,2 script Mysterious Man#magum 89,{
if (checkweight(1201,1) == 0) {
mes "[Mysterious Man]";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 295291a16..bf4fd021d 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Swordsman Skills Quests
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules GIT
//===== Description: =========================================
//= Quests for skills: Fatal Blow, Mobile HP Recovery,
// Auto-Berserk
@@ -13,142 +13,9 @@
//= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//= 1.7 Updated to latest available official file. [Masao]
//= 1.8 Fixed JobLevel requirements. [Euphy]
+//= 1.9 Removed Knight De Thomas. [Streusel]
//============================================================
-izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
- if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
- mes "[De Thomas]";
- mes "Oh, no! You must have been hurt! Are you ok?";
- mes "You must have fought hard to get such serious injuries..";
- mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
- next;
- mes "[De Thomas]";
- if (Sex == 0) {
- mes "For these swordsmen and knights, there is a wonderful skill.";
- }
- else {
- mes "For these swordswomen and knights, there is a wonderful skill young lady.";
- }
- mes "I present to you - HP Recovery While Moving!";
- mes "Body moving is a splendid skill";
- mes "that allows you to regain strength(HP)";
- mes "while you are moving!";
- next;
- mes "[De Thomas]";
- mes "It is currently under development";
- mes "so it may not recover that much,";
- mes "but it will help a little.";
- mes "What do you think? Would you like to learn this skill?";
- next;
- switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
- case 1:
- mes "[De Thomas]";
- mes "Very well. I will tell you what you need to learn this skill.";
- mes "First, your job level must be higher than ^00880035^000000.";
- mes "You will also need ^008800200 empty bottles^000000.";
- mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
- next;
- mes "[De Thomas]";
- mes "Also, the armor you used in battle.";
- mes "This is also proof of an experienced fighter.";
- mes "For the armor... your armor is perfect!";
- mes "Bring your armor!";
- mes "Last but not least... bring me one ^008800Moth Wing^000000.";
- next;
- menu "Eh? You need that, too?",-;
- mes "[De Thomas]";
- mes "Not really.. I don't really NEED it.";
- mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
- mes "Of course! It would be much easier for me to get it myself.";
- mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
- next;
- mes "[De Thomas]";
- mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
- mes "Please, find me one...*sniffsniff*";
- mes "If you don't...";
- set sm_movingrecovery_x,1;
- mes "You won't get anything! Muahahaha.";
- close;
- case 2:
- mes "[De Thomas]";
- mes "...";
- close;
- }
- }
- else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) {
- mes "[De Thomas]";
- mes "Oh, it's you?";
- mes "Long time no see!";
- mes "You seem healthier than before.";
- mes "Hahahaha!";
- mes "Take care! See you again!";
- close;
- }
- else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) {
- mes "[De Thomas]";
- mes "Welcome back...";
- mes "are you ready to learn Body Movin'?";
- next;
- switch (select("Yes.:No, I'm not ready yet.")) {
- case 1:
- if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) {
- mes "[De Thomas]";
- mes "Let's see.....";
- next;
- mes "[De Thomas]";
- mes "Ok! I shall now teach you...";
- mes "...The Body Movin' skill!";
- next;
- delitem 713,200; //Empty_Bottle
- delitem 1058,1; //Wing_Of_Moth
- skill "SM_MOVINGRECOVERY",1,0;
- set sm_movingrecovery_x,2;
- mes "[De Thomas]";
- mes "There you go!";
- mes "Try it yourself.";
- mes "But don't overdo it.";
- next;
- mes "[De Thomas]";
- mes "Oh yeah, I won't be needing your";
- mes "armor so you can keep it.";
- mes "Good luck now!";
- close;
- }
- else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) {
- mes "[De Thomas]";
- mes "Wait a second, your Job level isn't above ^00880035^000000!";
- mes "Come back when it is.";
- close;
- }
- else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
- mes "[De Thomas]";
- mes "You do not have all the items I asked for.";
- next;
- mes "[De Thomas]";
- mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
- close;
- }
- mes "[De Thomas]";
- mes "You do not have all the items I asked for.";
- next;
- mes "[De Thomas]";
- mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
- close;
- case 2:
- mes "[De Thomas]";
- mes "Is that so?";
- mes "Then come when you are prepared.";
- close;
- }
- }
- mes "[De Thomas]";
- mes "My name is De Thomas Carlos.";
- mes "Knight of Prontera's 3rd Calvary.";
- mes "I have a certain duty these days.";
- mes "Ehem! Need I say more.";
- close;
-}
-
prt_in,75,88,5 script Leon Von Frich 85,3,3,{
if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index d0ba69d92..c8ed3d4f5 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Athena (1.0), Nana (1.1)
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= Any Athena & Hercules Version
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.4 Minor correction on airport warps
//= 1.5 Updated to match the new Izlude Map. [Masao]
//= 1.6 Added new warps [Streusel]
+//= 1.7 Removed indoor warps [Streusel]
//============================================================
//= Izlude City ==============================================
@@ -22,13 +23,11 @@ izlude,21,98,0 warp iz001 3,3,prt_fild08,367,212
izlude,52,172,0 warp iz04 2,2,izlude_in,74,161
izlude,130,257,0 warp iz09#1 2,2,iz_ac01,99,29
izlude,125,257,0 warp iz09#2 2,2,iz_ac01,99,29
-
+izlude,209,161,0 warp iz10 2,2,arena_room,100,30
+arena_room,99,23,0 warp iz_arena 2,2,izlude,209,161
izlude_in,108,169,0 warp iz05 2,3,izlude_in,84,169
izlude_in,148,127,0 warp iz03-1 2,5,izlude,207,162
-izlude_in,171,97,0 warp iz06 3,2,izlude_in,172,119
-izlude_in,172,116,0 warp iz06-1 3,2,izlude_in,172,94
-izlude_in,172,139,0 warp iz07 3,2,izlude_in,172,161
-izlude_in,172,158,0 warp iz07-1 3,2,izlude_in,172,136
+
izlude_in,43,169,0 warp w219 2,3,izlude_in,64,169
izlude_in,65,84,0 warp iz01-1 5,2,izlude,113,178
izlude_in,74,158,0 warp iz04-1 3,2,izlude,52,166