[#115] 115 flip96420

apps/auth-user/src/modules/auth/services/auth-google-exchange.service.ts

@@ -387,7 +387,6 @@ export class AuthGoogleExchangeService {
     };
   }
 
-
   private async initPlayerStats(user: ExchangeResult['user']): Promise<void> {
     const payload: Record<string, unknown> = {
       userId: user.id,

apps/frontend/lib/babylon/data/achievments.ts

@@ -1,25 +1,26 @@
-
 export class Achievements {
-
-	private achievements: any =
-	{
+	public achievements: Record<string, boolean> = {
 		"marathon-mayem": false,
 		"the early bird catches the worm!": false,
 		"first blood!": false,
 		"jump, JUMP, JUMP!!!": false,
 		"eagle eye": false,
-		"chip-in!": false
-	}
+		"chip-in!": false,
+	};
 
-	private distanceCounter: number = 0;
-	private marathonDistance: number = 20;
+	private distanceCounter = 0;
+	private marathonDistance = 20;
+	private userId: string;
 
-	constructor() {}
+	constructor(userId: string) {
+		this.userId = userId;
+		console.log(this.userId);
+	}
 
-	addToDistance(amount: number){
+	async addToDistance(amount: number) {
 		this.distanceCounter += amount;
-		if (this.distanceCounter >= this.marathonDistance && !this.achievements["marathon-mayem"])
-		{
+
+		if (this.distanceCounter >= this.marathonDistance && !this.achievements["marathon-mayem"]) {
 			this.achievements["marathon-mayem"] = true;
 			console.log("achievement unlocked!: marathon-mayem");
 		}

apps/frontend/lib/babylon/gui/GuiHelper.ts

@@ -7,6 +7,10 @@ import type { msgToServerType } from '@/lib/packets/msgToServerType';
 import { stateUi } from '../state/state_ui/stateUi';
 import { GameNotifications } from "../gui/GameNotifications";
 import { SocketStatus } from "./SocketStatus";
+import { StateMachine } from "../state/StateMachine";
+import { Achievement } from "next-auth/providers/42-school";
+import { Achievements } from "../data/achievments";
+import { distance } from "framer-motion";
 
 export class GuiHelper {
 	public socketStatus: SocketStatus;
@@ -15,12 +19,13 @@ export class GuiHelper {
 	public notifications: GameNotifications;
 	private resizeFunctions: Array<() => void> = [];
 	constructor(
+		machine: StateMachine,
 		scene: Scene, 
 		canvas: HTMLCanvasElement,
 		clientId: string,
 		msgToServer: msgToServerType
 	) {
-		const count = 0;
+		let count = 0;
 		// Text hitboxes may overlap with buttons and take over control
 
 		// GUI for non-interactable text
@@ -47,6 +52,16 @@ export class GuiHelper {
 			msgToServer<CS_DEV_StartEndscreen>(CS_Type.CS_DEV_StartEndscreen, {
 				won: false,
 				winnerId: clientId,
+				payload: {
+					userId: machine.userId,
+					type: "marathon-mayem" ,
+					name: "Marathon Mayem",
+					description: "Travel 20 meters total",
+					achieved: machine.achievements.achievements["marathon-mayem"],
+					progress: 10,
+					progressTarget: 50,
+					meta: { distance: 8 }
+				},
 			});
 		});
 		this.resizeFunctions.push(() => {

apps/frontend/lib/babylon/state/4_turn_start/Turn.ts

@@ -6,6 +6,7 @@ import { StateMachine } from "../StateMachine";
 import { ImportMesh } from "../1_loading/ImportMesh";
 import { aimingMeshes } from "../1_loading/loadGame";
 import { DotTail } from "../1_loading/DotTail";
+import { Projectile } from "../8_turn_end/Projectile";
 
 const pi2 = Math.PI * 2;
 

apps/frontend/lib/babylon/state/6_movement/movementTick.ts

@@ -83,13 +83,19 @@ function forAllWorms(
 
 	// Remove gravity if on ground
 	if (worm.onGround)
+	{
+		// console.log("My Gravity is 0!");
 		worm.aggregate.body.setGravityFactor(0);
+	}
 	else
+	{
+		// console.log("My Gravity is 1!");
 		worm.aggregate.body.setGravityFactor(1);
 
-	// When player is moving, send packet to update clients and server with that players position
-	if (isActive && isMovement && worm.aggregate.body.getLinearVelocity().length() > 0.01) {
-		broadcastPosition(worm.id, worm.collider.position.x, worm.collider.position.y);
+		// When player is moving, send packet to update clients and server with that players position
+		if (isActive && isMovement && worm.aggregate.body.getLinearVelocity().length() > 0.01) {
+			broadcastPosition(worm.id, worm.collider.position.x, worm.collider.position.y);
+		}
 	}
 }
 

apps/frontend/lib/babylon/state/7_aiming/AimingState.ts

@@ -30,6 +30,7 @@ function sendAimingDone(machine: StateMachine) {
 		(machine.loaded.turn.chosenWeapon?.getProjectileSpawnPos()?.y ??
 		machine.loaded.turn.chosenWorm.collider.position.y);
 	machine.msgToServer<CS_EndAimState>(CS_Type.CS_EndAimState, {
+		id: machine.loaded.turn.chosenWeapon?.weaponId ?? 0,
 		wormAngle: data.wormAngle,
 		position: {
 			x: pos_x,

apps/frontend/lib/babylon/state/8_turn_end/Projectile.ts

@@ -0,0 +1,53 @@
+import { Mesh, MeshBuilder, PhysicsAggregate, PhysicsMotionType, PhysicsShape, PhysicsShapeType, Scene, StateCondition, Vector3 } from "@babylonjs/core";
+import { StateMachine } from "../StateMachine";
+import { ThinSSRBlurCombinerPostProcess } from "@babylonjs/core/PostProcesses/thinSSRBlurCombinerPostProcess";
+
+export class Projectile {
+
+	private speed: number = 10000000;
+
+	public type: number = 0;
+	public launchPos: Vector3 = Vector3.Zero();
+	public launchAngle: number = 0;
+	public endPos: Vector3 = Vector3.Zero();
+
+	// public mesh: Mesh;
+	// public aggregate: PhysicsAggregate;
+
+	constructor() {}
+
+	launchProjectile(scene: Scene)
+	{
+		const mesh = MeshBuilder.CreateSphere
+		(
+			"projectile",
+			{ diameter: 0.5 },
+			scene
+		);
+		mesh.position = this.launchPos;
+
+		const aggregate = new PhysicsAggregate
+		(
+			mesh,
+			PhysicsShapeType.SPHERE,
+			{ mass: 1, restitution: 0, friction: 50 },
+			scene
+		);
+		aggregate.body.setMotionType(PhysicsMotionType.DYNAMIC);
+		mesh.isVisible = true;
+
+		console.log(`Received angle: ${this.launchAngle / Math.PI * 180}, turned into ${mesh.rotation.z / Math.PI * 180}`);
+
+		// this.mesh.isVisible = true;
+		// this.aggregate.body.setCollisionCallbackEnabled(true);
+
+		const direction2 = new Vector3(Math.sin(this.launchAngle), Math.cos(this.launchAngle), 0);
+		console.log("We go in", direction2);
+		aggregate.body.applyImpulse(direction2.scale(this.speed), mesh.getAbsolutePosition());
+
+		console.log("Launch position: ", this.launchPos);
+		console.log("Mesh position: ", mesh.position);
+		console.log("Launch angle: ", mesh.rotation.z);
+		console.log("Of course i did xd!");
+	}
+}

apps/frontend/lib/babylon/state/8_turn_end/TurnEndState.ts

@@ -1,7 +1,7 @@
 import { SC_TurnEnds, SC_Type } from '@/shared/packets/ServerClientPackets';
 import { IState } from '../IState'
 import { StateMachine } from '../StateMachine';
-import { IAction, Vector3 } from '@babylonjs/core'
+import { ActionManager, ExecuteCodeAction, IAction, MeshBuilder, PhysicsAggregate, PhysicsMotionType, PhysicsShapeType, Vector3 } from '@babylonjs/core'
 import { CS_ClientFinishedTurn, CS_Type } from '@/shared/packets/ClientServerPackets';
 
 /**
@@ -27,7 +27,13 @@ export class TurnEndState implements IState {
 		// Setup
 		turnMessage(this.machine);
 
+		// if (!this.machine.loaded)
+		// 	return;
+
+		// const projectile = this.machine.loaded.turn.projectile;
+
 		// Actions
+		// projectile.launchProjectile(this.machine.scene);
 	}
 
 	tick() {

apps/frontend/lib/babylon/state/9_game_end/GameEndState.ts

@@ -34,6 +34,16 @@ export class GameEndState implements IState {
 			this.machine.msgToServer<CS_DEV_StartEndscreen>(CS_Type.CS_DEV_StartEndscreen, {
 				won: false,
 				winnerId: "",
+				payload: {
+					userId: this.machine.userId,
+					type: "marathon-mayem" ,
+					name: "Marathon Mayem",
+					description: "Travel 20 meters total",
+					achieved: this.machine.achievements.achievements["marathon-mayem"],
+					progress: 10,
+					progressTarget: 50,
+					meta: { distance: 8 }
+				}
 			});
 		}
 	}

apps/frontend/lib/babylon/state/StateMachine.ts

@@ -26,6 +26,7 @@ import { aimingMeshes } from './1_loading/loadGame';
 import { Achievements } from '../data/achievments';
 import { movementTick } from './6_movement/movementTick';
 import { ExplosionParticles } from './8_turn_end/ExplosionParticles';
+import { useDeprecatedInvertedScale } from 'framer-motion';
 
 // Stores the part of the statemachine that are created in the loading step
 export interface loaded {
@@ -89,7 +90,7 @@ export class StateMachine {
 		this.guiHelper = undefined;
 		this.loaded = undefined;
 		this.activePlayerId = "";
-		this.achievements = new Achievements();
+		this.achievements = new Achievements(this.userId);
 	}
 
 	// Called only once per canvas, when sockets have been set up
@@ -154,7 +155,8 @@ export class StateMachine {
 		// Set up a fresh Game
 		this.log("Setting up new Game");
 
-		this.guiHelper = new GuiHelper(this.scene, this.canvas, this.userId, this.msgToServer);
+
+		this.guiHelper = new GuiHelper(this, this.scene, this.canvas, this.userId, this.msgToServer);
 		// Need to prompt socket to update the UI if its connected
 		this.queue?.updateSocketUi();
 		//this.msgToServer<CS_GetGameState>(CS_Type.CS_GetGameState, {});

apps/frontend/lib/packets/handlePacket.ts

@@ -1,7 +1,7 @@
 import { SC_Type, SC_GenericPacket, frontendServerPackets, SC_ExplosionOccurs } from "@/shared/packets/ServerClientPackets"
 import { StateMachine } from '../babylon/state/StateMachine';
 import { GameState } from '@/shared/state/GameState';
-import { Nullable } from "@babylonjs/core";
+import { Nullable, Vector3 } from "@babylonjs/core";
 import { Control, TextBlock } from "@babylonjs/gui";
 import { Player } from "../babylon/player/Player";
 import { Worm } from '../babylon/player/Worm';