frontengine 1.0.10__tar.gz → 1.0.12__tar.gz

{frontengine-1.0.10 → frontengine-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.10
+Version: 1.0.12
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

{frontengine-1.0.10 → frontengine-1.0.12}/frontengine/show/pet/desktop_pet.py

@@ -144,6 +144,23 @@ def windows_platforms(exclude_hwnds=()) -> list:
         return []
 
 
+def nearest_peer(center, peers):
+    """
+    回傳離 center 最近的同伴座標與距離；無同伴回傳 (None, inf)。
+    Return the nearest peer center and its distance to `center`, or
+    (None, inf) when there are no peers.
+    """
+    best = None
+    best_distance = float("inf")
+    cx, cy = center
+    for peer_x, peer_y in peers:
+        distance = ((peer_x - cx) ** 2 + (peer_y - cy) ** 2) ** 0.5
+        if distance < best_distance:
+            best_distance = distance
+            best = (peer_x, peer_y)
+    return best, best_distance
+
+
 def message_bucket(hour: int) -> str:
     """依小時回傳時段 / Time-of-day bucket for the given hour."""
     hour = int(hour) % 24
@@ -306,6 +323,8 @@ class PetMotion:
         self.on_platform = False
         self.platform_span: Optional[Tuple[float, float]] = None
         self.ground_feet = 0.0
+        # 追向某個 x（用於朝同伴走過去玩耍）/ Horizontal target to walk toward (play).
+        self.follow_target_x: Optional[float] = None
 
     @property
     def facing_left(self) -> bool:
@@ -318,6 +337,13 @@ class PetMotion:
         """設定可站立的視窗上緣平台 / Set standable window top-edge platforms."""
         self.platforms = list(platforms)
 
+    def set_follow(self, target_x) -> None:
+        """設定要走向的 x 座標（朝同伴玩耍）/ Set a horizontal target to walk toward."""
+        self.follow_target_x = float(target_x)
+
+    def clear_follow(self) -> None:
+        self.follow_target_x = None
+
     def set_target(self, x: float, y: float) -> None:
         self.target = (float(x), float(y))
 
@@ -330,6 +356,7 @@ class PetMotion:
         self.surface = SURFACE_FLOOR
         self.on_platform = False
         self.platform_span = None
+        self.follow_target_x = None
 
     def step(self) -> Tuple[int, int]:
         left, top, right, bottom = self.bounds
@@ -347,6 +374,8 @@ class PetMotion:
         )
         if airborne:
             return self._step_fall(left, top, right, bottom, floor_y)
+        if self.follow_target_x is not None:
+            return self._step_follow(left, top, right, bottom, floor_y)
         if self.on_platform:
             return self._step_platform(left, top, right, bottom, floor_y)
         if self.surface != SURFACE_FLOOR:
@@ -420,6 +449,25 @@ class PetMotion:
                 self._new_state(force_walk=True)
         return int(self.x), int(self.y)
 
+    def _step_follow(self, left, top, right, bottom, floor_y) -> Tuple[int, int]:
+        """朝 follow_target_x 走過去；抵達附近即清除並恢復隨機行為。"""
+        center_x = self.x + self.width / 2.0
+        if abs(center_x - self.follow_target_x) <= self.speed + 2.0:
+            self.follow_target_x = None
+            self._new_state()
+            return int(self.x), int(self.y)
+        self.state = "walk"
+        self.vx = float(self.speed) if self.follow_target_x >= center_x else float(-self.speed)
+        self.x += self.vx
+        if self.on_platform and self.platform_span is not None:
+            span_left, span_right = self.platform_span
+            self.x = min(max(self.x, span_left), span_right - self.width)
+            self.y = float(self.ground_feet - self.height)
+        else:
+            self.x = min(max(self.x, float(left)), float(right - self.width))
+            self.y = float(floor_y)
+        return int(self.x), int(self.y)
+
     def _platform_under(self) -> Optional[Tuple[float, float]]:
         """回傳目前站立平台的水平範圍；平台已消失（視窗移走/關閉）則回傳 None。"""
         body_left = self.x
@@ -616,6 +664,10 @@ class DesktopPetWidget(BaseWidget):
         self._init_sound(sound_path)
         self._sit_on_windows = bool(sit_on_windows)
         self._platform_tick = 0
+        # 多寵物互動 / Multi-pet interaction
+        self._peers_provider = None
+        self._peer_greeted = False
+        self._peer_tick = 0
         self._bubble = SpeechBubble()
         self._chatter_timer = QTimer(self)
         self._chatter_timer.setSingleShot(True)
@@ -629,10 +681,54 @@ class DesktopPetWidget(BaseWidget):
         self.close_action.triggered.connect(self.close)
         self.menu.addAction(self.close_action)
 
+    MEET_DISTANCE = 90.0
+    PLAY_RANGE = 320.0
+    PLAY_CHANCE = 0.25
+
     def set_pet_window_flag(self) -> None:
         """寵物需接收滑鼠以便拖曳，故 allow_input=True 並置頂。"""
         apply_overlay_window_flags(self, show_on_bottom=False, allow_input=True)
 
+    def center(self) -> Tuple[int, int]:
+        return (self.x() + self.width() // 2, self.y() + self.height() // 2)
+
+    def set_peers_provider(self, provider) -> None:
+        """設定回傳其他寵物中心座標清單的函式 / Provider of other pets' centres."""
+        self._peers_provider = provider
+
+    def _check_peers(self) -> None:
+        """靠近其他寵物時走過去玩耍、抵達後轉向打招呼（帶遲滯，避免重複）。"""
+        if self._peers_provider is None:
+            return
+        try:
+            peers = self._peers_provider()
+        except Exception:  # pragma: no cover - defensive
+            return
+        my_center = self.center()
+        peer, distance = nearest_peer(my_center, peers)
+        if peer is None:
+            self._peer_greeted = False
+            self.motion.clear_follow()
+            return
+        # play: a floor pet may walk over to a near-ish peer
+        if self.motion.behaviour == BEHAVIOUR_FLOOR:
+            if self.MEET_DISTANCE < distance <= self.PLAY_RANGE:
+                if self.motion.follow_target_x is not None or self._chatter_rng.random() < self.PLAY_CHANCE:
+                    self.motion.set_follow(peer[0])
+            elif distance > self.PLAY_RANGE:
+                self.motion.clear_follow()
+        # greet: face and say a meet line once per approach
+        if distance <= self.MEET_DISTANCE:
+            self.motion.clear_follow()
+            if self._talk and not self._peer_greeted:
+                self._peer_greeted = True
+                self.motion.vx = abs(self.motion.vx) if peer[0] >= my_center[0] else -abs(self.motion.vx)
+                pool = self._messages.get("meet") or []
+                if pool:
+                    self.say(pool[self._chatter_rng.randrange(len(pool))])
+        elif distance > self.MEET_DISTANCE * 1.6:
+            self._peer_greeted = False
+
     def _load_sprite(self, path: str):
         if Path(path).suffix.lower() in (".gif", ".webp"):
             movie = QMovie(str(path))
@@ -712,6 +808,7 @@ class DesktopPetWidget(BaseWidget):
             "night": lines("pet_chatter_night", "It's late - get some rest!|Still up?"),
             "happy": lines("pet_chatter_happy", "I'm so happy!|You're the best!|(^o^)"),
             "sad": lines("pet_chatter_sad", "Feeling a bit lonely...|Pet me?|(._.)"),
+            "meet": lines("pet_chatter_meet", "Hi friend!|Hello!|Let's play!"),
             "any": lines("pet_chatter_any", "Hi there!|(^_^)|Keep going!"),
         }
 
@@ -775,6 +872,10 @@ class DesktopPetWidget(BaseWidget):
         x, y = self.motion.step()
         self.move(x, y)
         self._set_active_sprite(self._visual_state())
+        self._peer_tick += 1
+        if self._peer_tick >= 5:
+            self._peer_tick = 0
+            self._check_peers()
         if self._bubble.isVisible():
             self._bubble.reposition(self)
 
@@ -786,6 +887,7 @@ class DesktopPetWidget(BaseWidget):
             self._last_move_delta = (0, 0)
             self._drag_offset = event.globalPosition().toPoint() - self.frameGeometry().topLeft()
             self.motion.wake()  # interacting wakes a sleeping pet
+            self.motion.clear_follow()
             self._mood.pet()    # petting cheers it up
             self._persist_mood()
             self._play_sound()

{frontengine-1.0.10 → frontengine-1.0.12}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -124,6 +124,7 @@ class PetSettingUI(QWidget):
             sit_on_windows=self.sit_checkbox.isChecked(),
         )
         pet.clone_requested.connect(self._spawn_pet)
+        pet.set_peers_provider(lambda me=pet: self._peer_centers(me))
         pet.set_pet_window_flag()
         self.pet_list.append(pet)
         screen = QGuiApplication.primaryScreen()
@@ -132,6 +133,18 @@ class PetSettingUI(QWidget):
         if geometry is not None:
             pet.start_moving((geometry.left(), geometry.top(), geometry.right(), geometry.bottom()))
 
+    def _peer_centers(self, me) -> list:
+        """回傳其他仍存活寵物的中心座標（略過已被銷毀者）。"""
+        centers = []
+        for other in list(self.pet_list):
+            if other is me:
+                continue
+            try:
+                centers.append(other.center())
+            except RuntimeError:
+                pass  # underlying C++ object already deleted
+        return centers
+
     def start_play_pet(self) -> None:
         front_engine_logger.info("[PetSettingUI] start_play_pet")
         if not self.pet_image_path or not self.ready_to_play:

{frontengine-1.0.10 → frontengine-1.0.12}/frontengine/utils/multi_language/english.py

@@ -237,6 +237,7 @@ english_word_dict = {
     "pet_chatter_any": "Hi there!|(^_^)|Keep going!|You've got this!",
     "pet_chatter_happy": "I'm so happy!|You're the best!|(^o^)/|Best day ever!",
     "pet_chatter_sad": "Feeling a bit lonely...|Pet me?|(._.)|Don't forget about me~",
+    "pet_chatter_meet": "Hi friend!|Hello there!|Let's play!|Fancy meeting you here!",
     "pet_start": "Spawn pet",
     "pet_message_box_text": "Pet image not found",
 }

{frontengine-1.0.10 → frontengine-1.0.12}/frontengine/utils/multi_language/traditional_chinese.py

@@ -238,6 +238,7 @@ traditional_chinese_word_dict = {
     "pet_chatter_any": "嗨！|(^_^)|加油！|你可以的！",
     "pet_chatter_happy": "我好開心！|你最棒了！|(^o^)/|今天真美好！",
     "pet_chatter_sad": "有點寂寞…|摸摸我好嗎？|(._.)|別忘了我～",
+    "pet_chatter_meet": "嗨朋友！|你好呀！|一起玩吧！|在這遇到你真巧！",
     "pet_start": "召喚寵物",
     "pet_message_box_text": "找不到寵物圖片",
 }

{frontengine-1.0.10 → frontengine-1.0.12}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.10
+Version: 1.0.12
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

{frontengine-1.0.10 → frontengine-1.0.12}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine"
-version = "1.0.10"
+version = "1.0.12"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]