Merge branch 'master' of http://cutpon.com:3000/devn00b/EQ2EMu

DB/updates/le_farjourneyfreeport_updates_sep21.sql

@@ -0,0 +1,11 @@
+UPDATE eq2emu.items SET adventure_classes='0' WHERE  id=88140;
+UPDATE eq2emu.item_details_weapon SET damage_low1='2', damage_high1='5', damage_low2='2', damage_high2='5', damage_low3='2', damage_high3='5' WHERE  id=18141;
+UPDATE eq2emu.spawn SET show_command_icon='1' WHERE  id=270007;
+UPDATE eq2emu.spawn_npcs SET min_level='20', max_level='20', enc_level='3' WHERE  id=35671;
+UPDATE eq2emu.spawn SET targetable='0' WHERE  id=270011;
+UPDATE eq2emu.items SET tradeskill_classes='0' WHERE  id=185427;
+UPDATE eq2emu.spawn SET attackable='0' WHERE  id=270009;
+UPDATE eq2emu.spawn_npcs SET enc_level='5' WHERE  id=35673;
+INSERT INTO starting_skills (class_id, race_id, skill_id, current_val, max_val) VALUES(255, 255, 3421494576, 1, 5);
+INSERT INTO starting_skills (class_id, race_id, skill_id, current_val, max_val) VALUES(255, 255, 1653482350, 1, 5);
+update spawn_objects, spawn set name='a treasure chest', model_type=4016, show_name=1, targetable=1, size=32, command_primary=16, command_secondary=0, visual_state=11903, attackable=0, show_level=0, show_command_icon=1, display_hand_icon=1, collision_radius=29, hp = 0, power = 0, device_id = 0, merchant_min_level = 0, merchant_max_level = 0 where spawn_objects.spawn_id = spawn.id and spawn.id = 270010;

EQ2/source/WorldServer/zoneserver.cpp

@@ -5067,7 +5067,7 @@ EQ2Packet* ZoneServer::GetZoneInfoPacket(Client* client){
 	packet->setDataByName("y", client->GetPlayer()->GetY());
 	packet->setDataByName("z", client->GetPlayer()->GetZ());
 
-	if (client->GetVersion() == 546 && (GetZoneFile() && strcmp("boat_06p_tutorial02", GetZoneFile()) == 0) && client->GetPlayer()->GetX() == this->GetSafeX() && client->GetPlayer()->GetY() == this->GetSafeY() && client->GetPlayer()->GetZ() == this->GetSafeZ()) { //basically the only time the player will see this is if their zone in coords are the exact same as the safe coords (they haven't moved)		
+	if ((GetZoneFile() && strcmp("boat_06p_tutorial02", GetZoneFile()) == 0) && client->GetPlayer()->GetX() == this->GetSafeX() && client->GetPlayer()->GetY() == this->GetSafeY() && client->GetPlayer()->GetZ() == this->GetSafeZ()) { //basically the only time the player will see this is if their zone in coords are the exact same as the safe coords (they haven't moved)		
 		vector<ZoneInfoSlideStruct*>* slides = GenerateTutorialSlides();
 		if (slides) {
 			packet->setArrayLengthByName("num_slides", slides->size());

server/Quests/FarJourneyFreeport/TasksaboardtheFarJourney.lua

@@ -109,6 +109,7 @@ function CurrentStep(Quest, QuestGiver, Player)
 			spawn = GetSpawnFromList(spawns, i-1)
 			if spawn then
 				ChangeHandIcon(spawn, 1)
+				SpawnSet(NPC, "targetable", 1, true, true)
 			end
 			i = i + 1
 		until spawn == Nil
@@ -255,6 +256,7 @@ end
 function Reload(Quest, QuestGiver, Player, Step)
 	if Step == 1 then
 		Step2Init(Quest, QuestGiver, Player)
+		CurrentStep(Quest, QuestGiver, Player)
 	elseif Step == 2 then
 		Step3Init(Quest, QuestGiver, Player)
 	elseif Step == 3 then

server/SpawnScripts/FarJourneyFreeport/atreasurechest.lua

@@ -7,7 +7,12 @@
 --]]
 
 function spawn(NPC)
+	ChangeHandIcon(NPC, 0)
+	SpawnSet(NPC, "targetable", 0, true, true)
+end
 
+function respawn(NPC)
+	spawn(NPC)
 end
 
 function open(NPC, Player)
@@ -20,6 +25,8 @@ function open(NPC, Player)
 		SetTutorialStep(player, 16)
 	else
 		DisplayText(Player, 12, "This box is empty.")
+		ChangeHandIcon(NPC, 0)
+		SpawnSet(NPC, "targetable", 0, true, true)
 	end
 end
 

server/WorldStructs.xml

@@ -986,7 +986,25 @@ to zero and treated like placeholders." />
 <Data ElementName="minute" Type="int8" Size="1" />
 <Data ElementName="seconds" Type="int8" Size="1" />
 <Data ElementName="unknown7" Type="float" Size="2" />
-<Data ElementName="unknown8" Type="int16" Size="1" />
+<Data ElementName="num_slides" Type="int8" Size="1" />
+<Data ElementName="slide_array" Type="Array" ArraySizeVariable="num_slides">
+	<Data ElementName="unknown1" Type="float" Size="2" />
+	<Data ElementName="unknown2" Type="int32" Size="2" />
+	<Data ElementName="unknown3" Type="int32" Size="1" />
+	<Data ElementName="unknown4" Type="int32" Size="1" />
+	<Data ElementName="slide" Type="EQ2_8Bit_String" />
+	<Data ElementName="voiceover" Type="EQ2_8Bit_String" />
+	<Data ElementName="key1" Type="int32" Size="1" />
+	<Data ElementName="key2" Type="int32" Size="1" />
+	<Data ElementName="num_transitions" Type="int8" Size="1" />
+	<Data ElementName="transitions_array" Type="Array" ArraySizeVariable="num_transitions">
+		<Data ElementName="transition_x" Type="int32" Size="1" />
+		<Data ElementName="transition_y" Type="int32" Size="1" />
+		<Data ElementName="transition_zoom" Type="float" Size="1" />
+		<Data ElementName="transition_time" Type="float" Size="1" />
+	</Data>
+</Data>
+<Data ElementName="unknown8" Type="int8" Size="1" />
 <Data ElementName="unknown9" Type="float" Size="1" />
 <Data ElementName="zone_flags" Type="int32" Size="1" />
 <Data ElementName="unknown10b" Type="int16" Size="1" />