From 98aa8733a45a9389108e095d8db14917f07de461 Mon Sep 17 00:00:00 2001
From: Tobias Nett <skaldarnar@googlemail.com>
Date: Mon, 26 Jul 2021 23:39:02 +0200
Subject: [PATCH] feat: use item activation (right click) for magic staff
 (#226)

---
 .../controllers/AttackSystem.java             | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/AttackSystem.java b/src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/AttackSystem.java
index 960a4cd5..fe748943 100644
--- a/src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/AttackSystem.java
+++ b/src/main/java/org/terasology/ligthandshadow/componentsystem/controllers/AttackSystem.java
@@ -10,55 +10,65 @@
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.engine.logic.characters.CharacterHeldItemComponent;
 import org.terasology.engine.logic.common.ActivateEvent;
+import org.terasology.engine.logic.inventory.ItemComponent;
+import org.terasology.engine.logic.players.PlayerCharacterComponent;
 import org.terasology.engine.network.ClientComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.lightandshadowresources.components.FlagComponent;
-import org.terasology.ligthandshadow.componentsystem.events.OnFlagDropEvent;
+import org.terasology.lightandshadowresources.components.LASTeamComponent;
+import org.terasology.ligthandshadow.componentsystem.components.FlagDropOnActivateComponent;
+import org.terasology.ligthandshadow.componentsystem.components.HasFlagComponent;
 import org.terasology.ligthandshadow.componentsystem.events.DropFlagEvent;
+import org.terasology.ligthandshadow.componentsystem.events.OnFlagDropEvent;
 import org.terasology.ligthandshadow.componentsystem.events.OnFlagPickupEvent;
 import org.terasology.ligthandshadow.componentsystem.events.ReturnFlagEvent;
 import org.terasology.module.inventory.events.InventorySlotChangedEvent;
-import org.terasology.engine.logic.players.PlayerCharacterComponent;
-import org.terasology.ligthandshadow.componentsystem.components.FlagDropOnActivateComponent;
-import org.terasology.ligthandshadow.componentsystem.components.HasFlagComponent;
-import org.terasology.lightandshadowresources.components.RaycastOnActivateComponent;
-import org.terasology.lightandshadowresources.components.LASTeamComponent;
 
 @RegisterSystem(RegisterMode.AUTHORITY)
 public class AttackSystem extends BaseComponentSystem {
+
     @In
     EntityManager entityManager;
 
     private EntityRef item;
 
+    /**
+     * Drop the flag if a player manages to "touch" (activate) the enemy flag bearer.
+     * @param event the activation event
+     * @param entity the target of the activation (here: the enemy flag bearer)
+     */
     @ReceiveEvent(components = {FlagDropOnActivateComponent.class, PlayerCharacterComponent.class, HasFlagComponent.class})
-    public void onActivate(ActivateEvent event, EntityRef entity) {
+    public void dropFlagOnTouch(ActivateEvent event, EntityRef entity) {
         dropFlagOnPlayerAttack(event, entity);
     }
 
+    /**
+     * Drop the flag if a player targets the enemy flag bearer with an item that causes a flag drop on activation.
+     * @param event the activation event, must target the enemy flag bearer
+     * @param item the target of the activation (here: the used item)
+     */
+    @ReceiveEvent(components = {FlagDropOnActivateComponent.class, ItemComponent.class})
+    public void dropFlagOnRangeAttack(ActivateEvent event, EntityRef item) {
+        if (event.getTarget().exists()
+                && event.getTarget().hasComponent(PlayerCharacterComponent.class)
+                && event.getTarget().hasComponent(HasFlagComponent.class)) {
+
+            dropFlagOnPlayerAttack(event, event.getTarget());
+        }
+    }
+
     /**
      * When player activates another with the magic staff, checks to see if the attacked player has a flag
      * If so, makes the player drop the flag
      * @param targetPlayer The player being attacked
      */
     private void dropFlagOnPlayerAttack(ActivateEvent event, EntityRef targetPlayer) {
-        EntityRef attackingPlayer = event.getInstigator(); // The player using the staff to attack
-        if (canPlayerAttack(attackingPlayer)) {
-            if (targetPlayer.hasComponent(PlayerCharacterComponent.class) && targetPlayer.hasComponent(HasFlagComponent.class)) {
-                // If the target player has the flag
-                targetPlayer.send(new DropFlagEvent(attackingPlayer));
-            }
-        }
-    }
-
-    private boolean canPlayerAttack(EntityRef attackingPlayer) {
-        if (!attackingPlayer.hasComponent(CharacterHeldItemComponent.class)) {
-            return false;
+        EntityRef attackingPlayer = event.getInstigator(); // The attacking player
+        if (targetPlayer.hasComponent(PlayerCharacterComponent.class) && targetPlayer.hasComponent(HasFlagComponent.class)) {
+            // If the target player has the flag
+            targetPlayer.send(new DropFlagEvent(attackingPlayer));
         }
-        EntityRef heldItem = attackingPlayer.getComponent(CharacterHeldItemComponent.class).selectedItem;
-        return heldItem.hasComponent(RaycastOnActivateComponent.class);
     }
 
     /**