frontengine 1.0.7__tar.gz → 1.0.9__tar.gz

{frontengine-1.0.7 → frontengine-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.7
+Version: 1.0.9
 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.7 → frontengine-1.0.9}/frontengine/show/pet/desktop_pet.py

@@ -3,12 +3,14 @@ from datetime import datetime
 from pathlib import Path
 from typing import Optional, Tuple
 
-from PySide6.QtCore import Qt, QRect, QTimer, Signal
+from PySide6.QtCore import Qt, QRect, QTimer, QUrl, Signal
 from PySide6.QtGui import QAction, QColor, QCursor, QFont, QFontMetrics, QMovie, QPainter, QPixmap, QTransform
+from PySide6.QtMultimedia import QSoundEffect
 from PySide6.QtWidgets import QMenu, QMessageBox, QWidget
 
 from frontengine.show.base_widget import BaseWidget
 from frontengine.show.window_helpers import apply_overlay_window_flags
+from frontengine.user_setting.user_setting_file import user_setting_dict
 from frontengine.utils.logging.loggin_instance import front_engine_logger
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
 
@@ -106,18 +108,56 @@ def message_bucket(hour: int) -> str:
     return "night"
 
 
-def pick_message(hour: int, rng, messages: dict) -> str:
+def pick_message(hour: int, rng, messages: dict, mood: Optional[str] = None) -> str:
     """
-    依時段從對應句庫（加上通用句庫）隨機挑一句台詞；句庫皆空回傳空字串。
-    Pick a chatter line from the time bucket plus the generic pool. rng needs
-    a ``randrange`` method (injectable for tests).
+    挑一句台詞：先放心情句庫（若有），再放時段句庫、通用句庫。皆空回傳空字串。
+    Pick a chatter line: mood pool (if any) first, then the time-of-day pool,
+    then the generic pool. rng needs ``randrange``.
     """
-    pool = list(messages.get(message_bucket(hour), [])) + list(messages.get("any", []))
+    pool = []
+    if mood and mood in messages:
+        pool += list(messages[mood])
+    pool += list(messages.get(message_bucket(hour), []))
+    pool += list(messages.get("any", []))
     if not pool:
         return ""
     return pool[rng.randrange(len(pool))]
 
 
+class PetMood:
+    """
+    寵物心情值 0~100：互動會上升、被忽略會慢慢下降；level() 回傳 happy/content/sad。
+    Pet happiness 0..100: petting raises it, neglect decays it; level() buckets it.
+    """
+
+    HAPPY = "happy"
+    CONTENT = "content"
+    SAD = "sad"
+
+    def __init__(self, value: int = 60) -> None:
+        self.value = self._clamp(value)
+
+    @staticmethod
+    def _clamp(value) -> int:
+        try:
+            return max(0, min(100, int(value)))
+        except (TypeError, ValueError):
+            return 60
+
+    def pet(self, amount: int = 12) -> None:
+        self.value = self._clamp(self.value + amount)
+
+    def decay(self, amount: int = 1) -> None:
+        self.value = self._clamp(self.value - amount)
+
+    def level(self) -> str:
+        if self.value >= 70:
+            return self.HAPPY
+        if self.value <= 30:
+            return self.SAD
+        return self.CONTENT
+
+
 class SpeechBubble(QWidget):
     """寵物頭上的小對話泡泡，數秒後自動消失 / A small speech bubble that auto-hides."""
 
@@ -412,10 +452,11 @@ class DesktopPetWidget(BaseWidget):
     clone_requested = Signal()
 
     def __init__(self, image_path: str, size: int = 128, speed: int = 3,
-                 behaviour: str = BEHAVIOUR_FLOOR, climb: bool = True, talk: bool = True):
+                 behaviour: str = BEHAVIOUR_FLOOR, climb: bool = True, talk: bool = True,
+                 sound_path: Optional[str] = None):
         front_engine_logger.info(
             f"[DesktopPetWidget] Init | path={image_path}, size={size}, speed={speed}, "
-            f"behaviour={behaviour}, climb={climb}, talk={talk}"
+            f"behaviour={behaviour}, climb={climb}, talk={talk}, sound={sound_path}"
         )
         super().__init__()
         self.opacity = 1.0
@@ -445,11 +486,14 @@ class DesktopPetWidget(BaseWidget):
         self._timer = QTimer(self)
         self._timer.timeout.connect(self._on_tick)
 
-        # Speech bubbles / chatter
+        # Speech bubbles / chatter / mood
         self._talk = bool(talk)
         self._moved = False
         self._chatter_rng = _random_module.SystemRandom()
+        self._mood = PetMood(user_setting_dict.get("pet_mood", 60))
         self._messages = self._load_messages()
+        self._sound: Optional[QSoundEffect] = None
+        self._init_sound(sound_path)
         self._bubble = SpeechBubble()
         self._chatter_timer = QTimer(self)
         self._chatter_timer.setSingleShot(True)
@@ -544,23 +588,53 @@ class DesktopPetWidget(BaseWidget):
             "afternoon": lines("pet_chatter_afternoon", "Good afternoon!|Taking a break?"),
             "evening": lines("pet_chatter_evening", "Good evening!|How was your day?"),
             "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?|(._.)"),
             "any": lines("pet_chatter_any", "Hi there!|(^_^)|Keep going!"),
         }
 
+    def _persist_mood(self) -> None:
+        user_setting_dict["pet_mood"] = self._mood.value
+
+    def _init_sound(self, sound_path: Optional[str]) -> None:
+        if not sound_path:
+            return
+        path = Path(sound_path)
+        if not (path.exists() and path.is_file()):
+            return
+        try:
+            self._sound = QSoundEffect(self)
+            self._sound.setSource(QUrl.fromLocalFile(str(path)))
+        except Exception as error:  # pragma: no cover - audio backend guard
+            front_engine_logger.warning(f"[DesktopPetWidget] sound load failed: {error!r}")
+            self._sound = None
+
+    def _play_sound(self) -> None:
+        if self._sound is None:
+            return
+        try:
+            self._sound.play()
+        except Exception as error:  # pragma: no cover - audio backend guard
+            front_engine_logger.warning(f"[DesktopPetWidget] sound play failed: {error!r}")
+
     def _schedule_chatter(self) -> None:
         if self._talk:
             self._chatter_timer.start(self._chatter_rng.randint(15000, 35000))
 
     def _on_chatter(self) -> None:
+        self._mood.decay()  # a little neglect over time
+        self._persist_mood()
         self.say()
         self._schedule_chatter()
 
     def say(self, text: Optional[str] = None) -> None:
-        """顯示一句台詞（text 為 None 時依時段隨機挑）。"""
+        """顯示一句台詞（text 為 None 時依心情/時段隨機挑）。"""
         if not self._talk:
             return
         if text is None:
-            text = pick_message(datetime.now().hour, self._chatter_rng, self._messages)
+            level = self._mood.level()
+            mood = level if level in (PetMood.HAPPY, PetMood.SAD) else None
+            text = pick_message(datetime.now().hour, self._chatter_rng, self._messages, mood=mood)
         if text:
             self._bubble.show_message(text, self)
 
@@ -585,6 +659,9 @@ 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._mood.pet()    # petting cheers it up
+            self._persist_mood()
+            self._play_sound()
             self._set_active_sprite(STATE_DRAG)
         super().mousePressEvent(event)
 

{frontengine-1.0.7 → frontengine-1.0.9}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -8,7 +8,7 @@ from PySide6.QtWidgets import (
 from frontengine.show.pet.desktop_pet import (
     DesktopPetWidget, BEHAVIOUR_FLOOR, BEHAVIOUR_WANDER, BEHAVIOUR_CHASE, scan_pet_pack,
 )
-from frontengine.ui.dialog.choose_file_dialog import choose_pet
+from frontengine.ui.dialog.choose_file_dialog import choose_pet, choose_wav_sound
 from frontengine.ui.page.utils import (
     build_recent_combobox,
     enable_file_drop,
@@ -32,6 +32,7 @@ class PetSettingUI(QWidget):
         self.pet_list: list = []
         self.ready_to_play = False
         self.pet_image_path: Optional[str] = None
+        self.pet_sound_path: Optional[str] = None
 
         # Choose file
         self.choose_file_button = QPushButton(
@@ -42,6 +43,10 @@ class PetSettingUI(QWidget):
             language_wrapper.language_word_dict.get("pet_choose_pack", "Choose pet pack...")
         )
         self.choose_pack_button.clicked.connect(self.choose_pack)
+        self.choose_sound_button = QPushButton(
+            language_wrapper.language_word_dict.get("pet_choose_sound", "Choose sound (optional)")
+        )
+        self.choose_sound_button.clicked.connect(self.choose_sound)
         self.ready_label = QLabel(language_wrapper.language_word_dict.get("Not Ready"))
 
         # Size
@@ -88,6 +93,7 @@ class PetSettingUI(QWidget):
         self.grid_layout.addWidget(self.choose_file_button, 0, 0)
         self.grid_layout.addWidget(self.ready_label, 0, 1)
         self.grid_layout.addWidget(self.choose_pack_button, 0, 2)
+        self.grid_layout.addWidget(self.choose_sound_button, 1, 2)
         self.grid_layout.addWidget(self.size_label, 1, 0)
         self.grid_layout.addWidget(self.size_combobox, 1, 1)
         self.grid_layout.addWidget(self.speed_label, 2, 0)
@@ -111,6 +117,7 @@ class PetSettingUI(QWidget):
             behaviour=self.behaviour_combobox.currentData(),
             climb=self.climb_checkbox.isChecked(),
             talk=self.talk_checkbox.isChecked(),
+            sound_path=self.pet_sound_path,
         )
         pet.clone_requested.connect(self._spawn_pet)
         pet.set_pet_window_flag()
@@ -141,6 +148,13 @@ class PetSettingUI(QWidget):
             add_recent_file("pet", self.pet_image_path)
             reload_recent_combobox(self.recent_files_combobox, "pet")
 
+    def choose_sound(self) -> None:
+        """選擇點擊時播放的音效（選填）/ Choose an optional click sound."""
+        front_engine_logger.info("[PetSettingUI] choose_sound")
+        path = choose_wav_sound(self)
+        if path:
+            self.pet_sound_path = path
+
     def choose_pack(self) -> None:
         """選擇動作包資料夾（依 walk/idle/climb/fall/drag 檔名對應狀態）。"""
         front_engine_logger.info("[PetSettingUI] choose_pack")
@@ -188,6 +202,7 @@ class PetSettingUI(QWidget):
             "behaviour": self.behaviour_combobox.currentData(),
             "climb": self.climb_checkbox.isChecked(),
             "talk": self.talk_checkbox.isChecked(),
+            "sound": self.pet_sound_path,
         }
 
     def set_state(self, state: dict) -> None:
@@ -211,3 +226,5 @@ class PetSettingUI(QWidget):
             self.climb_checkbox.setChecked(bool(state["climb"]))
         if "talk" in state:
             self.talk_checkbox.setChecked(bool(state["talk"]))
+        if state.get("sound"):
+            self.pet_sound_path = str(state["sound"])

{frontengine-1.0.7 → frontengine-1.0.9}/frontengine/user_setting/user_setting_file.py

@@ -33,6 +33,9 @@ user_setting_dict: Dict[str, Any] = {
     # 每天在指定時間自動套用預設集
     # Auto-apply a preset at a configured time each day
     "preset_schedule": dict(DEFAULT_PRESET_SCHEDULE),
+    # 桌面寵物心情值（0~100），跨工作階段保存
+    # Desktop pet mood (0..100), persisted across sessions
+    "pet_mood": 60,
 }
 
 

{frontengine-1.0.7 → frontengine-1.0.9}/frontengine/utils/multi_language/english.py

@@ -226,6 +226,7 @@ english_word_dict = {
     "pet_climb_label": "Climb walls",
     "pet_clone": "Clone",
     "pet_choose_pack": "Choose pet pack...",
+    "pet_choose_sound": "Choose sound (optional)",
     "pet_pack_empty": "No sprites (walk/idle/sleep/climb/fall/drag) found in that folder.",
     "pet_talk_label": "Speech bubbles",
     "pet_chatter_morning": "Good morning!|Rise and shine!|Ready for the day?",
@@ -233,6 +234,8 @@ english_word_dict = {
     "pet_chatter_evening": "Good evening!|How was your day?|Almost done?",
     "pet_chatter_night": "It's late - get some rest!|Still up?|Sweet dreams soon~",
     "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_start": "Spawn pet",
     "pet_message_box_text": "Pet image not found",
 }

{frontengine-1.0.7 → frontengine-1.0.9}/frontengine/utils/multi_language/traditional_chinese.py

@@ -227,6 +227,7 @@ traditional_chinese_word_dict = {
     "pet_climb_label": "攀爬牆壁",
     "pet_clone": "複製",
     "pet_choose_pack": "選擇動作包資料夾...",
+    "pet_choose_sound": "選擇音效（選填）",
     "pet_pack_empty": "該資料夾找不到精靈檔（walk/idle/sleep/climb/fall/drag）。",
     "pet_talk_label": "對話泡泡",
     "pet_chatter_morning": "早安！|新的一天開始囉！|準備好了嗎？",
@@ -234,6 +235,8 @@ traditional_chinese_word_dict = {
     "pet_chatter_evening": "晚上好！|今天過得如何？|快完成了嗎？",
     "pet_chatter_night": "很晚了，早點休息！|還沒睡嗎？|祝好夢～",
     "pet_chatter_any": "嗨！|(^_^)|加油！|你可以的！",
+    "pet_chatter_happy": "我好開心！|你最棒了！|(^o^)/|今天真美好！",
+    "pet_chatter_sad": "有點寂寞…|摸摸我好嗎？|(._.)|別忘了我～",
     "pet_start": "召喚寵物",
     "pet_message_box_text": "找不到寵物圖片",
 }

{frontengine-1.0.7 → frontengine-1.0.9}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.7
+Version: 1.0.9
 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.7 → frontengine-1.0.9}/pyproject.toml

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