Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
J
JTankTrouble
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
9831111
JTankTrouble
Commits
673d25eb
Commit
673d25eb
authored
Jul 28, 2020
by
9831111
🙂
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check wall enter for key up.
parent
c32410b3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
42 additions
and
19 deletions
+42
-19
GameState.java
src/GameState.java
+42
-19
No files found.
src/GameState.java
View file @
673d25eb
...
@@ -32,12 +32,15 @@ public class GameState {
...
@@ -32,12 +32,15 @@ public class GameState {
private
boolean
one
=
false
;
private
boolean
one
=
false
;
private
boolean
two
=
false
;
private
boolean
two
=
false
;
private
boolean
three
=
false
;
private
boolean
three
=
false
;
boolean
PermissionDown
=
true
;
boolean
PermissionUp
=
true
;
public
GameState
(
int
num
)
{
public
GameState
(
int
num
)
{
locX
=
100
;
locX
=
100
;
locY
=
100
;
locY
=
100
;
diam
=
42
;
//changed from 42 to 25
diam
=
25
;
rotateAmount
=
0
;
rotateAmount
=
0
;
gameOver
=
false
;
gameOver
=
false
;
//
//
...
@@ -64,9 +67,10 @@ public class GameState {
...
@@ -64,9 +67,10 @@ public class GameState {
}
}
public
Rectangle
getBounds
(
int
locX
,
int
locY
)
{
public
Rectangle
getBounds
(
int
locX
,
int
locY
)
{
return
new
Rectangle
(
locX
,
locY
,
25
,
25
);
return
new
Rectangle
(
locX
,
locY
,
28
,
28
);
}
}
/**
/**
* The method which updates the game state.
* The method which updates the game state.
*/
*/
...
@@ -77,35 +81,54 @@ public class GameState {
...
@@ -77,35 +81,54 @@ public class GameState {
locX
=
mouseX
-
diam
/
2
;
locX
=
mouseX
-
diam
/
2
;
}
}
if
(
keyUP
)
{
if
(
keyUP
)
{
// boolean Permission=true;
PermissionUp
=
true
;
// for (Wall wall : Controller.walls) {
for
(
Wall
wall
:
Controller
.
walls
)
{
// if(wall.intersects(getBounds(locX+5,locY+5))){
// System.out.println("4");
if
(
wall
.
getWidth
()
==
5
&&
wall
.
getHeight
()
==
50
&&
rotateAmount
!=
90
&&
rotateAmount
!=
-
90
&&
rotateAmount
!=
270
&&
rotateAmount
!=
-
270
)
{
// Permission = false;
if
((
getBounds
(
locX
,
locY
).
intersects
(
new
Rectangle
((
int
)
wall
.
getX
(),
(
int
)
wall
.
getY
(),
5
,
50
))))
{
// break;
PermissionUp
=
false
;
// }
break
;
// }
}
// if (Permission)
}
if
(
wall
.
getWidth
()
==
50
&&
wall
.
getHeight
()
==
5
&&
rotateAmount
!=
180
&&
rotateAmount
!=
-
180
&&
rotateAmount
!=
0
)
{
if
((
getBounds
(
locX
,
locY
).
intersects
(
new
Rectangle
((
int
)
wall
.
getX
(),
(
int
)
wall
.
getY
(),
50
,
5
))))
{
PermissionUp
=
false
;
break
;
}
}
}
if
(
PermissionUp
)
move
(+
5
);
move
(+
5
);
}
}
if
(
keyDOWN
)
{
if
(
keyDOWN
)
{
boolean
Permission
=
true
;
for
(
Wall
wall
:
Controller
.
walls
)
{
}
if
(
PermissionDown
)
move
(-
5
);
move
(-
5
);
}
}
if
(
keyLEFT
)
if
(
keyLEFT
)
{
rotateAmount
-=
15
;
rotateAmount
-=
15
;
}
if
(
keyRIGHT
)
if
(
keyRIGHT
)
{
rotateAmount
+=
15
;
rotateAmount
+=
15
;
}
locX
=
Math
.
max
(
locX
,
40
);
//Formula for tank movement limit
locX
=
Math
.
min
(
locX
,
20
+
(((
Controller
.
col
-
1
)
/
2
)
*
50
)
+
(((
Controller
.
col
-
1
)
/
2
)
+
1
)
*
5
-
25
);
locX
=
Math
.
max
(
locX
,
42
);
locX
=
Math
.
min
(
locX
,
GameFrame
.
GAME_WIDTH
-
diam
-
42
);
locY
=
Math
.
max
(
locY
,
70
);
locY
=
Math
.
max
(
locY
,
70
);
locY
=
Math
.
min
(
locY
,
((
Controller
.
row
-
1
)/
2
)*
50
+
60
);
//Formula for tank movement limit
locY
=
Math
.
min
(
locY
,
50
+
((
Controller
.
row
-
1
)
/
2
)
*
50
+
(((
Controller
.
row
-
1
)
/
2
)
+
1
)
*
5
-
25
);
}
}
public
void
move
(
int
px
)
{
public
void
move
(
int
px
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment