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

small change

Browse Source
This commit is contained in:
Arthur Bols
2018-05-22 14:03:31 +02:00
parent 0457f135e4
commit facabe5723
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OGP1718-Worms/src/worms/model/Projectile.java
View File

@@ -154,7 +154,6 @@ public abstract class Projectile extends GameObject {
public void hit(Worm... worm){ public void hit(Worm... worm){
for (Worm wormA : worm){ for (Worm wormA : worm){
//TODO bazooka: hitpoints multiplied with force?
wormA.decreaseHitPoints(getHitPoints()); wormA.decreaseHitPoints(getHitPoints());
} }
terminate(); terminate();

3
OGP1718-Worms/src/worms/model/Team.java
View File

@@ -83,8 +83,7 @@ public class Team {
Collection<Worm> worms = getAllWormsOfTeam(); Collection<Worm> worms = getAllWormsOfTeam();
for (Worm w : worm) { for (Worm w : worm) {
if (w == null || w.getTeam() != null) return false; if (w == null || w.getTeam() != null || !names.add(w.getName())) return false;
if (!names.add(w.getName())) return false;
if (worms.contains(w)) return false; if (worms.contains(w)) return false;
if (worms.size() == 0 && !w.isTerminated()) continue; if (worms.size() == 0 && !w.isTerminated()) continue;
if (w.getMass() < getMinMassTeam() / 2 || w.getMass() > 2 * getMinMassTeam() if (w.getMass() < getMinMassTeam() / 2 || w.getMass() > 2 * getMinMassTeam()