Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
javaProj
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Oscar Wiberg
javaProj
Commits
1186354d
Commit
1186354d
authored
1 year ago
by
Oscar Wiberg
Browse files
Options
Downloads
Patches
Plain Diff
Kollisions logik, händer inget vid krock än
parent
bab5ad12
No related branches found
No related tags found
1 merge request
!1
Testb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/states/PlayState.java
+11
-3
11 additions, 3 deletions
src/states/PlayState.java
src/states/Player.java
+26
-24
26 additions, 24 deletions
src/states/Player.java
with
37 additions
and
27 deletions
src/states/PlayState.java
+
11
−
3
View file @
1186354d
...
...
@@ -37,9 +37,6 @@ public class PlayState extends GameState {
private
String
informationText
;
private
Color
bgColor
;
private
Color
fontColor
;
private
Image
obstacle
;
private
Double
enemyPosX
=
-
100.00
;
private
Double
enemyPosY
=
250.00
;
private
boolean
up
=
false
;
private
Player
player
;
private
Enemy
enemy
;
...
...
@@ -121,6 +118,17 @@ public class PlayState extends GameState {
public
void
checkCollision
()
{
if
((
enemy
.
getEnemyX
()
<=
(
player
.
getPlayerX
()
+
80
))
&&
(
enemy
.
getEnemyX
()
>
player
.
getPlayerX
()))
{
// System.out.println("helo");
if
((
player
.
getPlayerY
()
+
60
)
>=
enemy
.
getEnemyY
()
)
{
System
.
out
.
println
(
"fäk"
);
player
.
decreaseLives
();
}
}
// rita upp från player samt enemy x och y kordinater + eller - höjd och bredd, då får vi spannen som enemy och player bilderna befinner sig i
// nästlade if satser, först kolla om enemy befinner sig i mitten av skärmen på players x position, sen kollar vi om players y är större än enemy
...
...
This diff is collapsed.
Click to expand it.
src/states/Player.java
+
26
−
24
View file @
1186354d
...
...
@@ -37,8 +37,8 @@ public class Player {
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
}
...
...
@@ -53,12 +53,14 @@ public class Player {
public
int
getLives
()
{
return
lives
;
return
this
.
lives
;
}
public
void
setLives
(
int
lives
)
{
this
.
lives
=
lives
;
public
void
decreaseLives
()
{
this
.
lives
--;
System
.
out
.
println
(
this
.
lives
);
}
...
...
@@ -71,30 +73,30 @@ public class Player {
return
playerY
;
}
public
void
jump
()
{
if
(!
down
)
{
playerY
-=
10
;
if
(
playerY
<=
110
)
{
down
=
true
;
if
(!
down
)
{
playerY
-=
10
;
if
(
playerY
<=
110
)
{
down
=
true
;
}
}
}
if
(
down
)
{
playerY
+=
10
;
if
(
playerY
==
265
)
{
down
=
false
;
}
...
...
@@ -102,7 +104,7 @@ public class Player {
}
}
public
void
setPlayerX
(
double
playerX
)
{
this
.
playerX
=
playerX
;
...
...
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