implement messages 6 to 9master

2 files changed, 146 insertions, 4 deletions

diff --git a/PROTOCOL.md b/PROTOCOL.md
index 059f50c..6f0b0be 100644
--- a/PROTOCOL.md
+++ b/PROTOCOL.md
@@ -12,10 +12,10 @@ this should suffice as a starting point.
 | 3 | c<-s | &#x2611; | &#x2611; | accept | accept connection |
 | 4 | c->s | &#x2611; | &#x2611; | player_info | inform server about player appearance and permabuffs|
 | 5 | c->s | &#x2611; | &#x2611; | player_inventory slot | tell the server about single inventory slot contents |
-| 6 | c->s | &#x2611; | &#x2610; | | |
-| 7 | c<-s | &#x2611; | &#x2610; | | |
-| 8 | c->s | &#x2611; | &#x2610; | | |
-| 9 | c<-s | &#x2611; | &#x2610; | | |
+| 6 | c->s | &#x2611; | &#x2611; | request_world_info | |
+| 7 | c<-s | &#x2611; | &#x2611; | world_info | server sends world metadata |
+| 8 | c->s | &#x2611; | &#x2611; | request_spawn | request to spawn player at given location |
+| 9 | c<-s | &#x2611; | &#x2611; | set_loading_message | messages shown while loading the world |
 | 10 | c<-s | &#x2611; | &#x2610; | | |
 | 11 |  | &#x2610; | &#x2610; | | |
 | 12 | c->s | &#x2611; | &#x2610; | | |
@@ -442,3 +442,55 @@ ilspy decompilation:
 		NetMessage.TrySendData(5, -1, whoAmI, null, num35, num36);
 	}
 ```
+
+
+## `id 6` `s<-c` request_world_info
+client asks server about world info (parts of world file header)
+
+| name | type | size | description |
+|--|--|--|--|
+| | | | |
+
+## `id 7` `s->c` world_info
+info about world state
+TODO describe fields
+
+| name | type | size | description |
+|--|--|--|--|
+| | | | |
+
+
+## `id 8` `s<-c` request_spawn
+request to spawn player at given location with team selected
+
+| name | type | size | description |
+|--|--|--|--|
+| tile | vec2<int> | 8 | spawn location |
+| team | uint8_t | 1 | team |
+
+```csharp
+	// Terraria.Netplay.InnerClientLoop
+    else if (Connection.State == 5 && WorldGen.worldCleared)
+	{
+		Connection.State = 6;
+		Main.player[Main.myPlayer].FindSpawn();
+		NetMessage.SendData(8, -1, -1, null, Main.player[Main.myPlayer].SpawnX, Main.player[Main.myPlayer].SpawnY, Main.player[Main.myPlayer].team);
+	}
+```
+
+## `id 9` `s<-c` set_loading_message
+
+| name | type | size | description |
+|--|--|--|--|
+| sections | uint32 | 4 | number of sections |
+| message | nstring | - | message to be shown |
+| flags | uint8_t | 1 | unused |
+
+```csharp
+    // Terraria.NetMessage.SendData
+    case 9: 
+	    writer.Write(number);
+	    text.Serialize(writer);
+	    BitsByte bitsByte30 = (byte)number2;
+	    writer.Write(bitsByte30);
+```
\ No newline at end of file
diff --git a/include/net/types.hpp b/include/net/types.hpp
index b565f51..fcc8b26 100644
--- a/include/net/types.hpp
+++ b/include/net/types.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <array>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <string>
 #include <unistd.h>
@@ -73,6 +75,30 @@ struct vec2 {
 	T y;
 };
 
+
+template<class T>
+struct plist {
+	std::vector<T> v;
+
+	template <class K>
+	ssize_t read(io::serialized_io<K>& io) {
+		uint8_t len;
+
+		auto offset = io.read(len);
+		v.resize(len);
+		offset += io.read(v);
+
+		return offset;
+	}
+	
+	template <class K>
+	ssize_t write(io::serialized_io<K>& io) {
+		auto offset = io.write(uint8_t(v.size()));
+		offset += io.write(v);
+		return offset;
+	}
+};
+
 // NetMessages
 
 struct connect {
@@ -135,6 +161,70 @@ struct player_inventory_slot {
 	bitset<2> 	flags;
 };
 
+struct request_world_info {
+	static constexpr uint8_t packet_id = 6;
+};
+
+struct world_info {
+	static constexpr uint8_t packet_id = 7;
+
+	int32_t time;
+	bitset<3> time_flags; // day? blood moon? eclipse?
+	uint8_t moon_phase;
+	vec2<uint16_t> tiles_limit;
+	vec2<uint16_t> spawn_tile;
+	uint16_t surface_level;
+	uint16_t rock_level;
+	int32_t worldid;
+	std::string worldname;
+	uint8_t gamemode;
+	std::array<uint8_t, 16> uuid;
+	uint64_t worldgen_version;
+	uint8_t moon_type;
+	std::array<uint8_t, 13> backgrounds;
+	std::array<uint8_t, 3> bg_styles;
+
+	float wind_speed_target;
+	uint8_t num_clouds;
+
+	std::array<int32_t, 3> trees;
+	std::array<uint8_t, 4> trees_styles;
+	std::array<int32_t, 3> cave_bg;
+	std::array<uint8_t, 4> cave_bg_styles;
+
+	std::array<uint8_t, 13> tree_tops;
+
+	float max_raining;
+
+	bitset<81> flags; // TODO: document them
+
+	uint8_t sundial_cooldown;
+	uint8_t moondial_cooldown;
+
+	std::array<uint16_t, 7> world_ores;
+	int8_t invasion_type;
+
+	uint64_t lobby_id = 0;
+
+	float sandstorm_severity;
+	plist<vec2<uint16_t>> extra_spawn_points;
+};
+
+struct request_spawn {
+	static constexpr uint8_t packet_id = 8;
+	
+	vec2<int32_t>  	tile;
+	uint8_t    		team;
+};
+
+struct set_loading_message {
+	static constexpr uint8_t packet_id = 9;
+	
+	int32_t sections;
+	nstring message;
+	uint8_t flags = 0;
+};
+
 inline nstring operator""_ns(const char* str, std::size_t)
 {
 	return nstring{nstring::Literal, str};