Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sae-2024-groupeK-franckelemon-singez-franos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Clement Franckelemon
sae-2024-groupeK-franckelemon-singez-franos
Commits
eecafa02
Commit
eecafa02
authored
11 months ago
by
Clement Franckelemon
Browse files
Options
Downloads
Patches
Plain Diff
Ajout de la mort des ennemies et ajout de score
parent
e661c809
No related branches found
No related tags found
1 merge request
!12
Main
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/Game.js
+21
-6
21 additions, 6 deletions
server/Game.js
server/main.js
+3
-3
3 additions, 3 deletions
server/main.js
with
24 additions
and
9 deletions
server/Game.js
+
21
−
6
View file @
eecafa02
...
...
@@ -26,20 +26,35 @@ module.exports = class Game{
for
(
let
i
=
0
;
i
<
remove
;
i
++
){
this
.
missiles
.
unshift
();
}
this
.
verifDead
();
},
1000
/
60
);
}
verifDead
(){
this
.
missiles
.
forEach
(
missile
=>
{
const
dead
s
=
[];
const
ennemiesMort
s
=
[];
this
.
ennemies
.
forEach
(
ennemie
=>
{
if
((
missile
.
missileX
<
ennemie
.
x
+
50
||
missile
.
missileX
>
ennemie
.
x
-
50
)
&&
(
missile
.
missileY
<
ennemie
.
y
||
missile
.
missileY
>
ennemie
.
y
-
50
)){
deads
.
push
(
ennemie
);
if
((
missile
.
missileX
<
ennemie
.
x
+
100
&&
missile
.
missileX
>
ennemie
.
x
-
100
)
&&
(
missile
.
missileY
<
ennemie
.
y
+
150
&&
missile
.
missileY
>
ennemie
.
y
+
20
))
{
ennemiesMorts
.
push
(
ennemie
);
}
});
deads
.
forEach
(
element
=>
{
this
.
ennemies
.
filter
(
undefined
,
items
=>
items
!==
element
);
})
if
(
ennemiesMorts
.
length
>
0
)
{
ennemiesMorts
.
forEach
(
ennemieMort
=>
{
console
.
log
(
ennemieMort
.
id
);
if
(
missile
.
proprietaire
===
this
.
playerOne
.
pseudo
)
{
this
.
playerOne
.
score
+=
100
;
}
else
{
this
.
playerTwo
.
score
+=
100
;
}
// Supprimer l'ennemi mort de la liste
this
.
ennemies
=
this
.
ennemies
.
filter
(
ennemie
=>
ennemie
!==
ennemieMort
);
});
// Supprimer le missile
this
.
missiles
=
this
.
missiles
.
filter
(
m
=>
m
!==
missile
);
}
});
}
...
...
This diff is collapsed.
Click to expand it.
server/main.js
+
3
−
3
View file @
eecafa02
...
...
@@ -111,13 +111,13 @@ app.post( "/launchGame", async ( req, res ) => {
socket
.
on
(
'
playerData
'
,(
data
)
=>
{
if
(
socket
.
id
==
game
.
playerOne
.
socketID
){
game
.
playerOne
.
actualiseSpeed
(
data
.
x
,
data
.
y
);
if
(
data
.
shoot
&&
lastShootJ1
+
100
0
<
performance
.
now
()){
if
(
data
.
shoot
&&
lastShootJ1
+
35
0
<
performance
.
now
()){
lastShootJ1
=
performance
.
now
();
game
.
addMissile
(
new
Missile
(
game
.
playerOne
.
pseudo
,
game
.
playerOne
.
x
,
game
.
playerOne
.
y
,
false
));
}
}
else
{
game
.
playerTwo
.
actualiseSpeed
(
data
.
x
,
data
.
y
);
if
(
data
.
shoot
&&
lastShootJ2
+
100
0
<
performance
.
now
()){
if
(
data
.
shoot
&&
lastShootJ2
+
35
0
<
performance
.
now
()){
lastShootJ2
=
performance
.
now
();
game
.
addMissile
(
new
Missile
(
game
.
playerTwo
.
pseudo
,
game
.
playerTwo
.
x
,
game
.
playerTwo
.
y
,
false
));
}
...
...
@@ -129,7 +129,7 @@ app.post( "/launchGame", async ( req, res ) => {
});
socket
.
on
(
'
disconnect
'
,
()
=>
{
console
.
log
(
'
Un client s
\'
est déconnecté
'
);
if
(
game
.
playerTwo
.
socketID
==
socket
.
id
){
if
(
game
.
playerTwo
!=
null
&&
game
.
playerTwo
.
socketID
==
socket
.
id
){
game
.
playerTwo
=
null
;
}
else
if
(
game
.
playerOne
.
socketID
==
socket
.
id
)
{
if
(
game
.
playerTwo
!=
null
){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment