Bug fixes and clean-up :

-- Miscs follow up af266777402e07428388e80db35544fbb9bcbe8e
-- Another clean-up in comodo_gambling.txt (thx @SkittleNugget)
-- Replaced occurrence of PcName and clean-up in tu_magician01.txt

Signed-off-by: Capuche <capucrath@gmail.com>
This commit is contained in:
Capuche 2014-07-13 21:48:09 +02:00
parent b5b25a82bb
commit ec485afe4c
4 changed files with 352 additions and 376 deletions

View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Reddozen, Cypress, Zefris //= Reddozen, Cypress, Zefris
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.4a //= 1.4c
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena Project //= rAthena Project
//===== Description: ========================================= //===== Description: =========================================
@ -25,6 +25,7 @@
//= 1.4 Updated Script to match AEGIS file. [Masao] //= 1.4 Updated Script to match AEGIS file. [Masao]
//= 1.4a Minor script updates. [Euphy] //= 1.4a Minor script updates. [Euphy]
//= 1.4b Minor fix about Weight and miscs updates. [Capuche] //= 1.4b Minor fix about Weight and miscs updates. [Capuche]
//= 1.4c Another clean-up. [Capuche]
//============================================================ //============================================================
comodo,219,158,6 script Kachua 4_F_02,{ comodo,219,158,6 script Kachua 4_F_02,{
@ -41,7 +42,6 @@ comodo,219,158,6 script Kachua 4_F_02,{
mes "showed me that diamond,"; mes "showed me that diamond,";
mes "it's been all I think about!"; mes "it's been all I think about!";
next; next;
if (select("Would you like to have mine?", "Ah, what a shame...") == 2) { if (select("Would you like to have mine?", "Ah, what a shame...") == 2) {
mes "[Kachua]"; mes "[Kachua]";
mes "Yes, I know..."; mes "Yes, I know...";
@ -52,7 +52,6 @@ comodo,219,158,6 script Kachua 4_F_02,{
cutin "katsua01.bmp",255; cutin "katsua01.bmp",255;
end; end;
} }
if (countitem(732) == 0) { if (countitem(732) == 0) {
cutin "katsua01.bmp",255; cutin "katsua01.bmp",255;
cutin "katsua03.bmp",2; cutin "katsua03.bmp",2;
@ -64,7 +63,6 @@ comodo,219,158,6 script Kachua 4_F_02,{
cutin "katsua03.bmp",255; cutin "katsua03.bmp",255;
end; end;
} }
mes "[Kachua]"; mes "[Kachua]";
mes "Are you sure you don't mind"; mes "Are you sure you don't mind";
mes "giving this to me? Thank you"; mes "giving this to me? Thank you";
@ -73,7 +71,6 @@ comodo,219,158,6 script Kachua 4_F_02,{
mes "you something from one of my"; mes "you something from one of my";
mes "collections~"; mes "collections~";
next; next;
if (MaxWeight - Weight < 5500) { if (MaxWeight - Weight < 5500) {
cutin "katsua01.bmp",255; cutin "katsua01.bmp",255;
cutin "katsua03.bmp",2; cutin "katsua03.bmp",2;
@ -86,24 +83,20 @@ comodo,219,158,6 script Kachua 4_F_02,{
cutin "katsua03.bmp",255; cutin "katsua03.bmp",255;
end; end;
} }
if (countitem(732) == 0) { // anti-hack if (countitem(732) == 0) { // anti-hack
logmes "Hack: Tried to bypass item check."; logmes "Hack: Tried to bypass item check.";
cutin "katsua01.bmp",255; cutin "katsua01.bmp",255;
close; close;
} }
delitem 732,1; delitem 732,1;
mes "[Kachua]"; mes "[Kachua]";
mes "So what would"; mes "So what would";
mes "you like to have?"; mes "you like to have?";
next; next;
switch (select("Weapon", "Armor", "Garment", "Helmet", "Shoes", "Shield")) { switch (select("Weapon", "Armor", "Garment", "Helmet", "Shoes", "Shield")) {
case 1: // Weapons case 1: // Weapons
.@gamble1 = rand(1,1000); .@gamble1 = rand(1,1000);
if ((.@gamble1 > 920) && (.@gamble1 < 931)) { if (.@gamble1 > 920 && .@gamble1 < 931) {
.@gamble2 = rand(1,85); .@gamble2 = rand(1,85);
if (.@gamble2 == 1) .@item = 1128; // Haedonggum[2] if (.@gamble2 == 1) .@item = 1128; // Haedonggum[2]
else if (.@gamble2 == 2) .@item = 1120; // Tsurugi[2] else if (.@gamble2 == 2) .@item = 1120; // Tsurugi[2]
@ -158,101 +151,101 @@ comodo,219,158,6 script Kachua 4_F_02,{
else if (.@gamble2 == 51) .@item = 1550; // Book[3] else if (.@gamble2 == 51) .@item = 1550; // Book[3]
else if (.@gamble2 == 52) .@item = 1246; // Cinquedea[2] else if (.@gamble2 == 52) .@item = 1246; // Cinquedea[2]
else if (.@gamble2 == 53) .@item = 1147; // Town Sword else if (.@gamble2 == 53) .@item = 1147; // Town Sword
else if (.@gamble2 > 53 && .@gamble2 < 56) .@item = 1264; // Specialty Jur[4] else if (.@gamble2 < 56) .@item = 1264; // Specialty Jur[4]
else if (.@gamble2 > 55 && .@gamble2 < 58) .@item = 1262; // Loki's Nail else if (.@gamble2 < 58) .@item = 1262; // Loki's Nail
else if (.@gamble2 > 57 && .@gamble2 < 60) .@item = 1622; // Hypnotist's Staff[2] else if (.@gamble2 < 60) .@item = 1622; // Hypnotist's Staff[2]
else if (.@gamble2 == 60) .@item = 1723;// Luna Bow[2] else if (.@gamble2 == 60) .@item = 1723;// Luna Bow[2]
else if (.@gamble2 > 60 && .@gamble2 < 63) .@item = 1965; // Red Flame Whip else if (.@gamble2 < 63) .@item = 1965; // Red Flame Whip
else if (.@gamble2 > 62 && .@gamble2 < 65) .@item = 1966; // Icicle Whip else if (.@gamble2 < 65) .@item = 1966; // Icicle Whip
else if (.@gamble2 > 64 && .@gamble2 < 67) .@item = 1967; // Gaia Whip else if (.@gamble2 < 67) .@item = 1967; // Gaia Whip
else if (.@gamble2 > 66 && .@gamble2 < 69) .@item = 1968; // Skipping Rope else if (.@gamble2 < 69) .@item = 1968; // Skipping Rope
else if (.@gamble2 > 68 && .@gamble2 < 71) .@item = 1914; // Burning Passion Guitar else if (.@gamble2 < 71) .@item = 1914; // Burning Passion Guitar
else if (.@gamble2 > 70 && .@gamble2 < 73) .@item = 1915; // Loner's Guitar else if (.@gamble2 < 73) .@item = 1915; // Loner's Guitar
else if (.@gamble2 > 72 && .@gamble2 < 75) .@item = 1916; // Green Acre Guitar else if (.@gamble2 < 75) .@item = 1916; // Green Acre Guitar
else if (.@gamble2 > 74 && .@gamble2 < 77) .@item = 1917; // Gentle Breeze Guitar else if (.@gamble2 < 77) .@item = 1917; // Gentle Breeze Guitar
else if (.@gamble2 > 76 && .@gamble2 < 79) .@item = 13004; // Cowardice Blade[2] else if (.@gamble2 < 79) .@item = 13004; // Cowardice Blade[2]
else if (.@gamble2 > 78 && .@gamble2 < 81) .@item = 1307; // Windhawk else if (.@gamble2 < 81) .@item = 1307; // Windhawk
else if (.@gamble2 == 81) .@item = 1560; // Sage's Diary[2] else if (.@gamble2 == 81) .@item = 1560; // Sage's Diary[2]
else if (.@gamble2 == 82) .@item = 1618; // Survivor's Rod[1] else if (.@gamble2 == 82) .@item = 1618; // Survivor's Rod[1]
else if (.@gamble2 == 83) .@item = 1620; // Survivor's Rod[1] else if (.@gamble2 == 83) .@item = 1620; // Survivor's Rod[1]
else if (.@gamble2 > 83 && .@gamble2 < 86) .@item = 1971; // Electric Wire else if (.@gamble2 < 86) .@item = 1971; // Electric Wire
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 201)) .@item = 1201; // Knife[3] else if (.@gamble1 < 201) .@item = 1201; // Knife[3]
else if ((.@gamble1 > 200) && (.@gamble1 < 301)) .@item = 1101; // Sword[3] else if (.@gamble1 < 301) .@item = 1101; // Sword[3]
else if ((.@gamble1 > 300) && (.@gamble1 < 401)) .@item = 1601; // Rod[3] else if (.@gamble1 < 401) .@item = 1601; // Rod[3]
else if ((.@gamble1 > 400) && (.@gamble1 < 501)) .@item = 1116; // Katana[3] else if (.@gamble1 < 501) .@item = 1116; // Katana[3]
else if ((.@gamble1 > 500) && (.@gamble1 < 601)) .@item = 1250; // Jur[2] else if (.@gamble1 < 601) .@item = 1250; // Jur[2]
else if ((.@gamble1 > 600) && (.@gamble1 < 701)) .@item = 1301; // Axe[3] else if (.@gamble1 < 701) .@item = 1301; // Axe[3]
else if ((.@gamble1 > 700) && (.@gamble1 < 801)) .@item = 1701; // Bow[3] else if (.@gamble1 < 801) .@item = 1701; // Bow[3]
else if ((.@gamble1 > 800) && (.@gamble1 < 851)) .@item = 1504; // Mace[3] else if (.@gamble1 < 851) .@item = 1504; // Mace[3]
else if ((.@gamble1 > 850) && (.@gamble1 < 901)) .@item = 1604; // Wand[2] else if (.@gamble1 < 901) .@item = 1604; // Wand[2]
else if ((.@gamble1 > 900) && (.@gamble1 < 911)) .@item = 1108; // Blade[4] else if (.@gamble1 < 911) .@item = 1108; // Blade[4]
else if ((.@gamble1 > 910) && (.@gamble1 < 921)) .@item = 1163; // Claymore else if (.@gamble1 < 921) .@item = 1163; // Claymore
else if ((.@gamble1 > 930) && (.@gamble1 < 961)) .@item = 1522; // Stunner else if (.@gamble1 < 961) .@item = 1522; // Stunner
else if ((.@gamble1 > 960) && (.@gamble1 < 971)) .@item = 1608; // Staff[3] else if (.@gamble1 < 971) .@item = 1608; // Staff[3]
else if ((.@gamble1 > 970) && (.@gamble1 < 981)) .@item = 1408; // Pike[4] else if (.@gamble1 < 981) .@item = 1408; // Pike[4]
else if ((.@gamble1 > 980) && (.@gamble1 < 991)) .@item = 1452; // Guisarme[3] else if (.@gamble1 < 991) .@item = 1452; // Guisarme[3]
else if ((.@gamble1 > 990) && (.@gamble1 < 1001)) .@item = 1208; // Main Gauche[4] else if (.@gamble1 < 1001) .@item = 1208; // Main Gauche[4]
break; break;
case 2: // Armors case 2: // Armors
.@gamble1 = rand(1,500); .@gamble1 = rand(1,500);
if ((.@gamble1 > 299) && (.@gamble1 < 303)) { if (.@gamble1 > 299 && .@gamble1 < 303) {
.@gamble2 = rand(1,30); .@gamble2 = rand(1,30);
if ((.@gamble2 > 0) && (.@gamble2 < 3)) .@item = 2315; // Chain Mail[1] if (.@gamble2 < 3) .@item = 2315; // Chain Mail[1]
else if ((.@gamble2 > 2) && (.@gamble2 < 5)) .@item = 2336; // Thief Clothes[1] else if (.@gamble2 < 5) .@item = 2336; // Thief Clothes[1]
else if ((.@gamble2 > 4) && (.@gamble2 < 7)) .@item = 2318; // Lord's Clothes[1] else if (.@gamble2 < 7) .@item = 2318; // Lord's Clothes[1]
else if ((.@gamble2 > 6) && (.@gamble2 < 9)) .@item = 2326; // Saint's Robe[1] else if (.@gamble2 < 9) .@item = 2326; // Saint's Robe[1]
else if ((.@gamble2 > 8) && (.@gamble2 < 11)) .@item = 2327; // Holy Robe else if (.@gamble2 < 11) .@item = 2327; // Holy Robe
else if ((.@gamble2 > 10) && (.@gamble2 < 13)) .@item = 2342; // Legion Plate Armor[1] else if (.@gamble2 < 13) .@item = 2342; // Legion Plate Armor[1]
else if ((.@gamble2 > 12) && (.@gamble2 < 15)) .@item = 2331; // Tights[1] else if (.@gamble2 < 15) .@item = 2331; // Tights[1]
else if ((.@gamble2 > 14) && (.@gamble2 < 17)) .@item = 2342; // Legion Plate Armor[1] else if (.@gamble2 < 17) .@item = 2342; // Legion Plate Armor[1]
else if ((.@gamble2 > 16) && (.@gamble2 < 19)) .@item = 2311; // Mink Coat[1] else if (.@gamble2 < 19) .@item = 2311; // Mink Coat[1]
else if ((.@gamble2 > 18) && (.@gamble2 < 21)) .@item = 2320; // Formal Suit[1] else if (.@gamble2 < 21) .@item = 2320; // Formal Suit[1]
else if ((.@gamble2 > 20) && (.@gamble2 < 23)) .@item = 2319; // Glittering Jacket[1] else if (.@gamble2 < 23) .@item = 2319; // Glittering Jacket[1]
else if ((.@gamble2 > 22) && (.@gamble2 < 25)) .@item = 2344; // Lucius's Fierce Armor of Volcano else if (.@gamble2 < 25) .@item = 2344; // Lucius's Fierce Armor of Volcano
else if ((.@gamble2 > 24) && (.@gamble2 < 27)) .@item = 2346; // Saphien's Armor of Ocean else if (.@gamble2 < 27) .@item = 2346; // Saphien's Armor of Ocean
else if ((.@gamble2 > 26) && (.@gamble2 < 29)) .@item = 2348; // Aebeccee's Raging Typhoon Armor else if (.@gamble2 < 29) .@item = 2348; // Aebeccee's Raging Typhoon Armor
else if ((.@gamble2 > 28) && (.@gamble2 < 31)) .@item = 2350; // Claytos Cracking Earth Armor else if (.@gamble2 < 31) .@item = 2350; // Claytos Cracking Earth Armor
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 51)) .@item = 2301; // Cotton Shirt else if (.@gamble1 < 51) .@item = 2301; // Cotton Shirt
else if ((.@gamble1 > 50) && (.@gamble1 < 101)) .@item = 2302; // Cotton Shirt[1] else if (.@gamble1 < 101) .@item = 2302; // Cotton Shirt[1]
else if ((.@gamble1 > 100) && (.@gamble1 < 151)) .@item = 2303; // Jacket else if (.@gamble1 < 151) .@item = 2303; // Jacket
else if ((.@gamble1 > 150) && (.@gamble1 < 201)) .@item = 2304; // Jacket[1] else if (.@gamble1 < 201) .@item = 2304; // Jacket[1]
else if ((.@gamble1 > 200) && (.@gamble1 < 251)) .@item = 2305; // Adventurer's Suit else if (.@gamble1 < 251) .@item = 2305; // Adventurer's Suit
else if ((.@gamble1 > 250) && (.@gamble1 < 300)) .@item = 2301; // Cotton Shirt else if (.@gamble1 < 300) .@item = 2301; // Cotton Shirt
else if ((.@gamble1 > 301) && (.@gamble1 < 351)) .@item = 2307; // Mantle else if (.@gamble1 < 351) .@item = 2307; // Mantle
else if ((.@gamble1 > 350) && (.@gamble1 < 401)) .@item = 2309; // Coat else if (.@gamble1 < 401) .@item = 2309; // Coat
else if ((.@gamble1 > 400) && (.@gamble1 < 402)) .@item = 2322; // Silk Robe[1] else if (.@gamble1 < 402) .@item = 2322; // Silk Robe[1]
else if ((.@gamble1 > 401) && (.@gamble1 < 403)) .@item = 2310; // Coat[1] else if (.@gamble1 < 403) .@item = 2310; // Coat[1]
else if ((.@gamble1 > 402) && (.@gamble1 < 411)) .@item = 2306; // Adventurer's Suit[1] else if (.@gamble1 < 411) .@item = 2306; // Adventurer's Suit[1]
else if ((.@gamble1 > 410) && (.@gamble1 < 416)) .@item = 2308; // Mantle[1] else if (.@gamble1 < 416) .@item = 2308; // Mantle[1]
else if ((.@gamble1 > 415) && (.@gamble1 < 421)) .@item = 2313; // Padded Armor[1] else if (.@gamble1 < 421) .@item = 2313; // Padded Armor[1]
else if ((.@gamble1 > 420) && (.@gamble1 < 426)) .@item = 2337; // Ninja Suit else if (.@gamble1 < 426) .@item = 2337; // Ninja Suit
else if ((.@gamble1 > 425) && (.@gamble1 < 431)) .@item = 2341; // Legion Plate Armor else if (.@gamble1 < 431) .@item = 2341; // Legion Plate Armor
else if ((.@gamble1 > 430) && (.@gamble1 < 436)) .@item = 2325; // Saint's Robe else if (.@gamble1 < 436) .@item = 2325; // Saint's Robe
else if ((.@gamble1 > 435) && (.@gamble1 < 441)) .@item = 2317; // Full Plate else if (.@gamble1 < 441) .@item = 2317; // Full Plate
else if ((.@gamble1 > 440) && (.@gamble1 < 446)) .@item = 2330; // Tights else if (.@gamble1 < 446) .@item = 2330; // Tights
else if ((.@gamble1 > 445) && (.@gamble1 < 451)) .@item = 2314; // Chain Mail else if (.@gamble1 < 451) .@item = 2314; // Chain Mail
else if ((.@gamble1 > 450) && (.@gamble1 < 456)) .@item = 2335; // Thief Clothes else if (.@gamble1 < 456) .@item = 2335; // Thief Clothes
else if ((.@gamble1 > 455) && (.@gamble1 < 461)) .@item = 2324; // Scapulare[1] else if (.@gamble1 < 461) .@item = 2324; // Scapulare[1]
else if ((.@gamble1 > 460) && (.@gamble1 < 466)) .@item = 2329; // Wooden Mail[1] else if (.@gamble1 < 466) .@item = 2329; // Wooden Mail[1]
else if ((.@gamble1 > 465) && (.@gamble1 < 471)) .@item = 2340; // Novice Breastplate[1] else if (.@gamble1 < 471) .@item = 2340; // Novice Breastplate[1]
else if ((.@gamble1 > 470) && (.@gamble1 < 476)) .@item = 2312; // Padded Armor else if (.@gamble1 < 476) .@item = 2312; // Padded Armor
else if ((.@gamble1 > 475) && (.@gamble1 < 481)) .@item = 2339; // Pantie else if (.@gamble1 < 481) .@item = 2339; // Pantie
else if ((.@gamble1 > 480) && (.@gamble1 < 486)) .@item = 2328; // Wooden Mail else if (.@gamble1 < 486) .@item = 2328; // Wooden Mail
else if ((.@gamble1 > 485) && (.@gamble1 < 491)) .@item = 2321; // Silk Robe else if (.@gamble1 < 491) .@item = 2321; // Silk Robe
else if ((.@gamble1 > 490) && (.@gamble1 < 501)) .@item = 2323; // Scapulare else if (.@gamble1 < 501) .@item = 2323; // Scapulare
break; break;
case 3: // Garments case 3: // Garments
.@gamble1 = rand(1,500); .@gamble1 = rand(1,500);
if ((.@gamble1 > 200) && (.@gamble1 < 204)) { if (.@gamble1 > 200 && .@gamble1 < 204) {
.@gamble2 = rand(1,16); .@gamble2 = rand(1,16);
if ((.@gamble2 > 0) && (.@gamble2 < 3)) .@item = 2506; // Manteau[1] if (.@gamble2 < 3) .@item = 2506; // Manteau[1]
else if ((.@gamble2 > 2) && (.@gamble2 < 5)) .@item = 2504; // Muffler[1] else if (.@gamble2 < 5) .@item = 2504; // Muffler[1]
else if ((.@gamble2 > 4) && (.@gamble2 < 8)) .@item = 2508; // Ragamuffin Manteau else if (.@gamble2 < 8) .@item = 2508; // Ragamuffin Manteau
else if ((.@gamble2 > 7) && (.@gamble2 < 11)) .@item = 2507; // Ancient Cape else if (.@gamble2 < 11) .@item = 2507; // Ancient Cape
else if (.@gamble2 == 11) .@item = 2513; // Heavenly Maiden Robe[1] else if (.@gamble2 == 11) .@item = 2513; // Heavenly Maiden Robe[1]
else if (.@gamble2 == 12) .@item = 2514; // Pauldron[1] else if (.@gamble2 == 12) .@item = 2514; // Pauldron[1]
else if (.@gamble2 == 13) .@item = 2523; // Undershirt[1] else if (.@gamble2 == 13) .@item = 2523; // Undershirt[1]
@ -260,48 +253,48 @@ comodo,219,158,6 script Kachua 4_F_02,{
else if (.@gamble2 == 15) .@item = 2509; // Survivor's Manteau else if (.@gamble2 == 15) .@item = 2509; // Survivor's Manteau
else if (.@gamble2 == 16) .@item = 2515; // Eagle Wing[1] else if (.@gamble2 == 16) .@item = 2515; // Eagle Wing[1]
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 101)) .@item = 2503; // Muffler else if (.@gamble1 < 101) .@item = 2503; // Muffler
else if ((.@gamble1 > 100) && (.@gamble1 < 201)) .@item = 2505; // Manteau else if (.@gamble1 < 201) .@item = 2505; // Manteau
else if ((.@gamble1 > 203) && (.@gamble1 < 451)) .@item = 2501; // Hood else if (.@gamble1 < 451) .@item = 2501; // Hood
else if ((.@gamble1 > 450) && (.@gamble1 < 501)) .@item = 2502; // Hood[1] else if (.@gamble1 < 501) .@item = 2502; // Hood[1]
break; break;
case 4: // Headgears case 4: // Headgears
.@gamble1 = rand(1,1000); .@gamble1 = rand(1,1000);
if ((.@gamble1 > 299) && (.@gamble1 < 304)) { if (.@gamble1 > 299 && .@gamble1 < 304) {
.@gamble2 = rand(1,93); .@gamble2 = rand(1,93);
if ((.@gamble2 > 0) && (.@gamble2 < 3)) .@item = 2251; // Monk Hat if (.@gamble2 < 3) .@item = 2251; // Monk Hat
else if ((.@gamble2 > 2) && (.@gamble2 < 5)) .@item = 2285; // Apple of Archer else if (.@gamble2 < 5) .@item = 2285; // Apple of Archer
else if ((.@gamble2 > 4) && (.@gamble2 < 7)) .@item = 2255; // Evil Wing else if (.@gamble2 < 7) .@item = 2255; // Evil Wing
else if ((.@gamble2 > 6) && (.@gamble2 < 9)) .@item = 5045; // Magician Hat else if (.@gamble2 < 9) .@item = 5045; // Magician Hat
else if ((.@gamble2 > 8) && (.@gamble2 < 11)) .@item = 2233; // Circlet[1] else if (.@gamble2 < 11) .@item = 2233; // Circlet[1]
else if ((.@gamble2 > 10) && (.@gamble2 < 13)) .@item = 2231; // Gemmed Sallet[1] else if (.@gamble2 < 13) .@item = 2231; // Gemmed Sallet[1]
else if ((.@gamble2 > 12) && (.@gamble2 < 15)) .@item = 2217; // Biretta[1] else if (.@gamble2 < 15) .@item = 2217; // Biretta[1]
else if ((.@gamble2 > 14) && (.@gamble2 < 17)) .@item = 2206; // Wedding Veil else if (.@gamble2 < 17) .@item = 2206; // Wedding Veil
else if ((.@gamble2 > 16) && (.@gamble2 < 19)) .@item = 2246; // Golden Gear else if (.@gamble2 < 19) .@item = 2246; // Golden Gear
else if ((.@gamble2 > 18) && (.@gamble2 < 21)) .@item = 2261; // Army Cap else if (.@gamble2 < 21) .@item = 2261; // Army Cap
else if ((.@gamble2 > 20) && (.@gamble2 < 23)) .@item = 2287; // Pirate Bandana else if (.@gamble2 < 23) .@item = 2287; // Pirate Bandana
else if ((.@gamble2 > 22) && (.@gamble2 < 25)) .@item = 5012; // Ph.D Hat else if (.@gamble2 < 25) .@item = 5012; // Ph.D Hat
else if ((.@gamble2 > 24) && (.@gamble2 < 27)) .@item = 2244; // Big Ribbon else if (.@gamble2 < 27) .@item = 2244; // Big Ribbon
else if ((.@gamble2 > 26) && (.@gamble2 < 29)) .@item = 2213; // Kitty Band else if (.@gamble2 < 29) .@item = 2213; // Kitty Band
else if ((.@gamble2 > 28) && (.@gamble2 < 31)) .@item = 2248; // Western Grace else if (.@gamble2 < 31) .@item = 2248; // Western Grace
else if ((.@gamble2 > 30) && (.@gamble2 < 33)) .@item = 2223; // Turban[1] else if (.@gamble2 < 33) .@item = 2223; // Turban[1]
else if ((.@gamble2 > 32) && (.@gamble2 < 35)) .@item = 2247; // Romantic Gent else if (.@gamble2 < 35) .@item = 2247; // Romantic Gent
else if ((.@gamble2 > 34) && (.@gamble2 < 37)) .@item = 2245; // Sweet Gent else if (.@gamble2 < 37) .@item = 2245; // Sweet Gent
else if ((.@gamble2 > 36) && (.@gamble2 < 39)) .@item = 5003; // Joker Jester else if (.@gamble2 < 39) .@item = 5003; // Joker Jester
else if ((.@gamble2 > 38) && (.@gamble2 < 41)) .@item = 2225; // Goggles[1] else if (.@gamble2 < 41) .@item = 2225; // Goggles[1]
else if ((.@gamble2 > 40) && (.@gamble2 < 43)) .@item = 5017; // Bone Helm else if (.@gamble2 < 43) .@item = 5017; // Bone Helm
else if ((.@gamble2 > 42) && (.@gamble2 < 45)) .@item = 5030; // Panda Hat else if (.@gamble2 < 45) .@item = 5030; // Panda Hat
else if ((.@gamble2 > 44) && (.@gamble2 < 47)) .@item = 5035; // Poring Hat else if (.@gamble2 < 47) .@item = 5035; // Poring Hat
else if ((.@gamble2 > 46) && (.@gamble2 < 49)) .@item = 2250; // Cute Ribbon else if (.@gamble2 < 49) .@item = 2250; // Cute Ribbon
else if ((.@gamble2 > 48) && (.@gamble2 < 51)) .@item = 2277; // Nurse Cap else if (.@gamble2 < 51) .@item = 2277; // Nurse Cap
else if ((.@gamble2 > 50) && (.@gamble2 < 53)) .@item = 5011; // Aerial else if (.@gamble2 < 53) .@item = 5011; // Aerial
else if ((.@gamble2 > 52) && (.@gamble2 < 55)) .@item = 2290; // Funeral Hat else if (.@gamble2 < 55) .@item = 2290; // Funeral Hat
else if ((.@gamble2 > 54) && (.@gamble2 < 57)) .@item = 5010; // Indian Fillet else if (.@gamble2 < 57) .@item = 5010; // Indian Fillet
else if ((.@gamble2 > 56) && (.@gamble2 < 60)) .@item = 2259; // Mini Propeller else if (.@gamble2 < 60) .@item = 2259; // Mini Propeller
else if ((.@gamble2 > 59) && (.@gamble2 < 62)) .@item = 5008; // Puppy Love else if (.@gamble2 < 62) .@item = 5008; // Puppy Love
else if ((.@gamble2 > 61) && (.@gamble2 < 63)) .@item = 2249; // Coronet else if (.@gamble2 < 63) .@item = 2249; // Coronet
else if ((.@gamble2 > 62) && (.@gamble2 < 65)) .@item = 2229; // Helm[1] else if (.@gamble2 < 65) .@item = 2229; // Helm[1]
else if (.@gamble2 == 65) .@item = 2258; // Spiky Band else if (.@gamble2 == 65) .@item = 2258; // Spiky Band
else if (.@gamble2 == 66) .@item = 2274; // Ghost Bandana else if (.@gamble2 == 66) .@item = 2274; // Ghost Bandana
else if (.@gamble2 == 67) .@item = 5019; // Corsair else if (.@gamble2 == 67) .@item = 5019; // Corsair
@ -314,67 +307,67 @@ comodo,219,158,6 script Kachua 4_F_02,{
else if (.@gamble2 == 74) .@item = 5093; // Coif[1] else if (.@gamble2 == 74) .@item = 5093; // Coif[1]
else if (.@gamble2 == 75) .@item = 5072; // Incubus Horn else if (.@gamble2 == 75) .@item = 5072; // Incubus Horn
else if (.@gamble2 == 76) .@item = 5002; // Jewel Crown else if (.@gamble2 == 76) .@item = 5002; // Jewel Crown
else if (.@gamble2 > 76 && .@gamble2 < 80) .@item = 5118; // Puppy Headband else if (.@gamble2 < 80) .@item = 5118; // Puppy Headband
else if (.@gamble2 > 79 && .@gamble2 < 83) .@item = 5120; // Bucket Hat[1] else if (.@gamble2 < 83) .@item = 5120; // Bucket Hat[1]
else if (.@gamble2 > 82 && .@gamble2 < 86) .@item = 5111; // Galapago Cap else if (.@gamble2 < 86) .@item = 5111; // Galapago Cap
else if (.@gamble2 > 85 && .@gamble2 < 89) .@item = 5116; // Banana Hat else if (.@gamble2 < 89) .@item = 5116; // Banana Hat
else if (.@gamble2 > 88 && .@gamble2 < 92) .@item = 5119; // Super Novice Hat[1] else if (.@gamble2 < 92) .@item = 5119; // Super Novice Hat[1]
else if (.@gamble2 > 91 && .@gamble2 < 94) .@item = 5141; // Marionetta Doll[1] else if (.@gamble2 < 94) .@item = 5141; // Marionetta Doll[1]
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 101)) .@item = 2226; // Cap else if (.@gamble1 < 101) .@item = 2226; // Cap
else if ((.@gamble1 > 100) && (.@gamble1 < 201)) .@item = 2211; // Bandana else if (.@gamble1 < 201) .@item = 2211; // Bandana
else if ((.@gamble1 > 200) && (.@gamble1 < 300)) .@item = 2209; // Ribbon[1] else if (.@gamble1 < 300) .@item = 2209; // Ribbon[1]
else if ((.@gamble1 > 303) && (.@gamble1 < 401)) .@item = 2220; // Hat else if (.@gamble1 < 401) .@item = 2220; // Hat
else if ((.@gamble1 > 400) && (.@gamble1 < 501)) .@item = 2232; // Circlet else if (.@gamble1 < 501) .@item = 2232; // Circlet
else if ((.@gamble1 > 500) && (.@gamble1 < 601)) .@item = 2216; // Biretta else if (.@gamble1 < 601) .@item = 2216; // Biretta
else if ((.@gamble1 > 600) && (.@gamble1 < 701)) .@item = 2230; // Gemmed Sallet else if (.@gamble1 < 701) .@item = 2230; // Gemmed Sallet
else if ((.@gamble1 > 700) && (.@gamble1 < 801)) .@item = 2224; // Goggles else if (.@gamble1 < 801) .@item = 2224; // Goggles
else if ((.@gamble1 > 800) && (.@gamble1 < 901)) .@item = 2222; // Turban else if (.@gamble1 < 901) .@item = 2222; // Turban
else if ((.@gamble1 > 900) && (.@gamble1 < 906)) .@item = 2228; // Helm else if (.@gamble1 < 906) .@item = 2228; // Helm
else if ((.@gamble1 > 905) && (.@gamble1 < 911)) .@item = 2252; // Wizard Hat else if (.@gamble1 < 911) .@item = 2252; // Wizard Hat
else if ((.@gamble1 > 910) && (.@gamble1 < 916)) .@item = 2227; // Cap[1] else if (.@gamble1 < 916) .@item = 2227; // Cap[1]
else if ((.@gamble1 > 915) && (.@gamble1 < 921)) .@item = 2221; // Hat[1] else if (.@gamble1 < 921) .@item = 2221; // Hat[1]
else if ((.@gamble1 > 920) && (.@gamble1 < 926)) .@item = 2299; // Orc Helm else if (.@gamble1 < 926) .@item = 2299; // Orc Helm
else if ((.@gamble1 > 925) && (.@gamble1 < 931)) .@item = 2236; // Santa Hat else if (.@gamble1 < 931) .@item = 2236; // Santa Hat
else if ((.@gamble1 > 930) && (.@gamble1 < 936)) .@item = 2275; // Red Bandana else if (.@gamble1 < 936) .@item = 2275; // Red Bandana
else if ((.@gamble1 > 935) && (.@gamble1 < 941)) .@item = 5015; // Egg Shell else if (.@gamble1 < 941) .@item = 5015; // Egg Shell
else if ((.@gamble1 > 940) && (.@gamble1 < 946)) .@item = 2215; // Flower Band else if (.@gamble1 < 946) .@item = 2215; // Flower Band
else if ((.@gamble1 > 945) && (.@gamble1 < 951)) .@item = 5092; // Coif else if (.@gamble1 < 951) .@item = 5092; // Coif
else if ((.@gamble1 > 950) && (.@gamble1 < 1001)) .@item = 2226; // Cap else if (.@gamble1 < 1001) .@item = 2226; // Cap
break; break;
case 5: // Footgear case 5: // Footgear
.@gamble1 = rand(1,500); .@gamble1 = rand(1,500);
if ((.@gamble1 > 299) && (.@gamble1 < 303)) { if (.@gamble1 > 299 && .@gamble1 < 303) {
.@gamble2 = rand(1,10); .@gamble2 = rand(1,10);
if ((.@gamble2 > 0) && (.@gamble2 < 3)) .@item = 2406; // Boots[1] if (.@gamble2 < 3) .@item = 2406; // Boots[1]
else if ((.@gamble2 > 2) && (.@gamble2 < 5)) .@item = 2412; // Greaves[1] else if (.@gamble2 < 5) .@item = 2412; // Greaves[1]
else if ((.@gamble2 > 4) && (.@gamble2 < 8)) .@item = 2404; // Shoes[1] else if (.@gamble2 < 8) .@item = 2404; // Shoes[1]
else if ((.@gamble2 > 7) && (.@gamble2 < 11)) .@item = 2407; // Crystal Pumps else if (.@gamble2 < 11) .@item = 2407; // Crystal Pumps
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 201)) .@item = 2401; // Sandals else if (.@gamble1 < 201) .@item = 2401; // Sandals
else if ((.@gamble1 > 200) && (.@gamble1 < 300)) .@item = 2408; // Shackles else if (.@gamble1 < 300) .@item = 2408; // Shackles
else if ((.@gamble1 > 302) && (.@gamble1 < 351)) .@item = 2411; // Greaves else if (.@gamble1 < 351) .@item = 2411; // Greaves
else if ((.@gamble1 > 350) && (.@gamble1 < 401)) .@item = 2403; // Shoes else if (.@gamble1 < 401) .@item = 2403; // Shoes
else if ((.@gamble1 > 400) && (.@gamble1 < 451)) .@item = 2405; // Boots else if (.@gamble1 < 451) .@item = 2405; // Boots
else if ((.@gamble1 > 450) && (.@gamble1 < 476)) .@item = 2409; // High Heels else if (.@gamble1 < 476) .@item = 2409; // High Heels
else if ((.@gamble1 > 475) && (.@gamble1 < 501)) .@item = 2402; // Sandals[1] else if (.@gamble1 < 501) .@item = 2402; // Sandals[1]
break; break;
case 6: // Shields case 6: // Shields
.@gamble1 = rand(1,500); .@gamble1 = rand(1,500);
if ((.@gamble1 > 200) && (.@gamble1 < 205)) { if (.@gamble1 > 200 && .@gamble1 < 205) {
.@gamble2 = rand(1,10); .@gamble2 = rand(1,10);
if ((.@gamble2 > 0) && (.@gamble2 < 3)) .@item = 2104; // Buckler[1] if (.@gamble2 < 3) .@item = 2104; // Buckler[1]
else if ((.@gamble2 > 2) && (.@gamble2 < 5)) .@item = 2106; // Shield[1] else if (.@gamble2 < 5) .@item = 2106; // Shield[1]
else if ((.@gamble2 > 4) && (.@gamble2 < 7)) .@item = 2102; // Guard[1] else if (.@gamble2 < 7) .@item = 2102; // Guard[1]
else if ((.@gamble2 > 6) && (.@gamble2 < 9)) .@item = 2111; // Sacred Mission else if (.@gamble2 < 9) .@item = 2111; // Sacred Mission
else if ((.@gamble2 > 8) && (.@gamble2 < 11)) .@item = 2109; // Memory Book else if (.@gamble2 < 11) .@item = 2109; // Memory Book
} }
else if ((.@gamble1 > 0) && (.@gamble1 < 201)) .@item = 2101; // Guard else if (.@gamble1 < 201) .@item = 2101; // Guard
else if ((.@gamble1 > 204) && (.@gamble1 < 301)) .@item = 2103; // Buckler else if (.@gamble1 < 301) .@item = 2103; // Buckler
else if ((.@gamble1 > 300) && (.@gamble1 < 401)) .@item = 2107; // Mirror Shield else if (.@gamble1 < 401) .@item = 2107; // Mirror Shield
else if ((.@gamble1 > 401) && (.@gamble1 < 481)) .@item = 2105; // Shield else if (.@gamble1 < 481) .@item = 2105; // Shield
else if ((.@gamble1 > 480) && (.@gamble1 < 501)) .@item = 2108; // Mirror Shield[1] else if (.@gamble1 < 501) .@item = 2108; // Mirror Shield[1]
break; break;
default: // Cancel button / hack default: // Cancel button / hack
cutin "katsua01.bmp",255; cutin "katsua01.bmp",255;

View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Fix up by Jukka //= Fix up by Jukka
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.4 //= 1.5
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena Project //= rAthena Project
//===== Description: ========================================= //===== Description: =========================================
@ -15,21 +15,21 @@
//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth] //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.3 Misc. updates. [L0ne_W0lf] //= 1.3 Misc. updates. [L0ne_W0lf]
//= 1.4 Updated to match the official script. [Euphy] //= 1.4 Updated to match the official script. [Euphy]
//= 1.5 Replaced occurrence of PcName and clean-up. [Capuche]
//============================================================ //============================================================
// Sign // Sign
//============================================================ //============================================================
geffen,61,174,4 script Sign#M 111,{ geffen,61,174,4 script Sign#M HIDDEN_NPC,{
mes "- Mage Job Change -"; mes "- Mage Job Change -";
close; close;
} }
// New Mage Manager // New Mage Manager
//============================================================ //============================================================
geffen,67,180,4 script New Mage Manager#M 102,{ geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "[Mana]"; mes "[Mana]";
if(Class == Job_Novice){ if(Class == Job_Novice){
mes "[Mana]";
mes "You're not ready for"; mes "You're not ready for";
mes "any of the training I have"; mes "any of the training I have";
mes "to offer. You'll have to train"; mes "to offer. You'll have to train";
@ -47,7 +47,6 @@ geffen,67,180,4 script New Mage Manager#M 102,{
close; close;
} }
if(eaclass()&(EAJL_UPPER|EAJL_2|EAJL_THIRD) && tu_magician01 < 7){ if(eaclass()&(EAJL_UPPER|EAJL_2|EAJL_THIRD) && tu_magician01 < 7){
mes "[Mana]";
mes "Although I offer magic"; mes "Although I offer magic";
mes "training, it's not very helpful"; mes "training, it's not very helpful";
mes "if you're already experienced"; mes "if you're already experienced";
@ -133,7 +132,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "sitting! I'm bushed, so it's"; mes "sitting! I'm bushed, so it's";
mes "time for a break. But we'll"; mes "time for a break. But we'll";
mes "continue this later, okay?"; mes "continue this later, okay?";
set tu_magician01, 1; tu_magician01 = 1;
if (checkre(3)) if (checkre(3))
getexp BaseLevel*3,BaseLevel*2; getexp BaseLevel*3,BaseLevel*2;
else else
@ -211,7 +210,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "only slightly injured and the"; mes "only slightly injured and the";
mes "Fire Wall won't necessarily"; mes "Fire Wall won't necessarily";
mes "block its approach. So beware!"; mes "block its approach. So beware!";
set .@eread_1,1; .@eread_1 = 1;
next; next;
break; break;
case 2: case 2:
@ -246,7 +245,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "afterwards, like Fire Bolt and"; mes "afterwards, like Fire Bolt and";
mes "Fire Ball, to take advantage of"; mes "Fire Ball, to take advantage of";
mes "the monster's Earth property."; mes "the monster's Earth property.";
set .@eread_2,1; .@eread_2 = 1;
next; next;
break; break;
case 3: case 3:
@ -284,7 +283,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "the ^93DB70Wind^000000 property skills"; mes "the ^93DB70Wind^000000 property skills";
mes "that we Mages can use are"; mes "that we Mages can use are";
mes "Lighning Bolt and Thunder Storm."; mes "Lighning Bolt and Thunder Storm.";
set .@eread_3,1; .@eread_3 = 1;
next; next;
break; break;
case 4: case 4:
@ -321,7 +320,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "actually freeze monsters."; mes "actually freeze monsters.";
mes "While monsters are frozen by"; mes "While monsters are frozen by";
mes "Frost Diver, they're considered Water monsters. Interesting, huh?"; mes "Frost Diver, they're considered Water monsters. Interesting, huh?";
set .@eread_4,1; .@eread_4 = 1;
next; next;
break; break;
case 5: case 5:
@ -354,7 +353,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "shield against long range"; mes "shield against long range";
mes "attacks or strong property"; mes "attacks or strong property";
mes "attacks, so be really careful!"; mes "attacks, so be really careful!";
set .@eread_5,1; .@eread_5 = 1;
next; next;
break; break;
case 6: case 6:
@ -371,18 +370,15 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "Alrighty, we'll"; mes "Alrighty, we'll";
mes "move on to the next"; mes "move on to the next";
mes "subject then. Ho ho ho~!"; mes "subject then. Ho ho ho~!";
set tu_magician01,2; tu_magician01 = 2;
specialeffect2 EF_HIT5; specialeffect2 EF_HIT5;
if(.@eread_1) getexp 150,70; .@total = .@eread_1 + .@eread_2 + .@eread_3 + .@eread_4 + .@eread_5;
if(.@eread_2) getexp 150,70; if (.@total) getexp (.@total*150),(.@total*70);
if(.@eread_3) getexp 150,70;
if(.@eread_4) getexp 150,70;
if(.@eread_5) getexp 150,70;
}
close; close;
} }
}
break; break;
}
}
case 2: case 2:
mes "I know that the concept"; mes "I know that the concept";
mes "of properties might be"; mes "of properties might be";
@ -458,67 +454,58 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "until you've collected"; mes "until you've collected";
mes "10 Chrysalis from them."; mes "10 Chrysalis from them.";
mes "Then bring them to me, okay?"; mes "Then bring them to me, okay?";
set tu_magician01, 3; tu_magician01 = 3;
getexp 400,200; getexp 400,200;
specialeffect2 EF_HIT5; specialeffect2 EF_HIT5;
close; close;
case 3: case 3:
case 4:
if (tu_magician01 == 3) {
mes "Ah, you're back?"; mes "Ah, you're back?";
mes "Let's see if you gathered"; mes "Let's see if you gathered";
mes "all 10 Chrysalis from hunting"; mes "all 10 Chrysalis from hunting";
mes "all of those Pupa. Hmmmm..."; mes "all of those Pupa. Hmmmm...";
next;
if (countitem(915) < 10) {
mes "[Mana]";
mes "Aw, you don't";
mes "have enough of";
mes "them yet. Head west";
mes "from here and hunt Pupa";
mes "to get more Chrysalis, okay?";
mes "For now, I'll just heal you up.";
set tu_magician01, 4;
percentheal 100,100;
close;
} else {
mes "[Mana]";
mes "...Nine, ten.";
mes "Alright, you pass!";
mes "By now, you must be more";
mes "used to using your skills, huh?";
mes "Anyway, let me know when you're ready for the next lesson, okay?";
set tu_magician01, 5;
getexp 400,200;
specialeffect2 EF_HIT5;
close;
} }
case 4: else {
mes "So..."; mes "So...";
mes "Did you get"; mes "Did you get";
mes "10 Chrysalis"; mes "10 Chrysalis";
mes "from hunting Pupa"; mes "from hunting Pupa";
mes "like I asked? I hope so..."; mes "like I asked? I hope so...";
mes "Because I'm going to check~"; mes "Because I'm going to check~";
}
next; next;
if(countitem(915) < 10){
mes "[Mana]"; mes "[Mana]";
if (countitem(915) < 10){
if (tu_magician01 == 3) {
mes "Aw, you don't";
mes "have enough of";
mes "them yet. Head west";
mes "from here and hunt Pupa";
mes "to get more Chrysalis, okay?";
mes "For now, I'll just heal you up.";
tu_magician01 = 4;
percentheal 100,100;
}
else {
mes "Whoa, you need"; mes "Whoa, you need";
mes "more than just this."; mes "more than just this.";
mes "I know you can do it..."; mes "I know you can do it...";
mes "Pupas are completely"; mes "Pupas are completely";
mes "defenseless monsters!"; mes "defenseless monsters!";
close; }
} else { }
mes "[Mana]"; else {
mes "...Nine, ten."; mes "...Nine, ten.";
mes "Alright, you pass!"; mes "Alright, you pass!";
mes "By now, you must be more"; mes "By now, you must be more";
mes "used to using your skills, huh?"; mes "used to using your skills, huh?";
mes "Anyway, let me know when you're ready for the next lesson, okay?"; mes "Anyway, let me know when you're ready for the next lesson, okay?";
set tu_magician01, 5; tu_magician01 = 5;
getexp 400,200; getexp 400,200;
specialeffect2 EF_HIT5; specialeffect2 EF_HIT5;
close;
} }
close;
case 5: case 5:
mes "Now I'll tell you"; mes "Now I'll tell you";
mes "what I know about the"; mes "what I know about the";
@ -544,8 +531,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "of Soul Strike and increase"; mes "of Soul Strike and increase";
mes "that skill's level, it will grow in strength and you'll be able"; mes "that skill's level, it will grow in strength and you'll be able";
mes "to cast it much more quickly."; mes "to cast it much more quickly.";
set .@skill_e1,1; .@skill_e1 = 1;
next;
break; break;
case 2: case 2:
mes "[Mana]"; mes "[Mana]";
@ -564,8 +550,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "certain number of attacks,"; mes "certain number of attacks,";
mes "depending on the level of the"; mes "depending on the level of the";
mes "Safety Wall skill that you use."; mes "Safety Wall skill that you use.";
set .@skill_e2,1; .@skill_e2 = 1;
next;
break; break;
case 3: case 3:
mes "[Mana]"; mes "[Mana]";
@ -583,8 +568,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "the range of the skill. Make"; mes "the range of the skill. Make";
mes "good use of the destructive"; mes "good use of the destructive";
mes "power of the Fire Ball!"; mes "power of the Fire Ball!";
next; .@skill_e3 = 1;
set .@skill_e3,1;
break; break;
case 4: case 4:
mes "[Mana]"; mes "[Mana]";
@ -610,8 +594,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "skill, its damage and chance"; mes "skill, its damage and chance";
mes "of freezing monsters will also"; mes "of freezing monsters will also";
mes "increase. Pretty dangerous, eh? ^FFFFFFkamenriderblack^000000"; mes "increase. Pretty dangerous, eh? ^FFFFFFkamenriderblack^000000";
set .@skill_e4,1; .@skill_e4 = 1;
next;
break; break;
case 5: case 5:
mes "[Mana]"; mes "[Mana]";
@ -629,8 +612,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "within a certain range."; mes "within a certain range.";
mes "It's an incredibly potent"; mes "It's an incredibly potent";
mes "ground targeting attack."; mes "ground targeting attack.";
set .@skill_e5,1; .@skill_e5 = 1;
next;
break; break;
case 6: case 6:
mes "[Mana]"; mes "[Mana]";
@ -655,8 +637,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "Fire Well strategically"; mes "Fire Well strategically";
mes "and effectively, it can"; mes "and effectively, it can";
mes "be a very powerful skill~"; mes "be a very powerful skill~";
set .@skill_e6,1; .@skill_e6 = 1;
next;
break; break;
case 7: case 7:
mes "[Mana]"; mes "[Mana]";
@ -674,8 +655,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "learn Energy Coat, I'm"; mes "learn Energy Coat, I'm";
mes "sure Blizardis will tell"; mes "sure Blizardis will tell";
mes "you all you need to know."; mes "you all you need to know.";
set .@skill_e7,1; .@skill_e7 = 1;
next;
break; break;
case 8: case 8:
mes "[Mana]"; mes "[Mana]";
@ -692,20 +672,14 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "you to help you in your"; mes "you to help you in your";
mes "training. I hope it comes"; mes "training. I hope it comes";
mes "in handy when fighting..."; mes "in handy when fighting...";
set tu_magician01, 6; tu_magician01 = 6;
getitem 1604,1; //Wand getitem 1604,1; //Wand
specialeffect2 EF_HIT5; specialeffect2 EF_HIT5;
if(.@skill_e1) getexp 300,100; .@total = .@skill_e1 + .@skill_e2 + .@skill_e3 + .@skill_e4 + .@skill_e5;
if(.@skill_e2) getexp 300,100; if (.@total) getexp (.@total*300),(.@total*100);
if(.@skill_e3) getexp 300,100;
if(.@skill_e4) getexp 300,100;
if(.@skill_e5) getexp 300,100;
if(.@skill_e6) getexp 300,100;
if(.@skill_e7) getexp 300,100;
close; close;
default:
break;
} }
next;
} }
close; close;
case 6: case 6:
@ -739,7 +713,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "done with what Yierhan"; mes "done with what Yierhan";
mes "has you do, come back"; mes "has you do, come back";
mes "and report to me, okay?"; mes "and report to me, okay?";
set tu_magician01, 7; tu_magician01 = 7;
emotion e_heh; emotion e_heh;
warp "morocc",182,286; warp "morocc",182,286;
close; close;
@ -764,7 +738,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "a message, saying that"; mes "a message, saying that";
mes "you've done a great job in"; mes "you've done a great job in";
mes "completing your mission."; mes "completing your mission.";
mes "Very nice work, "+PcName+"~"; mes "Very nice work, "+strcharinfo(0)+"~";
next; next;
mes "[Mana]"; mes "[Mana]";
mes "It seems like there are"; mes "It seems like there are";
@ -786,9 +760,9 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "a little reward for helping"; mes "a little reward for helping";
mes "out both of our guilds. Once"; mes "out both of our guilds. Once";
mes "again, thanks very much~"; mes "again, thanks very much~";
set tu_magician01, 28; tu_magician01 = 28;
getitem 2321,1; //Silk_Robe getitem 2321,1; //Silk_Robe
set Zeny, Zeny + 3000; Zeny = Zeny + 3000;
getexp 3000,1000; getexp 3000,1000;
close; close;
default: default:
@ -804,7 +778,6 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "keep up the good"; mes "keep up the good";
mes "work. And, um, is"; mes "work. And, um, is";
mes "Yierhan doing well?"; mes "Yierhan doing well?";
close;
} else { } else {
mes "You seem to be well"; mes "You seem to be well";
mes "experienced now and there"; mes "experienced now and there";
@ -812,7 +785,7 @@ geffen,67,180,4 script New Mage Manager#M 102,{
mes "really teach you. Now it's up"; mes "really teach you. Now it's up";
mes "to you to find ways to master"; mes "to you to find ways to master";
mes "the ways of magic on your own."; mes "the ways of magic on your own.";
}
close; close;
} }
} }
}

View File

@ -43,6 +43,16 @@ geffen_in,99,174,5 script Ore Tester#sorty 8_F_GIRL,{
mes "You don't have any "+getitemname(.@item)+"..."; mes "You don't have any "+getitemname(.@item)+"...";
close; close;
} }
// while(1) {
// if (countitem(.@item)) {
// set .@count, countitem(.@item);
// set .@total, .@total + .@count;
// delitem .@item, .@count;
// } else {
// getitem .@item, .@total;
// break;
// }
// }
.@count = countitem(.@item); .@count = countitem(.@item);
delitem .@item, .@count; delitem .@item, .@count;
getitem .@item, .@count; getitem .@item, .@count;

View File

@ -190,7 +190,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
mes "See you then."; mes "See you then.";
close; close;
case 3: case 3:
L_whathappen: L_WhatHappen:
mes "[Lucia]"; mes "[Lucia]";
mes "One day ^FF0000Strange Hydra^000000s"; mes "One day ^FF0000Strange Hydra^000000s";
mes "came here and surrounded the town."; mes "came here and surrounded the town.";
@ -261,7 +261,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
mes "Ok, please do me a favor."; mes "Ok, please do me a favor.";
close; close;
case 2: case 2:
goto L_whathappen; goto L_WhatHappen;
} }
} }
} }
@ -297,7 +297,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
mes "See you then."; mes "See you then.";
close; close;
case 3: case 3:
goto L_whathappen; goto L_WhatHappen;
} }
} }
} }