Fix #465 and Fix #463

EQ2/source/WorldServer/ClientPacketFunctions.cpp

@@ -241,10 +241,6 @@ void ClientPacketFunctions::SendUpdateSpellBook ( Client* client ){
 	client->GetPlayer()->UnlockAllSpells(true);
 }
 
-void ClientPacketFunctions::SendLoginCommandMessages ( Client* client ){
-	LogWrite(MISC__TODO, 1, "TODO", "Why is this function empty? Func: %s", __FUNCTION__);
-}
-
 void ClientPacketFunctions::SendServerControlFlags(Client* client, int8 param, int8 param_val, int8 value) {
 	PacketStruct* packet = configReader.getStruct("WS_ServerControlFlags", client->GetVersion());
 	if(packet) {

EQ2/source/WorldServer/ClientPacketFunctions.h

@@ -52,8 +52,6 @@ public:
 
 	static void SendUpdateSpellBook ( Client* client );
 
-	static void SendLoginCommandMessages ( Client* client );
-
 	static void SendSkillSlotMappings(Client* client);
 
 	static void SendRestartZoneMsg(Client* client);

EQ2/source/WorldServer/Combat.cpp

@@ -177,7 +177,6 @@ bool Entity::AttackAllowed(Entity* target, float distance, bool range_attack) {
 			return false;
 		}
 	}
-	LogWrite(MISC__TODO, 3, "TODO", "Add more AttackAllowed calculations\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
 	return true;
 }
 
@@ -988,8 +987,6 @@ bool Entity::DamageSpawn(Entity* victim, int8 type, int8 damage_type, int32 low_
 		}
 	}
 
-	LogWrite(MISC__TODO, 3, "TODO", "Take players armor into account\nfile: %s, func: %s, line: %i)", __FILE__, __FUNCTION__, __LINE__);
-
 	bool useWards = false;
 
 	if(damage <= 0){

EQ2/source/WorldServer/Commands/Commands.cpp

@@ -2416,7 +2416,8 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 			break;
 						 }
 		case COMMAND_SELECT_JUNCTION:{
-			LogWrite(MISC__TODO, 1, "TODO", "For access/travel selections (i.e. Mariner Bells, Player Death Window, etc.)\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
+			// transporters (bells birds) use OP_SelectZoneTeleporterDestinatio / ProcessTeleportLocation(app)
+			// this is only used for revive it seems
 			int32 choice = 0;
 			if(sep && sep->arg[0] && sep->IsNumber(0))
 				choice = atoul(sep->arg[0]);
@@ -2782,7 +2783,6 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 			break;
 						   }
 		case COMMAND_SIT: {
-			LogWrite(MISC__TODO, 1, "TODO", " Send update packet to all clients\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
 			if(client->GetPlayer()->GetHP() > 0){
 				client->QueuePacket(new EQ2Packet(OP_SitMsg, 0, 0));
 				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"You sit down.");
@@ -2791,7 +2791,6 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 			break;
 						  }
 		case COMMAND_STAND: {
-			LogWrite(MISC__TODO, 1, "TODO", " Send update packet to all clients\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
 			if(client->GetPlayer()->GetHP() > 0){
 				client->QueuePacket(new EQ2Packet(OP_StandMsg, 0, 0));
 				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"You stand up.");
@@ -3304,8 +3303,6 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 			if (!client->GetPlayer()->GetGroupMemberInfo() || !client->GetPlayer()->GetGroupMemberInfo()->leader)
 				return;
 
-			LogWrite(MISC__TODO, 0, "TODO", "Add a check to see if the client using the command (COMMAND_GROUP_KICK) is the group leader");
-
 			if (sep && sep->arg[0]) {
 				kicked_client = zone_list.GetClientByCharName(string(sep->arg[0]));
 				if (kicked_client)
@@ -5732,9 +5729,6 @@ void Commands::Command_AFK(Client* client, Seperator* sep)
 
 	if (player->get_character_flag(CF_AFK))
 	{
-		LogWrite(MISC__TODO, 1, "TODO", "player->SetActivityStatus(player->GetActivityStatus() + ACTIVITY_STATUS_AFK); <-- need to find this");
-		/*player->SetActivityStatus(player->GetActivityStatus() + ACTIVITY_STATUS_AFK); <-- need to find this */
-
 		if (sep && sep->argplus[0])
 			player->SetAwayMessage("I am away from the keyboard, " + string(sep->argplus[0]));
 		else
@@ -5752,8 +5746,6 @@ void Commands::Command_AFK(Client* client, Seperator* sep)
 
 		player->GetZone()->SimpleMessage(CHANNEL_COLOR_YELLOW, message.c_str(), player, 30);
 	}
-	/*else
-		player->SetActivityStatus(player->GetActivityStatus() - ACTIVITY_STATUS_AFK); <-- need to find this */
 }
 
 /* 
@@ -5811,8 +5803,7 @@ void Commands::Command_Claim(Client* client, Seperator* sep)
 {
 	if (sep && sep->arg[0] && sep->IsNumber(0)) 
 	{
-		LogWrite(MISC__TODO, 1, "TODO", "On Scatman's TODO list!\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-		client->SimpleMessage(CHANNEL_COLOR_YELLOW, "On Scatman's TODO :)");
+		LogWrite(MISC__TODO, 1, "TODO", "TODO: Command_Claim to be completed\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
 	}
 	else
 		client->ShowClaimWindow();
@@ -9392,8 +9383,7 @@ void Commands::Command_TradeAccept(Client* client, Seperator* sep)
 void Commands::Command_TradeReject(Client* client, Seperator* sep)
 {
 	PrintSep(sep, "COMMAND_REJECT_TRADE");
-	LogWrite(MISC__TODO, 1, "Command", "TODO-Command: Reject Player Trading");
-	client->Message(CHANNEL_COLOR_YELLOW, "You cannot trade with other players (Not Implemented)");
+	Command_TradeCancel(client, sep);
 }
 
 /* 

EQ2/source/WorldServer/Entity.cpp

@@ -1045,16 +1045,6 @@ void Entity::RemoveSpellEffect(LuaSpell* spell) {
 	MSpellEffects.releasewritelock(__FUNCTION__, __LINE__);
 }
 
-bool Entity::HasActiveMaintainedSpell(Spell* spell, Spawn* target){
-	LogWrite(MISC__TODO, 1, "TODO", "This does nothing... yet...\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-	return false;
-}
-
-bool Entity::HasActiveSpellEffect(Spell* spell, Spawn* target){
-	LogWrite(MISC__TODO, 1, "TODO", "This does nothing... yet...\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-	return false;
-}
-
 MaintainedEffects* Entity::GetFreeMaintainedSpellSlot(){
 	MaintainedEffects* ret = 0;
 	InfoStruct* info = GetInfoStruct();
@@ -1190,12 +1180,14 @@ InfoStruct* Entity::GetInfoStruct(){
 }
 
 Skill* Entity::GetSkillByName(const char* name, bool check_update){
-	LogWrite(MISC__TODO, 1, "TODO", "This does nothing... yet...\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
+	// NPC::GetSkillByName in NPC.cpp exists for NPC's
+	// Player::GetSkillByName in Player.cpp exists for Player's
 	return 0;
 }
 
 Skill* Entity::GetSkillByID(int32 id, bool check_update){
-	LogWrite(MISC__TODO, 1, "TODO", "This does nothing... yet...\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
+	// NPC::GetSkillByID in NPC.cpp exists for NPC's
+	// Player::GetSkillByID in Player.cpp exists for Player's
 	return 0;
 }
 

EQ2/source/WorldServer/Entity.h

@@ -452,8 +452,8 @@ struct InfoStruct{
 		override_primary_weapon_ = oldStruct->get_override_primary_weapon();
 		override_secondary_weapon_ = oldStruct->get_override_secondary_weapon();
 		override_ranged_weapon_ = oldStruct->get_override_ranged_weapon();
-	}
 
+	}
 	//mutable std::shared_mutex mutex_;
     std::string get_name() { std::lock_guard<std::mutex> lk(classMutex); return name_; }
 	int8	 get_class1() { std::lock_guard<std::mutex> lk(classMutex); return class1_; }
@@ -1245,8 +1245,6 @@ public:
 	virtual void AddSpellEffect(LuaSpell* spell, int32 override_expire_time = 0);
 	virtual void RemoveMaintainedSpell(LuaSpell* spell);
 	virtual void RemoveSpellEffect(LuaSpell* spell);
-	virtual bool HasActiveMaintainedSpell(Spell* spell, Spawn* target);
-	virtual bool HasActiveSpellEffect(Spell* spell, Spawn* target);
 	virtual void AddSkillBonus(int32 spell_id, int32 skill_id, float value);
 	void AddDetrimentalSpell(LuaSpell* spell, int32 override_expire_timestamp = 0);
 	DetrimentalEffects* GetDetrimentalEffect(int32 spell_id, Entity* caster);

EQ2/source/WorldServer/Guilds/Guild.cpp

@@ -154,10 +154,7 @@ void Guild::AddEXPCurrent(sint64 exp, bool send_packet) {
 	if (exp > 0 && level < GUILD_MAX_LEVEL) {
 		exp_current += exp;
 		if (exp_current >= exp_to_next_level) {
-
-			LogWrite(MISC__TODO, 1, "TODO", "Do we know what guild is leveling here yet?");
-
-			LogWrite(GUILD__DEBUG, 0, "Guilds", "Guild Level UP! New Level: %i (current XP: %ul)", level, exp_current);
+			LogWrite(GUILD__DEBUG, 0, "Guilds", "Guild %s Level UP! New Level: %i (current XP: %ul)", name, level, exp_current);
 			int64 left_over = exp_current - exp_to_next_level;
 			level++;
 			exp_to_next_level *= 2;
@@ -417,7 +414,6 @@ GuildMember * Guild::GetGuildMemberOnline(Client *client) {
 GuildMember * Guild::GetGuildMember(Player *player) {
 
 	assert(player);
-	LogWrite(MISC__TODO, 1, "TODO", "Figure out how to log this in %s: %i", __FUNCTION__, __LINE__);
 	return GetGuildMember(player->GetCharacterID());
 }
 
@@ -977,7 +973,6 @@ bool Guild::AddPointsToAll(Client *client, float points, const char *comment, bo
 			LogWrite(GUILD__DEBUG, 0, "Guilds", "\tAwarded By: %s +%.1f pts to Player: %s", client->GetPlayer()->GetName(), points, gm->name);
 		}
 
-		LogWrite(MISC__TODO, 1, "TODO", "Comment that this is temporary?\n%s, %s, %i", __FILE__, __FUNCTION__, __LINE__);
 		SendGuildMember(gm); //tmp
 	}
 	mMembers.releasereadlock(__FUNCTION__, __LINE__);
@@ -1024,7 +1019,6 @@ bool Guild::AddPointsToAllOnline(Client *client, float points, const char *comme
 		LogWrite(GUILD__DEBUG, 0, "Guilds", "Guild: %s", GetName());
 		LogWrite(GUILD__DEBUG, 0, "Guilds", "\tAwarded By: %s +%.1f pts to Player: %s", client->GetPlayer()->GetName(), points, gm->name);
 
-		LogWrite(MISC__TODO, 1, "TODO", "Comment that this is temporary?\n%s, %s, %i", __FILE__, __FUNCTION__, __LINE__);
 		SendGuildMember(gm); //tmp
 
 	}
@@ -1089,7 +1083,6 @@ bool Guild::AddPointsToGroup(Client *client, float points, const char *comment,
 			LogWrite(GUILD__DEBUG, 0, "Guilds", "Guild: %s", GetName());
 			LogWrite(GUILD__DEBUG, 0, "Guilds", "\tAwarded By: %s +%.1f pts to Player: %s", client->GetPlayer()->GetName(), points, gm->name);
 
-			LogWrite(MISC__TODO, 1, "TODO", "Comment that this is temporary?\n%s, %s, %i", __FILE__, __FUNCTION__, __LINE__);
 			SendGuildMember(gm); //tmp
 
 		}
@@ -1152,8 +1145,6 @@ bool Guild::AddPointsToGuildMember(Client *client, float points, const char *nam
 	AddPointHistory(gm, Timer::GetUnixTimeStamp(), client->GetPlayer()->GetName(), points, comment);
 
 	if (send_packet) {
-
-		LogWrite(MISC__TODO, 1, "TODO", "Comment that this is temporary?\n%s, %s, %i", __FILE__, __FUNCTION__, __LINE__);
 		SendGuildMember(gm); //tmp
 
 		SendGuildModification(points, &character_ids);
@@ -1166,9 +1157,6 @@ bool Guild::AddPointsToGuildMember(Client *client, float points, const char *nam
 }
 
 bool Guild::AddPointHistory(GuildMember *guild_member, int32 date, const char *modified_by, float points, const char *comment, bool new_point_history) {
-
-	LogWrite(MISC__TODO, 1, "TODO", "JA: decide to put logging here rather than in all AddPoints functions\n%s, %s, %i", __FILE__, __FUNCTION__, __LINE__);
-
 	PointHistory *ph, *ph_delete;
 	deque<PointHistory *> *ph_list;
 

EQ2/source/WorldServer/Items/Items.cpp

@@ -1307,7 +1307,6 @@ bool Item::IsShield(){
 }
 
 bool Item::IsAdornment(){
-	LogWrite(MISC__TODO, 1, "TODO", "Item Adornments\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
 	return generic_info.item_type == ITEM_TYPE_ADORNMENT && !CheckFlag2(ORNATE);
 }
 
@@ -2125,7 +2124,7 @@ void Item::serialize(PacketStruct* packet, bool show_name, Player* player, int16
 		for (itr = tradeskill_class_levels.begin(); itr != tradeskill_class_levels.end(); itr++, i++) {
 			packet->setArrayDataByName("adventure_class", 255, i);
 			packet->setArrayDataByName("tradeskill_class", itr->first, i);
-			packet->setArrayDataByName("level", itr->second, i);
+			packet->setArrayDataByName("level", itr->second * 10, i);
 		}
 		packet->setSubstructDataByName("footer", "required_classes", classes);
 	}

EQ2/source/WorldServer/LuaFunctions.cpp

@@ -4426,9 +4426,6 @@ int EQ2Emu_lua_Harvest(lua_State* state) {
 	if (player && node && player->IsPlayer() && node->IsGroundSpawn()) {
 		Client* client = player->GetZone()->GetClientBySpawn(player);
 		if (client) {
-
-			LogWrite(MISC__TODO, 1, "TODO", "Cancel harvest if skill insufficient; Func: %s, Line: %i", __FUNCTION__, __LINE__);
-
 			((GroundSpawn*)node)->ProcessHarvest(client);
 			if (((GroundSpawn*)node)->GetNumberHarvests() == 0) {
 				LuaSpell* spell = lua_interface->GetCurrentSpell(state);

EQ2/source/WorldServer/Player.cpp

@@ -70,8 +70,6 @@ Player::Player(){
 	pending_collection_reward = 0;
 	pos_packet_speed = 0;
 
-	LogWrite(MISC__TODO, 1, "TODO", "Add player commands here\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-
 	appearance.display_name = 1;
 	appearance.show_command_icon = 1;
 	appearance.player_flag = 1;
@@ -611,53 +609,19 @@ void PlayerInfo::SetAccountAge(int16 age){
 
 EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyValue) {
 	player->CalculateBonuses();
-/*	info_struct->heat = 15;
-	info_struct->heat_base = 13;
-	info_struct->divine = 14;
-	info_struct->divine_base = 11;
-	info_struct->cur_attack = 5;
-	info_struct->attack_base = 5;
-	info_struct->coin_copper = 1;
-	info_struct->coin_silver = 2;
-	info_struct->coin_gold = 3;
-	info_struct->coin_plat = 4;*/
 
 	int8 blah1 = 90;
 	int8 blah2 = 120;
-	/*for (int i = 0; i < 12; i++) {
-		info_struct->maintained_effects[i].icon = 8+i;
-		info_struct->maintained_effects[i].icon_backdrop = 315+i;
-		strcpy(info_struct->maintained_effects[i].name, "Testing Spell");
-		info_struct->maintained_effects[i].spell_id = 3000+i;
-		info_struct->maintained_effects[i].slot_pos = i;
-		info_struct->maintained_effects[i].expire_timestamp = Timer::GetCurrentTime2() + 72000;
-		if(i<2)
-			info_struct->maintained_effects[i].conc_used = 1;
-		info_struct->maintained_effects[i].total_time = 60+i;
-	}*/
+
 	PacketStruct* packet = configReader.getStruct("WS_CharacterSheet", version);
-	/*for (int i = 0; i < 1; i++) {
-		info_struct->spell_effects[i].icon = 303;
-		info_struct->spell_effects[i].icon_backdrop = 317;
-		info_struct->spell_effects[i].spell_id = 8308;
-		info_struct->spell_effects[i].expire_timestamp = Timer::GetCurrentTime2() + 72000;
-		if (i < 5)
-			packet->setSubstructDataByName("spell_effects", "cancellable", 1, i);
-	}*/
 	//0-69, locked screen movement
 	//30-69 normal movement
 	//10-30 normal movement
 
-	//for (int i = 5; i < 10; i++)
-		//packet->setDataByName("unknown19", 1+i, i);
-
-	//Sleep(5000);
-
 	if (packet) {
 		char name[40];
 		strncpy(name,info_struct->get_name().c_str(),40);
 		packet->setDataByName("character_name", name);
-		//	packet->setDataByName("unknown_1_1_MJ", 99);//unknown_1_1_MJ
 		packet->setDataByName("race", info_struct->get_race());
 		packet->setDataByName("gender", info_struct->get_gender());
 		packet->setDataByName("exiled", 0);  // need exiled data
@@ -670,7 +634,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("level", info_struct->get_level());
 		packet->setDataByName("effective_level", info_struct->get_effective_level() != 0 ? info_struct->get_effective_level() : info_struct->get_level());
 		packet->setDataByName("tradeskill_level", info_struct->get_tradeskill_level());
-		//		packet->setDataByName("unknown_1_2_MJ", 98);  //unknown_1_2_MJ
 		packet->setDataByName("account_age_base", info_struct->get_account_age_base());
 		//TODO: 2021 FIX THIS CASTING
 		for (int8 i = 0; i < 19; i++)
@@ -681,7 +644,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("deity", deity);
 		
 		packet->setDataByName("last_name", player->GetLastName());
-		//	packet->setDataByName("unknown_1_3_MJ", 97);//unknown_1_3_MJ
 		packet->setDataByName("current_hp", player->GetHP());
 		packet->setDataByName("max_hp", player->GetTotalHP());
 		packet->setDataByName("base_hp", player->GetTotalHPBase());
@@ -694,8 +656,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("hp_regen", player->GetInfoStruct()->get_hp_regen());
 		packet->setDataByName("power_regen", player->GetInfoStruct()->get_power_regen());
 
-		//	packet->setDataByName("unknown_1_4a_MJ", 96); //-1// was unknown11
-		//	packet->setDataByName("unknown_1_4b_MJ", 96); //-1
 		packet->setDataByName("stat_bonus_health", player->CalculateBonusMod());//bonus health and bonus power getting same value?
 		packet->setDataByName("stat_bonus_power", player->CalculateBonusMod());//bonus health and bonus power getting same value?
 		float bonus_health = floor((float)(info_struct->get_sta() * player->CalculateBonusMod()));
@@ -712,19 +672,14 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("avoidance_pct", (int16)info_struct->get_avoidance_display()*10.0f);//avoidance_pct 192 = 19.2% // confirmed DoV
 		packet->setDataByName("avoidance_base", (int16)info_struct->get_avoidance_base()*10.0f); // confirmed DoV
 		packet->setDataByName("avoidance", info_struct->get_cur_avoidance());
-		//		packet->setDataByName("unknown_1096_1_MJ", 90);//unknown_1096_1_MJ
 		packet->setDataByName("base_avoidance_pct", info_struct->get_base_avoidance_pct());// confirmed DoV
-		//		packet->setDataByName("unknown_1096_2_MJ", 89);//unknown_1096_2_MJ
 		float parry_pct = info_struct->get_parry(); // client works off of int16, but we use floats to track the actual x/100%
 		packet->setDataByName("parry",(int16)(parry_pct*10.0f));// confirmed DoV
-		//		packet->setDataByName("unknown_1096_3_MJ", 88);//unknown_1096_3_MJ
 
 		float block_pct = info_struct->get_block()*10.0f;
 		
 		packet->setDataByName("block", (int16)block_pct);// confirmed DoV
-		//		packet->setDataByName("unknown_1096_4_MJ", 87);//unknown_1096_4_MJ
 		packet->setDataByName("uncontested_block", info_struct->get_uncontested_block());// confirmed DoV
-		//		packet->setDataByName("unknown_1096_5_MJ", 86);//unknown_1096_5_MJ
 		packet->setDataByName("str", info_struct->get_str());// confirmed DoV
 		packet->setDataByName("sta", info_struct->get_sta());// confirmed DoV
 		packet->setDataByName("agi", info_struct->get_agi());// confirmed DoV
@@ -735,7 +690,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("agi_base", info_struct->get_agi_base());// confirmed DoV
 		packet->setDataByName("wis_base", info_struct->get_wis_base());// confirmed DoV
 		packet->setDataByName("int_base", info_struct->get_intel_base());// confirmed DoV
-		//		packet->setDataByName("unknown_1096_6_MJ", 86);//unknown_1096_6_MJ
 		if (version <= 996) {
 			packet->setDataByName("heat", info_struct->get_heat());
 			packet->setDataByName("cold", info_struct->get_cold());
@@ -756,24 +710,19 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 			packet->setDataByName("elemental", info_struct->get_heat());// confirmed DoV
 			packet->setDataByName("noxious", info_struct->get_poison());// confirmed DoV
 			packet->setDataByName("arcane", info_struct->get_magic());// confirmed DoV
-			//		packet->setDataByName("unknown_1096_7_MJ", 85);//unknown_1096_7_MJ
 			packet->setDataByName("elemental_base", info_struct->get_elemental_base());// confirmed DoV
 			packet->setDataByName("noxious_base", info_struct->get_noxious_base());// confirmed DoV
 			packet->setDataByName("arcane_base", info_struct->get_arcane_base());// confirmed DoV
 		}
-		//	packet->setDataByName("unknown_1096_8_MJ", 205);//unknown_1096_8_MJ
 		packet->setDataByName("elemental_absorb_pve", 0); //210 = 21.0% confirmed DoV
 		packet->setDataByName("noxious_absorb_pve", 0);//210 = 21.0% confirmed DoV
 		packet->setDataByName("arcane_absorb_pve", 0);//210 = 21.0% confirmed DoV
-		//		packet->setDataByName("unknown_1096_9_MJ", 240);//unknown_1096_9_MJ
 		packet->setDataByName("elemental_absorb_pvp", 0);//210 = 21.0% confirmed DoV
 		packet->setDataByName("noxious_absorb_pvp", 0);//210 = 21.0% confirmed DoV
 		packet->setDataByName("arcane_absorb_pvp", 0);//210 = 21.0% confirmed DoV
-			//	packet->setDataByName("unknown_1096_10_MJ", 280);//unknown_1096_10_MJ
 		packet->setDataByName("elemental_dmg_reduction", 0);// confirmed DoV
 		packet->setDataByName("noxious_dmg_reduction", 0);// confirmed DoV
 		packet->setDataByName("arcane_dmg_reduction", 0);// confirmed DoV
-		//		packet->setDataByName("unknown_1096_11_MJ", 320);//unknown_1096_11_MJ
 		packet->setDataByName("elemental_dmg_reduction_pct", 0);//210 = 21.0% confirmed DoV
 		packet->setDataByName("noxious_dmg_reduction_pct", 0);//210 = 21.0% confirmed DoV
 		packet->setDataByName("arcane_dmg_reduction_pct", 0);//210 = 21.0% confirmed DoV
@@ -821,7 +770,7 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("adv_xp_to_aa_xp_max", 100);  // aa slider position // dov confirmed
 		packet->setDataByName("aa_blue_bar", 0);// dov confirmed
 		packet->setDataByName("bonus_achievement_xp", 0); // dov confirmed
-		//		packet->setDataByName("unknown_1096_12_MJ", 90);
+
 		packet->setDataByName("items_found", 62);// dov confirmed
 		packet->setDataByName("named_npcs_killed", 192);// dov confirmed
 		packet->setDataByName("quests_completed", 670);// dov confirmed
@@ -833,16 +782,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("coins_silver", info_struct->get_coin_silver());// dov confirmed
 		packet->setDataByName("coins_gold", info_struct->get_coin_gold());// dov confirmed
 		packet->setDataByName("coins_plat", info_struct->get_coin_plat());// dov confirmed
-		//packet->setDataByName("unknown_1096_15_MJ", 50);//unknown_1096_15_MJ
-		//////Spell Effects go here, but are below
-		//////Dettrimental effects go here, but are below
-		packet->setDataByName("trauma_count", 45);// added with spells leave here for testing//dov confirmed
-		packet->setDataByName("arcane_count", 255);// added with spells leave here for testing//dov confirmed
-		packet->setDataByName("noxious_count", 47);// added with spells leave here for testing//dov confirmed
-		packet->setDataByName("elemental_count", 255);// added with spells leave here for testing//dov confirmed
-		packet->setDataByName("curse_count", 49);// added with spells leave here for testing//dov confirmed
-	//	packet->setDataByName("unknown_1096_17_MJ", 30);//unknown_1096_17_MJ
-		//////Maintained effects go here, but are below
 		
 		Skill* skill = player->GetSkillByName("Swimming", false);
 		float breath_modifier = rule_manager.GetGlobalRule(R_Player, SwimmingSkillMinBreathLength)->GetFloat();
@@ -859,7 +798,7 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 				breath_modifier = diff_mod;
 		}
 		packet->setDataByName("breath", breath_modifier);
-		//packet->setDataByName("unknown_1096_18_MJ", 1000);//16880
+
 		packet->setDataByName("melee_pri_dmg_min", player->GetPrimaryWeaponMinDamage());// dov confirmed
 		packet->setDataByName("melee_pri_dmg_max", player->GetPrimaryWeaponMaxDamage());// dov confirmed
 		packet->setDataByName("melee_sec_dmg_min", player->GetSecondaryWeaponMinDamage());// dov confirmed
@@ -876,10 +815,7 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 			packet->setDataByName("melee_sec_delay", (float)player->GetSecondaryWeaponDelay() * .001);// dov confirmed
 			packet->setDataByName("ranged_delay", (float)player->GetRangeWeaponDelay() * .001);// dov confirmed
 		}
-		//packet->setDataByName("unknown_1096_18_MJ", 99);//unknown_1096_19a_MJ
-		//packet->setDataByName("unknown_1096_18_MJ", 98);//unknown_1096_19b_MJ
-		//packet->setDataByName("unknown_1096_18_MJ", 97);//unknown_1096_19c_MJ
-		//packet->setDataByName("unknown_1096_18_MJ", 96);//unknown_1096_19d_MJ
+
 		packet->setDataByName("ability_mod_pve", info_struct->get_ability_modifier());// dov confirmed
 		packet->setDataByName("base_melee_crit", 85);//85 = 8500% dov confirmed
 		packet->setDataByName("base_spell_crit", 84);// dov confirmed
@@ -913,48 +849,31 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 			if (player->get_character_flag(CF_ALLOW_GUILD_INVITES))
 				packet->setDataByName("flags_show_guild_invites", 1);
 		}
-		//unknown_1096_20_MJ
-		//unknown_1096_21_MJ
-		//unknown_1096_22_MJ
-		//unknown_1096_23_MJ
+
 		packet->setDataByName("haste", info_struct->get_haste());// dov confirmed
-		//unknown_1096_24_MJ
-		//unknown_1096_25_MJ
-		//unknown_1096_26_MJ
 		packet->setDataByName("drunk", info_struct->get_drunk());// dov confirmed
-		//unknown_1096_27_MJ
+
 		packet->setDataByName("hate_mod", info_struct->get_hate_mod());// dov confirmed
 		packet->setDataByName("adventure_effects_bonus", 55);// NEED an adventure_effects_bonus// dov confirmed
 		packet->setDataByName("tradeskill_effects_bonus", 56);// NEED an tradeskill_effects_bonus// dov confirmed
-		//unknown_1096_28_MJ
 		packet->setDataByName("dps", info_struct->get_dps());// dov confirmed
-		//unknown_1096_29_MJ
 		packet->setDataByName("melee_ae", info_struct->get_melee_ae());// dov confirmed
 		packet->setDataByName("multi_attack", info_struct->get_multi_attack());// dov confirmed
 		packet->setDataByName("spell_multi_attack", info_struct->get_spell_multi_attack());// dov confirmed
-		//unknown_1096_30_MJ
 		packet->setDataByName("block_chance", info_struct->get_block_chance());// dov confirmed
-		//unknown_1096_31_MJ
 		packet->setDataByName("crit_chance", info_struct->get_crit_chance());// dov confirmed
-		//unknown_1096_32_MJ
 		packet->setDataByName("crit_bonus", info_struct->get_crit_bonus());// dov confirmed
 
 		packet->setDataByName("potency", info_struct->get_potency());//info_struct->get_potency);// dov confirmed
 
-		//unknown_1096_33_MJ
 		packet->setDataByName("reuse_speed", info_struct->get_reuse_speed());// dov confirmed
 		packet->setDataByName("recovery_speed", info_struct->get_recovery_speed());// dov confirmed
 		packet->setDataByName("casting_speed", info_struct->get_casting_speed());// dov confirmed
 		packet->setDataByName("spell_reuse_speed", info_struct->get_spell_reuse_speed());// dov confirmed
-		//unknown_1096_34_MJ
 		packet->setDataByName("strikethrough", info_struct->get_strikethrough());//dov confirmed
-		//unknown_1096_35_MJ
 		packet->setDataByName("accuracy", info_struct->get_accuracy());//dov confirmed
-		//unknown_1096_36_MJ
 		packet->setDataByName("critical_mit", info_struct->get_critical_mitigation());//dov /confirmed
-		//unknown_1096_37_MJ
-		//toughness_resist_crit_pvp
-		//unknown_1096_38_MJ
+
 		((Entity*)player)->MStats.lock();
 		packet->setDataByName("durability_mod", player->stats[ITEM_STAT_DURABILITY_MOD]);// dov confirmed
 		packet->setDataByName("durability_add", player->stats[ITEM_STAT_DURABILITY_ADD]);// dov confirmed
@@ -964,10 +883,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("crit_success_mod", player->stats[ITEM_STAT_CRIT_SUCCESS_MOD]);// dov confirmed
 		((Entity*)player)->MStats.unlock();
 
-		//unknown_1096_39_MJ
-		/////GRoup Members
-		//unknown_1096_40_MJ
-		//unknown_1096_41_MJ
 		if (version <= 283 && info_struct->get_pet_id() == 0xFFFFFFFF)
 			packet->setDataByName("pet_id", 0);
 		else {
@@ -976,17 +891,17 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 			strncpy(pet_name, info_struct->get_pet_name().c_str(), 32);
 			packet->setDataByName("pet_name", pet_name);
 		}
-		//unknown_1096_42_MJ
+
 		packet->setDataByName("pet_health_pct", info_struct->get_pet_health_pct());
 		packet->setDataByName("pet_power_pct", info_struct->get_pet_power_pct());
-		//unknown_1096_43_MJ
+
 		packet->setDataByName("pet_movement", info_struct->get_pet_movement());
 		packet->setDataByName("pet_behavior", info_struct->get_pet_behavior());
 		packet->setDataByName("rain", info_struct->get_rain());
 		packet->setDataByName("rain2", info_struct->get_wind()); //-102.24);
 		packet->setDataByName("status_points", info_struct->get_status_points());
 		packet->setDataByName("guild_status", 888888);
-		//unknown_1096_44_MJ
+
 		if (house_zone_id > 0){
 			string house_name = database.GetZoneName(house_zone_id);
 			if(house_name.length() > 0)
@@ -994,7 +909,7 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		}
 		else
 			packet->setDataByName("house_zone", "None");
-		//unknown_1096_45_MJ		
+
 		if (bind_zone_id > 0){
 			string bind_name = database.GetZoneName(bind_zone_id);
 			if(bind_name.length() > 0)
@@ -1036,8 +951,7 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 
 
 		info_struct->set_max_weight(200);
-		//packet->setDataByName("auto_attack", 1);
-		//492
+
 		if (version <= 546) {
 			packet->setDataByName("exp_yellow", info_struct->get_xp_yellow() / 10);
 			packet->setDataByName("exp_blue", info_struct->get_xp_blue()/10);
@@ -1092,270 +1006,22 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		packet->setDataByName("unassigned_tradeskill_points", player->GetUnassignedTradeskillAA());
 		packet->setDataByName("total_tradeskill_prestige_points", player->GetTradeskillPrestigeAA());
 		packet->setDataByName("unassigned_tradeskill_prestige_points", player->GetUnassignedTradeskillPrestigeAA());
-		/*packet->setDataByName("unknown13", 201, 0);
-		packet->setDataByName("unknown13", 201, 1);
-		packet->setDataByName("unknown13", 234, 2);
-		packet->setDataByName("unknown13", 201, 3);
-		packet->setDataByName("unknown13", 214, 4);
-		packet->setDataByName("unknown13", 234, 5);
-		packet->setDataByName("unknown13", 234, 6);
-
-		packet->setDataByName("unknown14", 78);
-		*/
-
-		//packet->setDataByName("unknown23", 1, 146);
-
-		//packet->setDataByName("unknown24", 0xFF, 42);
-		//packet->setDataByName("unknown24", 0xFF, 46);
 
 		// unknown14c = percent aa exp to next level
 		packet->setDataByName("unknown14d", 100, 0);
 		packet->setDataByName("unknown20", 1084227584, 72);
-		//packet->setDataByName("unknown16", 0xFFFFFFFF, 4);
-
-
-		//packet->setDataByName("unknown15b", 9911);
-
 		packet->setDataByName("unknown15c", 200);
 
-		//packet->setDataByName("unknown15", 100, 10);
-
-		/*packet->setDataByName("unknown19", 1);
-		packet->setDataByName("unknown19", 3, 1);
-		packet->setDataByName("unknown19", 1074301064, 2);
-		packet->setDataByName("unknown19", 1, 3);
-		packet->setDataByName("unknown19", 3, 4);
-		packet->setDataByName("unknown19", 1074301064, 5);
-		packet->setDataByName("unknown19", 6, 6);
-		packet->setDataByName("unknown19", 14, 7);
-		packet->setDataByName("unknown19", 1083179008, 8);*/
 		player->SetGroupInformation(packet);
-		//packet->setDataByName("unknown20", 1, 107);
-		//packet->setDataByName("unknown20", 1, 108);
-		//packet->setDataByName("unknown20", 1, 109);
-		//packet->setDataByName("unknown20", 1, 110);
-		//packet->setDataByName("unknown20", 1, 111);
-		//packet->setDataByName("unknown20b", 255);
-		//packet->setDataByName("unknown20b", 255, 1);
-		//packet->setDataByName("unknown20b", 255, 2);
-		//packet->setDataByName("in_combat", 32768);	
-		//make name flash red
-		/*packet->setDataByName("unknown20", 8);
-		packet->setDataByName("unknown20", 38, 70);
-		packet->setDataByName("unknown20", 17, 77);
-		packet->setDataByName("unknown20", 1, 112); //melee stats and such
-		packet->setDataByName("unknown20", 1, 113);
-		packet->setDataByName("unknown20", 1, 114);
-		packet->setDataByName("unknown20", 1, 115);
-
-		packet->setDataByName("unknown20", 4294967295, 309);
-		packet->setDataByName("unknown22", 2, 4);
-		packet->setDataByName("unknown23", 2, 29);
-		*/
-		//packet->setDataByName("unknown20b", 1, i); // pet bar in here
-		//	for(int i=0;i<19;i++)
-		//		packet->setDataByName("unknown7", 257, i);
-			//packet->setDataByName("unknown21", info_struct->rain, 2);
-
-			/*packet->setDataByName("unknown22", 3, 4);
-			packet->setDataByName("unknown23", 3, 161);
-			packet->setDataByName("unknown20", 103);
-			packet->setDataByName("unknown20", 1280, 70);
-			packet->setDataByName("unknown20", 9, 71);
-			packet->setDataByName("unknown20", 5, 72);
-			packet->setDataByName("unknown20", 4294967271, 73);
-			packet->setDataByName("unknown20", 5, 75);
-			packet->setDataByName("unknown20", 1051, 77);
-			packet->setDataByName("unknown20", 3, 78);
-			packet->setDataByName("unknown20", 6, 104);
-			packet->setDataByName("unknown20", 1, 105);
-			packet->setDataByName("unknown20", 20, 106);
-			packet->setDataByName("unknown20", 3, 107);
-			packet->setDataByName("unknown20", 1, 108);
-			packet->setDataByName("unknown20", 1, 109);
-			packet->setDataByName("unknown20", 4278190080, 494);
-			packet->setDataByName("unknown20b", 255);
-			packet->setDataByName("unknown20b", 255, 1);
-			packet->setDataByName("unknown20b", 255, 2);
-			packet->setDataByName("unknown20", 50, 75);
-			*/
-
-
-
-
-
-
-
-
-			/*packet->setDataByName("unknown199a", 843);// 25);
-			//packet->setDataByName("unknown199b", 844);// 30);
-			//packet->setDataByName("unknown199c", 845);// 45);
-			//packet->setDataByName("unknown199d", 846);// 55);
-
-
-			packet->setDataByName("unknown37", 537);
-			packet->setDataByName("unknown38", 538);
-			packet->setDataByName("unknown39", 539);
-			packet->setDataByName("unknown40", 540);
-			packet->setDataByName("unknown41", 541);
-			packet->setDataByName("unknown42", 542);
-			packet->setDataByName("unknown43", 543);
-			packet->setDataByName("unknown44", 544);
-
-			packet->setDataByName("ability_mod_pvp", 542);
-			packet->setDataByName("unknown43", 543);
-			packet->setDataByName("unknown44", 544);
-
-
-			packet->setDataByName("unknown45", 645);
-			packet->setDataByName("unknown46", 646);
-			packet->setDataByName("unknown47", 647);
-			packet->setDataByName("unknown48", 648);
-			packet->setDataByName("unknown49", 649);
-			packet->setDataByName("unknown50", 650);
-			packet->setDataByName("unknown51", 651);
-			packet->setDataByName("unknown52", 652);
-			packet->setDataByName("unknown53", 653);
-			packet->setDataByName("unknown54", 654);
-			packet->setDataByName("unknown55", 655);
-			packet->setDataByName("unknown56", 656);
-			packet->setDataByName("unknown57", 657);
-			packet->setDataByName("unknown58", 658);
-			packet->setDataByName("unknown59", 659);
-			packet->setDataByName("unknown60", 660);
-
-			*/
-
-
 
 		packet->setDataByName("in_combat_movement_speed", 125);
 
 		packet->setDataByName("increase_max_power", 127);
 		packet->setDataByName("increase_max_power2", 128);
-		//129 does not exist
-	/*	packet->setDataByName("unknown130", 130);
-		packet->setDataByName("unknown132", 132);
-		packet->setDataByName("unknown133", 133);
-
-
-		packet->setDataByName("unknown137", 137);
-		packet->setDataByName("unknown138", 138);
-		packet->setDataByName("unknown139", 139);
-
-
-		packet->setDataByName("unknown141", 141);
-		packet->setDataByName("unknown142", 142);
-
-
-
-
-		packet->setDataByName("unknown144", 144);
-
-		packet->setDataByName("unknown147", 147);
-		packet->setDataByName("unknown148", 148);
-
-		packet->setDataByName("unknown170", 170);
-		packet->setDataByName("unknown171", 171);
-		packet->setDataByName("unknown172", 172);
-		packet->setDataByName("unknown173", 173);
-		packet->setDataByName("unknown174", 174);
-		packet->setDataByName("unknown175", 175);
-		packet->setDataByName("unknown176", 176);
-		packet->setDataByName("unknown177", 177);
-		packet->setDataByName("loot_coin", 178);
-		packet->setDataByName("mitigation_increase", 179);
-		packet->setDataByName("unknown180", 180);
-
-		packet->setDataByName("unknown182", 182);
-
-		packet->setDataByName("unknown184", 184);
-		packet->setDataByName("unknown185", 185);
-		packet->setDataByName("unknown186", 186);
-		packet->setDataByName("unknown187", 187);
-		packet->setDataByName("unknown188", 188);
-		packet->setDataByName("unknown189", 189);
-		packet->setDataByName("unknown190", 190);
-		packet->setDataByName("unknown191", 191);
-		packet->setDataByName("unknown192", 192);
-		packet->setDataByName("unknown193", 193);
-		packet->setDataByName("unknown194", 194);
-		packet->setDataByName("unknown195", 195);
-		packet->setDataByName("unknown196", 196);
-		packet->setDataByName("unknown197", 197);
-		packet->setDataByName("unknown198", 198);
-		packet->setDataByName("unknown199", 199);
-		packet->setDataByName("unknown200", 200);
-		packet->setDataByName("unknown201", 201);
-		packet->setDataByName("unknown202", 202);
-		packet->setDataByName("unknown203", 203);
-		packet->setDataByName("unknown204", 204);
-		packet->setDataByName("unknown205", 205);
-		packet->setDataByName("unknown206", 206);
-		packet->setDataByName("unknown207", 207);
-		packet->setDataByName("unknown208", 208);
-		packet->setDataByName("unknown209", 209);
-		packet->setDataByName("unknown210", 210);
-		packet->setDataByName("unknown211", 211);
-		packet->setDataByName("unknown212", 212);
-		packet->setDataByName("unknown213", 213);
-		packet->setDataByName("unknown214", 214);
-		packet->setDataByName("unknown215", 215);
-		packet->setDataByName("unknown216", 216);
-		packet->setDataByName("unknown217", 217);
-		packet->setDataByName("unknown218", 218);
-		packet->setDataByName("unknown219", 219);
-		packet->setDataByName("unknown220", 220);
-		packet->setDataByName("unknown221", 221);
-		packet->setDataByName("unknown222", 222);
-		packet->setDataByName("unknown223", 223);
-		packet->setDataByName("unknown224", 224);
-		packet->setDataByName("unknown225", 225);
-		packet->setDataByName("unknown226", 226);
-		packet->setDataByName("unknown227", 227);
-		packet->setDataByName("unknown228", 228);
-		packet->setDataByName("unknown229", 229);
-		packet->setDataByName("unknown230", 230);
-		packet->setDataByName("unknown231", 231);
-		packet->setDataByName("unknown232", 232);
-		packet->setDataByName("unknown233", 233);
-		packet->setDataByName("unknown234", 234);
-		packet->setDataByName("unknown235", 235);
-		packet->setDataByName("unknown236", 236);
-		packet->setDataByName("unknown237", 237);
-		packet->setDataByName("unknown238", 238);
-		packet->setDataByName("unknown239", 239);
-		packet->setDataByName("unknown240", 240);
-
-		// Tradeskill stats
-		packet->setDataByName("unknown383", 383);
-		packet->setDataByName("unknown384", 384);
-		packet->setDataByName("unknown385", 385);
-		packet->setDataByName("unknown386", 386);
-		packet->setDataByName("unknown387", 387);
-		packet->setDataByName("unknown388", 388);
-		packet->setDataByName("unknown389", 389);
-		packet->setDataByName("unknown390", 390);
-		packet->setDataByName("unknown391", 391);
-		packet->setDataByName("unknown392", 392);
-		packet->setDataByName("unknown393", 393);
-		packet->setDataByName("unknown394", 394);
-		packet->setDataByName("unknown395", 395);
-		packet->setDataByName("unknown396", 396);
-		packet->setDataByName("unknown397", 397);
-		packet->setDataByName("unknown398", 398);
-
-
-		*/
-
-
 
 		packet->setDataByName("vision", info_struct->get_vision());
 		packet->setDataByName("breathe_underwater", info_struct->get_breathe_underwater());
 
-
-
-
-
 		int32 expireTimestamp = 0;
 		Spawn* maintained_target = 0;
 		player->GetSpellEffectMutex()->readlock(__FUNCTION__, __LINE__);
@@ -1382,8 +1048,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 			else if (version < 942)//version 942 added 15 additional spell effect slots
 				break;
 			packet->setSubstructDataByName("spell_effects", "spell_id", info_struct->spell_effects[i].spell_id, i, 0);
-			/*if(info_struct->spell_effects[i].spell_id > 0 && info_struct->spell_effects[i].spell_id < 0xFFFFFFFF)
-				packet->setSubstructDataByName("spell_effects", "unknown2", 514, i, 0);*/
 			packet->setSubstructDataByName("spell_effects", "total_time", info_struct->spell_effects[i].total_time, i, 0);
 			expireTimestamp = info_struct->spell_effects[i].expire_timestamp;
 			if (expireTimestamp == 0xFFFFFFFF)
@@ -1476,95 +1140,16 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 		//packet->setDataByName("spirit_progress", .67);
 
 		packet->setDataByName("combat_exp_enabled", 1);
-		/*for (int i = 0; i < 12; i++) {
-			packet->setSubstructDataByName("spell_effects", "spell_id", i + 1, i);
-			if (i % 2 == 0)
-				packet->setSubstructDataByName("spell_effects", "cancellable", 1, i);
-		}*/
-		int testa = 0x41;
-		int testb = 0x41;
-		//160-330
-		//0-250 (160-250) //top down view
-		//250-290 nothing
-		//290-330 //blocked view
-		//310-330 nothing
-		//1168: 00 00 00 00 00 00 00 00 - 00 00 00 00 00 41 41 41  | .............AAA
-		//1184: 42 41 43 41 44 41 45 00 - 00 00 00 00 00 00 00 00 | BACADAE......... //blocked view
-		//1184: 00 41 41 41 42 41 43 00 - 00 00 00 00 00 00 00 00 | .AAABAC......... //blocked view
-		//1184: 00 41 41 41 41 00 00 00 - 00 00 00 00 00 00 00 00 | .AAAA........... //blocked view
-		//1184: 00 41 41 00 00 00 00 00 - 00 00 00 00 00 00 00 00 | .AA............. //blocked view
-		//1184: 00 41 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 | .AA............. //blocked view
-		//1184: 41 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 | .AA............. //blocked view 293
-		//1168: 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 41 | ...............A //blocked view 292
-		//packet->setDataByName("screen_blur", 0); //1168: 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 41 00 //blurred view
-		//packet->setDataByName("unknown18", testa, 295);
-		//packet->setDataByName("unknown18", testa, 296);
-		//packet->setDataByName("unknown18", testa, 297);
-		//300 pet junk
-		//492
-	/*for (int i = 300; i < 360; i++) {
-		packet->setDataByName("unknown19", testa, i);
-		testa++;
-		//packet->setDataByName("unknown19", 0xc3, i+1);
-	}*/
-	/*packet->setDataByName("pet_id", 5);
-	packet->setDataByName("pet_name", "Blah");
-	packet->setDataByName("pet_hp", .9);
-	packet->setDataByName("pet_power", .8);*/
-	/*packet->setDataByName("test7", 0x3f);
-	packet->setDataByName("test8", 0xc3);
-	packet->setDataByName("unknown17", 12);
-	packet->setDataByName("unknown17", 12, 1);
-	packet->setDataByName("unknown17", 12, 2);
-	packet->setDataByName("unknown17", 12, 3);*/
+		
 		string* data = packet->serializeString();
 		int32 size = data->length();
-		/*uchar blah[] = { 0x31,0x02,0x00,0x00,0xff,0x4f,0x77,0x6b,0x65,0x65,0x63,0x65,0x87,0x61
-	,0x67,0x68,0x1b,0x83,0x04,0x01,0x13,0x95,0x02,0x02,0x01,0x88,0x01,0x91,0x30,0x30
-	,0xa2,0x01,0x30,0x84,0x30,0x8a,0x38,0x38,0xf0,0x17,0x01,0x17,0x9f,0x01,0x17,0x01
-	,0x17,0x01,0x0a,0xd5,0x10,0x14,0x18,0x14,0xaa,0x14,0x10,0x14,0x95,0x18,0x14,0x14
-	,0x09,0xd1,0x08,0x08,0x06,0x82,0x06,0x1a,0xd1,0x28,0x28,0x1e,0x8a,0x1e,0x01,0x1f
-	,0x81,0x13,0x09,0x91,0x01,0x50,0x15,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff
-	,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f
-	,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff
-	,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff
-	,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f
-	,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff
-	,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff
-	,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f
-	,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff
-	,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff
-	,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x07,0x8f
-	,0xff,0xff,0xff,0xff,0x07,0x8f,0xff,0xff,0xff,0xff,0x47,0x8f,0xff,0xff,0xff,0xff
-	,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff
-	,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f
-	,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff
-	,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86
-	,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff
-	,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff
-	,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48
-	,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff
-	,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff
-	,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff
-	,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f
-	,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff
-	,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86
-	,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff
-	,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff
-	,0xff,0xff,0xff,0x86,0xff,0xff,0x48,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x48
-	,0x8f,0xff,0xff,0xff,0xff,0x86,0xff,0xff,0x0a,0x83,0xf0,0x41,0x7f,0x7f,0x7f,0x7f
-	,0x3a,0xff,0xff,0xff,0xff,0xff,0x4e,0x6f,0x20,0x87,0x50,0x65,0x74,0x2d,0x9f,0x3f
-	,0xc3,0x94,0xcb,0xc2,0x08,0x81,0x02 };*/
-	//size = sizeof(blah);
-	//packet->PrintPacket();
+
 		uchar* tmp = new uchar[size];
 		bool reverse = version > 283;
 		if (!changes) {
 			orig_packet = new uchar[size];
 			changes = new uchar[size];
 			memcpy(orig_packet, (uchar*)data->c_str(), size);
-
-			//DumpPacket(orig_packet, size);
 			size = Pack(tmp, orig_packet, size, size, version, reverse);
 		}
 		else {
@@ -1581,10 +1166,6 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 				else
 					memcpy(ptr2, (uchar*)&modifyValue, 1);
 			}
-			/*if (player->GetTempVariable("offset").length() > 0){
-				changes[atoul(player->GetTempVariable("offset").c_str())] = 0xF4;
-				changes[atoul(player->GetTempVariable("offset").c_str()) + 1] = 0x01;
-			}*/
 			Encode(changes, orig_packet, size);
 			if (modifyPos > 0) {
 				uchar* ptr2 = (uchar*)orig_packet;
@@ -1593,10 +1174,8 @@ EQ2Packet* PlayerInfo::serialize(int16 version, int16 modifyPos, int32 modifyVal
 				int16 tmpsize = modifyPos + 128;
 				if (tmpsize > size)
 					tmpsize = size;
-				//DumpPacket(ptr2, tmpsize - modifyPos);
 			}
 			size = Pack(tmp, changes, size, size, version, reverse);
-			//DumpPacket(tmp, size);
 		}
 
 		if (version >= 546)
@@ -3245,13 +2824,11 @@ PlayerInfo::PlayerInfo(Player* in_player){
 	info_struct->set_race(player->GetRace());
 	info_struct->set_gender(player->GetGender());
 	info_struct->set_level(player->GetLevel());
-	info_struct->set_tradeskill_level(player->GetTSLevel()); // JA: added 2011.07.22 to address TODO below
+	info_struct->set_tradeskill_level(player->GetTSLevel());
 	info_struct->set_tradeskill_class1(classes.GetTSBaseClass(player->GetTradeskillClass()));
 	info_struct->set_tradeskill_class2(classes.GetSecondaryTSBaseClass(player->GetTradeskillClass()));
 	info_struct->set_tradeskill_class3(player->GetTradeskillClass());
 
-	LogWrite(MISC__TODO, 1, "TODO", "Fix info_struct.tradeskill_level = player->GetArtLevel();\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-
 	for(int i=0;i<45;i++){
 		if(i<30){
 			info_struct->maintained_effects[i].spell_id = 0xFFFFFFFF;
@@ -3555,22 +3132,6 @@ void Player::RemoveSpellEffect(LuaSpell* spell){
 	GetSpellEffectMutex()->releasewritelock(__FUNCTION__, __LINE__);
 }
 
-bool Player::HasActiveMaintainedSpell(Spell* spell, Spawn* target){
-	GetMaintainedMutex()->readlock(__FUNCTION__, __LINE__);
-	for(int i=0;i<30;i++){
-		if (GetInfoStruct()->maintained_effects[i].spell_id == spell->GetSpellData()->id){
-			GetMaintainedMutex()->releasereadlock(__FUNCTION__, __LINE__);
-			return true;
-		}
-	}
-	GetMaintainedMutex()->releasereadlock(__FUNCTION__, __LINE__);
-	return false;
-}
-
-bool Player::HasActiveSpellEffect(Spell* spell, Spawn* target){
-	return false;
-}
-
 void Player::PrepareIncomingMovementPacket(int32 len, uchar* data, int16 version)
 {
 	if(GetClient() && GetClient()->IsReloadingZone())

EQ2/source/WorldServer/Player.h

@@ -484,8 +484,6 @@ public:
 	void	AddSpellEffect(LuaSpell* spell, int32 override_expire_time = 0);
 	void	RemoveMaintainedSpell(LuaSpell* spell);
 	void	RemoveSpellEffect(LuaSpell* spell);
-	bool	HasActiveMaintainedSpell(Spell* spell, Spawn* target);
-	bool	HasActiveSpellEffect(Spell* spell, Spawn* target);
 	void	AddQuickbarItem(int32 bar, int32 slot, int32 type, int16 icon, int16 icon_type, int32 id, int8 tier, int32 unique_id, const char* text, bool update = true);
 	void	RemoveQuickbarItem(int32 bar, int32 slot, bool update = true);
 	void	MoveQuickbarItem(int32 id, int32 new_slot);

EQ2/source/WorldServer/PlayerGroups.cpp

@@ -246,8 +246,7 @@ bool PlayerGroupManager::RemoveGroupMember(int32 group_id, Entity* member) {
 
 	if (m_groups.count(group_id) > 0) {
 		PlayerGroup* group = m_groups[group_id];
-
-		LogWrite(MISC__TODO, 0, "TODO", "Update PlayerGroupManager::RemoveGroupMember() to support removing buffs from NPC group members");
+		
 		if (member->IsPlayer())
 			client = member->GetGroupMemberInfo()->client;
 

EQ2/source/WorldServer/WorldDatabase.cpp

@@ -1758,15 +1758,11 @@ bool WorldDatabase::loadCharacter(const char* ch_name, int32 account_id, Client*
 		client->GetPlayer()->SetTradeskillClass(atoi(row[13]));
 		client->GetPlayer()->SetTSLevel(atoi(row[14]));
 
-		LogWrite(MISC__TODO, 1, "TODO", "Fix client->GetPlayer()->SetArtLevel(atoi(row[14]));\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-
 		client->GetPlayer()->features.wing_type = atoi(row[15]);
 		client->GetPlayer()->features.hair_type = atoi(row[16]);
 		client->GetPlayer()->features.chest_type = atoi(row[17]);
 		client->GetPlayer()->features.legs_type = atoi(row[18]);
 
-		LogWrite(MISC__TODO, 1, "TODO", "Fix SOGA appearances here\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
-
 		client->GetPlayer()->features.wing_type = atoi(row[19]);
 		client->GetPlayer()->features.soga_hair_type = atoi(row[20]);
 		client->GetPlayer()->features.soga_chest_type = atoi(row[21]);

EQ2/source/WorldServer/client.cpp

@@ -761,7 +761,6 @@ void Client::SendCharInfo() {
 	else {
 		player->SetResurrecting(false);
 	}
-	ClientPacketFunctions::SendLoginCommandMessages(this);
 
 	GetCurrentZone()->AddSpawn(player);
 	if(IsReloadingZone() && (zoning_x || zoning_y || zoning_z)) {
@@ -8269,12 +8268,7 @@ void Client::HandleSentMail(EQApplicationPacket* app) {
 							}
 							mail->time_sent = Timer::GetUnixTimeStamp();
 							mail->expire_time = mail->time_sent + 2592000;	//30 days in seconds
-							//int16 packettype = packet->getType_int16_ByName("packettype");
-							//int8 packetsubtype = packet->getType_int8_ByName("packetsubtype");
-							/*int32 postage_cost = packet->getType_int32_ByName("postage_cost");
-							int32 attachment_cost = packet->getType_int32_ByName("attachment_cost");
-							if (postage_cost > 0 || attachment_cost > 0)
-								PlaySoundA("coin_cha_ching");*/
+							
 							mail->save_needed = false;
 							database.SavePlayerMail(mail);
 							Client* to_client = zone_list.GetClientByCharID(player_to_id);
@@ -8284,6 +8278,10 @@ void Client::HandleSentMail(EQApplicationPacket* app) {
 								string popup_text = "You have unread mail!";
 								to_client->SendPopupMessage(10, popup_text.c_str(), "", 3, 0xFF, 0xFF, 0xFF);
 							}
+							else {
+								// don't need the pointer the client doesn't exist currently
+								safe_delete(mail);
+							}
 							ResetSendMail(false, false);
 						}
 						else
@@ -8333,32 +8331,29 @@ bool Client::AddMailItem(Item* item)
 			mail_window.char_item_id = item->details.item_id;
 			mail_window.stack = item->details.count;
 			ret = true;
-		PacketStruct* packet = configReader.getStruct("WS_UpdatePlayerMail", GetVersion());
-				packet->setDataByName("coin_copper", mail_window.coin_copper);
-				packet->setDataByName("coin_silver", mail_window.coin_silver);
-				packet->setDataByName("coin_gold", mail_window.coin_gold);
-				packet->setDataByName("coin_plat", mail_window.coin_plat);
-					if(item)
-					{
-					packet->setDataByName("stack", mail_window.stack);
-					item->stack_count = mail_window.stack;
-					if (version < 860)
-						packet->setItemByName("item", item, player, 0, -1);
-					else if (version < 1193)
-						packet->setItemByName("item", item, player, 0, 0);
-					else
-						packet->setItemByName("item", item, player, 0, 2);
-					}
-					else
-					{
-						packet->setDataByName("end_tag2", GetItemPacketType(GetVersion()));
-						packet->setDataByName("end_tag3", 0xFF);
-					}
-				//packet->setDataByName("packettype", GetItemPacketType(version));
-				//packet->setDataByName("packetsubtype", 0xFF);
-				//packet->setDataByName("unknown2", 0);
-				//packet->PrintPacket();
-				QueuePacket(packet->serialize());
+			PacketStruct* packet = configReader.getStruct("WS_UpdatePlayerMail", GetVersion());
+			packet->setDataByName("coin_copper", mail_window.coin_copper);
+			packet->setDataByName("coin_silver", mail_window.coin_silver);
+			packet->setDataByName("coin_gold", mail_window.coin_gold);
+			packet->setDataByName("coin_plat", mail_window.coin_plat);
+			
+			if(item)
+			{
+				packet->setDataByName("stack", mail_window.stack);
+				item->stack_count = mail_window.stack;
+				if (version < 860)
+					packet->setItemByName("item", item, player, 0, -1);
+				else if (version < 1193)
+					packet->setItemByName("item", item, player, 0, 0);
+				else
+					packet->setItemByName("item", item, player, 0, 2);
+			}
+			else
+			{
+				packet->setDataByName("end_tag2", GetItemPacketType(GetVersion()));
+				packet->setDataByName("end_tag3", 0xFF);
+			}
+			QueuePacket(packet->serialize());
 		}
 		MMailWindowMutex.unlock();
 	}

EQ2/source/WorldServer/net.cpp

@@ -244,13 +244,6 @@ int main(int argc, char** argv) {
 #endif
 	}
 
-
-	// Called as a function so we can use /reload spawns any time
-	/*LogWrite(SPAWN__INFO, 0, "Spawn", "Initializing Spawn Subsystem...");
-	t_now = Timer::GetUnixTimeStamp();
-	world.LoadSpawnInformation();
-	LogWrite(SPAWN__INFO, 0, "Spawn", "Initialize Spawn Subsystem complete (took %u seconds)", Timer::GetUnixTimeStamp() - t_now);*/
-
 	// JA temp logger
 	LogWrite(MISC__TODO, 0, "Reformat", "JA: This is as far as I got reformatting the console logs.");
 
@@ -259,10 +252,7 @@ int main(int argc, char** argv) {
 		LogWrite(ITEM__INFO, 0, "Items", "Loading Items...");
 		database.LoadItemList();
 		MasterItemList::ResetUniqueID(database.LoadNextUniqueItemID());
-	}
-
-	if (!threadedLoad) {
-		// JA: Load all Spell info
+		
 		LogWrite(SPELL__INFO, 0, "Spells", "Loading Spells...");
 		database.LoadSpells();
 
@@ -272,17 +262,21 @@ int main(int argc, char** argv) {
 		// Jabantiz: Load traits
 		LogWrite(WORLD__INFO, 0, "Traits", "Loading Traits...");
 		database.LoadTraits();
-	}
-
-	if (!threadedLoad) {
+		
 		// JA: Load all Quest info
 		LogWrite(QUEST__INFO, 0, "Quests", "Loading Quests...");
 		database.LoadQuests();
-	}
-
-	if (!threadedLoad) {
+		
 		LogWrite(COLLECTION__INFO, 0, "Collect", "Loading Collections...");
 		database.LoadCollections();
+		
+		LogWrite(MISC__TODO, 1, "TODO", "TODO loading achievements\n\t(%s, function: %s, line #: %i)", __FILE__, __FUNCTION__, __LINE__);
+		//LogWrite(ACHIEVEMENT__INFO, 0, "Achievements", "Loading Achievements...");
+		//database.LoadAchievements();
+		//master_achievement_list.CreateMasterAchievementListPacket();
+		
+		LogWrite(MERCHANT__INFO, 0, "Merchants", "Loading Merchants...");
+		database.LoadMerchantInformation();
 	}
 
 	LogWrite(GUILD__INFO, 0, "Guilds", "Loading Guilds...");
@@ -294,12 +288,6 @@ int main(int argc, char** argv) {
 	database.LoadRecipes();
 	LogWrite(TRADESKILL__INFO, 0, "Tradeskills", "Loading Tradeskill Events...");
 	database.LoadTradeskillEvents();
-
-	if (!threadedLoad) {
-		LogWrite(ACHIEVEMENT__INFO, 0, "Achievements", "Loading Achievements...");
-		//database.LoadAchievements();
-		//master_achievement_list.CreateMasterAchievementListPacket();
-	}
 	
 	LogWrite(SPELL__INFO, 0, "AA", "Loading Alternate Advancements...");
 	database.LoadAltAdvancements();
@@ -313,11 +301,6 @@ int main(int argc, char** argv) {
 	LogWrite(CHAT__INFO, 0, "Chat", "Loading channels...");
 	database.LoadChannels();
 
-	if (!threadedLoad) {
-		LogWrite(MERCHANT__INFO, 0, "Merchants", "Loading Merchants...");
-		database.LoadMerchantInformation();
-	}
-
 	LogWrite(LUA__INFO, 0, "LUA", "Loading Spawn Scripts...");
 	database.LoadSpawnScriptData();