Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 2 bugs in Bard Job Quest

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10656 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2007-06-01 07:04:44 +00:00
parent 2d8c45a319
commit 2e6f899827
3 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
npc/Changelog.txt
View File

@ -3,6 +3,7 @@ Date Added
2007/06/01
* In thana Quest you may enter either "Charmstone" or "Charm Stone" [Lupus]
- Fixed bug in new Crusader Quest, optimized, changed common NPC names to more unique.
- Fixed 2 bugs in Bard Job Quest
2007/05/31
* Rev. 10653 Fixced some spelling and grammar in crusader quest. [L0ne_W0lf]
* Rev. 10651 Updated Crusader quest. [L0ne_W0lf]

18
npc/jobs/2-2/bard.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus, Samuray22
//===== Current Version: =====================================
//= 2.1b
//= 2.2
//===== Compatible With: =====================================
//= eAthena Final
//===== Description: =========================================
@ -20,6 +20,8 @@
// prize, too. Added Izidor flower [Lupus]
// 2.0 Changed numbers to constants. [Vicious]
// 2.1b Updated to the Official One. [Samuray22]
// 2.2 Fixed BUG when baby classes weren't able to get a job,
// fixed bug with final prize [Lupus] HAVE TO CHANE ALL ITEMS to numeric IDs
//============================================================
//=============== Ayealo ============================
@ -37,8 +39,8 @@ comodo,211,155,3 script Wandering Bard 741,5,5{
mes "Thou should not live this destinty...";
mes "Thou have forgotten your destinty...";
close;
} else if(Class != Job_Archer) {
if(Class == Job_Bard) {
} else if(BaseJob != Job_Archer) {
if(BaseJob == Job_Bard) {
mes "[Ayealo]";
mes "Hey friends! You must be good at singing or roaming?";
mes "Have you improved your singing?";
@ -51,7 +53,7 @@ comodo,211,155,3 script Wandering Bard 741,5,5{
mes "Don't forget to stay happy always.";
mes "Our singing is to bring happiness and pleasant to everyone.";
close;
} else if(Class == Job_Novice) {
} else if(BaseJob == Job_Novice) {
mes "[Ayealo]";
mes "Let all the sadness";
mes "incomplete wishes.";
@ -73,7 +75,7 @@ comodo,211,155,3 script Wandering Bard 741,5,5{
mes "A place with all the happiness things.";
next;
mes "[Ayealo]";
if(Sex == 1) {
if(Sex) {
mes "Hope that you can forget all the things that happened today.";
mes "Enjoy yourself!";
} else {
@ -84,7 +86,7 @@ comodo,211,155,3 script Wandering Bard 741,5,5{
}
} else if(BARD_Q == 0) {
mes "[Ayealo]";
if(Sex == 1) {
if(Sex) {
mes "Hello! The joyful Archer,";
} else {
mes "Hello! Lovely Miss Archer,";
@ -144,7 +146,7 @@ comodo,211,155,3 script Wandering Bard 741,5,5{
mes "[Ayealo]" ;
mes "Thank you. I'm very happy if you're feeling happy with my singing.";
next;
if (Sex == 1 && JobLevel > 39) {
if (Sex && JobLevel > 39) {
mes "[Ayealo]";
mes "It's wonderful if there are more people can sing as well.";
mes "It's OK, it's not bad like this, He-he.";
@ -838,7 +840,7 @@ B_Change:
} else if(countitem("Tree_Of_Archer_3") > 59) {
delitem "Tree_Of_Archer_3", 60;
getitem "Mandolin", 1;
} else if(Tree_Of_Archer_2 > 59) {
} else if(countitem("Tree_Of_Archer_2") > 59) {
delitem "Tree_Of_Archer_2", 60;
getitem "Mandolin", 1;
} else if(countitem("Tree_Of_Archer_1") > 59) {

24
npc/jobs/2-2/crusader.txt
View File

@ -56,15 +56,15 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "Be advised to continue practicing yourself.";
close;
}
else if(Class != Job_Swordman) {
if(Class == Job_Crusader) {
else if(BaseJob != Job_Swordman) {
if(BaseJob == Job_Crusader) {
mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
next;
mes "[Michael Halig]";
mes "Chaos will one day arise to challenge our principles of peace, justice and order. Until we have eliminated evil and created our ideal world, we must not cease training.";
close;
}
else if(Class == Job_Novice) {
else if(BaseJob == Job_Novice) {
mes "We are Crusaders,";
mes "warriors preparing";
mes "to fight in the Holy War.";
@ -313,12 +313,12 @@ prt_castle,45,169,5 script Senior Crusader 752,{
//===================== Suffering Man: 2º Endurance Test ===============================================
prt_castle,164,32,1 script Man in Anguish 733,{
mes "[Murnak Mijoul]";
if(Class != Job_Swordman) {
if (Class == Job_Crusader) {
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
mes "Don't linger around in a place like this and forge your own path towards discovering your own strengths. The day that we will join hands in battle will come soon.";
close;
}
else if(Class == Job_Novice) {
else if(BaseJob == Job_Novice) {
mes "A Novice...?";
mes "So green, and yet,";
mes "so much potential.";
@ -445,8 +445,8 @@ prt_castle,164,32,1 script Man in Anguish 733,{
//===================== Gabriel Valentine: 3º Knowledge Test =================================
prt_church,95,127,3 script Crusader 745,{
mes "[Gabriel Valentine]";
if(Class != Job_Swordman) {
if (Class == Job_Crusader) {
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
mes "Welcome, fellow Crusader.";
mes "How is your training";
mes "coming along?";
@ -455,7 +455,7 @@ prt_church,95,127,3 script Crusader 745,{
mes "You must not forget to train everyday, and prepare for the day the Holy War will come upon us.";
close;
}
else if(Class == Job_Novice) {
else if(BaseJob == Job_Novice) {
mes "Welcome, I am a Crusader.";
mes "I am preparing for the";
mes "foretold Holy War";
@ -789,8 +789,8 @@ C_Questions:
prt_castle,35,151,5 script Patron Knight 751,{
mes "[Bliant Piyord]";
mes "Welcome.";
if(Class != Job_Swordman) {
if(Class == Job_Crusader) {
if(BaseJob != Job_Swordman) {
if(BaseJob == Job_Crusader) {
mes "How goes";
mes "your training?";
next;
@ -798,7 +798,7 @@ prt_castle,35,151,5 script Patron Knight 751,{
mes "Develop your faith. From faith springs strength and discipline. Day after day, train yourself and become a great Crusader.";
close;
}
else if(Class == Job_Novice) {
else if(BaseJob == Job_Novice) {
mes "We are Crusaders,";
mes "warriors of holiness preparing for the great Holy War that is to come.";
next;