From c856b07c45aed6c5842ee19a940f7e76f780221c Mon Sep 17 00:00:00 2001
From: Atemo <Atemo@users.noreply.github.com>
Date: Thu, 23 Aug 2018 15:49:32 +0200
Subject: [PATCH] Suggestion of 'killedgid', variable set when a monster is
 killed containing the monster game ID (#3418)

---
 doc/script_commands.txt      | 10 ++++++----
 src/map/map.hpp              |  1 +
 src/map/mob.cpp              |  3 +++
 src/map/pc.cpp               |  4 ++++
 src/map/pc.hpp               |  2 +-
 src/map/script_constants.hpp |  1 +
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index d88ef1e6a2..26e0b4b6ab 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -943,8 +943,9 @@ This special label triggers when a player kills another player. The variable
 
 OnNPCKillEvent:
 
-This special label triggers when a player kills a monster without label. The variable
-'killedrid' is set to the Class (mob ID) of the monster killed.
+This special label triggers when a player kills a monster without label.
+The variable 'killedrid' is set to the Class (mob ID) of the monster killed.
+The variable 'killedgid' is set to the ID (unique mob game ID) of the monster killed.
 
 OnPCLoadMapEvent:
 
@@ -6052,8 +6053,9 @@ The only very special thing about this command is an event label, which is an
 optional parameter. This label is written like '<NPC object name>::<label name>'
 and upon the monster being killed, it will execute the script inside of the
 specified NPC object starting from the label given. The RID of the player
-attached at this execution will be the RID of the killing character. The variable
-'killedrid' is set to the Class (mob ID) of the monster killed.
+attached at this execution will be the RID of the killing character.
+The variable 'killedrid' is set to the Class (mob ID) of the monster killed.
+The variable 'killedgid' is set to the ID (unique mob game ID) of the monster killed.
 
 <size> can be:
 	Size_Small	(0)		(default)
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 45bd7e248d..5200ff6b49 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -411,6 +411,7 @@ enum _sp {
 	SP_UPPER,SP_PARTNER,SP_CART,SP_FAME,SP_UNBREAKABLE,	//56-60
 	SP_CARTINFO=99,	// 99
 
+	SP_KILLEDGID=118,
 	SP_BASEJOB=119,	// 100+19 - celest
 	SP_BASECLASS=120,	//Hmm.. why 100+19? I just use the next one... [Skotlex]
 	SP_KILLERRID=121,
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 586300682e..b9b2387310 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -2994,16 +2994,19 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 
 		if( md->npc_event[0] && !md->state.npc_killmonster ) {
 			if( sd && battle_config.mob_npc_event_type ) {
+				pc_setparam(sd, SP_KILLEDGID, md->bl.id);
 				pc_setparam(sd, SP_KILLEDRID, md->mob_id);
 				pc_setparam(sd, SP_KILLERRID, sd->bl.id);
 				npc_event(sd,md->npc_event,0);
 			} else if( mvp_sd ) {
+				pc_setparam(mvp_sd, SP_KILLEDGID, md->bl.id);
 				pc_setparam(mvp_sd, SP_KILLEDRID, md->mob_id);
 				pc_setparam(mvp_sd, SP_KILLERRID, sd?sd->bl.id:0);
 				npc_event(mvp_sd,md->npc_event,0);
 			} else
 				npc_event_do(md->npc_event);
 		} else if( mvp_sd && !md->state.npc_killmonster ) {
+			pc_setparam(mvp_sd, SP_KILLEDGID, md->bl.id);
 			pc_setparam(mvp_sd, SP_KILLEDRID, md->mob_id);
 			npc_script_event(mvp_sd, NPCE_KILLNPC); // PCKillNPC [Lance]
 		}
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 7e9e822543..e7cea9c804 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -8116,6 +8116,7 @@ int pc_readparam(struct map_session_data* sd,int type)
 		case SP_FAME:            val = sd->status.fame; break;
 		case SP_KILLERRID:       val = sd->killerrid; break;
 		case SP_KILLEDRID:       val = sd->killedrid; break;
+		case SP_KILLEDGID:       val = sd->killedgid; break;
 		case SP_SITTING:         val = pc_issit(sd)?1:0; break;
 		case SP_CHARMOVE:		 val = sd->status.character_moves; break;
 		case SP_CHARRENAME:		 val = sd->status.rename; break;
@@ -8383,6 +8384,9 @@ bool pc_setparam(struct map_session_data *sd,int type,int val)
 	case SP_KILLEDRID:
 		sd->killedrid = val;
 		return true;
+	case SP_KILLEDGID:
+		sd->killedgid = val;
+		return true;
 	case SP_CHARMOVE:
 		sd->status.character_moves = val;
 		return true;
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index c23a235e29..e2720449c9 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -587,7 +587,7 @@ struct map_session_data {
 	size_t duel_group; // duel vars [LuzZza]
 	size_t duel_invite;
 
-	int killerrid, killedrid;
+	int killerrid, killedrid, killedgid;
 
 	int cashPoints, kafraPoints;
 	int rental_timer;
diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp
index e03f7ab09d..faf9c21a58 100644
--- a/src/map/script_constants.hpp
+++ b/src/map/script_constants.hpp
@@ -511,6 +511,7 @@
 	export_parameter("BaseClass",SP_BASECLASS);
 	export_parameter("killerrid",SP_KILLERRID);
 	export_parameter("killedrid",SP_KILLEDRID);
+	export_parameter("killedgid",SP_KILLEDGID);
 	export_parameter("Sitting",SP_SITTING);
 	export_parameter("CharMoves",SP_CHARMOVE);
 	export_parameter("CharRename",SP_CHARRENAME);