* Added Karma and Manner to const.txt

* Delete players' ID from id_db when kicking everyone from the map-server due to char disconnection -- Fixes an odd crash with lazy mob AI

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

4 files changed, 26 insertions, 0 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 765aab1f4..bf9594a14 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,17 @@
 Date	Added
 
 01/31
+        * Added Karma and Manner to const.txt
+          -- To change a player's alignment to more Good/Evil in scripting for example,
+             use:
+                 set Karma, Karma + <number here>;
+
+             In older exe's (11-08 or older) you can actually check your karma in the
+             character alignment screen (alt-A)
+             The rest is up to your scripting creativity ^^
+
+        * Delete players' ID from id_db when kicking everyone from the map-server due
+          to char disconnection -- Fixes an odd crash with lazy mob AI [celest]
 	* Added at(@) command @autoloot, which turns autoloot on or off for the
 	  player who uses it [Upa-Kun]
 01/29
diff --git a/db/const.txt b/db/const.txt
index 63c502fba..2aa8757c4 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -110,6 +110,8 @@ MaxHp		6	1
 Sp		7	1
 MaxSp		8	1
 BaseJob		119	1
+Karma		4
+Manner		5
 
 bMaxHP		6
 bMaxSP		8
diff --git a/src/map/map.c b/src/map/map.c
index 50f44c327..c214f16a2 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1094,6 +1094,7 @@ int map_quit(struct map_session_data *sd) {
 	} 
 	strdb_erase(nick_db,sd->status.name);
 	numdb_erase(charid_db,sd->status.char_id);
+	numdb_erase(id_db,sd->bl.id);
 	free(sd->reg);
 	free(sd->regstr);
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 6026da033..e98df2a02 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4748,6 +4748,12 @@ int pc_readparam(struct map_session_data *sd,int type)
 	case SP_LUK:
 		val= sd->status.luk;
 		break;
+	case SP_KARMA:	// celest
+		val = sd->status.karma;
+		break;
+	case SP_MANNER:
+		val = sd->status.manner;
+		break;
 	case SP_FAME:
 		val= sd->fame;
 		break;
@@ -4877,6 +4883,12 @@ int pc_setparam(struct map_session_data *sd,int type,int val)
 	case SP_LUK:
 		sd->status.luk = val;
 		break;
+	case SP_KARMA:
+		sd->status.karma = val;
+		break;
+	case SP_MANNER:
+		sd->status.manner = val;
+		break;
 	case SP_FAME:
 		sd->fame = val;
 		break;