frontengine 1.0.6__tar.gz → 1.0.8__tar.gz

{frontengine-1.0.6 → frontengine-1.0.8}/PKG-INFO

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

@@ -9,6 +9,7 @@ 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
 
@@ -26,6 +27,7 @@ SURFACE_RIGHT = "right"
 # 視覺狀態（決定顯示哪張精靈）/ Visual states (which sprite to show)
 STATE_WALK = "walk"
 STATE_IDLE = "idle"
+STATE_SLEEP = "sleep"
 STATE_CLIMB = "climb"
 STATE_FALL = "fall"
 STATE_DRAG = "drag"
@@ -34,13 +36,23 @@ STATE_DRAG = "drag"
 # Accepted file stems per state inside a pet pack folder (first match wins).
 _PACK_STATE_ALIASES = {
     STATE_WALK: ("walk", "run", "move"),
-    STATE_IDLE: ("idle", "sit", "stand", "sleep"),
+    STATE_IDLE: ("idle", "sit", "stand"),
+    STATE_SLEEP: ("sleep", "zzz", "rest"),
     STATE_CLIMB: ("climb", "grab", "wall"),
     STATE_FALL: ("fall", "jump"),
     STATE_DRAG: ("drag", "pinch", "grabbed", "held"),
 }
 _PACK_EXTS = (".gif", ".webp", ".png", ".jpg", ".jpeg")
 
+# 缺該狀態精靈時的退回順序 / Fallback order when a state's sprite is missing
+_STATE_FALLBACKS = {
+    STATE_SLEEP: (STATE_IDLE, STATE_WALK),
+    STATE_IDLE: (STATE_WALK,),
+    STATE_CLIMB: (STATE_WALK,),
+    STATE_FALL: (STATE_WALK,),
+    STATE_DRAG: (STATE_WALK,),
+}
+
 
 def scan_pet_pack(folder: str) -> dict:
     """
@@ -76,6 +88,8 @@ def derive_visual_state(dragging: bool, airborne: bool, surface: str, motion_sta
         return STATE_FALL
     if surface in (SURFACE_LEFT, SURFACE_RIGHT, SURFACE_CEILING):
         return STATE_CLIMB
+    if surface == SURFACE_FLOOR and motion_state == STATE_SLEEP:
+        return STATE_SLEEP
     if surface == SURFACE_FLOOR and motion_state == "idle":
         return STATE_IDLE
     return STATE_WALK
@@ -93,18 +107,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."""
 
@@ -192,8 +244,9 @@ class PetMotion:
         self.vx = float(self.speed)
         self.vy = 0.0 if behaviour != BEHAVIOUR_WANDER else float(self.speed)
         self._airborne = False
-        self.state = "walk"  # walk | idle
+        self.state = "walk"  # walk | idle | sleep
         self._state_ticks = 0
+        self._idle_count = 0
         self.target: Optional[Tuple[float, float]] = None
         self.asleep = False
         self.climb = bool(climb)
@@ -329,13 +382,25 @@ class PetMotion:
     def _new_state(self, force_walk: bool = False) -> None:
         if force_walk or self._rng.random() < 0.65:
             self.state = "walk"
+            self._idle_count = 0
             if not force_walk:
                 self.vx = float(self.speed) if self._rng.random() < 0.5 else float(-self.speed)
             self._state_ticks = self._rng.randint(30, 120)
+        elif self._idle_count >= 2:
+            # been idling a while -> doze off
+            self.state = STATE_SLEEP
+            self._idle_count = 0
+            self._state_ticks = self._rng.randint(120, 300)
         else:
             self.state = "idle"
+            self._idle_count += 1
             self._state_ticks = self._rng.randint(20, 80)
 
+    def wake(self) -> None:
+        """喚醒寵物並恢復走動（互動時呼叫）/ Wake the pet and resume walking."""
+        self._idle_count = 0
+        self._new_state(force_walk=True)
+
     # --- free wander ---
     def _step_wander(self, left, top, right, bottom) -> Tuple[int, int]:
         if abs(self.vy) < 1e-9:
@@ -419,10 +484,11 @@ 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._bubble = SpeechBubble()
         self._chatter_timer = QTimer(self)
@@ -461,7 +527,7 @@ class DesktopPetWidget(BaseWidget):
             return self._sprites["default"]
         if state in self._sprites:
             return self._sprites[state]
-        for fallback in (STATE_WALK, STATE_IDLE):
+        for fallback in _STATE_FALLBACKS.get(state, (STATE_WALK,)):
             if fallback in self._sprites:
                 return self._sprites[fallback]
         return next(iter(self._sprites.values()), None)
@@ -518,23 +584,32 @@ 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 _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)
 
@@ -558,6 +633,9 @@ class DesktopPetWidget(BaseWidget):
             self._moved = False
             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._set_active_sprite(STATE_DRAG)
         super().mousePressEvent(event)
 

{frontengine-1.0.6 → frontengine-1.0.8}/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.6 → frontengine-1.0.8}/frontengine/utils/multi_language/english.py

@@ -226,13 +226,15 @@ english_word_dict = {
     "pet_climb_label": "Climb walls",
     "pet_clone": "Clone",
     "pet_choose_pack": "Choose pet pack...",
-    "pet_pack_empty": "No sprites (walk/idle/climb/fall/drag) found in that folder.",
+    "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?",
     "pet_chatter_afternoon": "Good afternoon!|Taking a break?|Keep it up!",
     "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.6 → frontengine-1.0.8}/frontengine/utils/multi_language/traditional_chinese.py

@@ -227,13 +227,15 @@ traditional_chinese_word_dict = {
     "pet_climb_label": "攀爬牆壁",
     "pet_clone": "複製",
     "pet_choose_pack": "選擇動作包資料夾...",
-    "pet_pack_empty": "該資料夾找不到精靈檔（walk/idle/climb/fall/drag）。",
+    "pet_pack_empty": "該資料夾找不到精靈檔（walk/idle/sleep/climb/fall/drag）。",
     "pet_talk_label": "對話泡泡",
     "pet_chatter_morning": "早安！|新的一天開始囉！|準備好了嗎？",
     "pet_chatter_afternoon": "午安！|要不要休息一下？|繼續加油！",
     "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.6 → frontengine-1.0.8}/frontengine.egg-info/PKG-INFO

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

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