Merge pull request #481 from KinglyKrab/master

Added GetInstanceTimerByID(instance_id) to Perl and Lua.

changelog.txt

@@ -2,6 +2,10 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
 == 12/28/2015 ==
 Kinglykrab: Added GetInstanceTimer() to Perl and Lua.
+	- Added GetInstanceTimerByID(instance_id) to Perl and Lua.
+	- Note: If you do not provide an instance id in the method it defaults to instance id 0 and returns 0 for time remaining.
+	- Added UpdateZoneHeader(type, value) to Perl and Lua.
+	- Note: UpdateZoneHeader allows you to manipulate fog color, fog density, and many other zone header settings on the fly in Perl and Lua.
 	
 == 12/21/2015 ==
 Natedog: Updated item table fields and added a few missing fields for evolving items

zone/embparser_api.cpp

@@ -2930,6 +2930,18 @@ XS(XS__GetInstanceTimer) {
 	XSRETURN_UV(timer);
 }
 
+XS(XS__GetInstanceTimerByID);
+XS(XS__GetInstanceTimerByID) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: GetInstanceTimerByID(instance_id)");
+	
+	uint16 instance_id = (uint16)SvUV(ST(0));
+	uint32 timer = quest_manager.GetInstanceTimerByID(instance_id);
+	
+	XSRETURN_UV(timer);
+}
+
 XS(XS__GetInstanceID);
 XS(XS__GetInstanceID) {
 	dXSARGS;
@@ -3625,6 +3637,19 @@ XS(XS__debug)
 	XSRETURN_EMPTY;
 }
 
+XS(XS__UpdateZoneHeader);
+XS(XS__UpdateZoneHeader) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: UpdateZoneHeader(type, value)");
+	
+	std::string type = (std::string)SvPV_nolen(ST(0));
+	std::string value = (std::string)SvPV_nolen(ST(1));
+	quest_manager.UpdateZoneHeader(type, value);
+	
+	XSRETURN_EMPTY;
+}
+
 
 /*
 This is the callback perl will look for to setup the
@@ -3662,6 +3687,7 @@ EXTERN_C XS(boot_quest)
 		newXS(strcpy(buf, "DestroyInstance"), XS__DestroyInstance, file);
 		newXS(strcpy(buf, "UpdateInstanceTimer"), XS__UpdateInstanceTimer, file);
 		newXS(strcpy(buf, "GetInstanceTimer"), XS__GetInstanceTimer, file);
+		newXS(strcpy(buf, "GetInstanceTimerByID"), XS__GetInstanceTimerByID, file);
 		newXS(strcpy(buf, "FlagInstanceByGroupLeader"), XS__FlagInstanceByGroupLeader, file);
 		newXS(strcpy(buf, "FlagInstanceByRaidLeader"), XS__FlagInstanceByRaidLeader, file);
 		newXS(strcpy(buf, "FlyMode"), XS__FlyMode, file);
@@ -3853,6 +3879,7 @@ EXTERN_C XS(boot_quest)
 		newXS(strcpy(buf, "untraindiscs"), XS__untraindiscs, file);
 		newXS(strcpy(buf, "updatespawntimer"), XS__UpdateSpawnTimer, file);
 		newXS(strcpy(buf, "updatetaskactivity"), XS__updatetaskactivity, file);
+		newXS(strcpy(buf, "UpdateZoneHeader"), XS__UpdateZoneHeader, file);
 		newXS(strcpy(buf, "varlink"), XS__varlink, file);
 		newXS(strcpy(buf, "voicetell"), XS__voicetell, file);
 		newXS(strcpy(buf, "we"), XS__we, file);

zone/lua_general.cpp

@@ -812,6 +812,10 @@ uint32 lua_get_instance_timer() {
 	return quest_manager.GetInstanceTimer();
 }
 
+uint32 lua_get_instance_timer_by_id(uint16 instance_id) {
+	return quest_manager.GetInstanceTimerByID(instance_id);
+}
+
 int lua_get_instance_id(const char *zone, uint32 version) {
 	return quest_manager.GetInstanceID(zone, version);
 }
@@ -1300,6 +1304,10 @@ void lua_debug(std::string message, int level) {
 	Log.Out(static_cast<Logs::DebugLevel>(level), Logs::QuestDebug, message);
 }
 
+void lua_update_zone_header(std::string type, std::string value) {
+	quest_manager.UpdateZoneHeader(type, value);
+}
+
 #define LuaCreateNPCParse(name, c_type, default_value) do { \
 	cur = table[#name]; \
 	if(luabind::type(cur) != LUA_TNIL) { \

zone/questmgr.cpp

@@ -2606,6 +2606,21 @@ uint32 QuestManager::GetInstanceTimer() {
 	return 0;
 }
 
+uint32 QuestManager::GetInstanceTimerByID(uint16 instance_id) {
+	if (instance_id == 0)
+		return 0;
+	
+	std::string query = StringFormat("SELECT ((start_time + duration) - UNIX_TIMESTAMP()) AS `remaining` FROM `instance_list` WHERE `id` = %lu", (unsigned long)instance_id);
+	auto results = database.QueryDatabase(query);
+	
+	if (results.Success()) {
+		auto row = results.begin();
+		uint32 timer = atoi(row[0]);
+		return timer;
+	}
+	return 0;
+}
+
 uint16 QuestManager::GetInstanceID(const char *zone, int16 version)
 {
 	QuestManagerCurrentQuestVars();
@@ -3078,3 +3093,75 @@ std::string QuestManager::GetEncounter() const {
 
 	return "";
 }
+
+void QuestManager::UpdateZoneHeader(std::string type, std::string value) {
+	if (strcasecmp(type.c_str(), "ztype") == 0)
+		zone->newzone_data.ztype = atoi(value.c_str());
+	else if (strcasecmp(type.c_str(), "fog_red") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.fog_red[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "fog_green") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.fog_green[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "fog_blue") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.fog_blue[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "fog_minclip") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.fog_minclip[i] = atof(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "fog_maxclip") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.fog_maxclip[i] = atof(value.c_str());
+		}
+	}
+	else if (strcasecmp(type.c_str(), "gravity") == 0)
+		zone->newzone_data.gravity = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "time_type") == 0)
+		zone->newzone_data.time_type = atoi(value.c_str());
+	else if (strcasecmp(type.c_str(), "rain_chance") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.rain_chance[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "rain_duration") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.rain_duration[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "snow_chance") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.snow_chance[i] = atoi(value.c_str());
+		}
+	} else if (strcasecmp(type.c_str(), "snow_duration") == 0) {
+		for (int i = 0; i < 4; i++) {
+			zone->newzone_data.snow_duration[i] = atoi(value.c_str());
+		}
+	}
+	else if (strcasecmp(type.c_str(), "sky") == 0)
+		zone->newzone_data.sky = atoi(value.c_str());
+	else if (strcasecmp(type.c_str(), "safe_x") == 0)
+		zone->newzone_data.safe_x = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "safe_y") == 0)
+		zone->newzone_data.safe_y = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "safe_z") == 0)
+		zone->newzone_data.safe_z = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "max_z") == 0)
+		zone->newzone_data.max_z = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "underworld") == 0)
+		zone->newzone_data.underworld = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "minclip") == 0)
+		zone->newzone_data.minclip = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "maxclip") == 0)
+		zone->newzone_data.maxclip = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "fog_density") == 0)
+		zone->newzone_data.fog_density = atof(value.c_str());
+	else if (strcasecmp(type.c_str(), "suspendbuffs") == 0)
+		zone->newzone_data.SuspendBuffs = atoi(value.c_str());
+	
+	EQApplicationPacket* outapp = new EQApplicationPacket(OP_NewZone, sizeof(NewZone_Struct));
+	memcpy(outapp->pBuffer, &zone->newzone_data, outapp->size);
+	entity_list.QueueClients(0, outapp);
+	safe_delete(outapp);
+}

zone/questmgr.h

@@ -218,7 +218,9 @@ public:
 	uint32 MerchantCountItem(uint32 NPCid, uint32 itemid);
 	uint16 CreateInstance(const char *zone, int16 version, uint32 duration);
 	void UpdateInstanceTimer(uint16 instance_id, uint32 new_duration);
+	void UpdateZoneHeader(std::string type, std::string value);
 	uint32 GetInstanceTimer();
+	uint32 GetInstanceTimerByID(uint16 instance_id = 0);
 	void DestroyInstance(uint16 instance_id);
 	uint16 GetInstanceID(const char *zone, int16 version);
 	void AssignToInstance(uint16 instance_id);