* Fixed Apple of Idun not checking for bard soul link (bugreport:1028)

 * Fixed Advanced Adrenaline Rush not working barehanded (bugreport:1049)
 * Disabled idle_no_autoloot setting (bugreport:1051)

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

6 files changed, 13 insertions, 5 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6f74644b9..46186b2fd 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/02/27
+	* Fixed Apple of Idun not checking for bard soul link (bugreport:1028)
+	* Fixed Advanced Adrenaline Rush not working barehanded (bugreport:1049)
+	* Disabled idle_no_autoloot setting (bugreport:1051)
 	* Removed NODAMAGE and ICEWALL cell types (mem usage back to normal)
 	- Icewall now uses basic cell type 5 (nonwalkable, shootable)
 	- as a consequence, you can now warp to a nonwalkable cell - but only
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index f2170eb4c..17e80c4e1 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2008/02/27
+	* Disabled idle_no_autoloot setting (bugreport:1051)
 2008/02/14
 	* Removed atcommand @whozeny [ultramage]
 2008/02/11
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index b8c1544a5..d93337429 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -137,5 +137,6 @@ bone_drop: 0
 character_size: 0
 
 // Idle characters can receive autoloot?
-// Set to the time in seconds where an idle character will stop receiving items from Autoloot.
-idle_no_autoloot: 120
+// Set to the time in seconds where an idle character will stop receiving
+// items from Autoloot (0: disabled).
+idle_no_autoloot: 0
diff --git a/db/Changelog.txt b/db/Changelog.txt
index b6def1d0d..0f726eee7 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -37,6 +37,8 @@
 	2376 General's_Plate_Mail	Increases heal recovery effectiveness on you by 10%
 
 =======================
+2008/02/27
+	* Added barehanded weapons to Full Adrenaline Rush's list [ultramage]
 2008/02/07
 	* Rev. 12183 Updated some existing items and added some others. [L0ne_W0lf]
 	* Changed NPC_BLEEDING in mob_skill_db to be target not self.
diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index 67bf71c26..c7858cadc 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -353,7 +353,7 @@
 456,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SL_ROGUE
 457,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SL_ASSASSIN
 458,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SL_BLACKSMITH
-459,0,0,64,0,0,0,1:2:3:4:5:6:7:8:9:10:12:13:14:15:16,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#
+459,0,0,64,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BS_ADRENALINE2#
 460,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SL_HUNTER
 461,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SL_SOULLINKER
 462,0,0,120:110:100:90:80:70:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAIZEL#Kaizel#
diff --git a/src/map/skill.c b/src/map/skill.c
index 00bfa96cb..17175b741 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6910,8 +6910,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 		case UNT_APPLEIDUN: //Apple of Idun [Skotlex]
 		{
 			int heal;
-			if (sg->src_id == bl->id)
-				break;
+			if( sg->src_id == bl->id && !(tsc && tsc->data[SC_SPIRIT] && tsc->data[SC_SPIRIT]->val2 == SL_BARDDANCER) )
+				break; // affects self only when soullinked
 			heal = sg->val2;
 			if(tsc && tsc->data[SC_CRITICALWOUND])
 				heal -= heal * tsc->data[SC_CRITICALWOUND]->val2 / 100;