定数化

common_const.py

@@ -3,6 +3,12 @@ class CWindow:
     HEIGHT: int = 768
 
 
-class CMath:
+class CKita:
-    PI: float = 3.14159265358979323846
+    WIDTH: float = CWindow.HEIGHT / 3.84
+    HEIGHT: float = WIDTH
+
+
+class CJojoko:
+    WIDTH: float = CKita.HEIGHT * .75
+    HEIGHT: float = WIDTH
 

common_module.py

@@ -45,9 +45,3 @@ class CommonModule:
 
         return trimmed_left[:cls.index_by_f2c (trimmed_left, length)]
 
-    @staticmethod
-    def rad_to_deg (
-            rad:    float) \
-    -> float:
-        return rad * 180 / CMath.PI
-

main.py

@@ -1,6 +1,7 @@
 # vim: nosmartindent autoindent
 
 import json
+import math
 import random
 import subprocess
 import sys
@@ -24,6 +25,14 @@ from youtube import *
 
 
 class Main:
+    kita_x: float = CWindow.WIDTH / 2
+    kita_y: float = 1000000.
+    kita_arg: float = 0.
+
+    jojoko_x: float = CWindow.WIDTH / 2
+    jojoko_y: float = 1000000.
+    jojoko_arg: float = 0.
+
     @classmethod
     def main (
             cls,
@@ -87,11 +96,11 @@ class Main:
 
         # き太く陽
         kita: pygame.Surface = pygame.transform.scale (
-                pygame.image.load ('sun.png'), (200, 200))
+                pygame.image.load ('sun.png'), (CKita.WIDTH, CKita.HEIGHT))
 
         # 大月ヨヨコ
         jojoko: pygame.Surface = pygame.transform.scale (
-                pygame.image.load ('moon.png'), (200, 200))
+                pygame.image.load ('moon.png'), (CJojoko.WIDTH, CJojoko.HEIGHT))
 
         # 音声再生器の初期化
         pygame.mixer.init (frequency = 44100)
@@ -149,11 +158,13 @@ class Main:
 
             # 日の角度
             sun.compute (observer_with_time)
-            sun_alt: float = CommonModule.rad_to_deg (sun.alt)
+            sun_alt: float = math.degrees (sun.alt)
+            sun_az: float = math.degrees (sun.az)
 
             # 月の角度
             moon.compute (observer_with_time)
-            moon_alt: float = CommonModule.rad_to_deg (moon.alt)
+            moon_alt: float = math.degrees (moon.alt)
+            moon_az: float = math.degrees (moon.az)
 
             # 月齢
             new_moon_dt: datetime = ephem.localtime (
@@ -166,7 +177,7 @@ class Main:
             cls.draw_bg (screen, bg_day, bg_evening, bg_night, bg_grass,
                          kita, jojoko,
                          sunrise_start, sunrise_end, sunset_start, sunset_end,
-                         sun_alt, moon_alt, moon_days_old)
+                         sun_alt, sun_az, moon_alt, moon_az, moon_days_old)
 
             # 左上に時刻表示
             for i in range (4):
@@ -259,7 +270,7 @@ class Main:
                                                + '...')),
                                          True,
                                          (192, 0, 0)),
-                                    (100, 200 + 384) if goatoh_mode else (100 + (64 if (double_mode and not goatoh_talking) else 0), 200))
+                                    (100, 200 + CWindow.HEIGHT / 2) if goatoh_mode else (100 + (64 if (double_mode and not goatoh_talking) else 0), 200))
 
                         pygame.display.update ()
 
@@ -296,7 +307,8 @@ class Main:
                                      bg_grass, kita, jojoko,
                                      sunrise_start, sunrise_end,
                                      sunset_start, sunset_end,
-                                     sun_alt, moon_alt, moon_days_old)
+                                     sun_alt, sun_az, moon_alt, moon_az,
+                                     moon_days_old)
 
                         chat_item.author = {'name':     'ゴートうひとり' if goatoh_talking else '伊地知ニジカ',
                                             'id':       '',
@@ -327,14 +339,16 @@ class Main:
             bg_evening:         pygame.Surface,
             bg_night:           pygame.Surface,
             bg_grass:           pygame.Surface,
-            kita:               pygame.Surface,
+            kita_original:      pygame.Surface,
             jojoko_original:    pygame.Surface,
             sunrise_start:      datetime,
             sunrise_end:        datetime,
             sunset_start:       datetime,
             sunset_end:         datetime,
             sun_alt:            float,
+            sun_az:             float,
             moon_alt:           float,
+            moon_az:            float,
             moon_days_old:      float) \
     -> None:
         sunrise_centre: datetime = (
@@ -343,7 +357,20 @@ class Main:
                 sunset_start + (sunset_end - sunset_start) / 2)
 
         jojoko: pygame.Surface = cls.get_jojoko (jojoko_original,
-                                                 moon_days_old)
+                                                 moon_days_old, moon_alt, moon_az)
+
+        # TODO: 大月と重複多いため修正すること
+        x = CWindow.WIDTH * (sun_az - 80) / 120
+        y = ((CWindow.HEIGHT / 2)
+             - (CWindow.HEIGHT / 2 + CKita.HEIGHT / 2) * math.sin (math.radians (sun_alt)) / math.sin ( math.radians (60)))
+        arg = math.degrees (math.atan2 (y - cls.kita_y, x - cls.kita_x))
+
+        cls.kita_x = x
+        cls.kita_y = y
+        if abs (arg - cls.kita_arg) > 3:
+            cls.kita_arg = arg
+
+        kita: pygame.Surface = pygame.transform.rotate (kita_original, -(90 + cls.kita_arg))
 
         dt: datetime = datetime.now ()
 
@@ -368,17 +395,13 @@ class Main:
 
         screen.blit (bg_evening, (0, 0))
 
-        if -10 <= moon_alt < 40:
+        if (moon_az < 220) and (-10 <= moon_alt):
-            y = ((CWindow.HEIGHT / 2 + 100)
+            screen.blit (jojoko, jojoko.get_rect (center = (cls.jojoko_x, cls.jojoko_y)))
-                 - (CWindow.HEIGHT / 2 + 200) / 30 * moon_alt)
-            screen.blit (jojoko, jojoko.get_rect (center = (400, y)))
 
             screen.blit (bg_grass, (0, 0))
 
-        if -10 <= sun_alt < 40:
+        if (sun_az < 220) and (-10 <= sun_alt):
-            y = ((CWindow.HEIGHT / 2 + 100)
+            screen.blit (kita, kita.get_rect (center = (cls.kita_x, cls.kita_y)))
-                 - (CWindow.HEIGHT / 2 + 200) / 30 * sun_alt)
-            screen.blit (kita, kita.get_rect (center = (400, y)))
 
             screen.blit (bg_grass, (0, 0))
 
@@ -386,27 +409,37 @@ class Main:
     def get_jojoko (
             cls,
             jojoko_original:    pygame.Surface,
-            moon_days_old:      float) \
+            moon_days_old:      float,
+            moon_alt:           float,
+            moon_az:            float) \
     -> pygame.Surface:
         jojoko: pygame.Surface = jojoko_original.copy ()
 
         jojoko.set_colorkey ((0, 255, 0))
 
-        for i in range (200):
+        for i in range (int (CJojoko.HEIGHT)):
-            if 1 <= moon_days_old < 7:
+            # TODO: 冗長かつ可読性に缺けるため修正すること
-                pygame.gfxdraw.bezier (jojoko, ((0, 100 + i), (100, 180 * moon_days_old / 7 - 80 + i), (200, 100 + i)), 3, (0, 255, 0))
+            if 1 <= moon_days_old < 15:
-            elif moon_days_old < 14:
+                pygame.gfxdraw.bezier (jojoko, ((0, CJojoko.HEIGHT / 2 + i), (CJojoko.WIDTH / 2, (CJojoko.HEIGHT * 0.9) * moon_days_old / 7 - CJojoko.HEIGHT * 0.4 + i), (CJojoko.WIDTH, CJojoko.HEIGHT / 2 + i)), 3, (0, 255, 0))
-                pygame.gfxdraw.bezier (jojoko, ((0, 100 + i), (100, 180 * moon_days_old / 7 - 80 + i), (200, 100 + i)), 3, (0, 255, 0))
+            elif moon_days_old < 16:
-            elif moon_days_old < 15:
                 pass
-            elif moon_days_old < 22:
-                pygame.gfxdraw.bezier (jojoko, ((0, 100 - i), (100, 180 * (moon_days_old - 15) / 7 - 80 - i), (200, 100 - i)), 3, (0, 255, 0))
             elif moon_days_old < 30:
-                pygame.gfxdraw.bezier (jojoko, ((0, 100 - i), (100, 180 * (moon_days_old - 15) / 7 - 80 - i), (200, 100 - i)), 3, (0, 255, 0))
+                pygame.gfxdraw.bezier (jojoko, ((0, CJojoko.HEIGHT / 2 - i), (CJojoko.WIDTH / 2, (CJojoko.HEIGHT * 0.9) * (moon_days_old - 15) / 7 - CJojoko.HEIGHT * 0.4 - i), (CJojoko.WIDTH, CJojoko.HEIGHT / 2 - i)), 3, (0, 255, 0))
             else:
                 jojoko.fill ((0, 255, 0))
 
-        return jojoko
+        # TODO: き太く陽生成と重複多いため外出しすること
+        x = CWindow.WIDTH * (moon_az - 80) / 120
+        y = ((CWindow.HEIGHT / 2)
+             - (CWindow.HEIGHT / 2 + CJojoko.HEIGHT / 2) * math.sin (math.radians (moon_alt)) / math.sin (math.radians (60)))
+        arg = math.degrees (math.atan2 (y - cls.jojoko_y, x - cls.jojoko_x))
+
+        cls.jojoko_x = x
+        cls.jojoko_y = y
+        if abs (arg - cls.jojoko_arg) > 3:
+            cls.jojoko_arg = arg
+
+        return pygame.transform.rotate (jojoko, -(90 + cls.jojoko_arg))
 
 
 if __name__ == '__main__':

talk.py

@@ -24,7 +24,13 @@ class Talk:
     top_p: float = 1.
 
     @classmethod
-    def main (cls, message: str, name: str | None = None, histories: list = [], goatoh_mode: bool = False) -> str:
+    def main (
+            cls,
+            message:        str,
+            name:           str | None  = None,
+            histories:      list        = [],
+            goatoh_mode:    bool        = False,
+    ) -> str:
         # ChatGPT API Organisation ID
         openai.organization = OPENAI_ORGANISATION
 
@@ -38,8 +44,13 @@ class Talk:
         return answer.content if answer is not None else cls.DUMMY_RESPONSE
 
     @classmethod
-    def __get_message (cls, message: str, name: str | None, histories: list, goatoh_mode: bool = False) \
+    def __get_message (
-            -> chat.chat_completion_message.ChatCompletionMessage | None:
+            cls,
+            message:        str,
+            name:           str | None,
+            histories:      list,
+            goatoh_mode:    bool        = False,
+    ) -> chat.chat_completion_message.ChatCompletionMessage | None:
         # プロンプト（JSON 等外部ファイルに置くことを検討）
         if goatoh_mode:
             messages: list = [{'role':    'system',
@@ -203,13 +214,13 @@ class Talk:
                                                  + 'ふざけるのはいい加減にするぬ゛ぬ゛ん゛。'))},
 
                               {'role':    'system',
-                               'content': '洗操歌（しーざおぐあ）歌って'},
+                               'content': '洗澡歌（しーざおぐあ）歌って'},
                             
                               {'role':    'assistant',
                                'content': ('おけだぬ゛～゛ん゛（苦笑）。'
-                                           + '毛巾浴帽小鸭鸭水温刚刚好♪'
+                                           + '毛巾浴帽小鴨鴨水溫剛剛好♪'
-                                           + '泼泼水来搓泡泡今天真是美妙♪'
+                                           + '潑潑水來搓泡泡今天眞是美妙♪'
-                                           + '大声唱歌扭扭腰我爱洗洗澡♪'
+                                           + '大聲唱歌扭扭腰我愛洗洗澡♪'
                                            + 'だぬ゛ん♪')},
 
                               {'role':    'system',