diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 06b5f9cfd4..087e90317d 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -2774,8 +2774,8 @@ This function is intended for use in item scripts. --------------------------------------- -*getnameditem(,""); -*getnameditem("",""); +*getnameditem(,""|); +*getnameditem("",""|); 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; + sc_start SC_BLESSING,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; + // 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; diff --git a/npc/re/merchants/bio4_reward.txt b/npc/re/merchants/bio4_reward.txt index 0f92972f9c..3b7e5603a6 100644 --- a/npc/re/merchants/bio4_reward.txt +++ b/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 "<>"; - 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; diff --git a/src/map/script.c b/src/map/script.c index 13139f31b0..eb1a1e1289 100644 --- a/src/map/script.c +++ b/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);