Merge branch 'master' into academie

db/re/item_package.txt

@@ -874,22 +874,22 @@ IG_Xmas_Pet_Scroll,732,150,10,1,0,0,1	// 10x Crystal_Jewel__
 IG_Xmas_Pet_Scroll,14508,150,10,1,0,0,1	// 10x Zeny_Scroll
 IG_Xmas_Pet_Scroll,7776,50,5,1,0,0,1	// 5x Max_Weight_Up_Scroll
 
-IG_Lucky_Scroll08,12211,220,05,0,0,0,1	// 05x Kafra_Card
+IG_Lucky_Scroll08,12211,220,5,0,0,0,1	// 5x Kafra_Card
 IG_Lucky_Scroll08,12208,210,5,0,0,0,1	// 5x Battle_Manual
 IG_Lucky_Scroll08,12210,210,5,0,0,0,1	// 5x Bubble_Gum
-IG_Lucky_Scroll08,12922,100,05,0,0,0,1	// 05x Token_Of_Siegfried_Box
-IG_Lucky_Scroll08,12213,2,0,0,0,0,1	// 0x Neuralizer
-IG_Lucky_Scroll08,5226,1,0,0,0,0,1	// 0x Mini_Propeller_
-IG_Lucky_Scroll08,12999,5,0,0,0,0,1	// 0x Branch_Of_Dead_Tree_Box
-IG_Lucky_Scroll08,4168,1,0,0,0,0,1	// 0x Dark_Lord_Card
-IG_Lucky_Scroll08,4169,1,0,0,0,0,1	// 0x Dark_Illusion_Card
-IG_Lucky_Scroll08,5215,2,0,0,0,0,1	// 0x Angelic_Chain_
-IG_Lucky_Scroll08,5216,3,0,0,0,0,1	// 0x Satanic_Chain_
-IG_Lucky_Scroll08,5217,2,0,0,0,0,1	// 0x Magestic_Goat_TW
-IG_Lucky_Scroll08,5218,3,0,0,0,0,1	// 0x Bunny_Band_
-IG_Lucky_Scroll08,5219,5,0,0,0,0,1	// 0x Drooping_Kitty_
-IG_Lucky_Scroll08,5077,65,0,0,0,0,1	// 0x Tulip_Hairpin
-IG_Lucky_Scroll08,12901,60,0,0,0,0,1	// 0x Insurance_Package
+IG_Lucky_Scroll08,12922,100,5,0,0,0,1	// 5x Token_Of_Siegfried_Box
+IG_Lucky_Scroll08,12213,2,1,0,0,0,1	// 1x Neuralizer
+IG_Lucky_Scroll08,5226,1,1,0,0,0,1	// 1x Mini_Propeller_
+IG_Lucky_Scroll08,12999,5,1,0,0,0,1	// 1x Branch_Of_Dead_Tree_Box
+IG_Lucky_Scroll08,4168,1,1,0,0,0,1	// 1x Dark_Lord_Card
+IG_Lucky_Scroll08,4169,1,1,0,0,0,1	// 1x Dark_Illusion_Card
+IG_Lucky_Scroll08,5215,2,1,0,0,0,1	// 1x Angelic_Chain_
+IG_Lucky_Scroll08,5216,3,1,0,0,0,1	// 1x Satanic_Chain_
+IG_Lucky_Scroll08,5217,2,1,0,0,0,1	// 1x Magestic_Goat_TW
+IG_Lucky_Scroll08,5218,3,1,0,0,0,1	// 1x Bunny_Band_
+IG_Lucky_Scroll08,5219,5,1,0,0,0,1	// 1x Drooping_Kitty_
+IG_Lucky_Scroll08,5077,65,1,0,0,0,1	// 1x Tulip_Hairpin
+IG_Lucky_Scroll08,12901,60,1,0,0,0,1	// 1x Insurance_Package
 IG_Lucky_Scroll08,610,110,15,0,0,0,1	// 15x Leaf_Of_Yggdrasil
 
 IG_Br_SwordPackage,2317,0,1,0,0,0,1	// 1x Plate_Armor_
@@ -3149,14 +3149,14 @@ IG_Sg_Weapon_Supply_Box,12678,13,1,1	// 1x Siege_Arrow_Quiver_A
 IG_Sg_Weapon_Supply_Box,12677,13,1,1	// 1x Siege_Arrow_Quiver_S
 
 //TODO: Confirm the items & rates
-IG_Adventurer_Returns_Support_Box,16505,1	// 1x Steamed_Tongue_Box_10
-IG_Adventurer_Returns_Support_Box,16506,1	// 1x Steamed_Desert_Scorpions_Box_10
-IG_Adventurer_Returns_Support_Box,16507,1	// 1x Dragon_Breath_Cocktail_Box_10
-IG_Adventurer_Returns_Support_Box,16508,1	// 1x Hwergelmir's_Tonic_Box_10
-IG_Adventurer_Returns_Support_Box,16509,1	// 1x Cooked_Nine_Tail_Box_10
-IG_Adventurer_Returns_Support_Box,16510,1	// 1x Immortal_Stew_Box_10
-IG_Adventurer_Returns_Support_Box,16514,1	// 1x Blessing_Scroll_Box_10
-IG_Adventurer_Returns_Support_Box,16515,1	// 1x Increase_Agility_Scroll_Box_10
+IG_Adventurer_Returns_Support_Box,16505,1,1	// 1x Steamed_Tongue_Box_10
+IG_Adventurer_Returns_Support_Box,16506,1,1	// 1x Steamed_Desert_Scorpions_Box_10
+IG_Adventurer_Returns_Support_Box,16507,1,1	// 1x Dragon_Breath_Cocktail_Box_10
+IG_Adventurer_Returns_Support_Box,16508,1,1	// 1x Hwergelmir's_Tonic_Box_10
+IG_Adventurer_Returns_Support_Box,16509,1,1	// 1x Cooked_Nine_Tail_Box_10
+IG_Adventurer_Returns_Support_Box,16510,1,1	// 1x Immortal_Stew_Box_10
+IG_Adventurer_Returns_Support_Box,16514,1,1	// 1x Blessing_Scroll_Box_10
+IG_Adventurer_Returns_Support_Box,16515,1,1	// 1x Increase_Agility_Scroll_Box_10
 
 //TODO: Confirm the items & rates
 IG_Support_Package,12208,1,2,1	// 2x Battle_Manual
@@ -3250,22 +3250,22 @@ IG_Support_Package_III10,14725,1,11,1	// 11x Sealed_Bacsojin_Scroll
 
 //TODO: Confirm the items & rates
 //IG_Unlimited_Box,,0,5,0	//5 ASPD Enhanced Potion
-//IG_Unlimited_Box,,0,10,0	//10 Red Boost
+IG_Unlimited_Box,12796,0,10,0	// 10x Red_Booster
 IG_Unlimited_Box,12841,0,1,0	// 1x Golden_Treasure_Box
 
 //TODO: Confirm the items & rates
 //IG_Unlimited_Box_II,,0,5,0	//50 ASPD Enhanced Potion
-//IG_Unlimited_Box_II,,0,10,0	//100 Red Boost
+IG_Unlimited_Box_II,12796,0,10,0	// 100x Red_Booster
 IG_Unlimited_Box_II,12841,0,11,0	// 11x Golden_Treasure_Box
 
 //TODO: Confirm the items & rates
 //IG_Unlimited_Box_II,,0,5,0	//5 ASPD Enhanced Potion
-//IG_Unlimited_Box_II,,0,10,0	//10 Red Boost
+IG_Unlimited_Box_II,12796,0,10,0	// 10x Red_Booster
 IG_Unlimited_Box_II,14733,0,1,0	// 1x Sealed_Pharaoh_Scroll
 
 //TODO: Confirm the items & rates
-//IG_Unlimited_Box_II10,,0,5,0	//50 ASPD Enhanced Potion
-//IG_Unlimited_Box_II10,,0,10,0	//100 Red Boost
+//IG_Unlimited_Box_II10,,0,50,0	//50 ASPD Enhanced Potion
+IG_Unlimited_Box_II10,12796,0,100,0	// 100x Red_Booster
 IG_Unlimited_Box_II10,14733,0,11,0	// 11x Sealed_Pharaoh_Scroll
 
 //TODO: Confirm the items & rates
@@ -3299,7 +3299,7 @@ IG_Support_Package_II,12210,1,2,1	// 2x Bubble_Gum
 IG_Support_Package_II,12883,1,2,1	// 2x Almighty
 IG_Support_Package_II,14600,1,2,1	// 2x Mental_Potion
 //IG_Support_Package_II,,1,6,1	//6x Mysterious Water of Life
-IG_Support_Package_II,14725,1,1,1 //1x Sealed_Bacsojin_Scroll
+IG_Support_Package_II,14725,1,1,1 // 1x Sealed_Bacsojin_Scroll
 
 //TODO: Confirm the items & rates
 IG_Support_Package_II10,12208,1,20,1	// 20x Battle_Manual
@@ -3307,7 +3307,7 @@ IG_Support_Package_II10,12210,1,20,1	// 20x Bubble_Gum
 IG_Support_Package_II10,12883,1,20,1	// 20x Almighty
 IG_Support_Package_II10,14600,1,20,1	// 20x Mental_Potion
 //IG_Support_Package_II10,,1,60,1	//60x Mysterious Water of Life
-IG_Support_Package_II10,14725,1,1,1	//1x Sealed_Bacsojin_Scroll
+IG_Support_Package_II10,14725,1,1,1	// 1x Sealed_Bacsojin_Scroll
 
 IG_Level_Up_Box100,6231,0,1,0	// 1x Guarantee_Weapon_6Up
 IG_Level_Up_Box100,22523,0,1,0	// 1x Level_Up_Box120
@@ -3897,7 +3897,7 @@ IG_Miracle_Lucky_Egg,18742,1,1 // 1x MoonStar
 IG_Miracle_Lucky_Egg,6438,1,3 // 3x Blessed_Weapon_Ore
 IG_Miracle_Lucky_Egg,6439,1,3 // 3x Blessed_Armor_Ore
 IG_Miracle_Lucky_Egg,12902,1,1 // 1x Bubble Gum Box
-//IG_Miracle_Lucky_Egg,,1,1 // ?? Yggdrasil Berry
+//IG_Miracle_Lucky_Egg,607,1,1 // ?? Yggdrasil Berry
 
 //! TODO: Confirm the rates
 IG_Legend_Hero_Lucky_Egg,4145,1,1 // 1x Berzebub Card

doc/script_commands.txt

@@ -2774,8 +2774,8 @@ This function is intended for use in item scripts.
 
 ---------------------------------------
 
-*getnameditem(<item id>,"<name to inscribe>");
-*getnameditem("<item name>","<name to inscribe>");
+*getnameditem(<item id>,"<name to inscribe>"|<char id>);
+*getnameditem("<item name>","<name to inscribe>"|<char id>);
 
 This function is equivalent to using 'getitem', however, it will not just give 
 the character an item object, but will also inscribe it with a specified 
@@ -5158,7 +5158,8 @@ a rate and flag.
 
 'sc_start2' and 'sc_start4' allow extra parameters to be passed, and are used only
 for effects that require them. The meaning of the extra values vary depending on the
-effect type.
+effect type. For more infos, read status_change.txt containing a list of all Status Changes
+and theirs val1, val2, val3, and val4 usage in source.
 
 'sc_end' will remove a specified status effect. If SC_ALL (-1) is given, it will
 perform a complete removal of all statuses (although permanent ones will re-apply).
@@ -5168,12 +5169,14 @@ Examples:
 	sc_start SC_POISON,600000,0,5000;
 
 	// This will bestow the effect of Level 10 Blessing.
-	sc_start 10,240000,10;
-
-	// Elemental armor defense takes the following four values:
-	// val1 is the first element, val2 is the resistance to the element val1.
-	// val3 is the second element, val4 is the resistance to the element val3.
-	sc_start4 SC_DefEle,60000,Ele_Fire,20,Ele_Water,-15;
+	sc_start SC_BLESSING,240000,10;
+
+	// Adjust element resistance by percentage. Sample with Resist_Fire item script:
+	// val1: Water resistance
+	// val2: Earth resistance
+	// val3: Fire resistance
+	// val4: Wind resistance
+	sc_start4 SC_ARMOR_ELEMENT,1200000,-15,0,20,0;
 
 	// This will end the Freezing status for the invoking character.
 	sc_end SC_FREEZE;

npc/re/merchants/bio4_reward.txt

@@ -279,7 +279,7 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 					break;
 				case 4:
 					mes "<<Ygnus Stale[1]>>";
-					mes "When doing short distance attack, cast ¹ßÈ­ to the player and to the enemy with a certain chance.";
+					mes "When doing short distance attack, cast Burn status to the player and to the enemy with a certain chance.";
 					mes "Two-Handed Axe / ATK 250 / Weight 190 / Fire Property / Weapon Lv 4 / Required Lv 95 / Socket 1 / for High Swordman/Merchant Classes";
 					callsub L_Reward, 1392, 50, 100, 35; //Ygnus_Stale
 					break;

src/config/core.h

@@ -27,9 +27,9 @@
 /// your map-server using more resources while this is active, comment the line
 #define SCRIPT_CALLFUNC_CHECK
 
-/// Uncomment to disable rAthena's anonymous stat report
+/// Comment to enable rAthena's anonymous stat report
 /// We kindly ask you to consider keeping it enabled, it helps us improve rAthena.
-//#define STATS_OPT_OUT
+#define STATS_OPT_OUT
 
 /// uncomment to enable query_sql script command and mysql logs to function on it's own thread
 /// be aware this feature is under tests and you should use at your own risk, we however

src/map/script.c

@@ -9923,8 +9923,10 @@ BUILDIN_FUNC(getexp)
 
 	// bonus for npc-given exp
 	bonus = battle_config.quest_exp_rate / 100.;
-	base = (int) cap_value(base * bonus, 0, INT_MAX);
-	job = (int) cap_value(job * bonus, 0, INT_MAX);
+	if (base)
+		base = (int) cap_value(base * bonus, 0, INT_MAX);
+	if (job)
+		job = (int) cap_value(job * bonus, 0, INT_MAX);
 
 	pc_gainexp(sd, NULL, base, job, true);