summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-03 20:09:17 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-03 20:09:17 +0000
commit221132efd7248b031377f4735a1976bfd835a8d0 (patch)
treeb2769abd3a9d4871bc3b7511cc8b5fc5014721a4 /npc
parent7ded1afb331d57979fe8fa11bc446ed073198308 (diff)
downloadhercules-221132efd7248b031377f4735a1976bfd835a8d0.tar.gz
hercules-221132efd7248b031377f4735a1976bfd835a8d0.tar.bz2
hercules-221132efd7248b031377f4735a1976bfd835a8d0.tar.xz
hercules-221132efd7248b031377f4735a1976bfd835a8d0.zip
- Follow up r15363.
* Fixed missing countitem() check. * Added Credits to some Job change Files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15366 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/jobs/3-1/archbishop.txt1
-rw-r--r--npc/jobs/3-1/ranger.txt1
-rw-r--r--npc/jobs/3-1/warlock.txt18
3 files changed, 11 insertions, 9 deletions
diff --git a/npc/jobs/3-1/archbishop.txt b/npc/jobs/3-1/archbishop.txt
index f246e1561..ebeb7b7bc 100644
--- a/npc/jobs/3-1/archbishop.txt
+++ b/npc/jobs/3-1/archbishop.txt
@@ -2,6 +2,7 @@
//= Arch Bishop Job Quest
//===== By: ==================================================
//= L0ne_W0lf
+//= Credits: Gepard
//===== Current Version: =====================================
//= 1.1
//===== Compatible With: =====================================
diff --git a/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt
index 6cc102c6e..7887b014c 100644
--- a/npc/jobs/3-1/ranger.txt
+++ b/npc/jobs/3-1/ranger.txt
@@ -2,6 +2,7 @@
// Ranger Job change Quest
//===== By: ==================================================
//= Masao
+//= Credits: Muad_Dib
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt
index 47b8c01b2..7a0467500 100644
--- a/npc/jobs/3-1/warlock.txt
+++ b/npc/jobs/3-1/warlock.txt
@@ -2,7 +2,7 @@
// Warlock Job change Quest
//===== By: ==================================================
//= Masao
-//= Credits: Muad_Dib
+//= Credits: Muad_Dib, Gepard & L0ne_W0lf
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
@@ -829,13 +829,13 @@ spl_in02,84,103,3 script Assistant#Warlock2 445,{
mes "Would you like to try it again?";
mes "Let me give you more rubies.";
next;
- if (12384 > 0){
+ if (countitem(12384) > 0){
delitem 12384,countitem(12384);
- }else if (12385 > 0){
+ }else if (countitem(12385) > 0){
delitem 12385,countitem(12385);
- }else if (12386 > 0){
+ }else if (countitem(12386) > 0){
delitem 12386,countitem(12386);
- }else if (12387 > 0){
+ }else if (countitem(12387) > 0){
delitem 12387,countitem(12387);
}
getitem 12384,5;
@@ -850,13 +850,13 @@ spl_in02,84,103,3 script Assistant#Warlock2 445,{
mes "[Assistant]";
mes "You have successfully crystallized the Hollow Stone.";
mes "I'm sorry that I've doubted you.";
- if (12384 > 0){
+ if (countitem(12384) > 0){
delitem 12384,countitem(12384);
- }else if (12385 > 0){
+ }else if (countitem(12385) > 0){
delitem 12385,countitem(12385);
- }else if (12386 > 0){
+ }else if (countitem(12386) > 0){
delitem 12386,countitem(12386);
- }else if (12387 > 0){
+ }else if (countitem(12387) > 0){
delitem 12387,countitem(12387);
}
next;