From a9b72e6aa2a97ba1c16d5917c7da8c0daea6dc25 Mon Sep 17 00:00:00 2001
From: Akbar Yahya <akbaryahya_ym@yahoo>
Date: Sun, 29 Jan 2023 15:27:40 +0800
Subject: [PATCH] * Rename RotationSpeed to MathQuaternion * Fix
 DailyTaskFilterCityRsp

---
 proto/DailyTaskFilterCityRsp.proto              | 17 +++++++++--------
 ...RotationSpeed.proto => MathQuaternion.proto} |  2 +-
 proto/ObstacleInfo.proto                        |  4 ++--
 proto/PlatformInfo.proto                        |  6 +++---
 proto/RoutePoint.proto                          |  6 +++---
 5 files changed, 18 insertions(+), 17 deletions(-)
 rename proto/{RotationSpeed.proto => MathQuaternion.proto} (83%)

diff --git a/proto/DailyTaskFilterCityRsp.proto b/proto/DailyTaskFilterCityRsp.proto
index 452ace80..6f41d904 100644
--- a/proto/DailyTaskFilterCityRsp.proto
+++ b/proto/DailyTaskFilterCityRsp.proto
@@ -1,13 +1,14 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 message DailyTaskFilterCityRsp {
-	enum BAECKJPDBMI {
-		option allow_alias = true;
-		NONE = 0;
-		PEPPOHPHJOJ = 131;
-		DCDNILFDFLB = 0;
-		NNBKOLMPOEA = 1;
-	}
+	//enum BAECKJPDBMI {
+	//	option allow_alias = true;
+	//	NONE = 0;
+	//	PEPPOHPHJOJ = 131;
+	//	DCDNILFDFLB = 0;
+	//	NNBKOLMPOEA = 1;
+	//}
 
-	repeated uint32 city_id = 15;
+    int32 retcode = 5;
+	uint32 city_id = 15;
 }
diff --git a/proto/RotationSpeed.proto b/proto/MathQuaternion.proto
similarity index 83%
rename from proto/RotationSpeed.proto
rename to proto/MathQuaternion.proto
index 8540211f..9e8e8275 100644
--- a/proto/RotationSpeed.proto
+++ b/proto/MathQuaternion.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-message RotationSpeed {
+message MathQuaternion {
 	float x = 1;
 	float y = 2;
 	float z = 3;
diff --git a/proto/ObstacleInfo.proto b/proto/ObstacleInfo.proto
index bf4d5fb8..6413641f 100644
--- a/proto/ObstacleInfo.proto
+++ b/proto/ObstacleInfo.proto
@@ -6,11 +6,11 @@ option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
 import "Vector3Int.proto";
 import "ShapeType.proto";
-import "RotationSpeed.proto";
+import "MathQuaternion.proto";
 message ObstacleInfo {
 	Vector center = 4;
 	Vector3Int extents = 12;
 	ShapeType shape = 5;
 	int32 obstacleId = 9;
-	RotationSpeed Vector = 2;
+	MathQuaternion Vector = 2;
 }
diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto
index 6c466be4..8b5d82ad 100644
--- a/proto/PlatformInfo.proto
+++ b/proto/PlatformInfo.proto
@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 
 
 import "Vector.proto";
-import "RotationSpeed.proto";
+import "MathQuaternion.proto";
 import "MovingPlatformType.proto";
 import "Route.proto";
 message PlatformInfo {
@@ -14,10 +14,10 @@ message PlatformInfo {
 	uint32 startSceneTime = 4;
 	Vector startPos = 7;
 	bool isStarted = 8;
-	RotationSpeed startRot = 9;
+	MathQuaternion startRot = 9;
 	uint32 stopSceneTime = 10;
 	Vector posOffset = 11;
-	RotationSpeed rotOffset = 12;
+	MathQuaternion rotOffset = 12;
 	MovingPlatformType movingPlatformType = 13;
 	bool isActive = 14;
 	Route route = 15;
diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto
index 1902bd2e..7b3b1261 100644
--- a/proto/RoutePoint.proto
+++ b/proto/RoutePoint.proto
@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 
 
 import "Vector.proto";
-import "RotationSpeed.proto";
+import "MathQuaternion.proto";
 message RoutePoint {
 	Vector position = 1;
 	float arriveRange = 2;
@@ -15,7 +15,7 @@ message RoutePoint {
 	}
 	oneof rotate_params {
 		Vector rotation = 21;
-		RotationSpeed rotation_speed = 22;
-		RotationSpeed axis_speed = 23;
+		MathQuaternion rotation_speed = 22;
+		MathQuaternion axis_speed = 23;
 	}
 }