saltpaper 0.0.3a0__py3-none-any.whl → 0.0.5a0__py3-none-any.whl

saltpaper/__init__.py

@@ -2,5 +2,5 @@ from saltpaper.services import *
 from saltpaper.functions import *
 from saltpaper.worldsystem.world import World
 
-SALTPAPER_VER = "0.0.1"
+SALTPAPER_VER = "0.0.5 (pre-alpha)"
 print(f"saltPAPER {SALTPAPER_VER}")

saltpaper/functions/__init__.py

@@ -1,2 +1,3 @@
 from .test import make_test_entity
+from .spawn import *
 from .vectortools import VectorTools

saltpaper/functions/spawn.py

@@ -0,0 +1,11 @@
+from saltpaper.worldsystem.entity import Entity
+from saltpaper.worldsystem.components import Position, Sprite
+
+def make_display_entity(world, layer, position, asset_id) -> Entity:
+    
+    ent = Entity(world)
+    position = Position(layer, position)
+    sprite = Sprite(asset_id)
+    ent.add_many(position, sprite)
+
+    return ent

saltpaper/services/assetservice.py

@@ -12,10 +12,12 @@ filetypes = {
 }
 
 class AssetService():
-    def __init__(self):
+    def __init__(self, assets_folder_path):
         self.cache = {}
         self.roots = []
 
+        self.set_assets_folder(assets_folder_path)
+
     def set_assets_folder(self, path):
         path = Path(path)
         self.roots.append(path)
@@ -41,6 +43,9 @@ class AssetService():
                     self.cache[id] = asset
                     return asset
 
+        if id == "image_missing":
+            raise FileNotFoundError(f"No /image/missing.png is set")
+
         print(
             f"asset not found: '{id}' (type='{kind}', name='{name}'). "
             f"tried locations:" + '\n'.join(searched) + "\n",

saltpaper/services/displayservice.py

@@ -57,9 +57,9 @@ class DisplayService():
         self.layers.append(layer)
         self.refresh_sorting()
 
-    def add_many_layers(self, layers):
+    def add_many_layers(self, layers:list):
         self.layers.extend(layers)
-        self.refresh_sorting
+        self.refresh_sorting()
 
     def remove_layer(self, layer):
         for i, item in enumerate(self.layers):

saltpaper/services/inputservice.py

@@ -13,6 +13,7 @@ if __name__ == "__main__":
 import pygame
 import pygame.locals as pl
 import pygame._sdl2.controller as ctrl
+import pygame._sdl2.video as sdl_video
 
 KEY_VALUE_TO_NAME = {
     value: name
@@ -76,11 +77,21 @@ class Criteria():
         return on_held_interval
 
 class Event():
-    def __init__(self, triggers: str | list, criteria: Callable, callback: Callable, args: list = None):
+    def __init__(
+            self,
+            triggers: str | list,
+            criteria: Callable,
+            callback: Callable,
+            args: list = None,
+            priority: int = 0,
+            eat_trigger: bool = False
+    ):
         self.triggers = triggers if isinstance(triggers, list) else [triggers]
         self.criteria = criteria
         self.callback = callback
         self.args = args if args else []
+        self.priority = priority
+        self.eat_trigger = eat_trigger
 
 
 class InputService():

saltpaper/services/layer.py

@@ -4,18 +4,19 @@ import numpy as np
 class Layer:
     def __init__(
             self,
-            dimensions,
-            render_priority=0,
-            tick_priority=0,
-            opacity_percent=100,
-            surface=None,
+            dimensions:tuple[int,int],
+            render_priority:int=0,
+            tick_priority:int=0,
+            opacity_percent:int=100,
+            surface:pygame.Surface=None,
+            offset:tuple[int,int]=(0,0)
     ):
         self.dimensions = dimensions
         self.surface = surface if surface else pygame.Surface(dimensions, pygame.HWSURFACE | pygame.SRCALPHA)
         self.visible = True
         self.ticking = True
         self.opacity_percent = opacity_percent
-        self.offset = (0,0)
+        self.offset:tuple[int,int] = offset
         
         self.render_priority = render_priority
         self.tick_priority = tick_priority
@@ -43,6 +44,11 @@ class Layer:
         surf.set_alpha(int(self.opacity_percent * 2.55))
         return surf
     
+    def relative_coords(self, coords):
+        x, y = coords
+        newcoords = (x - self.offset[0], y - self.offset[1])
+        return newcoords
+    
 
     def loopscroll(self, dx, dy, dt=1.0):
         self._loopscroll_accum_x += dx * dt

saltpaper/worldsystem/components/position.py

@@ -2,24 +2,29 @@ class Position():
     def __init__(
             self,
             layer:int=0,
-            x:int=0,
-            y:int=0,
+            position:tuple[int,int]=(0,0),
             height:int=0,
             width:int=0
     ):
         self.layer = layer
-        self.x = x
-        self.y = y
+        self.position = position
         self.height = height
         self.width = width
 
     @property
-    def position(self):
-        return (self.x, self.y)
+    def x(self):
+        return self.position[0]
+    
+    @property
+    def y(self):
+        return self.position[1]
 
     def set_layer(self, layer):
         self.layer = layer
 
     def move(self, dx, dy):
         self.x += dx
-        self.y += dy
+        self.y += dy
+
+    def is_point_inside(self, point):
+        x, y  = point

{saltpaper-0.0.3a0.dist-info → saltpaper-0.0.5a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: saltpaper
-Version: 0.0.3a0
+Version: 0.0.5a0
 Summary: A small game-engine/framework built on top of pygame
 Author-email: Lauren Kinder <mail@hermod.uk>
 License-Expression: MIT

{saltpaper-0.0.3a0.dist-info → saltpaper-0.0.5a0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-saltpaper/__init__.py,sha256=cZ3wNR0lUAwlyUgL4GWFUMvQ5Z1k6QkfIe1RD8ICbWg,173
+saltpaper/__init__.py,sha256=LrY78Ej9y8JGqZOdjYKMsydpIYJzZy9AgAMsPG5rTWE,185
 saltpaper/assets/.DS_Store,sha256=7-Z-79uIc0CMx4UUj3sSlYE6KAWyk5qlKRTLRnrq8N8,8196
 saltpaper/assets/talk.wav,sha256=rRmMxGFBFGiU59VqfmhIcwdZfuYdY9fUdkv7Os7S3hU,30624
 saltpaper/assets/fonts/LibertinusMono-Regular.ttf,sha256=q9MJTt9ehi35gD8LH8jgr66CFH2oyxsylV3nqPsIOPA,153120
@@ -7,23 +7,24 @@ saltpaper/assets/music/catacomb.wav,sha256=Rx3u6xe2YnST9c7KKJ6seF9bG6rJyC683Sc6j
 saltpaper/assets/tilemaps/test.aseprite,sha256=ZmWh2Ima2Lha5t4kjgNMsnlCamBNEKUsO547Hhtoa2w,416
 saltpaper/assets/tilemaps/test.png,sha256=Q2LU88aK3DOLHrXBjuT86ZJTP_ckODwo1g5Pe9Jut7g,927
 saltpaper/assets/tilemaps/test.yaml,sha256=8YWZeFfbxKxSK8MnEYxERjJIpSszMzRxp5lzGNl2yYw,220
-saltpaper/functions/__init__.py,sha256=seVutHUkY36p2YR6oMHmh4RA9ofWhpMKjVxCl-YNxVA,71
+saltpaper/functions/__init__.py,sha256=aI9Lkm4SRTeWn40xEh9nfuN-b-jq9ImleO-ky690z8w,92
+saltpaper/functions/spawn.py,sha256=YRvnuEImANzvuB872k5D1VwivG5cfGQEkcbJwmvqHso,330
 saltpaper/functions/test.py,sha256=sNpRCjy1CrMrlHv770RTtN6iDwB3Hq7-rKdKaTi3b8s,323
 saltpaper/functions/vectortools.py,sha256=I2ok4i0kZqGq5YXgY1nLblgA14mnlC53D2BBSHrbsHM,752
 saltpaper/services/__init__.py,sha256=Sseu7zdeaB3InIIcs5DIRFK4hhGBqxwvTQaAQP8ksaw,292
-saltpaper/services/assetservice.py,sha256=DQOEo3IXWYdrDXrvLztC1Z6f2QeCNk41oGP08w8Ya_c,1957
-saltpaper/services/displayservice.py,sha256=ihyMK8gy3IDYl2HGFhsVMxbTAQo0_r8KiaEk644ummc,2992
-saltpaper/services/inputservice.py,sha256=WNdD0wE2okTbRJDtMBPnxyHmkde0dIocbtSAlX-V408,4884
-saltpaper/services/layer.py,sha256=YoJQ0fwQ4EgXkJWHlgwVd8uv9TnafnmQL1NljoRRxRQ,3089
+saltpaper/services/assetservice.py,sha256=KqVD9UXnDB8JUH4XjTcdRBQkFeSPEcijXiSQHYnAlxw,2133
+saltpaper/services/displayservice.py,sha256=NzBmzuaVMcygNv2HnEJZDU5AqV3I_9giGGybvcu2sgY,2999
+saltpaper/services/inputservice.py,sha256=MRIbdwspCw4hS1zVy2VI7_n2UY0Vp9H6omKZK3yCBnE,5131
+saltpaper/services/layer.py,sha256=eIDzZmt1CwjbApnzGsGkM-rJQ-TXmBF-6ho_hNSCPGc,3339
 saltpaper/services/renderservice.py,sha256=jwhnWoa1a_mHXkoHnK-wREGR0cIBKkGf-pVythHkU1E,1250
 saltpaper/services/stateservice.py,sha256=KviqdOkEgZyOiwadOz1nn5QB4jdHUwbGYf355NcqkhM,287
 saltpaper/worldsystem/entity.py,sha256=bRyFMfHblzMwzo81YshDkDjvpMXZrEVrvWjgXtdlS5c,987
 saltpaper/worldsystem/world.py,sha256=-8ckweO6pcwaLb42PGKPveuuHNeR_o0cVqUDFcEt93w,442
 saltpaper/worldsystem/components/__init__.py,sha256=ZYfSsWkkqC-Dkl9QwAjPBydca7ifBzxEhG9_OOcMgRs,57
-saltpaper/worldsystem/components/position.py,sha256=lNNh6BoErEEq7SgM347ceLNMOAdnkq1e2LMr_ejZmwE,500
+saltpaper/worldsystem/components/position.py,sha256=QIJHVc8r1i0KhBBJdAN1dnlPky_8AWkpRJWLvBrGKo0,618
 saltpaper/worldsystem/components/sprite.py,sha256=pQHkyNNKv_iy33LLbqZlOXTU-dqoPzFX7ojjYMOH_BY,102
-saltpaper-0.0.3a0.dist-info/licenses/LICENSE,sha256=Fh0aFC8RSdix3JzjFyLJ3IuzsD1FfsbGFkyqDj5qvXQ,1075
-saltpaper-0.0.3a0.dist-info/METADATA,sha256=-zPNWq7aIhc0xUl3NFnqwW-Zg54igAV9rdq7jC2M8oQ,646
-saltpaper-0.0.3a0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-saltpaper-0.0.3a0.dist-info/top_level.txt,sha256=JACZnZhYYkgmdSz3T1JXacHS4L0UM6NbeReLoNLu6jw,10
-saltpaper-0.0.3a0.dist-info/RECORD,,
+saltpaper-0.0.5a0.dist-info/licenses/LICENSE,sha256=Fh0aFC8RSdix3JzjFyLJ3IuzsD1FfsbGFkyqDj5qvXQ,1075
+saltpaper-0.0.5a0.dist-info/METADATA,sha256=6X29jU0N0cGWwRUshm1uhiiVNMDKsK9bAenhvtuv8u0,646
+saltpaper-0.0.5a0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+saltpaper-0.0.5a0.dist-info/top_level.txt,sha256=JACZnZhYYkgmdSz3T1JXacHS4L0UM6NbeReLoNLu6jw,10
+saltpaper-0.0.5a0.dist-info/RECORD,,