Merge pull request #21 from lxgr-linux/feat/protocolls

Feat/protocolls

Author: lxgr-linux

.github/workflows/ruff.yml

@@ -0,0 +1,24 @@
+name: ruff-format-check
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Ruff
+        run: pip install ruff
+
+      - name: Run Ruff check
+        run: ruff check .

.gitignore

@@ -5,4 +5,5 @@ dist
 scrap_engine.egg-info
 submit.sh
 .eggs
-.idea/*
+.idea
+.ruff_cache

examples/lil_t.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 import scrap_engine as se
-import time, os, threading, sys
+import time
+import os
+import threading
+import sys
 
 os.system("")
 width, height = os.get_terminal_size()
@@ -36,7 +39,7 @@ def recogniser():
             else:
                 ev="'"+a.rstrip()+"'"
 else:
-    from pynput.keyboard import Key, Listener
+    from pynput.keyboard import Listener
     def recogniser():
         global ev
         while True:

examples/lil_t_endless.py

@@ -1,6 +1,11 @@
 #!/usr/bin/env python3
+import os
+import random
+import sys
+import threading
+import time
+
 import scrap_engine as se
-import time, os, threading, sys, random
 
 
 class PanelItem(se.Object):
@@ -10,48 +15,61 @@ def bump_left(self):
         self.remove()
 
     def bump(self, ob, x, y):
-        ob.set(ob.x-1, ob.y)
-        self.set(self.x-1, self.y)
+        ob.set(ob.x - 1, ob.y)
+        self.set(self.x - 1, self.y)
 
 
 class Panel(se.Square):
     def init(self):
         for ob in self.obs:
             moving.append(ob)
 
+
 def genpanel():
     global panelindex, test
-    exec("panel_%s=Panel('#', 10, 1, ob_class=PanelItem)"%panelindex)
-    exec("panel_%s.add(map, map.width-11, map.height-%i)"%(panelindex, random.randint(8,20)))
-    exec("panel_%s.init()"%panelindex)
-    panelindex+=1
+    exec("panel_%s=Panel('#', 10, 1, ob_class=PanelItem)" % panelindex)
+    exec(
+        "panel_%s.add(map, map.width-11, map.height-%i)"
+        % (panelindex, random.randint(8, 20))
+    )
+    exec("panel_%s.init()" % panelindex)
+    panelindex += 1
+
 
 def on_press(key):
     global ev
-    ev=str(key)
+    ev = str(key)
+
+
+if (
+    sys.platform == "linux"
+):  # Use another (not on xserver relying) way to read keyboard input, to make this shit work in tty or via ssh, where no xserver is available
 
-if sys.platform == "linux":  # Use another (not on xserver relying) way to read keyboard input, to make this shit work in tty or via ssh, where no xserver is available
     def recogniser():
-        import tty, sys, termios
-        global ev, old_settings, termios, fd, do_exit
+        import sys
+        import termios
+        import tty
 
-        do_exit=False
-        fd=sys.stdin.fileno()
+        global ev, old_settings, fd, do_exit
+
+        do_exit = False
+        fd = sys.stdin.fileno()
         old_settings = termios.tcgetattr(fd)
         tty.setraw(fd)
         while True:
-            char=sys.stdin.read(1)
+            char = sys.stdin.read(1)
             if ord(char) == 13:
-                ev="Key.enter"
+                ev = "Key.enter"
             elif ord(char) == 32:
-                ev="Key.space"
+                ev = "Key.space"
             else:
-                ev="'"+char.rstrip()+"'"
+                ev = "'" + char.rstrip() + "'"
             if ord(char) == 3 or do_exit:
                 termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-                ev="exit"
+                ev = "exit"
 else:
-    from pynput.keyboard import Key, Listener
+    from pynput.keyboard import Listener
+
     def recogniser():
         global ev
         while True:
@@ -62,78 +80,97 @@ def recogniser():
 def main():
     global v, t, ev, g, framenum, genframe
     while True:
-        nexty=lambda v,g,t : round(player.y-(v*(v/g)-1/2*g*(v/g)**2)-v*t+1/2*g*t**2)
+
+        def nexty(v, g, t):
+            return round(
+                player.y
+                - (v * (v / g) - 1 / 2 * g * (v / g) ** 2)
+                - v * t
+                + 1 / 2 * g * t**2
+            )
+
         for ob in map.obs[1:]:
-            if player.y+1 == ob.y and player.x == ob.x:
-                t=0
-                v=0
+            if player.y + 1 == ob.y and player.x == ob.x:
+                t = 0
+                v = 0
         for ob in map.obs[1:]:
-            if player.y < ob.y < nexty(v,g,t) and ob.x == player.x+1:
-                player.set(player.x, ob.y-1)
-                t=0
-                v=0
+            if player.y < ob.y < nexty(v, g, t) and ob.x == player.x + 1:
+                player.set(player.x, ob.y - 1)
+                t = 0
+                v = 0
                 break
-            elif player.y > ob.y > nexty(v,g,t) and ob.x == player.x+1:
-                player.set(player.x, ob.y+1)
-                t=0
-                v=0
+            elif player.y > ob.y > nexty(v, g, t) and ob.x == player.x + 1:
+                player.set(player.x, ob.y + 1)
+                t = 0
+                v = 0
                 break
         if ev == "Key.space":
-            v=-0.25
-            ev=0
+            v = -0.25
+            ev = 0
         elif ev == "exit":
-            ev=0
+            ev = 0
             raise KeyboardInterrupt
-        if player.set(player.x, nexty(v,g,t))!= 0 and t != 0:
+        if player.set(player.x, nexty(v, g, t)) != 0 and t != 0:
             for ob in map.obs[1:]:
-                if ob.x == player.x and ob.y == nexty(v,g,t):
-                    v=0
-            player.set(player.x, player.y+1)
-        t+=1
+                if ob.x == player.x and ob.y == nexty(v, g, t):
+                    v = 0
+            player.set(player.x, player.y + 1)
+        t += 1
         # exec("point_%s=PanelItem('*', 'float')"%panelindex)
         # exec("point_%s.add(map, player.x-1, player.y)"%panelindex)
         # exec("moving.append(point_%s)"%panelindex)
         # panelindex+=1
         for mov in moving:
-            mov.set(mov.x-1, mov.y)
-        if player.x < smap.x-1:
+            mov.set(mov.x - 1, mov.y)
+        if player.x < smap.x - 1:
             exit()
-        h.rechar((2-len(str(player.y)))*" "+str(player.y)+" "+str(map.height)+" "+str(player.y)+" "+str(nexty(v,g,t))+" "+str(player.y-nexty(v,g,t)))
-        if genframe+15 == framenum:
+        h.rechar(
+            (2 - len(str(player.y))) * " "
+            + str(player.y)
+            + " "
+            + str(map.height)
+            + " "
+            + str(player.y)
+            + " "
+            + str(nexty(v, g, t))
+            + " "
+            + str(player.y - nexty(v, g, t))
+        )
+        if genframe + 15 == framenum:
             genpanel()
-            genframe+=15
+            genframe += 15
         time.sleep(0.05)
         smap.remap()
         smap.show()
-        framenum+=1
+        framenum += 1
 
 
 os.system("")
 width, height = os.get_terminal_size()
-t=ev=v=0
-g=0.015
-panelindex=0
-framenum=0
-genframe=0
-
-map=se.Map(height-1, width+12, " ")
-smap=se.Submap(map, 0, 0)
-
-player=se.Object("t")
-block=PanelItem("#")
-panel=Panel("#", 10, 1, ob_class=PanelItem)
-ground=se.Square("#", map.width, 5)
-h=se.Text("00 00")
-
-player.add(map, round(smap.width/2), round(map.height/2))
-block.add(map, map.width-11, map.height-6)
-panel.add(map, map.width-11, map.height-10)
-ground.add(map, 0, map.height-5)
+t = ev = v = 0
+g = 0.015
+panelindex = 0
+framenum = 0
+genframe = 0
+
+map = se.Map(height - 1, width + 12, " ")
+smap = se.Submap(map, 0, 0)
+
+player = se.Object("t")
+block = PanelItem("#")
+panel = Panel("#", 10, 1, ob_class=PanelItem)
+ground = se.Square("#", map.width, 5)
+h = se.Text("00 00")
+
+player.add(map, round(smap.width / 2), round(map.height / 2))
+block.add(map, map.width - 11, map.height - 6)
+panel.add(map, map.width - 11, map.height - 10)
+ground.add(map, 0, map.height - 5)
 h.add(smap, 0, 0)
-moving=[ob for ob in panel.obs]+[block]
+moving = [ob for ob in panel.obs] + [block]
 
-recognising=threading.Thread(target=recogniser)
-recognising.daemon=True
+recognising = threading.Thread(target=recogniser)
+recognising.daemon = True
 recognising.start()
 
 smap.remap()

examples/scrap_bench.py

@@ -1,7 +1,11 @@
 #!/usr/bin/env python3
 
+import os
+import random
+import time
+
 import scrap_engine as se
-import time, random, os
+
 
 def main():
     global avr, tcount
@@ -10,11 +14,17 @@ def main():
     b_map = se.Map(background=" ")
     text = se.Text("0")
     avr = se.Text("0")
-    rectangle = se.Square('\033[34ma\033[0m', 50, 10)
-    text.add(b_map, round((b_map.width-len(text.text))/2-10),
-             round(b_map.height/2)-1)
-    avr.add(b_map, round((b_map.width-len(text.text))/2-10),
-            round(b_map.height/2))
+    rectangle = se.Square("\033[34ma\033[0m", 50, 10)
+    text.add(
+        b_map,
+        round((b_map.width - len(text.text)) / 2 - 10),
+        round(b_map.height / 2) - 1,
+    )
+    avr.add(
+        b_map,
+        round((b_map.width - len(text.text)) / 2 - 10),
+        round(b_map.height / 2),
+    )
     rectangle.add(b_map, 0, 0)
 
     tcount = 0
@@ -26,12 +36,16 @@ def main():
         time0 = time.time()
         times += time2
         for ob in rectangle.obs:
-            ob.set(random.choice([ob.x, ob.x+1, ob.x-1]), random.choice([ob.y, ob.y+1, ob.y-1]))
+            ob.set(
+                random.choice([ob.x, ob.x + 1, ob.x - 1]),
+                random.choice([ob.y, ob.y + 1, ob.y - 1]),
+            )
         text.rechar(str(time2))
-        avr.rechar(str(times/tcount if tcount != 0 else 1))
+        avr.rechar(str(times / tcount if tcount != 0 else 1))
         b_map.show()
         tcount += 1
-        time2 = time.time()-time0
+        time2 = time.time() - time0
+
 
 if __name__ == "__main__":
     try: