Forráskód Böngészése

extended controls: map e -> select elephant trunk in battle

Fabian Peter Hammerle 6 éve
szülő
commit
d6f8952a4a
3 módosított fájl, 9 hozzáadás és 5 törlés
  1. 1 0
      README.md
  2. 6 4
      tooncher/actions.py
  3. 2 1
      tooncher/controls.py

+ 1 - 0
README.md

@@ -81,4 +81,5 @@ $ tooncher --cpu-limit 70 cfo
 | s   | walk backward                   |
 | a   | turn left                       |
 | d   | turn right                      |
+| e   | select elephant trunk in battle |
 | f   | select fog in battle            |

+ 6 - 4
tooncher/actions.py

@@ -5,10 +5,12 @@ except ImportError:
     pass
 
 
-class SelectFogAction:
+class SelectGagAction:
 
-    def __init__(self):
+    def __init__(self, factor_x, factor_y):
         self._button = Xlib.X.Button1
+        self._factor_x = factor_x
+        self._factor_y = factor_y
 
     def execute(self, extended_controls, xkeyevent):
         engine_geometry = extended_controls._engine_window.get_geometry()
@@ -17,8 +19,8 @@ class SelectFogAction:
             window=extended_controls.engine_window,
             detail=self._button,
             state=xkeyevent.state,
-            event_x=int(engine_geometry.width/2-smaller_dimension/2+smaller_dimension*0.619), # 908,
-            event_y=int(engine_geometry.height/2-smaller_dimension/2+smaller_dimension*0.453), # 1064,
+            event_x=int(engine_geometry.width/2+smaller_dimension*self._factor_x),
+            event_y=int(engine_geometry.height/2+smaller_dimension*self._factor_y),
             # apparently root_x & root_y do not need to correspond with event_x/y.
             # attributes are still required to be set.
             root_x=0, # xkeyevent.root_x,

+ 2 - 1
tooncher/controls.py

@@ -20,7 +20,8 @@ if Xlib:
         XK.XK_a: RewriteKeyEventAction(keysym=XK.XK_Left),
         XK.XK_s: RewriteKeyEventAction(keysym=XK.XK_Down),
         XK.XK_d: RewriteKeyEventAction(keysym=XK.XK_Right),
-        XK.XK_f: SelectFogAction(),
+        XK.XK_e: SelectGagAction(factor_x=0.038, factor_y=-0.047), # elephant trunk
+        XK.XK_f: SelectGagAction(factor_x=0.119, factor_y=-0.047), # foghorn
     }