* Merged changes from trunk [14636:14686/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 64 insertions, 24 deletions

diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index 3f25dc4c5..840aea3de 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -3,7 +3,7 @@
 //===== By ================================================
 //= Developers
 //===== Version ===========================================
-//= 1.1.20101205
+//= 1.1.20110124
 //=========================================================
 //= 1.0 - Standardized doc file
 //= 1.1.20080612 - skill command and bonuses (bAutoSpell, bSkillAtk, 
@@ -19,6 +19,13 @@
 //=   bUnbreakableWeapon, bUnbreakableArmor, bUnbreakableHelm,
 //=   bUnbreakableShield, bUnbreakableShoes, bBreakWeaponRate and
 //=   bBreakArmorRate. [Ai4rei]
+//= 1.1.20110124 - added documentation for bAgiVit, bAgiDexStr,
+//=   bUnbreakable, bShortWeaponDamageReturn, bLongWeaponDamageReturn,
+//=   bWeaponComaEle, bAddEff2, bMagicDamageReturn, bRandomAttackIncrease,
+//=   bPerfectHide, bNoKnockback, bClassChange, bHPDrainValue, bWeaponAtk,
+//=   bWeaponAtkRate, bDelayrate, bHPDrainRateRace, bSPDrainRateRace,
+//=   bAddEffOnSkill, bNoMiscDamage, bLongAtkRate, bUnstripable,
+//=   bHPDrainValueRace, bMagicSPGainValue and bMagicHPGainValue. [Ai4rei]
 //===== Description =======================================
 //= List of script instructions used in item bonuses,
 //= mainly bonus/bonus2/bonus3/bonus4/bonus5 arguments
@@ -34,6 +41,8 @@ bonus bInt,n;				INT + n
 bonus bDex,n;				DEX + n
 bonus bLuk,n;				LUK + n
 bonus bAllStats,n;			STR + n, AGI + n, VIT + n, INT + n, DEX + n, LUK + n
+bonus bAgiVit,n;			AGI + n, VIT + n
+bonus bAgiDexStr,n;			STR + n, AGI + n, DEX + n
 bonus bMaxHP,n;				MaxHP + n
 bonus bMaxSP,n;				MaxSP + n
 bonus bMaxHPrate,n;			MaxHP + n% 
@@ -120,9 +129,9 @@ bonus bIntravision,n;			Always see Hiding and Cloaking players/mobs (n is meanin
 bonus bHealPower,n;			Increase heal amount of all heal skills by n%
 bonus bHealPower2,n;			Increase heal amount if you are healed by any skills by n%
 bonus2 bAddEff,e,x;			Adds a x/10000 chance to cause effect e to the target when attacking (e.g. x=100 makes 1% chance, x=10000 makes 100% chance, etc)
-							e: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stan, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding
+							e: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stun, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding
 bonus2 bResEff,e,x;			Adds a x/10000 tolerance to effect e (e.g. x=100 makes 1% tolerance, x=10000 makes 100% tolerance, etc)
-							e: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stan, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding
+							e: Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence, Eff_Stun, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding
 bonus2 bCastrate,n,x;			Adjust casting time of skill n by x% (supports skill names)
 bonus2 bAddSize,n,x;			+x% physical damage against size n.
 							n: 0=Small  1=Medium  2=Large
@@ -395,3 +404,36 @@ bonus bUnbreakableShield,n;	Shield cannot be damaged/broken by any means (n is m
 bonus bUnbreakableShoes,n;	Shoes cannot be damaged/broken by any means (n is meaningless)
 bonus bBreakWeaponRate,n;	Adds a n/100% chance to break enemy's weapon while attacking (stacks with other break chances).
 bonus bBreakArmorRate,n;	Adds a n/100% chance to break enemy's armor while attacking (stacks with other break chances).
+bonus bUnbreakable,n;		Reduces the break chance of all equipped equipment by n%.
+bonus bShortWeaponDamageReturn,n;	Reflects n% of received melee damage back to the enemy that caused it.
+bonus bLongWeaponDamageReturn,n;	Reflects n% of received ranged damage back to the enemy that caused it.
+bonus2 bWeaponComaEle,x,n;	Adds a n/100% chance to cause Coma when attacking a monster of element x with normal attack.
+							x:	0=Neutral, 1=Water, 2=Earth, 3=Fire, 4=Wind, 5=Poison,
+								6=Holy, 7=Dark, 8=Spirit, 9=Undead
+bonus2 bAddEff2,x,n;	Adds a n/100% chance to cause status change x on self when attacking.
+						x:	Eff_Blind, Eff_Sleep, Eff_Poison, Eff_Freeze, Eff_Silence,
+							Eff_Stun, Eff_Curse, Eff_Confusion, Eff_Stone, Eff_Bleeding
+bonus bMagicDamageReturn,n;	Adds a n% chance to reflect targetted magic spells back to the enemy that caused it.
+bonus2 bRandomAttackIncrease,x,n;	Adds a n% chance to inflict x% additional damage to the enemy with normal attack.
+bonus bPerfectHide,n;	Hidden/cloaked character is no longer detected by monsters with 'detector' mode (n is meaningless).
+bonus bNoKnockback,n;	Character is no longer knocked back by enemy skills with such effect (n is meaningless).
+bonus bClassChange,n;	Gives a n/100% chance to change the attacked monster's class with normal attack.
+bonus bHPDrainValue,n;	Heals +n HP with normal attack.
+bonus2 bHPDrainValue,n,x;	Heals +n HP with normal attack. When x is non-zero, the HP is drained instead.
+bonus2 bWeaponAtk,x,n;	Adds n ATK when weapon of type x is equipped.
+						x: see doc/item_db.txt -> view -> weapons for possible values
+bonus2 bWeaponAtkRate,x,n;	Adds n% damage to normal attacks when weapon of type x is equipped.
+							x: see doc/item_db.txt -> view -> weapons for possible values
+bonus bDelayrate,n;	Increases skill delay by n%.
+bonus3 bHPDrainRateRace,r,n,x;	Adds a n/10% chance to receive x% of dealed damage as HP from a monster of race r with normal attack.
+bonus3 bSPDrainRateRace,r,n,x;	Adds a n/10% chance to receive x% of dealed damage as SP from a monster of race r with normal attack.
+bonus3 bAddEffOnSkill,s,x,n;	Adds a n/100% chance to cause status change x on enemy when using skill s (supports skill names)
+bonus4 bAddEffOnSkill,s,x,n,t;	Adds a n/100% chance to cause status change x when using skill s (supports skill names)
+								t:	ATF_SELF   = causes status change to oneself
+									ATF_TARGET = causes status change to the enemy
+bonus bNoMiscDamage,n;	Adds n% reduction to received misc damage.
+bonus bLongAtkRate,n;	Increases damage of ranged attacks by n%.
+bonus bUnstripable,n;	Armor cannot be taken off via strip skills (n is meaningless)
+bonus2 bHPDrainValueRace,r,n;	Heals +n HP when attacking a monster of race r with normal attack.
+bonus bMagicSPGainValue,n;	Heals +n SP when killing an enemy with magic attack.
+bonus bMagicHPGainValue,n;	Heals +n HP when killing an enemy with magic attack.
diff --git a/doc/mob_db_mode_list.txt b/doc/mob_db_mode_list.txt
index 9fa403f1d..26af0c167 100644
--- a/doc/mob_db_mode_list.txt
+++ b/doc/mob_db_mode_list.txt
@@ -82,7 +82,7 @@ Random Target: Picks a new random target in range on each attack / skill.
 Aegis Mob Types:
 -------------------------------------------------------------------------------
 
-What Aegis has are mob-types, where each type represents an AI behaviour that
+What Aegis has are mob-types, where each type represents an AI behavior that
 is mimicked by a group of eA mode bits. This is the table to convert from one
 to another:
 
@@ -91,22 +91,22 @@ Aegis/eA (description)
 02: 0x0083 (passive, looter)
 03: 0x1089 (passive, assist and change-target melee)
 04: 0x3885 (angry, change-target melee/chase)
-05: 0x2085 (aggro, change-target chase)
+05: 0x2085 (aggressive, change-target chase)
 06: 0x0000 (passive, immobile, can't attack) [plants]
 07: 0x108B (passive, looter, assist, change-target melee)
-08: 0x6085 (aggro, change-target chase, target weak enemies)
-09: 0x3095 (aggro, change-target melee/chase, cast sensor idle) [Guardian]
-10: 0x0084 (aggro, immobile)
-11: 0x0084 (aggro, immobile) [Guardian]
-12: 0x2085 (aggro, change-target chase) [Guardian]
-13: 0x308D (aggro, change-target melee/chase, assist)
+08: 0x6085 (aggressive, change-target chase, target weak enemies)
+09: 0x3095 (aggressive, change-target melee/chase, cast sensor idle) [Guardian]
+10: 0x0084 (aggressive, immobile)
+11: 0x0084 (aggressive, immobile) [Guardian]
+12: 0x2085 (aggressive, change-target chase) [Guardian]
+13: 0x308D (aggressive, change-target melee/chase, assist)
 17: 0x0091 (passive, cast sensor idle)
-19: 0x3095 (aggro, change-target melee/chase, cast sensor idle)
-20: 0x3295 (aggro, change-target melee/chase, cast sensor idle/chase)
-21: 0x3695 (aggro, change-target melee/chase, cast sensor idle/chase, chase-change target)
+19: 0x3095 (aggressive, change-target melee/chase, cast sensor idle)
+20: 0x3295 (aggressive, change-target melee/chase, cast sensor idle/chase)
+21: 0x3695 (aggressive, change-target melee/chase, cast sensor idle/chase, chase-change target)
 25: 0x0001 (passive, can't attack) [Pet]
-26: 0xB695 (aggro, change-target melee/chase, cast sensor idle/chase, chase-change target, random target)
-27: 0x8084 (aggro, immobile, random target)
+26: 0xB695 (aggressive, change-target melee/chase, cast sensor idle/chase, chase-change target, random target)
+27: 0x8084 (aggressive, immobile, random target)
 
 - Note that the detector bit due to being Insect/Demon, plant and Boss mode
   bits need to be added independently of this list.
diff --git a/doc/sample/basejob_baseclass_upper.txt b/doc/sample/basejob_baseclass_upper.txt
index 913707404..8463a5d6e 100644
--- a/doc/sample/basejob_baseclass_upper.txt
+++ b/doc/sample/basejob_baseclass_upper.txt
@@ -3,5 +3,6 @@ prontera,155,177,1	script	Tell Me	725,{
 	mes "Class: " + Class;
 	mes "BaseClass: " + BaseClass;
 	mes "BaseJob: " + BaseJob;
-	mes "Upper: " + Uppser;
+	mes "Upper: " + Upper;
+	close;
 }
\ No newline at end of file
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 383a3c301..edca5e037 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -4,7 +4,7 @@
 //= A reference manual for the eAthena scripting language.
 //= Commands are sorted depending on their functionality.
 //===== Version ===========================================
-//= 3.34.20101217
+//= 3.35.20110106
 //=========================================================
 //= 1.0 - First release, filled will as much info as I could
 //=       remember or figure out, most likely there are errors,
@@ -153,6 +153,8 @@
 //=       behavior. [Ai4rei]
 //= 3.34.20101217
 //=       Spellcheck. [Ai4rei]
+//= 3.35.20110106
+//=       Removed bug warning from 'deletearray'. [Ai4rei]
 //=========================================================
 
 This document is a reference manual for all the scripting commands and functions 
@@ -2105,11 +2107,6 @@ array, shifting all the elements beyond this towards the beginning.
 
     deletearray @array[1],3
 
-IMPORTANT: deletarray is horribly broken since the earliest days of jAthena. It 
-tends to merrily remove much more variables than it's told to remove, which 
-makes it pretty much useless for anything other than removing an array from 
-memory entirely. This would be very handy, if it always worked. 
-
 ---------------------------------------
 
 ======================================
diff --git a/doc/whisper_sys.txt b/doc/whisper_sys.txt
index 2c786ebd5..f8bab699a 100644
--- a/doc/whisper_sys.txt
+++ b/doc/whisper_sys.txt
@@ -11,7 +11,7 @@ You whisper to NPCCommander in Game with formatted instructions like these:
 
 //============================================================
 
-[To NPC:Commander]       Report#Killstealing#Lordalfa
+[To NPC:NPCCommander]       Report#Killstealing#Lordalfa
 
 //============================================================