input: Support rotate action with cursor

tchx84 · Feb 22, 2024 · b8f0f83 · b8f0f83
1 parent 170e40d
commit b8f0f83
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/gameeky/client/input/cursor.py b/src/gameeky/client/input/cursor.py
@@ -33,6 +33,13 @@
 
 
 class Cursor:
+    __sequence__ = {
+        Direction.NORTH: Direction.EAST,
+        Direction.EAST: Direction.SOUTH,
+        Direction.SOUTH: Direction.WEST,
+        Direction.WEST: Direction.NORTH,
+    }
+
     def __init__(self, widget: Gtk.Widget, model: Scene, service: Service) -> None:
         super().__init__()
         self._service = service
@@ -64,9 +71,12 @@ def __init__(self, widget: Gtk.Widget, model: Scene, service: Service) -> None:
         self._action: Optional[Action] = None
         self._direction: Optional[Direction] = None
 
-    def _find(self, position: Vector) -> Optional[Entity]:
+    def _find_player(self) -> Optional[Entity]:
+        if self._service.session is None:
+            return None
+
         for entity in self._model.entities:
-            if entity.position == position:
+            if entity.id == self._service.session.entity_id:
                 return entity
 
         return None
@@ -87,7 +97,7 @@ def __on_tick(self, *args) -> int:
         if self._target is None:
             return GLib.SOURCE_CONTINUE
 
-        if (player := self._find(self._model.anchor)) is None:
+        if (player := self._find_player()) is None:
             return GLib.SOURCE_CONTINUE
 
         x = (
@@ -167,7 +177,12 @@ def __on_left_pressed(
         self._popover.display(x, y)
 
     def __on_action_perfomed(self, popover: Gtk.Popover, action: Action) -> None:
-        self._service.message(action, 0)
+        value = 0
+
+        if action == Action.ROTATE and (player := self._find_player()):
+            value = self.__sequence__[player.direction]
+
+        self._service.message(action, value)
         self._target = None
 
     def shutdown(self) -> None:

diff --git a/src/gameeky/player/widgets/actions_popover.ui b/src/gameeky/player/widgets/actions_popover.ui
@@ -54,6 +54,17 @@
             <property name="name">interact</property>
           </object>
         </child>
+        <child>
+          <object class="GtkListBoxRow">
+            <property name="child">
+              <object class="GtkLabel">
+                <property name="label" translatable="yes">Rotate</property>
+                <property name="xalign">0.0</property>
+              </object>
+            </property>
+            <property name="name">rotate</property>
+          </object>
+        </child>
         <child>
           <object class="GtkListBoxRow">
             <property name="child">