OGP/worms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed setMass

Browse Source
This commit is contained in:
Arthur Bols
2018-03-08 16:52:04 +01:00
parent d82212f23e
commit 8d28f1f214
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OGP1718-Worms/src/worms/model/Worm.java
View File

@@ -115,7 +115,7 @@ public class Worm {
if (!isValidRadius(radius)) if (!isValidRadius(radius))
throw new IllegalArgumentException("Invalid radius"); throw new IllegalArgumentException("Invalid radius");
this.radius = radius; setRadius(radius);
this.minimumRadius = minimumRadius; this.minimumRadius = minimumRadius;
this.actionPoints = this.maxActionPoints; this.actionPoints = this.maxActionPoints;
@@ -296,9 +296,8 @@ public class Worm {
*/ */
private void setMass(double radius) { private void setMass(double radius) {
final long rho = 1062; final double rho = 1062.0;
double mass = rho * (4 / 3 * PI * pow(radius, 3)); double mass = rho * (4.0 / 3.0 * PI * pow(radius, 3));
this.mass = mass; this.mass = mass;
setMaxActionPoints(mass); setMaxActionPoints(mass);
} }
@@ -594,6 +593,8 @@ public class Worm {
* |result == this.actionPoints > 0 && this.orientation < Math.PI * |result == this.actionPoints > 0 && this.orientation < Math.PI
*/ */
private boolean canJump() { private boolean canJump() {
System.out.println(this.actionPoints);
System.out.println(this.orientation);
return this.actionPoints > 0 && this.orientation < PI; return this.actionPoints > 0 && this.orientation < PI;
} }