Merge branch 'master' of https://git.eq2emu.com/devn00b/EQ2EMu

EQ2/source/WorldServer/Entity.cpp

@@ -718,8 +718,8 @@ void Entity::ChangePrimaryWeapon(){
 	Item* item = equipment_list.GetItem(EQ2_PRIMARY_SLOT);
 	if(item && item->details.item_id > 0 && item->IsWeapon()){
 		GetInfoStruct()->set_primary_weapon_delay(item->weapon_info->delay * 100);
-		GetInfoStruct()->set_primary_weapon_damage_low(item->weapon_info->damage_low3);
-		GetInfoStruct()->set_primary_weapon_damage_high(item->weapon_info->damage_high3);
+		GetInfoStruct()->set_primary_weapon_damage_low(item->weapon_info->damage_low3 + str_offset_dmg);
+		GetInfoStruct()->set_primary_weapon_damage_high(item->weapon_info->damage_high3 + str_offset_dmg);
 		GetInfoStruct()->set_primary_weapon_type(item->GetWeaponType());
 		GetInfoStruct()->set_wield_type(item->weapon_info->wield_type);
 	}

EQ2/source/WorldServer/client.cpp

@@ -6237,12 +6237,12 @@ void Client::DisplayQuestComplete(Quest* quest, bool tempReward, std::string cus
 	if (packet) {
 		packet->setDataByName("title", "Quest Reward!");
 		packet->setDataByName("name", quest->GetName());
-		if(customDescription.size() > 0)
+		if(tempReward)
 		{
 			packet->setDataByName("description", customDescription.c_str());
 		}
 		else
-			packet->setDataByName("description", quest->GetDescription());
+			packet->setDataByName("description", quest->GetCompletedDescription());
 		
 		packet->setDataByName("level", quest->GetLevel());
 		packet->setDataByName("encounter_level", quest->GetEncounterLevel());