Add new Fly mode

marioCST · Sep 25, 2022 · d123e4d · d123e4d
1 parent 4b75a8b
commit d123e4d
Showing 1 changed file with 102 additions and 4 deletions.
diff --git a/Horion/Module/Modules/Fly.cpp b/Horion/Module/Modules/Fly.cpp
@@ -7,7 +7,8 @@ Fly::Fly() : IModule('F', Category::MOVEMENT, "Fly to the sky") {
 			   .addEntry(EnumEntry("AirStuck", 2))
 			   .addEntry(EnumEntry("Jetpack", 3))
 			   .addEntry(EnumEntry("Jetpack2", 4))
-			   .addEntry(EnumEntry("Motion", 5));
+			   .addEntry(EnumEntry("Motion", 5))
+			   .addEntry(EnumEntry("Moonlight", 6));
 	registerEnumSetting("Mode", &mode, 0);
 	registerFloatSetting("Horizontal Speed", &this->horizontalSpeed, this->horizontalSpeed, 0.1f, 10.f);
 	registerFloatSetting("Vertical Speed", &this->verticalSpeed, this->verticalSpeed, 0.1f, 10.f);
@@ -64,7 +65,9 @@ void Fly::onTick(C_GameMode *gm) {
 
 			gm->player->setPos(pos.add(vec3_t(x, 0.5f, z)));
 		}
-	} break;
+
+		break;
+	}
 	case 2:
 		gm->player->velocity = vec3_t(0, 0, 0);
 		break;
@@ -79,8 +82,9 @@ void Fly::onTick(C_GameMode *gm) {
 		moveVec.z = sin(calcYaw) * cos(calcPitch) * horizontalSpeed;
 
 		gm->player->lerpMotion(moveVec);
-	} break;
 
+		break;
+	}
 	case 4: {
 		if (gameTick >= 5) {
 			float calcYaw = (gm->player->yaw + 90) * (PI / 180);
@@ -110,8 +114,13 @@ void Fly::onTick(C_GameMode *gm) {
 			gm->player->velocity.y -= 0.15f;
 			gameTick = 0;
 		}
+
+		gm->player->velocity = vec3_t(0, 0, 0);
+
+		break;
 	}
 	case 5:
+	case 6:
 		gm->player->velocity = vec3_t(0, 0, 0);
 	}
 }
@@ -126,6 +135,7 @@ void Fly::onDisable() {
 			g_Data.getLocalPlayer()->canFly = false;
 		break;
 	case 1:
+	case 5:
 		g_Data.getLocalPlayer()->velocity = vec3_t(0, 0, 0);
 	}
 }
@@ -135,6 +145,8 @@ void Fly::onMove(C_MoveInputHandler *input) {
 	if (localPlayer == nullptr)
 		return;
 
+	bool keyPressed = false;
+
 	switch (mode.selected) {
 	case 5: {
 		vec3_t *localPlayerPos = localPlayer->getPos();
@@ -147,34 +159,120 @@ void Fly::onMove(C_MoveInputHandler *input) {
 			localPlayer->velocity.y += verticalSpeed;
 			localPlayer->fallDistance = 0.f;
 		}
+
 		if (input->isSneakDown) {
 			localPlayer->velocity.y -= verticalSpeed;
 			localPlayer->fallDistance = 0.f;
 		}
+
 		if (input->right) {
 			yaw += 90.f;
+
 			if (input->forward)
 				yaw -= 45.f;
 			else if (input->backward)
 				yaw += 45.f;
 		}
+
 		if (input->left) {
 			yaw -= 90.f;
+
 			if (input->forward)
 				yaw += 45.f;
 			else if (input->backward)
 				yaw -= 45.f;
 		}
+
 		if (input->backward && !input->left && !input->right)
 			yaw += 180.f;
+
 		if (pressed) {
 			float calcYaw = (yaw + 90.f) * (PI / 180.f);
 			vec3_t moveVec;
+
 			moveVec.x = cos(calcYaw) * horizontalSpeed;
 			moveVec.y = localPlayer->velocity.y;
 			moveVec.z = sin(calcYaw) * horizontalSpeed;
 			localPlayer->lerpMotion(moveVec);
 		}
-	} break;
+
+		break;
+	}
+	case 6: {
+		// Moonlight is an AntiCheat by disepi (Zephyr Developer)
+		// This Fly/Glide worked on the Hive in the first half year of 2021
+		// Idea from Weather Client (dead by now), TurakanFly from BadMan worked similar with less height loss
+
+		C_LocalPlayer *localPlayer = g_Data.getLocalPlayer();
+
+		if (localPlayer->onGround == false) {
+			localPlayer->velocity.y = 0;
+		}
+
+		C_GameSettingsInput *input = g_Data.getClientInstance()->getGameSettingsInput();
+
+		if (input == nullptr)
+			return;
+
+		float yaw = localPlayer->yaw;
+
+		if (GameData::isKeyDown(*input->forwardKey) && GameData::isKeyDown(*input->backKey))
+			return;
+		else if (GameData::isKeyDown(*input->forwardKey) && GameData::isKeyDown(*input->rightKey) && !GameData::isKeyDown(*input->leftKey)) {
+			yaw += 45.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->forwardKey) && GameData::isKeyDown(*input->leftKey) && !GameData::isKeyDown(*input->rightKey)) {
+			yaw -= 45.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->backKey) && GameData::isKeyDown(*input->rightKey) && !GameData::isKeyDown(*input->leftKey)) {
+			yaw += 135.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->backKey) && GameData::isKeyDown(*input->leftKey) && !GameData::isKeyDown(*input->rightKey)) {
+			yaw -= 135.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->forwardKey)) {
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->backKey)) {
+			yaw += 180.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->rightKey) && !GameData::isKeyDown(*input->leftKey)) {
+			yaw += 90.f;
+			keyPressed = true;
+		} else if (GameData::isKeyDown(*input->leftKey) && !GameData::isKeyDown(*input->rightKey)) {
+			yaw -= 90.f;
+			keyPressed = true;
+		} else {
+			localPlayer->velocity.x = 0.f;
+			localPlayer->velocity.z = 0.f;
+			keyPressed = false;
+		}
+
+		if (yaw >= 180)
+			yaw -= 360.f;
+
+		float calcYaw = (yaw + 90) * (PI / 180);
+		vec3_t moveVec;
+		moveVec.x = cos(calcYaw) * horizontalSpeed;
+		moveVec.y = localPlayer->velocity.y;
+		moveVec.z = sin(calcYaw) * horizontalSpeed;
+
+		if (keyPressed) {
+			localPlayer->lerpMotion(moveVec);
+			keyPressed = false;
+		}
+
+		if (gameTick > 6) {
+			if (localPlayer->onGround == false) {
+				vec3_t pos;
+				pos.x = localPlayer->getPos()->x;
+				pos.y = localPlayer->getPos()->y - 0.025f;
+				pos.z = localPlayer->getPos()->z;
+
+				localPlayer->setPos(pos);
+			}
+
+			gameTick = 0;
+		}
+	}
 	}
 }