Tim/Zoelda
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

player can take damage

Browse Source
This commit is contained in:
Asecave
2021-06-28 23:04:39 +02:00
parent 0b521ca667
commit f36c861726
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Zoelda/src/main/World.java
View File

@@ -1,6 +1,7 @@
package main; package main;
import ea.Knoten; import ea.Knoten;
import main.entities.Snake;
import main.entities.player.Player; import main.entities.player.Player;
import main.maps.ImageMap; import main.maps.ImageMap;
import main.maps.Map; import main.maps.Map;
@@ -34,7 +35,11 @@ public class World extends Knoten {
player = new Player(); player = new Player();
currentMap.getEntities().add(player); currentMap.getEntities().add(player);
currentMap.add(player.actionFigur); currentMap.add(player.actionFigur);
Main.instance.manager.anmelden(player, 20);
Snake s = new Snake();
currentMap.getEntities().add(s);
currentMap.add(s.actionFigur);
currentMap.registerEntities();
add(currentMap); add(currentMap);

14
Zoelda/src/main/entities/Snake.java
View File

@@ -10,6 +10,9 @@ public class Snake extends LivingEntity {
private static SheetLoader loader = new SheetLoader("/res/images/snake_spritesheet_calciumtrice.png", 32, 32, private static SheetLoader loader = new SheetLoader("/res/images/snake_spritesheet_calciumtrice.png", 32, 32,
new int[] { 10, 10, 10, 10, 13, 8 }); new int[] { 10, 10, 10, 10, 13, 8 });
private float damage = 0.1f;
private boolean attackOnce;
public Snake() { public Snake() {
super(loader.getFigur(0), "idle"); super(loader.getFigur(0), "idle");
@@ -38,6 +41,14 @@ public class Snake extends LivingEntity {
if (lineOfSightClear(player)) { if (lineOfSightClear(player)) {
if (dist(player) < 1f) { if (dist(player) < 1f) {
zustandSetzen("attack"); zustandSetzen("attack");
if (actionFigur.aktuelleFigur().aktuellesBild() == 6) {
if (!attackOnce) {
attackOnce = true;
player.takeDamage(damage, this);
}
} else {
attackOnce = false;
}
} else { } else {
Vektor toPlayer = vectorToEntity(player).normiert(); Vektor toPlayer = vectorToEntity(player).normiert();
velX += toPlayer.x * accelleration; velX += toPlayer.x * accelleration;
@@ -47,7 +58,8 @@ public class Snake extends LivingEntity {
} else { } else {
if (!actionFigur.aktuellesVerhalten().equals("idle")) { if (!actionFigur.aktuellesVerhalten().equals("idle")) {
zustandSetzen("lost_sight"); zustandSetzen("lost_sight");
if (actionFigur.aktuelleFigur().aktuellesBild() == actionFigur.aktuelleFigur().animation().length - 1) { if (actionFigur.aktuelleFigur().aktuellesBild() == actionFigur.aktuelleFigur().animation().length
- 1) {
zustandSetzen("idle"); zustandSetzen("idle");
} }
} }

33
Zoelda/src/main/entities/player/Player.java
View File

@@ -27,9 +27,6 @@ public class Player extends LivingEntity {
posX = 7.5f; posX = 7.5f;
posY = 5.5f; posY = 5.5f;
// XXX
accelleration = 0.05f;
// unterschiedliche Animationsgeschwindigkeiten // unterschiedliche Animationsgeschwindigkeiten
// für idle // für idle
loader.getFigur(0).animationsGeschwindigkeitSetzen(200); loader.getFigur(0).animationsGeschwindigkeitSetzen(200);
@@ -100,20 +97,22 @@ public class Player extends LivingEntity {
// auf Kollisionen prüfen // auf Kollisionen prüfen
checkTileCollisions(Main.instance.getWorld().getCurrentMap()); checkTileCollisions(Main.instance.getWorld().getCurrentMap());
if (!onlyAttackOnceTrigger && actionFigur.aktuellesVerhalten().equals("swipe") if (!actionFigur.aktuellesVerhalten().equals(getDamageAnimationName())) {
&& actionFigur.aktuelleFigur().aktuellesBild() == 1) { if (!onlyAttackOnceTrigger && actionFigur.aktuellesVerhalten().equals("swipe")
onlyAttackOnceTrigger = true; && actionFigur.aktuelleFigur().aktuellesBild() == 1) {
ArrayList<Entity> entities = Main.instance.getWorld().getCurrentMap().getEntities(); onlyAttackOnceTrigger = true;
for (Entity e : entities) { ArrayList<Entity> entities = Main.instance.getWorld().getCurrentMap().getEntities();
if (e instanceof LivingEntity && e != this && e.dist(this) <= range) { for (Entity e : entities) {
LivingEntity le = (LivingEntity) e; if (e instanceof LivingEntity && e != this && e.dist(this) <= range) {
if (le.getHP() > 0) { LivingEntity le = (LivingEntity) e;
Vektor toE = vectorToEntity(le); if (le.getHP() > 0) {
toE = toE.normiert(); Vektor toE = vectorToEntity(le);
if ((toE.x > 0 && !side) || (toE.x <= 0 && side)) { toE = toE.normiert();
le.setVelX(le.getVelX() + toE.x * 0.1f); if ((toE.x > 0 && !side) || (toE.x <= 0 && side)) {
le.setVelY(le.getVelY() + toE.y * 0.1f); le.setVelX(le.getVelX() + toE.x * 0.1f);
le.takeDamage(0.1f, this); le.setVelY(le.getVelY() + toE.y * 0.1f);
le.takeDamage(0.1f, this);
}
} }
} }
} }