diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-11-21 15:59:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-21 15:59:07 +0300 |
commit | e0bff9d14ccbdc5f0311539fd24a474e7e02741d (patch) | |
tree | 085bcf17d42535c93083dba8f5870c2223684fd6 /npc/re/jobs/novice | |
parent | 511219ae00986d41586f99421fef2126325f1e15 (diff) | |
parent | c12429cd00ce531b2ff685c201d74e2576c2a4aa (diff) | |
download | hercules-e0bff9d14ccbdc5f0311539fd24a474e7e02741d.tar.gz hercules-e0bff9d14ccbdc5f0311539fd24a474e7e02741d.tar.bz2 hercules-e0bff9d14ccbdc5f0311539fd24a474e7e02741d.tar.xz hercules-e0bff9d14ccbdc5f0311539fd24a474e7e02741d.zip |
Merge pull request #1514 from HerculesWS/itemdb-fixes
Itemdb AegisName fixes
Diffstat (limited to 'npc/re/jobs/novice')
-rw-r--r-- | npc/re/jobs/novice/academy.txt | 14 | ||||
-rw-r--r-- | npc/re/jobs/novice/novice.txt | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 6164a0994..bee91f382 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -123,8 +123,8 @@ int_land,58,69,5 script Sailor#int_land 4W_SAILOR,{ mes("I'll let you know when we set sail~!"); close(); } else { - if (countitem(Lumber) >= 2) { - delitem(Lumber, countitem(Lumber)); + if (countitem(Wood) >= 2) { + delitem(Wood, countitem(Wood)); completequest(21002); mes("[Sailor]"); mes("Unbelievable, perfect! Any chance you want to join my crew?"); @@ -2646,8 +2646,8 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{ getitem(Novice_Egg_Cap, 1); // Novice_Egg_Cap getitem(Novice_Knife, 1); // Novice_Knife getitem(Novice_Guard, 1); // Novice_Guard - getitem(Criatura_Academy_Hat, 1); // Criatura_Academy_Hat - getitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + getitem(Cryptura_Academy_Hat, 1); + getitem(Cryptura_Hair_Coupon, 1); getitem(Novice_Potion, 300); // Novice_Potion next(); mes("[Receptionist]"); @@ -5208,7 +5208,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ cutin("", 255); completequest(2295); setquest(2296); - getitem(Little_Unripe_Apple, 5); // Little_Unripe_Apple + getitem(Unripe_Apple2, 5); close(); } else if (questprogress(2296) == 1) { if (countitem(Novice_Poring_Egg) > 0) { @@ -6111,7 +6111,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } close(); case 2: - if (!countitem(Criatura_Hair_Coupon)) { + if (!countitem(Cryptura_Hair_Coupon)) { mes("[Otter Samssoon]"); mes("Come on.. Honey~"); mes("You should bring ^ff0000'Criatura Hair Coupon'^000000 for changing hair..."); @@ -6192,7 +6192,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("- Chikak, crack, crack.. -"); mes("- Snap, snap, snap.. Crack -"); next(); - delitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + delitem(Cryptura_Hair_Coupon, 1); cutin("", 255); mes("[Otter Samssoon]"); mes("Oh my! Oh my! Oh my!"); diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 811593c81..6ac0d9935 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -445,7 +445,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "You've come along fine this far."; mes "This is not much, but take this as a reward."; job_novice_q = 7; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; completequest 7120; close; } else if (job_novice_q == 7) { @@ -2609,7 +2609,7 @@ L_Supplies: nov_3_swordman = 40; getitem Cargo_Free_Ticket,20; getitem Warp_Free_Ticket,30; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; getitem N_Cutter,1; next; mes "[Hanson]"; |