summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/events/halloween_2013.txt12
-rw-r--r--npc/re/instances/OldGlastHeim.txt84
-rw-r--r--npc/re/instances/ghost_palace.txt15
-rw-r--r--npc/re/jobs/3-1/ranger.txt2
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt1
-rw-r--r--npc/re/jobs/novice/academy.txt14
-rw-r--r--npc/re/jobs/novice/novice.txt4
-rw-r--r--npc/re/merchants/coin_exchange.txt4
-rw-r--r--npc/re/merchants/enchan_mal.txt10
-rw-r--r--npc/re/merchants/flute.txt4
-rw-r--r--npc/re/merchants/shadow_refiner.txt2
-rw-r--r--npc/re/merchants/shops.txt58
-rw-r--r--npc/re/quests/cupet.txt6
-rw-r--r--npc/re/quests/eden/26-40.txt6
-rw-r--r--npc/re/quests/eden/eden_iro.txt2
-rw-r--r--npc/re/quests/eden/eden_quests.txt158
-rw-r--r--npc/re/quests/newgears/2012_headgears.txt24
-rw-r--r--npc/re/quests/quests_eclage.txt14
-rw-r--r--npc/re/quests/quests_mora.txt2
19 files changed, 196 insertions, 226 deletions
diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt
index 6f16d437c..acfd60f9f 100644
--- a/npc/re/events/halloween_2013.txt
+++ b/npc/re/events/halloween_2013.txt
@@ -267,7 +267,7 @@ L_Explain:
niflheim,181,173,5 script Chef Candycon#2013HE 4_M_NFDEADSWDMAN,{
if (eve_bs == 1) {
- if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) {
+ if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) {
mes "[Chef Candycon]";
mes "Clang~Clang~!";
next;
@@ -400,16 +400,16 @@ L_GivePumpkin:
mes "Eeh~~ You have no use for those pumpkins~~";
close;
}
- if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) {
+ if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) {
mes "[Chef Candycon]";
mes "Ooops where is pumpkin? escaped again?";
mes "Oh, boy...no... you should go to get them again...";
close;
}
- if (countitem(Inorganic_Pumpkin))
- delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin);
- if (countitem(Organic_Pumpkin))
- delitem Organic_Pumpkin,countitem(Organic_Pumpkin);
+ if (countitem(INORGANIC_PUMPKIN))
+ delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN);
+ if (countitem(ORGANIC_PUMPKIN))
+ delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN);
eve_bs = 2;
getitem HALLOWEEN_G_BOX,1;
erasequest 11378;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 0b21767f7..bf099cd2d 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -2226,7 +2226,7 @@ OnEnable:
end;
}
-// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_STAT_Boots
+// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_*_Boots
// Upon trade all refines got removed
// Uses Temporal_Crystal
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -2275,7 +2275,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
mes("You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000.");
next;
setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Luck";
- setarray .@equip_type[0], Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots;
+ setarray .@equip_type[0], Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots;
.@select = select("Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots");
switch (.@select) {
case 1:
@@ -2296,7 +2296,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
mes("The boots has been upgraded as you want.");
delequip .@part;
delitem Temporal_Crystal, 5;
- getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots
+ getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots
close;
}
mes("[Hugin's Butler]");
@@ -2307,7 +2307,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
}
// Enchant NPC - Coagulated Spell to enchants on 4th slot. First one to pick --> upgraded --> additional random enchant on 3rd slot
-// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_STAT_Boots
+// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_*_Boots
// Enchanting can fail, the 3th slot random one is guaranteed
// Refine remains
// Item Used: Coagulated_Spell
@@ -2371,18 +2371,18 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
setarray .@enchant_rate[0], 90, 80, 70, 50, 100; // Enchant Success Rate in %
.@random = rand(1, 100);
switch (.@equip_id) {
- case Temporal_STR_Boots:
- case Temporal_INT_Boots:
- case Temporal_AGI_Boots:
- case Temporal_VIT_Boots:
- case Temporal_DEX_Boots:
- case Temporal_LUK_Boots:
- case Temporal_STR_Boots_:
- case Temporal_INT_Boots_:
- case Temporal_AGI_Boots_:
- case Temporal_VIT_Boots_:
- case Temporal_DEX_Boots_:
- case Temporal_LUK_Boots_:
+ case Temporal_Str_Boots:
+ case Temporal_Int_Boots:
+ case Temporal_Agi_Boots:
+ case Temporal_Vit_Boots:
+ case Temporal_Dex_Boots:
+ case Temporal_Luk_Boots:
+ case Temporal_Str_Boots_:
+ case Temporal_Int_Boots_:
+ case Temporal_Agi_Boots_:
+ case Temporal_Vit_Boots_:
+ case Temporal_Dex_Boots_:
+ case Temporal_Luk_Boots_:
if (.@card3 == 0) { //4th slot 1st try enchanting
.@cost = .@enchant_cost[0];
.@scs = .@enchant_rate[0];
@@ -2450,7 +2450,7 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
case MHP2:
case Attack_Delay_4:
case Luck6:
- .@enchant = callfunc("F_Rand", Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
+ .@enchant = callfunc("F_Rand", Bears_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
mes("[Hugin's Magic Master]"); // Custom text
mes("Seems you already completed the best upgrade option in your 4th slot. For that I can give a random bonus effect to your 3rd slot. And of course, with certain payment...");
next;
@@ -2566,9 +2566,9 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
close;
}
-// Socket NPC - Contaminated_Magic or Temporal_Crystal to add card slot
+// Socket NPC - Corrupted_Charm or Temporal_Crystal to add card slot
// After the boots were slotted, you can still enchant, but slotting removes any enchants and refines applied before.
-// Item Used: Contaminated_Magic, Temporal_Crystal
+// Item Used: Corrupted_Charm, Temporal_Crystal
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
disable_items;
@@ -2601,12 +2601,12 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
}
.@equip_id = getequipid(.@part);
switch (.@equip_id) {
- case Temporal_STR_Boots:
- case Temporal_INT_Boots:
- case Temporal_AGI_Boots:
- case Temporal_VIT_Boots:
- case Temporal_DEX_Boots:
- case Temporal_LUK_Boots:
+ case Temporal_Str_Boots:
+ case Temporal_Int_Boots:
+ case Temporal_Agi_Boots:
+ case Temporal_Vit_Boots:
+ case Temporal_Dex_Boots:
+ case Temporal_Luk_Boots:
mes("[Hugin's Craftsman]");
mes("The ^FF0000Boots and all enchants or refines will be lost if you fail this.^000000\r"
"Still want to risk it?");
@@ -2629,7 +2629,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
mes("Then my last question:\r"
"Which item are you gonna use to pay me?");
next;
- setarray .@slotpay[0], Temporal_Crystal, Contaminated_Magic;
+ setarray .@slotpay[0], Temporal_Crystal, Corrupted_Charm;
setarray .@slotcost[0], 10, 50;
setarray .@slotchance[0], 80, 65; // Custom rates
.@select = select("Cancel", "Temporal Crystal", "Contaminated Magic");
@@ -2664,18 +2664,18 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
specialeffect2 EF_PHARMACY_OK;
delequip .@part;
// todo: read aegis name and attach "_" to worn constant
- if (.@equip_id == Temporal_STR_Boots) {
- getitem2 Temporal_STR_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_INT_Boots) {
- getitem2 Temporal_INT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_AGI_Boots) {
- getitem2 Temporal_AGI_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
- } else if (.@equip_id == Temporal_VIT_Boots) {
- getitem2 Temporal_VIT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_DEX_Boots) {
- getitem2 Temporal_DEX_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_LUK_Boots) {
- getitem2 Temporal_LUK_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ if (.@equip_id == Temporal_Str_Boots) {
+ getitem2 Temporal_Str_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Int_Boots) {
+ getitem2 Temporal_Int_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Agi_Boots) {
+ getitem2 Temporal_Agi_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
+ } else if (.@equip_id == Temporal_Vit_Boots) {
+ getitem2 Temporal_Vit_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Dex_Boots) {
+ getitem2 Temporal_Dex_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Luk_Boots) {
+ getitem2 Temporal_Luk_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
}
close;
default:
@@ -2699,7 +2699,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{
mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000.");
mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>");
next;
- setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+ setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
setarray .@cost[0], 3000, 70;
.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
switch (.@select) {
@@ -2717,7 +2717,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{
close;
}
delitem .@item, .@cost;
- getitem White_Knight_Card, 1;
+ getitem White_Knightage_Card, 1;
close;
}
}
@@ -2732,7 +2732,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{
mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000.");
mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>");
next;
- setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+ setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
setarray .@cost[0], 5000, 100;
.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
switch (.@select) {
@@ -2750,7 +2750,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{
close;
}
delitem .@item, .@cost;
- getitem Khalitzburg_Knight_Card, 1;
+ getitem Khali_Knightage_Card, 1;
close;
}
}
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index 08fe3b71b..b1a8f3c10 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -318,9 +318,9 @@ OnInstanceInit:
"Everything will be vanished...");
close2();
if (first_time_gpmission)
- getitem Gray_Piece, 1;
+ getitem(Gray_Shard, 1);
if (!first_time_gpmission) {
- getitem Gray_Piece, 2;
+ getitem(Gray_Shard, 2);
getexp(900000, 500000);
++first_time_gpmission;
}
@@ -705,9 +705,10 @@ OnInstanceInit:
mes("The cursed knight...\r"
"Please help me save the soul of Sakray.");
next;
- setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow,
- Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield,
- Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet;
+ setarray(.@items_list,
+ Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow,
+ Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray,
+ Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet);
setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100;
.@menulist$ = "";
@@ -734,7 +735,7 @@ OnInstanceInit:
break;
case 2:
next;
- if (countitem(Gray_Piece) < .@cost[.@choice]) {
+ if (countitem(Gray_Shard) < .@cost[.@choice]) {
mes("[King]");
mes("You don't have enough Gray Shards.");
mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice]));
@@ -755,7 +756,7 @@ OnInstanceInit:
mes("[King]");
mes("The power requires a sacrifice.\r"
"Please be careful...");
- delitem Gray_Piece, .@cost[.@choice];
+ delitem(Gray_Shard, .@cost[.@choice]);
getitem .@items_list[.@choice], 1;
close();
}
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 0308884fd..78e200843 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1748,7 +1748,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{
jobchange roclass(eaclass()|EAJL_THIRD);
getitem Sniper_Goggle,1;
getitem Green_Apple_Ring,1;
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
close;
}
mes "Hey, you look great.";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 5cead2250..7fe7a1d2a 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -147,7 +147,6 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{
}
mes "[Heinrich]";
if (job_royal == 1) {
- mes "[Heinrich]";
mes "You are persistent friend.";
mes "Do you have more things to talk to me about?";
next;
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]";
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index b714dd71d..be9f1dbee 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1129,7 +1129,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
Assassin_Mask_,
Elven_Ears,
Hahoe_Mask,
- Boy's_Cap;
+ Boys_Cap;
setarray .@costumes[0], C_Frog_Cap,
C_Centimental_Flower,
C_Magestic_Goat,
@@ -1139,7 +1139,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
C_Assassin_Mask_,
C_Elven_Ears,
C_Hahoe_Mask,
- C_Boy's_Cap;
+ C_Boys_Cap;
if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
.@item_check =1;
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 7be4eaa6f..864505b85 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -93,7 +93,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1224: callsub L_Socket,1,2; //Sword_Breaker
case 1225: callsub L_Socket,1,2; //Mail_Breaker
case 1227: callsub L_Socket,1,2; //Weeder_Knife
- case 1229: callsub L_Socket,1,2; //Mama's_Knife
+ case 1229: callsub L_Socket,1,2; //Mamas_Knife
case 1232: callsub L_Socket,1,2; //Assasin_Dagger
case 1233: callsub L_Socket,1,2; //Exercise
case 1235: callsub L_Socket,1,2; //Azoth
@@ -212,7 +212,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1466: callsub L_Socket,1,2; //Crescent_Scythe
case 1467: callsub L_Socket,1,2; //Bill_Guisarme
case 1468: callsub L_Socket,1,2; //Zephyrus
- case 1469: callsub L_Socket,1,2; //Longinus's_Spear
+ case 1469: callsub L_Socket,1,2; //Longinuss_Spear
case 1470: callsub L_Socket,1,2; //Brionac
case 1471: callsub L_Socket,1,2; //Hell_Fire
case 1474: callsub L_Socket,1,2; //Gae_Bolg
@@ -264,7 +264,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 15: // Books
switch(@mal_equip_id) {
case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse
- case 1558: callsub L_Socket,1,2; //Girl's_Diary
+ case 1558: callsub L_Socket,1,2; //Girls_Diary
case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon
case 1561: callsub L_Socket,1,2; //Hardback
case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield
@@ -311,11 +311,11 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1963: callsub L_Socket,1,2; //Rapture_Rose
case 1964: callsub L_Socket,1,2; //Chemeti
case 1969: callsub L_Socket,1,2; //Bladed_Whip
- case 1970: callsub L_Socket,1,2; //Queen's_Whip
+ case 1970: callsub L_Socket,1,2; //Queens_Whip
case 1972: callsub L_Socket,1,2; //Electric_Eel
case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot
case 1974: callsub L_Socket,1,2; //Carrot_Whip
- case 1976: callsub L_Socket,1,2; //Queen's_Whip_
+ case 1976: callsub L_Socket,1,2; //Queens_Whip_
case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes
case 1984: callsub L_Socket,2,2; //Stem_Whip
case 1985: callsub L_Socket,4,2; //Rosebine
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 6732035dc..98fd3789c 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -110,7 +110,7 @@ pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD
tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
- if (countitem(Wolf's_Flute)) {
+ if (countitem(Wolfs_Flute)) {
mes "[Expert Flute Crafter]";
mes "The Wolf Flute you have is crafted by myself, with wood.";
mes "You can come back here and find me if you lose your Wolf flute!";
@@ -137,7 +137,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
mes "Hope you are ready to use it.";
delitem Bamboo_Cut,1;
Zeny -= 100000;
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
close;
}
mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
index 4e5049e5f..2f8984498 100644
--- a/npc/re/merchants/shadow_refiner.txt
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -158,7 +158,7 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
}
delitem .@choose,1;
Zeny -= 20000;
- if (getequippercentrefinery(.@SelectedPart) > rand(100) || getequippercentrefinery(.@SelectedPart) > rand(100)) {
+ if (getequippercentrefinery(.@SelectedPart) > rand(100) || ( .@option == 1 && getequippercentrefinery(.@SelectedPart) > rand(100))) {
successrefitem .@SelectedPart;
mes "[Shadow Blacksmith]";
mes "Refine was successful.";
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 54155e8c4..543d9cdc7 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -547,42 +547,42 @@ OnInit:
prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Heaven's_Feather_and_Hell's_Fire;
- sellitem Altea_and_Ares;
- sellitem Color_Scope;
+ sellitem H_FEATHER_H_FIRE;
+ sellitem ALTAIR_ARES;
+ sellitem COLORSCOPE;
sellitem RAG203;
- sellitem Death_Fire;
- sellitem Rolling_Thunder;
- sellitem Peace_Breaker;
- sellitem Mini_Mei;
- sellitem Tempest;
- sellitem End_Of_The_Horizon;
- sellitem South_Cross;
+ sellitem DEATHFIRE;
+ sellitem R_THUNDER;
+ sellitem P_BREAKER;
+ sellitem MINIMAY;
+ sellitem TEMPEST;
+ sellitem END_OF_HORIZON;
+ sellitem Southern_Cross_R;
}
prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Slug_Ammunition_L;
- sellitem Slug_Ammunition_M;
- sellitem Slug_Ammunition_H;
- sellitem Full_Metal_Jacket;
- sellitem Projection_Landmines;
+ sellitem Slug_Bullet_1;
+ sellitem Slug_Bullet_2;
+ sellitem Slug_Bullet_3;
+ sellitem Fullmetal_Jacket_Bullet;
+ sellitem Mine_Projectile;
sellitem Dragon_Tail_Missile;
sellitem Special_Alloy_Trap;
sellitem Bullet;
sellitem Silver_Bullet_;
sellitem Shell_Of_Blood_;
- sellitem Armor_Piercing_Bullet;
- sellitem Blazing_Bullet;
+ sellitem AP_Ammo;
+ sellitem Blaze_Bullet;
sellitem Freezing_Bullet;
- sellitem Lightning_Bullet;
- sellitem Magic_Stone_Bullet;
- sellitem Purifying_Bullet;
- sellitem Incendiary_Grenade;
- sellitem Lightning_Grenade;
- sellitem Poison_Grenade;
- sellitem Flash_Grenade;
- sellitem Cyro_Grenade;
+ sellitem Electric_Shock_Bullet;
+ sellitem Magical_Stone_Bullet;
+ sellitem Sanctified_Bullet;
+ sellitem Flare_Sphere_;
+ sellitem Lighting_Sphere_;
+ sellitem Poison_Sphere_;
+ sellitem Blind_Sphere_;
+ sellitem Freezing_Sphere_;
}
//== Morroc ===============================================
@@ -712,16 +712,16 @@ OnInit:
morocc,171,103,4 trader Item Collector#moc3 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
morocc,205,247,2 trader Item Collector#moc4 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index ac4a765fd..72e1bd6c9 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -38,7 +38,7 @@
setarray .@tame_id[0],Unripe_Apple,Orange_Juice,Rainbow_Carrot,Earthworm_The_Dude,Rotten_Fish,Sweet_Milk,Well_Dried_Bone,Singing_Flower,Dew_Laden_Moss;
setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3;
- setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore;
+ setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animals_Skin,Animals_Skin,Grasshoppers_Leg,Mushroom_Spore;
setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500;
setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014;
.@tame_gets = 3;
@@ -95,9 +95,9 @@
setarray .@tame_id[0],Silver_Knife_Of_Chaste,Monster_Juice,Contracts_In_Shadow,Sway_Apron,Prohibition_Red_Candle,Book_Of_Devil;
setarray .@tame_amount[0],1,1,1,1,1,1;
- setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn;
+ setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alices_Apron,Queens_Whip,Evil_Horn;
setarray .@hunt_amount[0],600,600,600,500,1,100;
- setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0;
+ setarray .@hunt_id2[0],0,0,0,0,Executioners_Mitten,0;
setarray .@hunt_amount2[0],0,0,0,0,20,0;
setarray .@mob_id[0],1170,1035,1109,1275,1200,1101;
.@tame_gets = 1;
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index 3a3068a5c..1c680d7ed 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -530,11 +530,11 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{
break;
case 2:
callsub L_Quest,8275;
- if ((countitem(Bear's_Foot) > 9) && (countitem(Animal's_Skin) > 4)) {
+ if ((countitem(Bears_Foot) > 9) && (countitem(Animals_Skin) > 4)) {
callsub L_Reward;
getitem Novice_Potion,100;
- delitem Bear's_Foot,10;
- delitem Animal's_Skin,5;
+ delitem Bears_Foot,10;
+ delitem Animals_Skin,5;
getexp 1000,100;
erasequest 8275;
close;
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 460960d72..2d72b3541 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -709,7 +709,7 @@ OnInit:
tradertype(NST_CASH);
sellitem Blue_Potion_Box,5;
sellitem F_Neuralizer_Box,400;
- sellitem FPr_Reset_Stone_Box,100;
+ sellitem FPremium_Reset_Stone_Box,100;
sellitem F_Abrasive_Box10,75;
sellitem F_G_O_I_Box10,25;
sellitem Greed_Scroll_Box_30,30;
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index f58c3ed5a..9e49a415b 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Capuche
//= Copyright (C) Euphy
//= Copyright (C) Masao
@@ -117,7 +117,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{
case 2:
mes "You are so rude!";
specialeffect2 EF_HIT1;
- percentheal -50,0;
+ percentheal -50, 0;
next;
mes "-Beats quickly and this shining Rune Knight turns invisible.";
mes "It hurts too much-";
@@ -712,7 +712,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 3) {
@@ -750,7 +750,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 4) {
@@ -806,7 +806,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 5) {
@@ -952,7 +952,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "Take care to check your map so you don't get lost.";
mes "It's a service meeow.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 8) {
@@ -990,7 +990,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "I will help you a little.";
mes "Here, I have recovered your strengh meow..";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 9) {
@@ -1025,7 +1025,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "I will help you a little.";
mes "Here, I have recovered your strengh meow..";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 10) {
@@ -1137,7 +1137,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{
mes "Just in case I will recover all your energy.";
mes "It's the last step so be careful.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 15) {
@@ -1168,7 +1168,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{
mes "Just in case I will recover all your energy.";
mes "It's the last step so be careful.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 16) {
@@ -1290,7 +1290,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "Can you stay longer?";
mes "Ok, I will recover your strengh so, keep going.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 19) {
@@ -1329,7 +1329,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "See, to cheer you up I will heal you until you finish the training.";
mes "Chin up and cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 20) {
@@ -1357,7 +1357,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "Just Vitata, isn't that an easy opponent?";
mes "If you see Maya just run away.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 21) {
@@ -1472,7 +1472,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 26) {
@@ -1503,7 +1503,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 27) {
@@ -1529,7 +1529,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 28) {
@@ -1602,7 +1602,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 31) {
@@ -1626,7 +1626,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 32) {
@@ -1729,7 +1729,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{
mes "Mermans are not easy opponents.";
mes "I will help you recover so cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 35) {
@@ -1763,7 +1763,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{
mes "Strouf are not easy opponents.";
mes "I can help you recover so cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 36) {
@@ -1855,38 +1855,31 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
close;
}
mes "[Michael]";
- if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) {
+ if (BaseClass == Job_Swordman) {
callsub S_Select,"We have one and Two-handed swords",
P_Slayer1,"Eden Slayer I","Two-handed sword","Attack 162","",
P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for.";
- }
- if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
+ } else if (BaseClass == Job_Thief || BaseClass == Job_Ninja || BaseClass == Job_Novice) {
callsub S_Select,"",
P_Dagger1,"Eden Dagger I","Dagger","MATK+60, attack 124","This is what we strive for.";
- }
- if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
+ } else if (BaseClass == Job_Merchant) {
callsub S_Select,"We have a mace and a One-handed sword",
P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for.",
P_Mace1,"Eden Mace I","Mace","Attack 142","";
- }
- if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+ } else if (BaseClass == Job_Archer) {
callsub S_Select,"",
P_Bow1,"Eden Bow I","Bow","Attack 82","";
- }
- if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
+ } else if (BaseClass == Job_Acolyte) {
callsub S_Select,"We have a mace and a staff",
P_Mace1,"Eden Mace I","Mace","Attack 142","",
P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60","";
- }
- if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
+ } else if (BaseClass == Job_Mage) {
callsub S_Select,"",
P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60","";
- }
- if (Class == Job_Gunslinger) {
+ } else if (BaseClass == Job_Gunslinger) {
callsub S_Select,"",
P_Revolver1,"Eden Revolver I","Revolver","HIT-5, attack 44","";
}
-
mes "Let me see... you will receive..";
mes "the Eden Group Boots II and Uniform II.";
next;
@@ -1933,34 +1926,28 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
close;
}
mes "[Michael]";
- if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) {
+ if (BaseClass == Job_Swordman) {
callsub S_Select,"We have one and Two-handed swords",
P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","",
P_Slayer2,"Eden Slayer II","Two-handed sword","Attack 185","";
- }
- if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || Class == Job_Ninja) {
+ } else if (BaseClass == Job_Thief || BaseClass == Job_Novice || BaseJob == Job_Soul_Linker || BaseClass == Job_Ninja) {
callsub S_Select,"",
P_Dagger2,"Eden Dagger II","Dagger","MATK+70, attack 158","";
- }
- if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
+ } else if (BaseClass == Job_Acolyte) {
callsub S_Select,"We have a mace and a staff",
P_Mace2,"Eden Mace II","Mace","Attack 163","",
P_Staff2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60","";
- }
- if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+ } else if (BaseClass == Job_Archer) {
callsub S_Select,"",
P_Bow2,"Eden Bow II","Bow","Attack 82","";
- }
- if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
+ } else if (BaseClass == Job_Mage) {
callsub S_Select,"",
P_Staff2,"Eden Staff II","Staff","INT+3, MATK+155, attack 60","";
- }
- if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
+ } else if (BaseClass == Job_Merchant) {
callsub S_Select,"We have a mace and a One-handed sword",
P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","",
P_Mace2,"Eden Mace II","Mace","Attack 163","";
- }
- if (Class == Job_Gunslinger) {
+ } else if (BaseClass == Job_Gunslinger) {
callsub S_Select,"",
P_Revolver2,"Eden Revolver II","Revolver","HIT-5, attack 60","";
}
@@ -2024,12 +2011,12 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
mes "What status bonus do you want to upgrade?";
next;
switch (select("Upgrade STR", "Upgrade AGI", "Upgrade VIT", "Upgrade INT", "Upgrade DEX", "Upgrade LUK", "Nevermind.")) {
- case 1: callsub S_Upgrade,"STR",4701;
- case 2: callsub S_Upgrade,"AGI",4731;
- case 3: callsub S_Upgrade,"VIT",4741;
- case 4: callsub S_Upgrade,"INT",4711;
- case 5: callsub S_Upgrade,"DEX",4721;
- case 6: callsub S_Upgrade,"LUK",4751;
+ case 1: callsub S_Upgrade,"STR",Strength2;
+ case 2: callsub S_Upgrade,"AGI",Agility2;
+ case 3: callsub S_Upgrade,"VIT",Vitality2;
+ case 4: callsub S_Upgrade,"INT",Inteligence2;
+ case 5: callsub S_Upgrade,"DEX",Dexterity2;
+ case 6: callsub S_Upgrade,"LUK",Luck2;
case 7:
mes "[Michael]";
mes "Why? It'll be beter than it is.";
@@ -2252,8 +2239,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 2700;
- percentheal 50,0;
- percentheal 0,50;
+ percentheal 50, 50;
close;
}
mes "[Chef]";
@@ -2269,8 +2255,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 3000;
- percentheal 50,0;
- percentheal 0,50;
+ percentheal 50, 50;
close;
}
mes "[Chef]";
@@ -2291,8 +2276,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 3600;
- percentheal 75,0;
- percentheal 0,75;
+ percentheal 75, 75;
close;
}
mes "[Chef]";
@@ -2308,8 +2292,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 4000;
- percentheal 75,0;
- percentheal 0,75;
+ percentheal 75, 75;
close;
}
mes "[Chef]";
@@ -2327,8 +2310,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered your HP and SP. -";
Zeny = Zeny - 4500;
- percentheal 100,0;
- percentheal 0,100;
+ percentheal 100, 100;
close;
}
mes "[Chef]";
@@ -2346,8 +2328,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered your HP and SP. -";
Zeny = Zeny - 5000;
- percentheal 100,0;
- percentheal 0,100;
+ percentheal 100, 100;
close;
}
mes "[Chef]";
@@ -2967,7 +2948,7 @@ comodo,173,354,5 script Dispatched Instructor#02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "Let me help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 3) {
@@ -3027,7 +3008,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "I'll help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 4) {
@@ -3057,7 +3038,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "I'll help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else {
@@ -3144,7 +3125,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{
mes "I'll watch your back!.";
mes "... Of.. Course.. I'll fight too!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 9) {
@@ -3176,7 +3157,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{
mes "I'll watch your back, like last time.";
mes "... Of... Course... I'll fight them too!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 10) {
@@ -3280,7 +3261,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{
mes "If you're hurt I'll heal you a bit.";
}
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
else if (para_2nd01 == 14) {
if (questprogress(7226,HUNTING) == 2 && questprogress(7227,HUNTING) == 2) {
@@ -3312,7 +3293,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{
mes "Ugh this is difficult.";
mes "I'll make you feel better though.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 15) {
@@ -3418,7 +3399,7 @@ ice_dun01,154,13,5 script Dispatched Instructor#05 4_F_JOB_BLACKSMITH,{
setquest 7231; // Hunting and Gathering
getexp 40000,40000;
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
else {
mes "The biggest stumbling block is dealing with the Siromas.";
@@ -3637,7 +3618,7 @@ man_fild01,43,234,3 script Dispatched Instructor#07 4_DST_SOLDIER,{
mes "You seem a bit flushed.";
mes "Fine I'll heal you!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 25)
@@ -3722,7 +3703,7 @@ spl_fild02,377,149,3 script Dispatched Instructor#08 4_M_DST_MASTER,{
mes "[Mine]";
mes "You're not lying about being a real adventurer are you?";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 27) {
@@ -3952,19 +3933,19 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{
P_Bow3,"Eden Group Bow III","Bow, Attack 140",
P_Tail1,"Eden Group Whip I","Whip, Attack 125";
}
- else if (Class == Job_Ninja) {
+ else if (BaseClass == Job_Ninja) {
callsub L_Select,"",
P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165",
P_Huuma_Shuriken1,"Eden Group Huuma Shuriken I","Huuma Suriken, MATK +50, ATK 170";
}
- else if (Class == Job_Star_Gladiator)
+ else if (BaseJob == Job_Star_Gladiator)
getitem P_Dic1,1;
- else if (Class == Job_Soul_Linker) {
+ else if (BaseJob == Job_Soul_Linker) {
callsub L_Select,"",
P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165",
P_Staff3,"Eden Group Staff III","Staff, MATK +170, INT +4, ATK 60";
}
- else if (Class == Job_Gunslinger)
+ else if (BaseClass == Job_Gunslinger)
getitem P_Revolver3,1;
else {
mes "Hmm, you are eligible to receive equipment.";
@@ -4079,21 +4060,10 @@ moc_para01,112,79,3 script Weapons Expert BK#2nd11 4_M_REPAIR,{
P_Revolver3,
P_Knuckle1,
P_Huuma_Shuriken1;
- .@menu$ = "Eden Group Slayer III:" +
- "Eden Group Saber III:" +
- "Eden Group Dagger III:" +
- "Eden Group Katar I:" +
- "Eden Group Axe I:" +
- "Eden Group Spear I:" +
- "Eden Group Staff III:" +
- "Eden Group Mace III:" +
- "Eden Group Bow III:" +
- "Eden Group Dictionary I:" +
- "Eden Group Guitar I:" +
- "Eden Group Whip I:" +
- "Eden Group Revolver III:" +
- "Eden Group Knuckles I:" +
- "Eden Group Huuma Shuriken I";
+ .@wplist_size = getarraysize(.@wplist);
+ for ( .@i = 0; .@i < .@wplist_size; ++.@i ) {
+ .@menu$ += getitemname(.@wplist[.@i]) + ":";
+ }
mes "[BK]";
mes "What's happening?";
mes "No way?!";
diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index 10566cb39..e243300d5 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -469,10 +469,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
Assassin_Mask_, -1, 200, Improved_Assassin_Mask,
Welding_Mask, -1, 200, Improved_Welding_Mask,
Safety_Ring, -1, 200, Safety_Ring_,
- Angel's_Protection, 1, 100, Im_Angel's_Protection,
- Angel's_Safeguard, 1, 100, Impr_Angel's_Safeguard,
- Angel's_Arrival, 1, 100, Impr_Angel's_Arrival,
- Angel's_Warmth, 1, 100, Impr_Angel's_Warmth,
+ Angels_Protection, 1, 100, Im_Angels_Protection,
+ Angels_Safeguard, 1, 100, Impr_Angels_Safeguard,
+ Angels_Arrival, 1, 100, Impr_Angels_Arrival,
+ Angels_Warmth, 1, 100, Impr_Angels_Warmth,
Kiss_Of_Angel, 1, 100, Improved_Kiss_Of_Angel;
break;
case 4:
@@ -487,10 +487,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
Variant_Shoes, -1, 300, Enhanced_Variant_Shoes,
Ring_Of_Flame_Lord,-1, 300, Good_Ring_Of_Flame_Lord,
Ring_Of_Resonance, -1, 300, Good_Ring_Of_Resonance,
- Angel's_Protection, 1, 20, Im_Angel's_Protection,
- Angel's_Safeguard, 1, 20, Impr_Angel's_Safeguard,
- Angel's_Arrival, 1, 20, Impr_Angel's_Arrival,
- Angel's_Warmth, 1, 20, Impr_Angel's_Warmth,
+ Angels_Protection, 1, 20, Im_Angels_Protection,
+ Angels_Safeguard, 1, 20, Impr_Angels_Safeguard,
+ Angels_Arrival, 1, 20, Impr_Angels_Arrival,
+ Angels_Warmth, 1, 20, Impr_Angels_Warmth,
Kiss_Of_Angel, 1, 20, Improved_Kiss_Of_Angel;
break;
}
@@ -680,10 +680,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
else if (.@r <= 9) getitem Improved_Assassin_Mask,1;
else if (.@r <= 12) getitem Improved_Welding_Mask,1;
else if (.@r <= 13) getitem Safety_Ring_,1;
- else if (.@r <= 14) getitem Im_Angel's_Protection,1;
- else if (.@r <= 15) getitem Impr_Angel's_Safeguard,1;
- else if (.@r <= 16) getitem Impr_Angel's_Arrival,1;
- else if (.@r <= 17) getitem Impr_Angel's_Warmth,1;
+ else if (.@r <= 14) getitem Im_Angels_Protection,1;
+ else if (.@r <= 15) getitem Impr_Angels_Safeguard,1;
+ else if (.@r <= 16) getitem Impr_Angels_Arrival,1;
+ else if (.@r <= 17) getitem Impr_Angels_Warmth,1;
else getitem Improved_Kiss_Of_Angel,1;
break;
case 4:
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index f1abf56aa..d669d0d46 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -2807,7 +2807,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -2949,7 +2949,7 @@ ecl_in04,224,234,4 script Mark Esha#ep14_2in2 4_M_BLUEMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3094,7 +3094,7 @@ ecl_in04,223,234,4 script Maggi Steen#ep14_2in2 4_F_PINKWOMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3230,7 +3230,7 @@ ecl_in04,223,230,4 script Alp Ocart#ep14_2in2 4_M_BLACKMAN,{
emotion e_dots;
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -17592,7 +17592,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
}
}
else if (questprogress(7420) == 1) {
- if ((countitem(Pinguicula's_fruit_Jam) < 3) || (countitem(Luciola's_Honey_Jam) < 3)) {
+ if ((countitem(Pinguiculas_fruit_Jam) < 3) || (countitem(Luciolas_Honey_Jam) < 3)) {
mes "[Leo]";
mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~";
mes "They are specialties of the base of Splendide.";
@@ -17611,8 +17611,8 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
mes "It seems like Mayor Jun has an eye for character.";
mes "So he is Mayor after all...";
next;
- delitem Pinguicula's_fruit_Jam,3; //Pinguicula's_fruit_Jam
- delitem Luciola's_Honey_Jam,3; //Luciola's_Honey_Jam
+ delitem Pinguiculas_fruit_Jam,3;
+ delitem Luciolas_Honey_Jam, 3;
completequest 7420;
getexp 200000,200000;
.@alltotal = questprogress(7420) + questprogress(7419) + questprogress(7418);
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 79615327d..39ca8649c 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -5148,7 +5148,7 @@ function script mora_remains {
1@mist,145,245,0 script Meshir's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell
1@mist,196,276,0 script Noirit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato
1@mist,304,327,0 script Pajama God's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf
-1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell
+1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snails_Shell
1@mist,330,177,0 script Milebit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn
1@mist,284,84,0 script Kunmun's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin
1@mist,170,54,0 script Tsaihokin's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-27 04:35:51 +0000