From 10f1fd8989263efe65f554db3a0b9442c3fd6e77 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sat, 6 Jun 2020 18:17:46 +0200
Subject: [PATCH] Rename wall types

---
 lihzahrd/tiles/walltype.py | 171 +++++++++++++++++++------------------
 1 file changed, 87 insertions(+), 84 deletions(-)

diff --git a/lihzahrd/tiles/walltype.py b/lihzahrd/tiles/walltype.py
index 99cbca4..9cc63d2 100644
--- a/lihzahrd/tiles/walltype.py
+++ b/lihzahrd/tiles/walltype.py
@@ -237,91 +237,94 @@ class WallType(enum.IntEnum):
     SILLY_BALLOON_GREEN_WALL = 230
 
     # 1.4, adapted from: https://github.com/TerraMap/windows/blob/master/Data/tiles.xml
-    IRONBRICK = 231
-    LEADBRICK = 232
-    LESIONBLOCK = 233
-    CRIMSTONEBRICK = 234
-    SMOOTHSANDSTONE = 235
+    # Ecto blocks are craftable versions of the natural walls which can be crafted in graveyards
+    # https://terraria.gamepedia.com/1.4.0.1
+
+    IRON_BRICK = 231
+    LEAD_BRICK = 232
+    LESION_BLOCK = 233
+    CRIMSTONE_BRICK = 234
+    SMOOTH_SANDSTONE = 235
     SPIDER = 236
-    SOLARBRICK = 237
-    VORTEXBRICK = 238
-    NEBULABRICK = 239
-    STARDUSTBRICK = 240
-    ORANGESTAINEDGLASS = 241
-    GOLDSTARRYGLASSWALL = 242
-    BLUESTARRYGLASSWALL = 243
-    LIVINGWOODUNSAFE = 244
-    WROUGHTIRONFENCE = 245
-    EBONSTONEECHO = 246
-    MUDWALLECHO = 247
-    PEARLSTONEECHO = 248
-    SNOWWALLECHO = 249
-    AMETHYSTECHO = 250
-    TOPAZECHO = 251
-    SAPPHIREECHO = 252
-    EMERALDECHO = 253
-    RUBYECHO = 254
-    DIAMONDECHO = 255
-    CAVE1ECHO = 256
-    CAVE2ECHO = 257
-    CAVE3ECHO = 258
-    CAVE4ECHO = 259
-    CAVE5ECHO = 260
-    CAVE6ECHO = 261
-    CAVE7ECHO = 262
-    SPIDERECHO = 263
-    CORRUPTGRASSECHO = 264
-    HALLOWEDGRASSECHO = 265
-    ICEECHO = 266
-    OBSIDIANBACKECHO = 267
-    CRIMSONGRASSECHO = 268
-    CRIMSTONEECHO = 269
-    CAVEWALL1ECHO = 270
-    CAVEWALL2ECHO = 271
-    MARBLEECHOUNUSED = 272
-    GRANITEECHOUNUSED = 273
-    CAVE8ECHO = 274
-    SANDSTONEECHO = 275
-    CORRUPTION1ECHO = 276
-    CORRUPTION2ECHO = 277
-    CORRUPTION3ECHO = 278
-    CORRUPTION4ECHO = 279
-    CRIMSON1ECHO = 280
-    CRIMSON2ECHO = 281
-    CRIMSON3ECHO = 282
-    CRIMSON4ECHO = 283
-    DIRT1ECHO = 284
-    DIRT2ECHO = 285
-    DIRT3ECHO = 286
-    DIRT4ECHO = 287
-    HALLOW1ECHO = 288
-    HALLOW2ECHO = 289
-    HALLOW3ECHO = 290
-    HALLOW4ECHO = 291
-    JUNGLE1ECHO = 292
-    JUNGLE2ECHO = 293
-    JUNGLE3ECHO = 294
-    JUNGLE4ECHO = 295
-    LAVA1ECHO = 296
-    LAVA2ECHO = 297
-    LAVA3ECHO = 298
-    LAVA4ECHO = 299
-    ROCKS1ECHO = 300
-    ROCKS2ECHO = 301
-    ROCKS3ECHO = 302
-    ROCKS4ECHO = 303
-    HARDENEDSANDECHO = 304
-    CORRUPTHARDENEDSANDECHO = 305
-    CRIMSONHARDENEDSANDECHO = 306
-    HALLOWHARDENEDSANDECHO = 307
-    CORRUPTSANDSTONEECHO = 308
-    CRIMSONSANDSTONEECHO = 309
-    HALLOWSANDSTONEECHO = 310
-    DESERTFOSSILECHO = 311
-    BAMBOOBLOCKWALL = 312
-    LARGEBAMBOOBLOCKWALL = 313
-    AMBERSTONEWALLECHO = 314
-    BAMBOOFENCE = 315
+    SOLAR_BRICK = 237
+    VORTEX_BRICK = 238
+    NEBULA_BRICK = 239
+    STARDUST_BRICK = 240
+    ORANGE_STAINED_GLASS = 241
+    GOLD_STARRY_GLASS_WALL = 242
+    BLUE_STARRY_GLASS_WALL = 243
+    LIVING_WOOD_UNSAFE = 244
+    WROUGHT_IRON_FENCE = 245
+    ECTO_EBONSTONE = 246
+    ECTO_MUDWALL = 247
+    ECTO_PEARLSTONE = 248
+    ECTO_SNOWWALL = 249
+    ECTO_AMETHYST = 250
+    ECTO_TOPAZ = 251
+    ECTO_SAPPHIRE = 252
+    ECTO_EMERALD = 253
+    ECTO_RUBY = 254
+    ECTO_DIAMOND = 255
+    ECTO_CAVE1 = 256
+    ECTO_CAVE2 = 257
+    ECTO_CAVE3 = 258
+    ECTO_CAVE4 = 259
+    ECTO_CAVE5 = 260
+    ECTO_CAVE6 = 261
+    ECTO_CAVE7 = 262
+    ECTO_SPIDER = 263
+    ECTO_CORRUPT_GRASS = 264
+    ECTO_HALLOWED_GRASS = 265
+    ECTO_ICE = 266
+    ECTO_OBSIDIAN_BACK = 267
+    ECTO_CRIMSON_GRASS = 268
+    ECTO_CRIMSTONE = 269
+    ECTO_CAVEWALL1 = 270
+    ECTO_CAVEWALL2 = 271
+    ECTO_MARBLE_UNUSED = 272
+    ECTO_GRANITE_UNUSED = 273
+    ECTO_CAVE8 = 274
+    ECTO_SANDSTONE = 275
+    ECTO_CORRUPTION1 = 276
+    ECTO_CORRUPTION2 = 277
+    ECTO_CORRUPTION3 = 278
+    ECTO_CORRUPTION4 = 279
+    ECTO_CRIMSON1 = 280
+    ECTO_CRIMSON2 = 281
+    ECTO_CRIMSON3 = 282
+    ECTO_CRIMSON4 = 283
+    ECTO_DIRT1 = 284
+    ECTO_DIRT2 = 285
+    ECTO_DIRT3 = 286
+    ECTO_DIRT4 = 287
+    ECTO_HALLOW1 = 288
+    ECTO_HALLOW2 = 289
+    ECTO_HALLOW3 = 290
+    ECTO_HALLOW4 = 291
+    ECTO_JUNGLE1 = 292
+    ECTO_JUNGLE2 = 293
+    ECTO_JUNGLE3 = 294
+    ECTO_JUNGLE4 = 295
+    ECTO_LAVA1 = 296
+    ECTO_LAVA2 = 297
+    ECTO_LAVA3 = 298
+    ECTO_LAVA4 = 299
+    ECTO_ROCKS1 = 300
+    ECTO_ROCKS2 = 301
+    ECTO_ROCKS3 = 302
+    ECTO_ROCKS4 = 303
+    ECTO_HARDENED_SAND = 304
+    ECTO_CORRUPT_HARDENED_SAND = 305
+    ECTO_CRIMSON_HARDENED_SAND = 306
+    ECTO_HALLOW_HARDENED_SAND = 307
+    ECTO_CORRUPT_SANDSTONE = 308
+    ECTO_CRIMSON_SANDSTONE = 309
+    ECTO_HALLOW_SANDSTONE = 310
+    ECTO_DESERT_FOSSIL = 311
+    BAMBOO_BLOCK_WALL = 312
+    LARGE_BAMBOO_BLOCK_WALL = 313
+    ECTO_AMBER_STONE_WALL = 314
+    BAMBOO_FENCE = 315
 
     def __repr__(self):
         return f"{self.__class__.__name__}.{self.name}"