bartek/base-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create action log panel in HUD

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-18 09:44:16 +02:00
parent ad30a8dcf5
commit a2d95855c5
10 changed files with 131 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/bartlomiejpluta/demo/world/weapon/MeleeWeapon.java
View File

@@ -10,6 +10,8 @@ import com.bartlomiejpluta.demo.database.model.MeleeWeaponModel;
import com.bartlomiejpluta.demo.entity.Character;
import com.bartlomiejpluta.demo.util.DiceRoller;
import com.bartlomiejpluta.demo.event.HitEvent;
public class MeleeWeapon implements Weapon {
private final Random random = new Random();
private final Context context;
@@ -43,9 +45,12 @@ public class MeleeWeapon implements Weapon {
var facingNeighbour = attacker.getCoordinates().add(attacker.getFaceDirection().vector, new Vector2i());
for(var entity : attacker.getLayer().getEntities()) {
if(entity.getCoordinates().equals(facingNeighbour) && entity.isBlocking() && entity instanceof Character) {
((Character) entity).hit(roller.roll());
animation.run(context, entity.getLayer(), entity);
var character = (Character) entity;
var damage = roller.roll();
character.hit(damage);
animation.run(context, character.getLayer(), character);
context.playSound(sound);
context.fireEvent(new HitEvent(attacker, character, damage));
return true;
}
}

14
src/main/java/com/bartlomiejpluta/demo/world/weapon/RangedWeapon.java
View File

@@ -5,12 +5,14 @@ import java.util.Random;
import lombok.*;
import com.bartlomiejpluta.base.api.context.Context;
import com.bartlomiejpluta.base.api.entity.Entity;
import com.bartlomiejpluta.base.api.move.Direction;
import com.bartlomiejpluta.base.api.move.*;
import com.bartlomiejpluta.base.lib.animation.*;
import com.bartlomiejpluta.demo.database.model.RangedWeaponModel;
import com.bartlomiejpluta.demo.entity.Character;
import com.bartlomiejpluta.demo.util.DiceRoller;
import com.bartlomiejpluta.demo.event.HitEvent;
public class RangedWeapon implements Weapon {
private final Random random = new Random();
private final Context context;
@@ -44,12 +46,14 @@ public class RangedWeapon implements Weapon {
this.punchSound = template.getPunchSound();
}
private void onHit(Entity entity) {
if(entity.isBlocking() && entity instanceof Character) {
var character = (Character) entity;
character.hit(roller.roll());
private void onHit(Movable attacker, Entity target) {
if(target.isBlocking() && target instanceof Character) {
var character = (Character) target;
var damage = roller.roll();
character.hit(damage);
punchAnimation.run(context, character.getLayer(), character);
context.playSound(punchSound);
context.fireEvent(new HitEvent((Character) attacker, character, damage));
}
}