Merge remote-tracking branch 'upstream/master'

4 files changed, 38 insertions, 8 deletions

diff --git a/Hercules-10.sln b/Hercules-10.sln
index 997df68af..f8bbc88c1 100644..100755
--- a/Hercules-10.sln
+++ b/Hercules-10.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-10\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-10\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}"
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-10\map
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-10\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-10\plugin-sample.vcxproj", "{F4A5705B-BED6-47AB-9135-2D39838F14DC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,10 +32,8 @@ Global
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
 		{D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.Build.0 = Release|Win32
-		{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.Build.0 = Debug|Win32
-		{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.ActiveCfg = Release|Win32
-		{E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.Build.0 = Release|Win32
+		{F4A5705B-BED6-47AB-9135-2D39838F14DC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4A5705B-BED6-47AB-9135-2D39838F14DC}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 9853c97f2..248d9bf1f 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -9,7 +9,22 @@
 //=            http://hercules.ws/board/                        
 //================= More Information =================
 // http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+//================ Structure Example =================
+/*
+Job_Name: { /* Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) */
+	inherit: ( "Other_Job_Name" ); /* Base job from which this job will inherit its skill tree. NV_TRICKDEAD inheritance is skipped for non-novices from the source */
+
+	skills: { /* SKILL_NAMEs come from the Name (16th column) value in db/pre-re/skill_db.txt */
+		SKILL_NAME1: Max_Level /* Use this for skills that don't have other skill prerequisite; Max_Level is a numeric value that should match your client side files */
+		SKILL_NAME2: { /* Use this for skills which have other skills as prerequisites */
+			MaxLevel: Max_Level /* Max_Level is a numeric value that should match your client side files */
+			SKILL_NAME_PREREQUISITE: Level_Prerequisite /* The prerequisite skill and min level for having this skill available. Should also match your client side files */
+			SKILL_NAME_PREREQUISITE2: Level_Prerequisite2 /* You can add as many prerequisite skills as you want. Minimum of 1 if you add a skill this way */
+		}
+}
+*/
 //====================================================
+
 Novice: {
 	skills: { 
 		NV_BASIC: 9
@@ -3833,4 +3848,4 @@ Oboro: {
 			OB_ZANGETSU: 2
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index f61205cfa..ebcd5b663 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -9,7 +9,22 @@
 //=            http://hercules.ws/board/                        
 //================= More Information =================
 // http://hercules.ws/board/topic/1188-skill-tree-db-redesign/ <desc~!>
+//================ Structure Example =================
+/*
+Job_Name: { /* Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) */
+	inherit: ( "Other_Job_Name" ); /* Base job from which this job will inherit its skill tree. NV_TRICKDEAD inheritance is skipped for non-novices from the source */
+
+	skills: { /* SKILL_NAMEs come from the Name (16th column) value in db/re/skill_db.txt */
+		SKILL_NAME1: Max_Level /* Use this for skills that don't have other skill prerequisite; Max_Level is a numeric value that should match your client side files */
+		SKILL_NAME2: { /* Use this for skills which have other skills as prerequisites */
+			MaxLevel: Max_Level /* Max_Level is a numeric value that should match your client side files */
+			SKILL_NAME_PREREQUISITE: Level_Prerequisite /* The prerequisite skill and min level for having this skill available. Should also match your client side files */
+			SKILL_NAME_PREREQUISITE2: Level_Prerequisite2 /* You can add as many prerequisite skills as you want. Minimum of 1 if you add a skill this way */
+	}
+}
+*/
 //====================================================
+
 Novice: {
 	skills: { 
 		NV_BASIC: 9
@@ -3830,4 +3845,4 @@ Oboro: {
 			OB_ZANGETSU: 2
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/map/pc.c b/src/map/pc.c
index c2d50a7ce..d8e2a0537 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -986,6 +986,8 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	sd->cansendmail_tick = tick;
 	sd->hchsysch_tick = tick;
 
+	sd->idletime = last_tick;
+	
 	for(i = 0; i < MAX_SPIRITBALL; i++)
 		sd->spirit_timer[i] = INVALID_TIMER;
 	for(i = 0; i < ARRAYLENGTH(sd->autobonus); i++)