From 56627f3e845bf0663ddf89881f096324b6953bd2 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 9 Dec 2020 16:50:47 +0100
Subject: [PATCH] Reorder texture pack entries

---
 squirrelbattle/display/texturepack.py | 63 ++++++++++++++++-----------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/squirrelbattle/display/texturepack.py b/squirrelbattle/display/texturepack.py
index 55966fc..880f9c4 100644
--- a/squirrelbattle/display/texturepack.py
+++ b/squirrelbattle/display/texturepack.py
@@ -14,10 +14,21 @@ class TexturePack:
     tile_bg_color: int
     entity_fg_color: int
     entity_bg_color: int
+
+    BODY_SNATCH_POTION: str
+    BOMB: str
+    HEART: str
+    HEDGEHOG: str
     EMPTY: str
-    WALL: str
     FLOOR: str
+    MERCHANT: str
     PLAYER: str
+    RABBIT: str
+    SUNFLOWER: str
+    SWORD: str
+    TEDDY_BEAR: str
+    TIGER: str
+    WALL: str
 
     ASCII_PACK: "TexturePack"
     SQUIRREL_PACK: "TexturePack"
@@ -46,20 +57,21 @@ TexturePack.ASCII_PACK = TexturePack(
     tile_bg_color=curses.COLOR_BLACK,
     entity_fg_color=curses.COLOR_WHITE,
     entity_bg_color=curses.COLOR_BLACK,
-    EMPTY=' ',
-    WALL='#',
-    FLOOR='.',
-    PLAYER='@',
-    HEDGEHOG='*',
-    HEART='❤',
-    BOMB='o',
-    RABBIT='Y',
-    TIGER='n',
-    TEDDY_BEAR='8',
-    MERCHANT='M',
-    SUNFLOWER='I',
+
     BODY_SNATCH_POTION='S',
+    BOMB='o',
+    EMPTY=' ',
+    FLOOR='.',
+    HEART='❤',
+    HEDGEHOG='*',
+    MERCHANT='M',
+    PLAYER='@',
+    RABBIT='Y',
+    SUNFLOWER='I',
     SWORD='\u2020',
+    TEDDY_BEAR='8',
+    TIGER='n',
+    WALL='#',
 )
 
 TexturePack.SQUIRREL_PACK = TexturePack(
@@ -69,18 +81,19 @@ TexturePack.SQUIRREL_PACK = TexturePack(
     tile_bg_color=curses.COLOR_BLACK,
     entity_fg_color=curses.COLOR_WHITE,
     entity_bg_color=curses.COLOR_WHITE,
-    EMPTY='  ',
-    WALL='🧱',
-    FLOOR='██',
-    PLAYER='🐿️ ️',
-    HEDGEHOG='🦔',
-    HEART='💜',
-    BOMB='💣',
-    RABBIT='🐇',
-    TIGER='🐅',
-    TEDDY_BEAR='🧸',
-    MERCHANT='🦜',
-    SUNFLOWER='🌻',
+
     BODY_SNATCH_POTION='🔀',
+    BOMB='💣',
+    EMPTY='  ',
+    FLOOR='██',
+    HEART='💜',
+    HEDGEHOG='🦔',
+    PLAYER='🐿️ ️',
+    MERCHANT='🦜',
+    RABBIT='🐇',
+    SUNFLOWER='🌻',
     SWORD='🗡️',
+    TEDDY_BEAR='🧸',
+    TIGER='🐅',
+    WALL='🧱',
 )