From c8c10119c0816c33c40905b8f04fe3b321003f97 Mon Sep 17 00:00:00 2001 From: rainlizard <15337628+rainlizard@users.noreply.github.com> Date: Wed, 5 Jun 2024 19:16:11 +1000 Subject: [PATCH] comments --- Autoload/Slabs.gd | 6 +++--- Scenes/SlabPalette.gd | 2 +- Scenes/SlabPlacement.gd | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Autoload/Slabs.gd b/Autoload/Slabs.gd index 35ee42ac..50735b30 100644 --- a/Autoload/Slabs.gd +++ b/Autoload/Slabs.gd @@ -34,7 +34,7 @@ var auto_wall_updates_these = { WALL_WITH_TWINS:null, WALL_WITH_WOMAN:null, WALL_WITH_PAIR:null, - WALL_DAMAGED:null, + WALL_UNDECORATED:null, } enum { @@ -47,7 +47,7 @@ enum { WALL_WITH_TWINS = 6, WALL_WITH_WOMAN = 7, WALL_WITH_PAIR = 8, - WALL_DAMAGED = 9, + WALL_UNDECORATED = 9, PATH = 10, CLAIMED_GROUND = 11, LAVA = 12, @@ -323,7 +323,7 @@ WALL_WITH_BANNER, WALL_WITH_TWINS, WALL_WITH_WOMAN, WALL_WITH_PAIR, -WALL_DAMAGED, +WALL_UNDECORATED, TREASURE_ROOM_WALL, LAIR_WALL, HATCHERY_WALL, diff --git a/Scenes/SlabPalette.gd b/Scenes/SlabPalette.gd index d05b3f6c..da38d2f8 100644 --- a/Scenes/SlabPalette.gd +++ b/Scenes/SlabPalette.gd @@ -389,7 +389,7 @@ extends Node # Slabset.dat[slabVariation + dir.ne][1] = fixUsingColumn #func edit_damaged_wall(): -# var slabVariation = 28 * Slabs.WALL_DAMAGED +# var slabVariation = 28 * Slabs.WALL_UNDECORATED # # var dmgWall1 = oDataClm.index_entry([25,82,123,120,77,0,0,0], 27) # var dmgWall2 = oDataClm.index_entry([25,82,124,121,77,0,0,0], 27) diff --git a/Scenes/SlabPlacement.gd b/Scenes/SlabPlacement.gd index ebda2c5d..aff42334 100644 --- a/Scenes/SlabPlacement.gd +++ b/Scenes/SlabPlacement.gd @@ -478,12 +478,12 @@ func set_torch_side(xSlab, ySlab, slabID, slabsetIndexGroup, constructedColumns, var torchSubtileToKeep = torchSubtileToKeepMap[torchDirection] #Slabs.WALL_WITH_TORCH = 5 - #Slabs.WALL_DAMAGED = 9 + #Slabs.WALL_UNDECORATED = 9 #Slabs.EARTH_WITH_TORCH = 3 #Slabs.EARTH = 2 var IdDiff if slabID == Slabs.WALL_WITH_TORCH: - IdDiff = Slabs.WALL_WITH_TORCH - Slabs.WALL_DAMAGED + IdDiff = Slabs.WALL_WITH_TORCH - Slabs.WALL_UNDECORATED elif slabID == Slabs.EARTH_WITH_TORCH: IdDiff = Slabs.EARTH_WITH_TORCH - Slabs.EARTH else: @@ -495,6 +495,7 @@ func set_torch_side(xSlab, ySlab, slabID, slabsetIndexGroup, constructedColumns, for i in 9: undecoratedGroup[i] = slabsetIndexGroup[i] - variDiff + # This code REMOVES torches, it doesn't add torches. It sets columns to the undecorated columns. for subtile in [7, 3, 1, 5]: # S W N E if torchSubtileToKeep != subtile: # Wall Torch Cube: 119