Add support for enemies' friendly fire

This commit is contained in:
2022-08-19 12:26:16 +02:00
parent 7b778845ba
commit 9124f5c58a
8 changed files with 43 additions and 10 deletions

View File

@@ -48,7 +48,7 @@ public class MeleeWeapon implements Weapon {
if(entity.getCoordinates().equals(facingNeighbour) && entity.isBlocking() && entity instanceof Character) {
var character = (Character) entity;
var damage = roller.roll();
character.hit(damage);
character.hit(attacker, damage);
animation.run(context, character.getLayer(), character);
context.playSound(sound);
context.fireEvent(new HitEvent(attacker, character, damage));

View File

@@ -12,6 +12,7 @@ import com.bartlomiejpluta.base.util.random.DiceRoller;
import com.bartlomiejpluta.base.generated.db.model.RangedWeaponModel;
import com.bartlomiejpluta.demo.entity.Character;
import com.bartlomiejpluta.demo.entity.NamedEntity;
import com.bartlomiejpluta.demo.event.HitEvent;
@@ -57,12 +58,13 @@ public class RangedWeapon implements Weapon {
private void onHit(Movable attacker, Entity target) {
if(target.isBlocking() && target instanceof Character) {
var namedAttacker = (Character) attacker;
var character = (Character) target;
var damage = dmgRoller.roll();
character.hit(damage);
character.hit(namedAttacker, damage);
punchAnimation.run(context, character.getLayer(), character);
context.playSound(punchSound);
context.fireEvent(new HitEvent((Character) attacker, character, damage));
context.fireEvent(new HitEvent(namedAttacker, character, damage));
}
}