item displaying

diff --git a/molpyup.py b/molpyup.py
index 6b49120e80483df0cec75461c9e6d47ecc830c18..dc38b81440930103c7e8ded2e14d6ca2a7020d91 100644 (file)
--- a/molpyup.py
+++ b/molpyup.py
@@ -257,6 +257,16 @@ class MolpyUp:
             self.imgPlatformWonTheGame,
             self.imgPlatformFrame1
         ]
             self.imgPlatformWonTheGame,
             self.imgPlatformFrame1
         ]

+        self.imgItem = [
+            [self.imgAccelerator, self.imgAcceleratorUsed],
+            [self.imgBeanie, None],
+            [self.imgSnake, self.imgSnakeRight, self.imgSnakeLeft],
+            [self.imgPrickly, self.imgPricklyCurled],
+            self.imgSandcastle,
+            [self.imgFlagRight, None],
+            self.imgPlantSand,
+            self.imgPlantGrass
+        ]

         self.dropLimit = 25
         if self.dropLimit >= self.platformHeight[self.platformTypeSand] + self.playerHeight:
             self.dropLimit = self.platformHeight[self.platformTypeSand] + self.playerHeight - 1
         self.dropLimit = 25
         if self.dropLimit >= self.platformHeight[self.platformTypeSand] + self.playerHeight:
             self.dropLimit = self.platformHeight[self.platformTypeSand] + self.playerHeight - 1


@@ -852,41 +862,14 @@ class MolpyUp:
             while self.items and self.items[0][1] - self.cameray > self.sy + self.sy // 12:
                 self.items.pop(0)
         for item in self.items:
             while self.items and self.items[0][1] - self.cameray > self.sy + self.sy // 12:
                 self.items.pop(0)
         for item in self.items:

-            if item[2] == self.itemTypeAccelerator:
-                if item[-1]:
-                    imgItem = self.imgAcceleratorUsed
-                else:
-                    imgItem = self.imgAccelerator
-            elif item[2] == self.itemTypeBeanie:
-                if not item[-1]:
-                    imgItem = self.imgBeanie
-                else:
-                    imgItem = None
-            elif item[2] == self.itemTypeSnake:
-                if item[-1] == -1:
-                    imgItem = self.imgSnakeLeft
-                elif item[-1] == 1:
-                    imgItem = self.imgSnakeRight
-                else:
-                    imgItem = self.imgSnake
-            elif item[2] == self.itemTypePrickly:
-                if not item[-1]:
-                    imgItem = self.imgPrickly
-                else:
-                    imgItem = self.imgPricklyCurled
-            elif item[2] == self.itemTypeSandcastle:
-                imgItem = self.imgSandcastle
-                if item[-1]:
+            if item[2] in (self.itemTypePlantSand, self.itemTypePlantGrass, self.itemTypeSnake):
+                imgItem = self.imgItem[item[2]][item[-1]]
+            elif item[2] in (self.itemTypeAccelerator, self.itemTypeBeanie, self.itemTypePrickly, self.itemTypeFlag):
+                imgItem = self.imgItem[item[2]][1 if item[-1] else 0]
+            else:
+                imgItem = self.imgItem[item[2]]
+                if (item[2] == self.itemTypeSandcastle) and item[-1]:

                     self.screen.blit(self.imgFlagRight, (item[0] + 4, item[1] - imgItem.get_height() + 2 - self.imgFlagRight.get_height() - self.cameray))
                     self.screen.blit(self.imgFlagRight, (item[0] + 4, item[1] - imgItem.get_height() + 2 - self.imgFlagRight.get_height() - self.cameray))

-            elif item[2] == self.itemTypeFlag:
-                if not item[-1]:
-                    imgItem = self.imgFlagRight
-                else:
-                    imgItem = None
-            elif item[2] == self.itemTypePlantSand:
-                imgItem = self.imgPlantSand[item[-1]]
-            elif item[2] == self.itemTypePlantGrass:
-                imgItem = self.imgPlantGrass[item[-1]]

             if imgItem:
                 self.screen.blit(imgItem, (item[0], item[1] - imgItem.get_height() - self.cameray))
             if not item[-1]:
             if imgItem:
                 self.screen.blit(imgItem, (item[0], item[1] - imgItem.get_height() - self.cameray))
             if not item[-1]: