From 2fc9381d9344d587685f2cb6fb7430448bae02a4 Mon Sep 17 00:00:00 2001
From: StochasticMouse <alessiorondelli0@gmail.com>
Date: Sat, 13 Jul 2024 15:29:03 +0200
Subject: [PATCH] added partner

---
 data/images/entities/partner.png | Bin 0 -> 2258 bytes
 data/maps/map_1.csv              |  16 ++++++------
 game.py                          |  31 ++++++++++++++---------
 scripts/entities.py              |  42 +++++++++++++++++++++++++++++++
 scripts/utils.py                 |  22 ++++++++++++++++
 5 files changed, 91 insertions(+), 20 deletions(-)
 create mode 100644 data/images/entities/partner.png

diff --git a/data/images/entities/partner.png b/data/images/entities/partner.png
new file mode 100644
index 0000000000000000000000000000000000000000..632369040722bac70065bf63be92b97495a1c283
GIT binary patch
literal 2258
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

literal 0
HcmV?d00001

diff --git a/data/maps/map_1.csv b/data/maps/map_1.csv
index b984a72..79d7ac1 100644
--- a/data/maps/map_1.csv
+++ b/data/maps/map_1.csv
@@ -4,16 +4,16 @@
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,2,2,2,1,1,1,1,1,1,2
+2,1,1,1,1,2,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,2,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,3,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,3,1,1,1,1,1,1,1,1,2
+2,1,1,1,3,3,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,3,1,1,1,1,1,1,1,1,2
+2,1,1,1,1,3,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
 2,1,1,1,1,1,1,1,1,1,1,1,1,1,2
diff --git a/game.py b/game.py
index f9f0261..1564405 100644
--- a/game.py
+++ b/game.py
@@ -1,7 +1,7 @@
 import pygame
 import numpy as np
 from scripts.tiles import Tilemap
-from scripts.entities import Entity
+from scripts.entities import Entity, Partner, GroupEntities
 from scripts.utils import load_image, load_images, to_isometric_pixel
 from scripts.camera import Camera
 
@@ -20,39 +20,46 @@ class Game:
         self.clock = pygame.time.Clock()
 
         self.player = Entity(self, 'player', (64., 64.), (28, 42))
+        self.partner = Partner(self, (80.,80.), (28,42))
+        self.entities = GroupEntities(self, [self.player, self.partner])
         self.assets = {
             'player' : load_image('entities/player.png'),
+            'partner': load_image('entities/partner.png'),
             #'grass' : load_images('tiles/grass/'),
             #'stone' : load_images('tiles/stone/')
             'iso'    : load_images('tiles/iso/')
         }
         self.tilemap = Tilemap(self, (64,32), 'map_1.csv')
         self.camera = Camera(self)
+    def render(self):
+        self.display.fill('white')
+        self.tilemap.render(self.display, offset = self.camera.scroll)
+        self.entities.render(self.display, offset = self.camera.scroll)
+        #self.player.render(self.display, offset = self.camera.scroll)
+        #self.partner.render(self.display, offset = self.camera.scroll)
+        self.screen.blit(pygame.transform.scale(self.display,self.screen.get_size()), (0,0))
+        pygame.display.update()
     def run(self):
         self.status = True
         while self.status:
-            self.display.fill('white')
             delta = np.array([0.0,0.0])
             for event in pygame.event.get():
                 if event.type == pygame.QUIT:
                     self.status = False
             keys = pygame.key.get_pressed()
             if keys[pygame.K_LEFT]:
-                delta[0] -= 5
+                delta += np.array([-5,5])
             if keys[pygame.K_RIGHT]:
-                delta[0] += 5
+                delta += np.array([5,-5])
             if keys[pygame.K_UP]:
-                delta[1] -= 5
+                delta += np.array([-5,-5])
             if keys[pygame.K_DOWN]:
-                delta[1] += 5
-            #print(self.tilemap.physics_rects_around(self.player.pos))
-            print(self.player.pos)
+                delta += np.array([5,5])
+
             self.camera.update()
             self.player.update(self.tilemap, delta)
-            self.tilemap.render(self.display, offset = self.camera.scroll)
-            self.player.render(self.display, offset = self.camera.scroll)
-            self.screen.blit(pygame.transform.scale(self.display,self.screen.get_size()), (0,0))
-            pygame.display.update()
+            self.partner.update()
+            self.render()
             self.clock.tick(60)
         pygame.quit()
 
diff --git a/scripts/entities.py b/scripts/entities.py
index 24bb303..aa70a9e 100644
--- a/scripts/entities.py
+++ b/scripts/entities.py
@@ -33,3 +33,45 @@ class Entity:
         surface.blit(self.game.assets[self.type], to_isometric_pixel(self.pos-np.array([48,80]))*np.array([1,0.5])-offset)
     def rect(self):
         return pygame.Rect(self.pos, self.size)
+
+class Partner(Entity):
+    def __init__(self, game, pos, size):
+        super().__init__(game, 'partner', pos, size)
+        self.player = game.player  #player a cui è linkato
+    def update(self):
+        R = 50
+        player_pos = self.player.pos
+        if np.linalg.norm(player_pos-self.pos) <= R:
+            return
+        a = np.stack([player_pos, self.pos])
+        if np.linalg.det(a) == 0:
+            line_coeffs = np.append(np.linalg.lstsq(a,np.array([[0.0],[0.0]]),rcond=None)[0],0)
+        else:
+            line_coeffs = np.append(np.linalg.lstsq(a,np.array([[1.0],[1.0]]),rcond=None)[0],1)
+        if np.abs(line_coeffs[1])<1e-7:
+            P3 = np.array([self.pos[0], player_pos[1] + R])  #np.sqrt(R ** 2 - (x - player_pos[0]) ** 2)
+            P4 = np.array([self.pos[0], player_pos[1] - R])
+            theta = 0
+            delta = 0
+        else:
+            m = - line_coeffs[0] / line_coeffs[1]
+            theta = np.arctan(m)
+            delta = R * np.array([np.cos(theta),np.sin(theta)])
+            P3 = player_pos + delta
+            P4 = player_pos - delta
+        P = (P3 if (np.linalg.norm(P3-self.pos) < np.linalg.norm(P4-self.pos)) else P4)
+        #super().update(tilemap, P - self.pos) #nice idea but sometimes gets blocked and needs to tp to the player
+        self.pos = P
+
+class GroupEntities:
+    def __init__(self, game, entities):
+        self.game = game
+        self.entities = entities #sorted(entities, key=(lambda x: x.pos[1]))
+    def add_entity(self, entity):
+        self.entities.append(entity)
+    #def update()
+    def render(self, surface, offset=np.array([0.,0.])):
+        self.entities.sort(key = (lambda x: x.pos[1]))
+        for entity in self.entities:
+            entity.render(surface, offset)
+    
diff --git a/scripts/utils.py b/scripts/utils.py
index f30cf1a..42ca966 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -37,3 +37,25 @@ def to_isometric_pixel(coord):
     a = np.array([[1,-1],[1,1]])
     a = 0.5 * a
     return np.squeeze(np.matmul(a,coord[:,np.newaxis]))
+
+class Animation:
+    def __init__(self, images, img_dur=5, loop=True):
+        self.images = images
+        self.img_duration = img_dur
+        self.loop = loop
+        self.done = False
+        self.frame = 0 #in the sense of gameframe, not current frame of the animation
+
+    def copy(self):
+        return Animation(self.images, self.img_duration, self.loop)
+
+    def update(self):
+        if self.loop:
+            self.frame = (self.frame + 1) % (self.img_duration * len(self.images))
+        else:
+            self.frame = min(self.frame + 1, self.img_duration * len(self.images) - 1)
+            if self.frame >= self.img_duration * len(self.images) - 1:
+                self.done = True
+    def img(self):
+        return self.images[int(self.frame / self.img_duration)]
+