Final update.

Author: Enigmatisms

data/playerData.pkl

@@ -13,7 +13,7 @@ class FloorEquipManage:
     def __init__(self, surface):
         self.All = MySprite()
         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.level=np.full((64, 42), -1, dtype = int)
         self.pool={}
         self.ptr=None       #传入ptr,需要和人物的背包联系
         self.dg=None
@@ -34,14 +34,14 @@ def __init__(self, surface):
             self.gnrt_dct={int(k):v[8] for k,v in tem.items()}         #生成一个字典,内容是key为物品ID, value为物品生成等级
 
     def reset(self):
-        self.level=[[-1 for i in range(42)] for j in range(64)]
+        self.level=np.full((64, 42), -1, dtype = int)
         self.pool = {}
 
     def setChar(self, x, y, val):
-        self.level[x][y]=val
+        self.level[x, y]=val
 
     def getChar(self, x, y):
-        return self.level[x][y]
+        return self.level[x, y]
 
     def getEquip(self, x, y):           #self.pool建立的是掉落在地上的武器的位置（key）与武器类实例（value）的映射
         judge=self.getChar(x, y)
@@ -143,7 +143,7 @@ def setRandomItems(self, n, tag=False):            #创建随机的装备
             self.setChar(x, y, eq.ID)
 
     def floorReset(self):
-        self.level=[[-1 for i in range(42)] for j in range(64)]
+        self.level=np.full((64, 42), -1, dtype = int)
         self.pool={}
 
     def canPlace(self, x, y):

equipment/equip.py

@@ -411,6 +411,7 @@ def loop8_quit():
                         gui.drawBigButton(400, 80, 54, 8, 8, gui.item_list)
                     else:
                         gui.drawBigButton(100, 140, 54, 16, 8, gui.item_list)
+                    gui.draw_gold(100, 572, pl.ptr.getMoney())
                     gui.drawPic()
                     gui.drawInfo()
                     gui.pageDisplay(880, 520)

main.py

@@ -131,7 +131,7 @@ def getChar(target, x, y, tag):
 
     @staticmethod
     def setChar(target, x, y, value):
-        target.level[x][y]=value
+        target.level[x, y]=value
 
     def show_info(self, x, y):
         #把information展示在屏幕的(x,y)点处

src/cursors.py

@@ -192,6 +192,11 @@ def drawBigButton(self, x, y, gap, n, col, val_lst):     #val_lst接受每个栏
             self.item.update(0)
             self.item.draw(self.screen)
 
+    def draw_gold(self, x, y, current_gold):
+        self.font.set_bold(True)
+        self.screen.blit(self.font.render(f"You have: {current_gold} g", True, (0, 0, 0)), (x, y))
+        self.font.set_bold(False)
+
     def drawSmallButton(self, tag=4, tag2=False):
         if not tag:         #传入的tag参数，在loop3中为self.current_npc
             if tag2:        #tag2是detail_judge

src/ezgui_m.py

@@ -140,7 +140,7 @@ def load_level(self, n=None):           #从DIY地图中取出数据加载~！
                     self.sur.reset()
                     self.npc.reset()
                     self.level = np.array(tem[n][0], dtype = int)
-                    self.sur.level = tem[n][1]
+                    self.sur.level = np.array(tem[n][1], dtype = int)
                     self.level_num = -1
                     return
                 print('You have %s map in storage.'%len(tem))
@@ -155,7 +155,7 @@ def load_level(self, n=None):           #从DIY地图中取出数据加载~！
                         self.sur.reset()
                         self.npc.reset()
                         self.level = np.array(tem[ num-1 ][ 0 ], dtype = int)
-                        self.sur.level=tem[ num-1 ][1]
+                        self.sur.level= np.array(tem[ num-1 ][1], dtype = int)
                         self.level_num=-1
             else:
                 print('You have no map to test! Go and create one!')
@@ -174,7 +174,7 @@ def load_diy(self, lvl=0):
             if num>0:
                 self.sur.reset()
                 self.level = np.array(tem[num][0], dtype = int)
-                self.sur.level = tem[num][1]
+                self.sur.level = np.array(tem[num][1], dtype = int)
                 self.stairs(1) if lvl else self.stairs()
                 if num == 9:
                     self.sur.treasure_box(11, 14)  # 重门迷宫需要更多宝箱

src/house_room.py

@@ -120,16 +120,25 @@ def getSurface(self):
         length=len(self.textList)
         self.textMod = min(length, self.textMod)
         if self.textMod:
-            for i in range(length-self.textMod, length):
+            for i in range(length-self.textMod, length - 1):
                 tem=self.font.render(self.textList[i], True, (0,0,0))
-                self.drawList.append(tem)
+                self.drawList.append([tem, self.textList[i], False])
+            self.font.set_bold(True)
+            self.drawList.append([self.font.render(self.textList[-1], True, (0,0,0)), self.textList[-1], True])
+            self.font.set_bold(False)
             self.textMod=0
 
     #打印信息
     def drawText(self, x, y):
         length=len(self.drawList)
-        for i in range(length):
-            self.screen.blit(self.drawList[i], (x, y-26*(length-i-1)))
+        for i in range(length - 1):
+            if self.drawList[i][2]:
+                image = self.font.render(self.drawList[i][1], True, (0,0,0))
+                self.drawList[i][0] = image
+                self.drawList[i][2] = False
+            self.screen.blit(self.drawList[i][0], (x, y-26*(length-i-1)))
+        if self.drawList:
+            self.screen.blit(self.drawList[-1][0], (x, y))
 
     def deathCause(self, tag, name='the Curse of Enigma'):
         if tag=='poison': self.death='The toxic substances in your body cost your life.'

src/info.py

@@ -294,7 +294,7 @@ def tagEffect(self):            #怪物特殊攻击效果
                     self.inf.prefabTell('blind')
                     if not self.ptr.blind:          #没瞎才能让玩家瞎
                         self.ptr.blind=True     #失明判断（防止重复减小玩家视野）
-                        self.ptr.LR-=1
+                        self.ptr.LR-=4
                 elif tag==4:
                     self.ptr.setStat(2, 4-self.ptr.fireR)             #燃烧
                     if 4 - self.ptr.fireR: self.inf.prefabTell('fire')

src/monster.py

@@ -20,7 +20,7 @@ def __init__(self):
         self.__score=0
         self.__career=-1
         self.__task=None
-        self.LR=4       #光照范围
+        self.LR=6       #光照范围
         self.blind=False
         self.frozen=False
         self.bleeding = False
@@ -52,13 +52,14 @@ def putInBag(self, stuff):      #背包里直接储存类的实例！
             self.carring_adder(stuff.weight)
             for k in self.__bag:
                 if stuff.name==k.name and stuff.tag!='Arrow':
-                    k.count+=stuff.count
-                    return True
+                    k.count += stuff.count
+                    break
                 elif stuff.name==k.name and stuff.tag=='Arrow':       #弓箭在数量上不堆叠，能量堆叠
-                    k.energy+=stuff.energy
-                    return True
+                    k.energy += stuff.energy
+                    break
+            else:
+                self.__bag.append(stuff)        #背包里没有就添加
             self.inf.prefabTell('pickup', back=self.inf.measure(stuff.count, stuff.tag, stuff.name))
-            self.__bag.append(stuff)        #背包里没有就添加
             return True
         else:
             self.inf.prefabTell('ovrw')
@@ -360,6 +361,7 @@ def career_setup(self, career):
             self.weight_setter(39)
             self.lv_adder()
             self.__career_setter(2)
+            self.LR+=1
             self.eqf.bagSetUp(2, self.__bag)
         elif career == 1:       #游侠！
             self.hp_setter(18)
@@ -371,7 +373,7 @@ def career_setup(self, career):
             self.weight_setter(41)
             self.lv_adder()
             self.__career_setter(1)
-            self.LR+=1
+            self.LR+=2
             self.eqf.bagSetUp(1, self.__bag)
         else:
             raise ValueError('Career number out of range(3).')
@@ -562,7 +564,7 @@ def stat3(self):            #失明效果(不致死)
             self.__stat[3]-=1
         elif self.__stat[3]==1:
             self.__stat[3] -= 1
-            self.LR+=1
+            self.LR += 4
             self.blind=False
         return 0
 
@@ -694,7 +696,7 @@ def reset(self):       #重置
         self.__score = 0
         self.__career = -1
         self.__task = None
-        self.LR = 4  # 光照范围
+        self.LR = 6  # 光照范围
         self.blind = False
         self.frozen = False
         self.bleeding = False