batframework 1.0.9a3__py3-none-any.whl → 1.0.9a4__py3-none-any.whl

batFramework/__init__.py

@@ -9,8 +9,8 @@ from .utils import Utils as utils
 from .tileset import Tileset
 from .timeManager import TimeManager,Timer,SceneTimer
 from .easingController import EasingController
-from .cutscene import Cutscene, CutsceneManager
-import batFramework.cutsceneBlocks
+import batFramework.cutscene
+from .cutsceneManager import CutsceneManager
 from .audioManager import AudioManager
 import batFramework.transition as transition
 from .action import Action

batFramework/cutscene.py

@@ -1,129 +1,44 @@
 import batFramework as bf
-from typing import TYPE_CHECKING,Self
-
-class CutsceneBlock: ...
-
-if TYPE_CHECKING:
-    from .cutsceneBlocks import CutsceneBlock
-
-
-class Cutscene: ...
-
-
-class CutsceneManager(metaclass=bf.Singleton):
-    def __init__(self) -> None:
-        self.current_cutscene: Cutscene = None
-        self.cutscenes: list[bf.Cutscene] = []
-        self.manager: bf.Manager = None
-
-    def set_manager(self, manager):
-        self.manager = manager
-
-    def get_flag(self, flag):
-        return None
-
-    def process_event(self, event):
-        if self.current_cutscene:
-            self.current_cutscene.process_event(event)
-
-    def queue(self, *cutscenes):
-        self.cutscenes.extend(cutscenes)
-        if self.current_cutscene is None:
-            self.play(self.cutscenes.pop(0))
-
-    def play(self, cutscene: Cutscene):
-        if self.current_cutscene is None:
-            self.current_cutscene = cutscene
-            self.current_cutscene.on_enter()
-            self.current_cutscene.init_blocks()
-            self.current_cutscene.play()
-
-    def enable_player_control(self) -> None:
-        pass
-
-    def disable_player_control(self) -> None:
-        pass
-    
-    def update(self, dt):
-        if not self.current_cutscene is None:
-            self.current_cutscene.update(dt)
-            # print("cutscene manager update")
-            if self.current_cutscene.has_ended():
-                self.current_cutscene.on_exit()
-                self.current_cutscene = None
-                if self.cutscenes:
-                    self.play(self.cutscenes.pop(0))
-                else:
-                    self.current_cutscene = None
-
 
 class Cutscene:
-    def __init__(self) -> None:
-        self.cutscene_blocks : list[CutsceneBlock] = []
-        self.block_index = 0
-        self.end_blocks: list[CutsceneBlock] = []
-        self.ended = False
-
-    def on_enter(self):
-        pass
-
-    def on_exit(self):
-        pass
-
-    def init_blocks(self):
-        pass
-
-    def add_blocks(self, *blocks: CutsceneBlock)->Self:
-        self.cutscene_blocks.extend(blocks)
-        return self
-        
-    def add_end_blocks(self, *blocks: CutsceneBlock)->Self:
-        _ = [block.set_parent_cutscene(self) for block in blocks]
-        self.end_blocks.extend(blocks)
-        return self
-        
-    def get_scene_at(self, index):
-        return bf.CutsceneManager().manager.scenes[index]
-
-    def get_current_scene(self):
-        return bf.CutsceneManager().manager.get_current_scene()
-
-    def set_scene(self, name, index=0):
-        return bf.CutsceneManager().manager.set_scene(name, index)
-
-    def get_scene(self, name):
-        return bf.CutsceneManager().manager.get_scene(name)
-
-    def add_block(self, *blocks: CutsceneBlock):
-        for block in blocks:
-            block.set_parent_cutscene(self)
-            self.cutscene_blocks.append(block)
-
-    def process_event(self, event):
-        if not self.ended and self.block_index < len(self.cutscene_blocks):
-            self.cutscene_blocks[self.block_index].process_event(event)
-
-    def play(self):
-        self.block_index = 0
-        if self.cutscene_blocks:
-            self.cutscene_blocks[self.block_index].start()
+    def __init__(self,*cutscenes):
+        self.is_over : bool = False
+        self.sub_cutscenes : list[Cutscene] = list(cutscenes)
+        self.sub_index = -1
+
+    def start(self):
+        if self.sub_cutscenes:
+            self.sub_index = 0
+            self.sub_cutscenes[self.sub_index].start()
         else:
-            self.ended
-
-    def update(self, dt):
-        if self.ended:
-            return
-        self.cutscene_blocks[self.block_index].update(dt)
-        if self.cutscene_blocks[self.block_index].has_ended():
-            self.block_index += 1
-            if self.block_index == len(self.cutscene_blocks):
-                if not self.end_blocks:
-                    self.ended = True
-                    return
-                else:
-                    self.cutscene_blocks.extend(self.end_blocks)
-                    self.end_blocks = []
-            self.cutscene_blocks[self.block_index].start()
-
-    def has_ended(self):
-        return self.ended
+            self.end()
+
+    def process_event(self,event):
+        if self.sub_index > 0: 
+            self.sub_cutscenes[self.sub_index].process_event(event)
+            
+    def update(self,dt):
+        if self.sub_index > 0: 
+            self.sub_cutscenes[self.sub_index].update(dt)
+            if self.sub_cutscenes[self.sub_index].is_over:
+                self.sub_index +=1
+                if self.sub_index >= len(self.sub_cutscenes):
+                    self.end()
+            
+    def end(self):
+        self.is_over = True
+
+
+class Wait(Cutscene):
+    def __init__(self,duration:float,scene_name:str="global"):
+        super().__init__()
+        self.duration = duration
+        self.scene_name = scene_name
+    def start(self):
+        self.timer = bf.SceneTimer(duration=self.duration,end_callback=self.end,scene_name=self.scene_name)
+        self.timer.start()
+
+
+
+# class TransitionToScene(bf.Cutscene):
+    # def __init__(self,scene_name:str,)

batFramework/cutsceneManager.py

@@ -0,0 +1,31 @@
+import batFramework as bf
+from typing import TYPE_CHECKING,Self
+import pygame
+# if TYPE_CHECKING:
+from .cutscene import Cutscene
+
+
+class CutsceneManager(metaclass=bf.Singleton):
+    def __init__(self) -> None:
+        self.current_cutscene: Cutscene = None
+        self.manager: bf.Manager = None
+
+    def set_manager(self, manager):
+        self.manager = manager
+
+    def process_event(self, event):
+        if self.current_cutscene is not None:
+            self.current_cutscene.process_event(event)
+            if event.type in bf.enums.playerInput:
+                event.consumed = True
+
+    def play(self,cutscene:Cutscene):
+        if self.current_cutscene is not None:return
+        self.current_cutscene = cutscene
+        cutscene.start()
+
+    def update(self,dt):
+        if self.current_cutscene:
+            self.current_cutscene.update(dt)
+            if self.current_cutscene.is_over:
+                self.current_cutscene = None

batFramework/enums.py

@@ -1,4 +1,8 @@
 from enum import Enum
+import pygame
+
+playerInput = [pygame.KEYDOWN,pygame.MOUSEBUTTONDOWN,pygame.KEYUP,pygame.MOUSEBUTTONUP]
+
 
 
 class color:
@@ -111,4 +115,6 @@ class textMode(Enum):
     ALPHABETICAL = 0
     NUMERICAL = 1
     ALPHANUMERICAL = 3
-    
+
+
+

batFramework/manager.py

@@ -74,6 +74,8 @@ class Manager(bf.SceneManager):
             if event.key == pygame.K_p:
                 self.print_status()
                 return
+        self.cutsceneManager.process_event(event)
+        if event.consumed: return
         super().process_event(event)
         if not event.consumed:
             if event.type == pygame.QUIT:

batFramework/renderGroup.py

@@ -8,13 +8,13 @@ from typing import Self, Iterator, Callable
 """
 
 
-class RenderGroup(bf.Entity):
+class RenderGroup(bf.Drawable):
     def __init__(
-        self, entity_iterator: Callable[[], Iterator[bf.Entity]], blit_flags: int = 0
+        self, entity_iterator: Callable[[], Iterator[bf.Drawable]], blit_flags: int = 0
     ) -> None:
         super().__init__()
         self.entity_iterator = entity_iterator
-        self.set_blit_flags(blit_flags)
+        # self.set_blit_flags(blit_flags)
         self.set_debug_color("white")
 
     def get_debug_outlines(self):

batFramework/sceneManager.py

@@ -171,6 +171,9 @@ class SceneManager:
 
     def process_event(self, event: pygame.Event):
 
+        if self.current_transitions and event in bf.enums.playerInput:
+            return
+
         if event.type in self.shared_events:
             [s.process_event(event) for s in self.scenes]
         else:

{batframework-1.0.9a3.dist-info → batframework-1.0.9a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batframework
-Version: 1.0.9a3
+Version: 1.0.9a4
 Summary: Pygame framework for making games easier.
 Author-email: Turan Baturay <baturayturan@gmail.com>
 Project-URL: Homepage, https://github.com/TuranBaturay/batFramework

{batframework-1.0.9a3.dist-info → batframework-1.0.9a4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-batFramework/__init__.py,sha256=vcfe0wd5ggzu2NfHoHMfGwMjpBZTPujMt3Fr2W_PWkE,2604
+batFramework/__init__.py,sha256=Fc9uFdDnmhJ1bhCI550T9cu_Zy-ni-avSs5pLmPEgiM,2595
 batFramework/action.py,sha256=919IVYKviLyVYDtQL7oZvlVuE_aodjJCuwz6fGi5sCk,8420
 batFramework/actionContainer.py,sha256=qy6-YY3iX26KJ8NqFMSYo6JExohD8HFk0sC1qhb7qA8,2602
 batFramework/animatedSprite.py,sha256=IWE8zUgpFaqQPUr7iOUo7TJ_E10aUaMNqlIqv8dW87E,4242
@@ -7,20 +7,20 @@ batFramework/audioManager.py,sha256=ANn6GXDm5bcThih0KD8jrF54Re20A6kxHQrVJu9QYxc,
 batFramework/camera.py,sha256=tSy9n20QLeJD3Uz352q-uejzAHPtQczvahaNz7APJcY,9408
 batFramework/character.py,sha256=AK5sQLvAOY3X4-7vzeHeIO5WDFsubn_TADLYxmYc0Qo,789
 batFramework/constants.py,sha256=x8a0GqBJdiwMEjlVohyL3AWHaSxyrBy-4pucVKVNakg,1354
-batFramework/cutscene.py,sha256=zra-hvAVY5buBPfFiog4psvLZW07qCt8LZzd7Vd-4qM,3858
-batFramework/cutsceneBlocks.py,sha256=3jtmTpV48NKCu-Qgjg7KN5KnwXn0kycIQ7t7G3RH3VE,4862
+batFramework/cutscene.py,sha256=oc6Ktl2t7zO-oH-HWU18wB5ABMyWg7-h3jREGKpcu50,1315
+batFramework/cutsceneManager.py,sha256=mvBR4KOv6KV9eHzhYH7r6IJMVLjM71C30C2OuvwbuSU,945
 batFramework/drawable.py,sha256=5We2ITq3M5ERG22-iQw7Mo_1LNo0nqma1P13tvphDjY,2197
 batFramework/dynamicEntity.py,sha256=SjXShy5aT4cQzjlTem05zSQRiNeq52AUXEBVodEG6gI,736
 batFramework/easingController.py,sha256=ql_nt8unwUZLy7MC7unzDn5eTW44VtjrOTCDs8WS0eY,1750
 batFramework/entity.py,sha256=wMQKR6IxQ69vtPY4nGsz7WnY9ApPhO_VY08IYx6yUu8,2910
-batFramework/enums.py,sha256=r7vAWBm5g3qrvN-WzBN-2ErNKFFqQ5mTrib2GjmDHmE,2083
+batFramework/enums.py,sha256=xkT4yepdLLQn-5YWoSxhHamXE7w_M-GIw47dWWHfKIs,2185
 batFramework/fontManager.py,sha256=M7h6AVq9Fwr51UTCFoGsg_PSurdjByA4w8qouXq4EKE,2254
-batFramework/manager.py,sha256=vu7TfDnJu08_I-pPWSn450NDrMY-LysLe8y3t2fTy_o,4404
+batFramework/manager.py,sha256=TQ0Q1f_GbQE8h4G9zCNQgtNTKNCj630S43Ai4e0yZik,4488
 batFramework/particle.py,sha256=Aps9eJNdFag-TlduMSezKp4ocFQVvI6iZ98chhdhbgE,3081
-batFramework/renderGroup.py,sha256=_VDvmP4iB-XarFJo_Uh5YKwWq1cazHmOBmTXZkqKk40,2020
+batFramework/renderGroup.py,sha256=CO8LtTP1gYI1i_8OwmMk2SlU33Nv4iXnHvK0RVK3D24,2026
 batFramework/resourceManager.py,sha256=0cOIAFXT7UzzvgHn9QkWcXsTp8H2bIS70NvvgpBL2_4,3554
 batFramework/scene.py,sha256=0E7omgNUEl5Uhbx8iO3exyCy4p1MC7bSvqfwncW4KMw,11281
-batFramework/sceneManager.py,sha256=_VPPi0WepH8_NQuwq6d4gfTFdmku3VxrDkJ8cu3oxqU,7008
+batFramework/sceneManager.py,sha256=GCGt7DYoty_wX2LVEhv0C6TaNyNWhKvWocwOqxUIBXc,7099
 batFramework/scrollingSprite.py,sha256=_1-hp7y3pC5m8g2VhFVgGOuJsOkOi8adhQiI2Rb0uPY,4133
 batFramework/sprite.py,sha256=Cz8qzl8jR8y33DUSCObJQOk5e8PcZeavtFhBdR2TogU,1627
 batFramework/stateMachine.py,sha256=wC-5xbKvf-vGm_N16X9KhgMya5915GyVXL79uk5Bapw,1359
@@ -56,8 +56,8 @@ batFramework/gui/constraints/constraints.py,sha256=XFvrjFFN1nmbYzI6l54DlZkrRP-wW
 batFramework/templates/__init__.py,sha256=8XN-7JwYFKTRx_lnUL_If3spwgn5_2b7bwmrRRBPON0,46
 batFramework/templates/character.py,sha256=4UEcegUIeIgj48sVgzyRcT6yjpFOZ8Q_gHTtiB5j6kw,1348
 batFramework/templates/states.py,sha256=WeomVrQ10vHxVCj9Wnk1PcinKyb871uV910mQe287kI,5370
-batframework-1.0.9a3.dist-info/LICENCE,sha256=A65iXbMDbOxQLDNOODJLqA7o5RxszYlEqIgNSzBQRf4,1073
-batframework-1.0.9a3.dist-info/METADATA,sha256=UpbSgm9XCqqMyFjRrXOdmPHYD70b-BW0SPVzedEvmCk,1694
-batframework-1.0.9a3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-batframework-1.0.9a3.dist-info/top_level.txt,sha256=vxAKBIk1oparFTxeXGBrgfIO7iq_YR5Fv1JvPVAIwmA,13
-batframework-1.0.9a3.dist-info/RECORD,,
+batframework-1.0.9a4.dist-info/LICENCE,sha256=A65iXbMDbOxQLDNOODJLqA7o5RxszYlEqIgNSzBQRf4,1073
+batframework-1.0.9a4.dist-info/METADATA,sha256=JIZ73b5rzLH38fgZtEOrFNIVvQpMoI5dpT0Y7CZJ5iU,1694
+batframework-1.0.9a4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+batframework-1.0.9a4.dist-info/top_level.txt,sha256=vxAKBIk1oparFTxeXGBrgfIO7iq_YR5Fv1JvPVAIwmA,13
+batframework-1.0.9a4.dist-info/RECORD,,

batFramework/cutsceneBlocks.py

@@ -1,169 +0,0 @@
-import batFramework as bf
-from .cutscene import Cutscene, CutsceneManager
-from .transition import *
-from typing import Optional,Callable
-
-# Define the base CutsceneBlock class
-class CutsceneBlock:
-    """
-    Base class for cutscene blocks. Represents a unit of action in a cutscene.
-    """
-
-    # Constructor for the CutsceneBlock
-    def __init__(self) -> None:
-        # Callback function, parent cutscene, and state variables
-        self.callback = None
-        self.parent_cutscene: Cutscene = None
-        self.get_flag = CutsceneManager().get_flag
-        self.ended = False
-        self.started = False
-
-    def get_scene_at(self, index):
-        return bf.CutsceneManager().manager.scenes[index]
-
-    def set_scene(self, name, index=0):
-        return CutsceneManager().manager.set_scene(name, index)
-
-    def get_current_scene(self):
-        return CutsceneManager().manager.get_current_scene()
-
-    def get_scene(self, name):
-        return CutsceneManager().manager.get_scene(name)
-
-    # Set the parent cutscene for this block
-    def set_parent_cutscene(self, parent):
-        """
-        Set the parent cutscene for this block.
-
-        Args:
-            parent: The parent cutscene object.
-        """
-        self.parent_cutscene = parent
-
-    # Process an event (placeholder implementation, to be overridden in subclasses)
-    def process_event(self, event):
-        """
-        Process an event for this cutscene block.
-
-        Args:
-            event: The event to be processed.
-        """
-        pass
-
-    # Update the block (placeholder implementation, to be overridden in subclasses)
-    def update(self, dt):
-        """
-        Update the cutscene block.
-
-        Args:
-            dt: Time elapsed since the last update.
-        """
-        pass
-
-    # Start the block
-    def start(self):
-        """
-        Start the cutscene block.
-        """
-        self.started = True
-
-    # Mark the block as ended
-    def end(self):
-        """
-        Mark the cutscene block as ended.
-        """
-        self.ended = True
-
-    # Check if the block has ended
-    def has_ended(self):
-        """
-        Check if the cutscene block has ended.
-
-        Returns:
-            bool: True if the block has ended, False otherwise.
-        """
-        return self.ended
-
-
-# Define the ParallelBlock class, a type of CutsceneBlock
-class ParallelBlock(CutsceneBlock):
-    """
-    Represents a parallel execution block for multiple Cutscene blocks.
-    """
-
-    def __init__(self, *blocks) -> None:
-        super().__init__()
-        # List of blocks to run in parallel
-        self.blocks: list[CutsceneBlock] = list(blocks)
-
-    # Start the parallel block (override the base class method)
-    def start(self):
-        super().start()
-        # Start each block in parallel
-        for block in self.blocks:
-            block.start()
-
-    # Process an event for each block in parallel
-    def process_event(self, event):
-        _ = [b.process_event(event) for b in self.blocks]
-
-    # Update each block in parallel
-    def update(self, dt):
-        _ = [b.update(dt) for b in self.blocks]
-
-    # Check if all blocks have ended
-    def has_ended(self):
-        return all(b.has_ended() for b in self.blocks)
-
-
-# Define the SceneTransitionBlock class, a type of CutsceneBlock
-class SceneTransitionBlock(CutsceneBlock):
-    """
-    Represents a scene transition Cutscene block.
-    """
-
-    # Constructor for SceneTransitionBlock
-    def __init__(
-        self, scene, transition: Transition = Fade(0.1), index: int = 0
-    ) -> None:
-        super().__init__()
-        # Target scene, transition type, duration, and additional keyword arguments
-        self.target_scene = scene
-        self.transition = transition
-        self.index = index
-        # Timer to handle the end of the transition
-        self.timer = bf.Timer(transition.duration, self.end)
-
-    # Start the scene transition block
-    def start(self):
-        """
-        Start the scene transition block.
-        """
-        super().start()
-        # Initiate the scene transition
-        if self.get_current_scene().name == self.target_scene:
-            self.end()
-            return
-        CutsceneManager().manager.transition_to_scene(
-            self.target_scene, self.transition, self.index
-        )
-        # Start the timer to handle the end of the transition
-        self.timer.start()
-
-class DelayBlock(CutsceneBlock):
-    def __init__(self, duration) -> None:
-        super().__init__()
-        self.timer = bf.Timer(duration=duration, end_callback=self.end)
-
-    def start(self):
-        super().start()
-        self.timer.start()
-
-class FunctionBlock(CutsceneBlock):
-    def __init__(self, func : Optional[Callable]) -> None:
-        self.function = func
-
-    def start(self):
-        super().start()
-        if self.function : self.function()
-        self.end()