ziver/evil-inside
1
0
Fork 0
Code Pull requests Releases Activity

Browse source
This commit is contained in:
Jesper Lundin 2007-04-18 17:49:11 +00:00
parent 14fcd78931
commit 6d06a75144
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ei/game/scene/weapons/BomberWeapon.java
View file

@ -28,7 +28,7 @@ public class BomberWeapon extends Weapon{
part.slowdown = 1; part.slowdown = 1;
part.rainbow = false; part.rainbow = false;
part.regenerate = false; part.regenerate = false;
part.size=20; part.size=10;
return part; return part;
} }

8
src/ei/game/scene/weapons/Weapon.java
View file

@ -32,7 +32,7 @@ public abstract class Weapon {
*/ */
public Weapon(Vector2f startPos) { public Weapon(Vector2f startPos) {
this.startPos = startPos; this.startPos = startPos;
this.minVelocity = 5; this.minVelocity = 10;
this.hit = false; this.hit = false;
part = getWeapon(); part = getWeapon();
part.setLocation(startPos); part.setLocation(startPos);
@ -74,11 +74,11 @@ public abstract class Weapon {
System.out.println("xVel: "+xVelocity); System.out.println("xVel: "+xVelocity);
//System.out.println("xVel: "+Math.abs(part.getLocation().getX()-vect.getX())); //System.out.println("xVel: "+Math.abs(part.getLocation().getX()-vect.getX()));
if(xVelocity < minVelocity && xVelocity < yVelocity) { if(xVelocity < minVelocity && xVelocity > yVelocity) {
yVelocity = (yVelocity/xVelocity)*minVelocity; yVelocity = (yVelocity/xVelocity)*minVelocity;
xVelocity = minVelocity; xVelocity = minVelocity;
} }
if(yVelocity < minVelocity && yVelocity < xVelocity) { if(yVelocity < minVelocity && yVelocity > xVelocity) {
xVelocity = (xVelocity/yVelocity)*minVelocity; xVelocity = (xVelocity/yVelocity)*minVelocity;
yVelocity = minVelocity; yVelocity = minVelocity;
} }
@ -96,7 +96,7 @@ public abstract class Weapon {
} }
if(Math.abs(part.getLocation().getX()-vect.getX()) < 10 && Math.abs(part.getLocation().getY()-vect.getY()) < 10) { if(Math.abs(part.getLocation().getX()-vect.getX()) < 10 && Math.abs(part.getLocation().getY()-vect.getY()) < 10) {
part.regenerate = false; part.regenerate = false;
if(!hit) { if(!hit && !InGameState.getMap().isPosEmpty(target.getX(), target.getY())) {
InGameState.getMap().getPos(target.getX(), target.getY()).damaged(damage); InGameState.getMap().getPos(target.getX(), target.getY()).damaged(damage);
hit = true; hit = true;
} }