Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 4391f0d

Browse files
committed
added colors and commented stuff
1 parent 72b22c8 commit 4391f0d

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

C61/sprint1/doc/the-last-stand/src/client/match/scenes/ClientMatch.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@ export default class ClientMatch extends Phaser.Scene {
7373
rect.destroy()
7474
this.players.delete(rect.name)
7575
}
76+
const colors = [0xff0000, 0x00ff00, 0x0000ff, 0xffff00];
7677

7778
for (const entity of entities.values()) {
7879
const existingRect = this.players.get(entity.name)
80+
7981
if (!existingRect) {
80-
const rect = this.add.rectangle(entity.position.x , entity.position.y, entity.size.width, entity.size.height, 0x00ff00)
82+
const rect = this.add.rectangle(entity.position.x , entity.position.y, entity.size.width, entity.size.height, colors[entity.id])
8183
rect.name = entity.name
8284
this.players.set(entity.name, rect)
8385
}

C61/sprint1/doc/the-last-stand/src/server/arena.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ export default Arena({
5151

5252
passport.deserializeUser((id, done) => {
5353
console.log('deserializeUser called with id:', id);
54-
User.findById(id, (err, user) => {
54+
User.findById(id, (err: any, user: boolean | Express.User | null | undefined) => {
5555
console.log('user found:', user);
5656
done(err, user);
5757
});
5858
});
5959

6060
app.use(cors());
61-
app.use((req, res, next) => {
61+
app.use((req: any, res: { header: (arg0: string, arg1: string) => void; }, next: () => void) => {
6262
res.header('Access-Control-Allow-Origin', 'http://localhost:5173');
6363
res.header('Access-Control-Allow-Credentials', 'true');
6464
next();

C61/sprint1/doc/the-last-stand/src/server/game/game_components/Jumper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default class Jumper extends GameComponent
1616
maxJumpNumber: number;
1717
jumpCount: number;
1818

19-
constructor(gameEntity : GameEntity, name: string = 'jumper', velocity: number = -260, maxJumpNumber: number = 2, jumpCount: number = 0) {
19+
constructor(gameEntity : GameEntity, name: string = 'jumper', velocity: number = -10, maxJumpNumber: number = 2, jumpCount: number = 0) {
2020
super(name, gameEntity);
2121
this.velocity = velocity;
2222
this.maxJumpNumber = maxJumpNumber;

C61/sprint1/doc/the-last-stand/src/server/rooms/MatchOrchestrer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class MatchOrchestrer extends Room<ServerMatch> {
3030
this.onMessage("req_action", (client, message) => {
3131

3232
this.state.entities.get(client.sessionId)?.components.get(this.inputHandler[message])?.execute(message);
33-
console.log(this.state.entities.get(client.sessionId)?.position.x, this.state.entities.get(client.sessionId)?.position.y);
33+
// console.log(this.state.entities.get(client.sessionId)?.position.x, this.state.entities.get(client.sessionId)?.position.y);
3434
this.broadcast("res_action", message, {
3535

3636
//except: client

0 commit comments

Comments
 (0)