WIP: Major revision for the game

Author: Enigmatisms

convert.py

@@ -0,0 +1,43 @@
+import os
+import re
+
+def replace_paths_in_file(file_path):
+    # Regular expression to match the file paths in the format r'xxx\yyy'
+    path_pattern = re.compile(r"r'([^']+)'")
+    
+    with open(file_path, 'r', encoding='utf-8') as file:
+        content = file.read()
+
+    # Find all matches of the pattern
+    paths = path_pattern.findall(content)
+    
+    if not paths:
+        return
+    
+    # Add import os if not already present
+    if 'import os' not in content:
+        content = 'import os\n' + content
+
+    # Replace each found path with os.path.join format
+    for path in paths:
+        # Replace backslashes and slashes with commas and double quotes
+        path_parts = re.split(r'[\\/]', path)
+        joined_path = 'os.path.join({})'.format(', '.join(['"{}"'.format(part) for part in path_parts]))
+        # Replace the original raw string path with the new joined path
+        content = content.replace(f"r'{path}'", joined_path)
+
+    # Write the updated content back to the file
+    with open(file_path, 'w', encoding='utf-8') as file:
+        file.write(content)
+
+def process_directory(directory):
+    for root, _, files in os.walk(directory):
+        for file in files:
+            if file.endswith('.py'):
+                file_path = os.path.join(root, file)
+                replace_paths_in_file(file_path)
+
+# Specify the directory to process
+directory_to_process = './loop_module/'
+
+process_directory(directory_to_process)

data/keyshortcuts.json

@@ -1 +1 @@
-{"up": 273, "down": 274, "lf": 276, "rt": 275, "topl": 113, "topr": 119, "btl": 97, "btr": 115, "etr": 13, "esc": 27, "map": 109, "cursor": 99, "bag": 9, "me": 98, "wand": 49, "bow": 50, "save": 48}
+{"up": 119, "down": 115, "lf": 97, "rt": 100, "topl": 105, "topr": 107, "btl": 106, "btr": 108, "etr": 32, "esc": 27, "map": 109, "cursor": 99, "bag": 9, "me": 98, "wand": 49, "bow": 50, "save": 48}

equipment/equip.py

@@ -1,3 +1,4 @@
+import os
 #!/usr/bin/env python3
 #-*-coding:utf-8-*-
 
@@ -11,7 +12,7 @@
 class FloorEquipManage:
     def __init__(self, surface):
         self.All = MySprite()
-        self.All.load(r'asset\process1.png', 0, 0, 32, 32, 16)
+        self.All.load(os.path.join("asset", "process1.png"), 0, 0, 32, 32, 16)
         self.level=[[-1 for i in range(42)] for j in range(64)]
         self.pool={}
         self.ptr=None       #传入ptr,需要和人物的背包联系
@@ -27,7 +28,7 @@ def __init__(self, surface):
         self.eq.getInfo()
         self.ect=EnchantItem()
 
-        with open(r'equipment\equipment.json', 'r') as read:       #创建测试时可以生成的武器列表
+        with open(os.path.join("equipment", "equipment.json")) as read:       #创建测试时可以生成的武器列表
             tem=json.load(read)
             self.create=[int(k) for k in tem.keys()]
             self.gnrt_dct={int(k):v[8] for k,v in tem.items()}         #生成一个字典,内容是key为物品ID, value为物品生成等级
@@ -306,7 +307,7 @@ def __init__(self, ID=0, x=0, y=0):
                           12: 'This will blind your eyes, makes it more vulnerable to the dark.'}
 
     def getInfo(self):
-        with open(r'equipment\equipment.json', 'r') as read:
+        with open(os.path.join("equipment", "equipment.json")) as read:
             self.items=json.load(read)
 
     def loadAttri(self, item, prefix=[]):            #从文档中获取对应装备的信息
@@ -401,11 +402,11 @@ def getDesc(self):          #生成对应的描述
     def formName(self):         #生成带词缀的名字
         if not self.name_set and self.lvl<=5:
             self.name_set=True
-            with open(r'data\attributes.json', 'r') as read:
+            with open(os.path.join("data", "attributes.json")) as read:
                 tem=json.load(read)
                 self.name=self.basic_name
                 for i in self.prefix:
-                    self.name=tem[str(i)][0]+' '+self.name
+                    self.name=f'{tem[str(i)][0]} {self.name}'
             self.priceMultiplier(tem)
         else:
             self.price=int(self.price*1.5)
@@ -460,7 +461,7 @@ def __init__(self, ID, x=0, y=0):
         self.attr=[]
 
     def setUpAttri(self):       #附魔时，所有属性对应加上
-        with open(r'data\attributes.json', 'r') as read:
+        with open(os.path.join("data", "attributes.json"), 'r') as read:
             tem=json.load(read)
         for i in self.prefix:
             self.atk+=tem[str(i)][1]
@@ -471,7 +472,7 @@ def setUpAttri(self):       #附魔时，所有属性对应加上
                 self.weight*=2
 
     def deSetAttri(self):           #退魔时，所有属性对照减去
-        with open(r'data\attributes.json', 'r') as read:
+        with open(os.path.join("data", "attributes.json"), 'r') as read:
             tem=json.load(read)
         for i in self.prefix:
             self.atk-=tem[str(i)][1]

equipment/equipment-old.json

@@ -1,3 +1,4 @@
+import os
 #!/usr/bin/env python3
 #-*-coding:utf-8-*-
 
@@ -10,9 +11,9 @@
 class Face:
     def __init__(self, screen):
         path=random.choice([0, 1])
-        if path: self.bk1 = pygame.image.load(r'asset\ethians1.jpg').convert()
-        else: self.bk1=pygame.image.load(r'asset\ethians2.jpg').convert()
-        self.author=pygame.image.load(r'asset\author.png').convert()
+        if path: self.bk1 = pygame.image.load(os.path.join("asset", "ethians1.jpg")).convert()
+        else: self.bk1=pygame.image.load(os.path.join("asset", "ethians2.jpg")).convert()
+        self.author=pygame.image.load(os.path.join("asset", "author.png")).convert()
         self.screen=screen
         self.surface = pygame.Surface((1200, 650))
         self.surface.fill((0, 0, 0))

equipment/equipment.json

@@ -1,3 +1,4 @@
+import os
 #!/usr/bin/env python3
 #-*-coding:utf-8-*-
 
@@ -8,37 +9,37 @@
 class PlayerGui:
     def __init__(self, surface, ptr):
         self.screen=surface
-        self.font1=pygame.font.Font(r'asset\fonts\verdana.ttf', 20)
-        self.font2=pygame.font.Font(r'asset\fonts\verdana.ttf', 15)
+        self.font1=pygame.font.Font(os.path.join("asset", "fonts", "verdana.ttf"), 20)
+        self.font2=pygame.font.Font(os.path.join("asset", "fonts", "verdana.ttf"), 15)
         self.mob=MySprite()
-        self.mob.load(r'asset\mobs.png', 0, 0, 32, 32, 10)
+        self.mob.load(os.path.join("asset", "mobs.png"), 0, 0, 32, 32, 10)
         self.mob_name={}
         """============按钮有关属性============="""
         self.btn=MySprite()
-        self.btn.load(r'asset\buttons_2.png', 0, 0, 96, 50, 1)
+        self.btn.load(os.path.join("asset", "buttons_2.png"), 0, 0, 96, 50, 1)
         self.btn.X, self.btn.Y=1000, 80
         self.button_word=[self.font1.render('Kills', True, (0,0,0)), self.font1.render('Back', True, (0,0,0))]
         self.rect=pygame.Rect((1000, 80, 96, 50))
         #====================================
         self.header=self.font1.render("Statistics for monsters killed", True, (0,0,0))
         self.player=MySprite()
-        self.player.load(r'asset\player.png', 0, 0, 104, 104, 3)
+        self.player.load(os.path.join("asset", "player.png"), 0, 0, 104, 104, 3)
         self.item=MySprite()
-        self.item.load(r'asset\items.png', 0, 0, 64, 64, 6)
+        self.item.load(os.path.join("asset", "items.png"), 0, 0, 64, 64, 6)
         self.bg_slot=[]
         self.equips=MySprite()
-        self.equips.load(r'asset\process.png', 0, 0, 64, 64, 16)
-        d=pygame.image.load(r'asset\warrior.png').convert()
+        self.equips.load(os.path.join("asset", "process.png"), 0, 0, 64, 64, 16)
+        d=pygame.image.load(os.path.join("asset", "warrior.png")).convert()
         self.bg_slot.append(d)
-        d=pygame.image.load(r'asset\ranger.png').convert()
+        d=pygame.image.load(os.path.join("asset", "ranger.png")).convert()
         self.bg_slot.append(d)
-        d=pygame.image.load(r'asset\wizard.png').convert()
+        d=pygame.image.load(os.path.join("asset", "wizard.png")).convert()
         self.bg_slot.append(d)
         self.ptr=ptr
         self.player_num=self.ptr.career_getter()
-        with open(r'data/eng_person_des.txt', 'r') as read:
+        with open(os.path.join("data", "eng_person_des.txt")) as read:
            total=json.load(read)
-        with open(r'data/mob_dir.json','r') as read:
+        with open(os.path.join("data", "mob_dir.json")) as read:
             dct=json.load(read)
             for v in dct.values():
                 self.mob_name[v[7]]=v[8]
@@ -50,7 +51,7 @@ def __init__(self, surface, ptr):
         self.texts=[]
         self.mode=0     #绘制界面模式标值（0是玩家信息，1是统计信息）
         self.killDict={}            #杀死怪物统计
-        self.str_dict={'Left':(708, 320), 'Right':(456, 320), 'Head':(540, 236), 'Armor':(540, 320), 'Leg':(540, 404), 'Necklace':(456, 236),
+        self.str_dict={'Left':(708, 320), 'Right':(456, 320), 'Head':(540, 236), 'Armoos.path.join(":(540, 320), ")Leg':(540, 404), 'Necklace':(456, 236),
                         'Ring':(456, 404), 'Feet':(624, 404), 'Wand':(708, 404), 'Cape':(624, 320), 'Amulet':(624, 236), 'Dual':0, 'Book':(708, 236)}
 
     def getInfo(self):      #获取信息

loop_module/Startup.py

@@ -1,3 +1,4 @@
+import os
 #-*-coding:utf-8-*-
 import pygame
 from src.ezplot import MySprite
@@ -6,15 +7,15 @@ class Monument:
     def __init__(self, surface):
         self.screen=surface
         self.stone=MySprite()
-        self.stone.load(r'asset\stones.png', 0, 0, 600, 650, 2)
+        self.stone.load(os.path.join("asset", "stones.png"), 0, 0, 600, 650, 2)
         self.inf, self.svt, self.hq=None, None, None
         self.mode=0         #0表示墓碑，1表示黄金纪念碑
         self.stone.X, self.stone.Y = 300, 0
         self.deaths=None
         self.heroes=None
         self.loopRecord=1
-        self.font=pygame.font.Font(r'asset\fonts\verdana.ttf', 13)
-        self.font2=pygame.font.Font(r'asset\fonts\verdana.ttf', 18)
+        self.font=pygame.font.Font(os.path.join("asset", "fonts", "verdana.ttf"), 13)
+        self.font2=pygame.font.Font(os.path.join("asset", "fonts", "verdana.ttf"), 18)
         self.text=[]
         self.text_len=0     #text surface列表的长度
         self.deathMap={(4, 7+3*i):i for i in range(11)}         #死亡信息保存点

loop_module/loop10.py

@@ -45,8 +45,8 @@
 pygame.display.set_caption('Ethians Alpha 1.0.0')
 path=os.path.join('asset', 'fonts', 'verdana.ttf')
 font=pygame.font.Font(path, 24)
-back=pygame.image.load(r'asset\back.png').convert_alpha()      #这是图形遮盖框
-map_back=pygame.image.load(r'asset\map_back.png').convert_alpha()      #地图编辑器特有图形覆盖框
+back=pygame.image.load(os.path.join('asset', 'back.png')).convert_alpha()      #这是图形遮盖框
+map_back=pygame.image.load(os.path.join('asset', 'map_back.png')).convert_alpha()      #地图编辑器特有图形覆盖框
 framerate = pygame.time.Clock()         #游戏内时钟
 ks=keySets(screen, hq.set_loop)          #按键设置模块
 ks.loadPreference()         #载入用户按键偏好设置
@@ -295,10 +295,10 @@ def loop8_quit():
                     cps.judge=False
                     qt.loopNum=1
                     hq.set_loop(6)
-                elif event.key==K_SPACE:    #开发者选项：SPACE键以重新绘制地图
-                    dg.create_map()
-                    pl.reset_pos()
-                    ms.reset_mist()
+                # elif event.key==K_SPACE:    #开发者选项：SPACE键以重新绘制地图
+                #     dg.create_map()
+                #     pl.reset_pos()
+                #     ms.reset_mist()
                 elif event.key==ks.keyPads['up']:
                     #pl.key_up([dg, dg.sur, npc, po])
                     pl.move(0, -1)

loop_module/loop11.py

@@ -57,19 +57,19 @@ def player_hit(self, hits=0, tag=1):            #tag是个辅助参数，以免
 class Infoimage:
     def __init__(self, surface):            #绘制怪物信息概览的小玩意
         self.screen=surface
-        self.mob_rect=pygame.image.load(r'asset\mob_back.png').convert()
+        self.mob_rect=pygame.image.load(os.path.join("asset", "mob_back.png")).convert()
         self.hp_rect=None
         self.hp_slot=MySprite()
-        self.hp_slot.load(r'asset\hp_slot.png', 0, 0, 72, 500, 3)
-        self.exp_slot=pygame.image.load(r'asset\exp_slot.png').convert_alpha()
+        self.hp_slot.load(os.path.join("asset", "hp_slot.png"), 0, 0, 72, 500, 3)
+        self.exp_slot=pygame.image.load(os.path.join("asset", "exp_slot.png")).convert_alpha()
         self.item=MySprite()
-        self.item.load(r'asset\process1.png', 0, 0, 32, 32, 16)
+        self.item.load(os.path.join("asset", "process1.png"), 0, 0, 32, 32, 16)
         self.item_detail=MySprite()
-        self.item_detail.load(r'equipment\process.png', 0, 0, 128, 128, 16)
+        self.item_detail.load(os.path.join("equipment", "process.png"), 0, 0, 128, 128, 16)
         self.mob_detail=MySprite()
-        self.mob_detail.load(r'asset\mob_demo.png', 0, 0, 128, 128, 10)
+        self.mob_detail.load(os.path.join("asset", "mob_demo.png"), 0, 0, 128, 128, 10)
         self.stats=MySprite()        #状态显示
-        self.stats.load(r'asset\stat.png', 0, 0, 48, 48, 6)
+        self.stats.load(os.path.join("asset", "stat.png"), 0, 0, 48, 48, 6)
         self.ptr=None
         self.po, self.inf=None, None
         self.origin_hp=0
@@ -218,85 +218,49 @@ def getDetail(self, item):
                 if item.enchant_lvl==6: text=self.bigf.render(t, True, (148,0,211))        #relic需要紫色的名字
                 else: text=self.bigf.render(t, True, (0,0,0))
             else: text=self.bigf.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t=item.describe
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Attack: '+str(item.atk)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Defence: '+str(item.defc)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Magic: '+str(item.magic)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Speed: '+str(item.speed)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Weight: '+str(item.weight)+'   Price: '+str(item.price)+' g'
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            lvl=item.lvl
-            if lvl != -1:
-                t='Level: '+str(lvl)
-            else:
-                t='Level: NaN'
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Generating Level: '+str(item.gnrt_lvl)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
+            self.texts.extend([
+                text,
+                self.font3.render(item.describe, True, (0,0,0)),
+                self.font3.render(f'Attack: {item.atk}', True, (0,0,0)),
+                self.font3.render(f'Defence: {item.defc}', True, (0,0,0)),
+                self.font3.render(f'Magic: {item.magic}', True, (0,0,0)),
+                self.font3.render(f'Speed: {item.speed}', True, (0,0,0)),
+                self.font3.render(f'Weight: {item.weight}   Price: {item.price} g', True, (0,0,0)),
+                self.font3.render(f'Level: {item.lvl if item.lvl != -1 else "NaN"}', True, (0,0,0)),
+                self.font3.render(f'Generating Level: {item.gnrt_lvl}', True, (0,0,0))
+            ])
             if item.energy:
-                t='Energy: '+str(item.energy)+'    Number of amount: '+str(item.count)
+                t=f'Energy: {item.energy}    Number of amount: {item.count}'
             else:
-                t='Item has no Energy /Number of amount: '+str(item.count)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
+                t=f'Item has no Energy /Number of amount: {item.count}'
+            self.texts.append(self.font3.render(t, True, (0,0,0)))
             for i in item.form_desc[:-1-item.form_desc[-1]]:      #准备普通装备描述
-                text=self.font3.render(i, True, (0,0,0))
-                self.texts.append(text)
+                self.texts.append(self.font3.render(i, True, (0,0,0)))
             for i in item.form_desc[-item.form_desc[-1] - 1:-1]:  # 准备lv6装备的攻击属性描述
-                text = self.font2.render(i, True, (148, 0, 211))
-                self.texts.append(text)
+                self.texts.append(self.font2.render(i, True, (148, 0, 211)))
             self.texts.append(item.form_desc[-1])
         else:
             ID=item.ID
             img=self.mob_detail.getImage(ID)
             self.texts.append(img)
-            t=item.name
-            text=self.bigf.render(t, True, (0,0,0))
-            self.texts.append(text)
-            with open(r'data\mob_desc.json', 'r') as read:
+            self.texts.append(self.bigf.render(item.name, True, (0,0,0)))
+            with open(os.path.join("data", "mob_desc.json"), 'r') as read:
                 desc=json.load(read)[str(ID)]
             for i in desc:
-                text=self.font3.render(i, True, (0,0,0))
-                self.texts.append(text)
-            t='HP: %2d/%2d'%(item.hp, item.origin_hp)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Attack: '+str(item.attack)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Defence: '+str(item.defence)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Magic: '+str(item.magic)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            t='Speed: '+str(item.speed)
-            text=self.font3.render(t, True, (0,0,0))
-            self.texts.append(text)
-            self.texts+=self.mobDetail(item)
+                self.texts.append(self.font3.render(i, True, (0,0,0)))
+            self.texts.extend([
+                self.font3.render(f'HP: {item.hp:2d}/{item.origin_hp:2d}', True, (0,0,0)),
+                self.font3.render(f'Attack: {item.attack}', True, (0,0,0)),
+                self.font3.render(f'Defence: {item.defence}', True, (0,0,0)),
+                self.font3.render(f'Magic: {item.magic}', True, (0,0,0)),
+                self.font3.render(f'Speed: {item.speed}', True, (0,0,0))
+            ])
+            self.texts.extend(self.mobDetail(item))
 
     def mobDetail(self, mob):
         extra=[]
-        if mob.servant:
-            t = "Friendly"
-            text = self.bigf.render(t, True, (0, 100, 0))
-        else:
-            t="Hostile"
-            text = self.bigf.render(t, True, (100, 0, 0))
+        text = self.bigf.render("Friendly", True, (0, 100, 0)) if mob.servant else \
+                self.bigf.render("Hostile", True, (100, 0, 0))
         extra.append(text)
         text = self.font3.render(self.mobIntel[mob.intelligent], True, (0, 0, 0))       #获取怪物能力信息
         extra.append(text)