From 677725791a27b587079896831e323c22716f26a0 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 26 Apr 2026 17:17:23 +0200 Subject: [PATCH] Removed unnecessary prints and added simple alarm sign sprite for later usage --- Assets/AlarmSign.aseprite | Bin 0 -> 771 bytes Assets/AlarmSign.png | Bin 0 -> 750 bytes Assets/AlarmSign.png.import | 40 +++++++++++++++++++ Scenes/Game.tscn | 71 ++++++++++++++++++++++++++------- Scripts/Helpers/Layer.cs | 27 +++---------- Scripts/Helpers/Placeholder.cs | 1 - Scripts/Helpers/WFC.cs | 1 - Scripts/World.cs | 4 -- 8 files changed, 101 insertions(+), 43 deletions(-) create mode 100644 Assets/AlarmSign.aseprite create mode 100644 Assets/AlarmSign.png create mode 100644 Assets/AlarmSign.png.import diff --git a/Assets/AlarmSign.aseprite b/Assets/AlarmSign.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..78237ffe6b64aa3127d419af38cd98a5904eae5a GIT binary patch literal 771 zcmZQ(W?*=*l#!tU2o)F@85kH+fEWRQVjw{V0U)FWXl7zy`1O$mY%2@U0x=+FR{&dy zWL*}J%>r_r0+6AkVB)G_lV)kyA7*{OQ0?Y|w0DPR{r+S&^JzfVJ_GY9dES}&LEb7x zHkS7GB?bvi(RmM(XaA2s`{eZPKmY&#pS^Z_OI>?rR#s$KP?=NL8Y82d;mOylclA&A z>dH5e2ic?m3=}x{4`i`3_#{@Q7AY8B0lI-z0Tdhx4F7>nhkyhI2Zo9{Z)Z48I;_CM z@^#hU|Fgf%I-EC^-%`NZOrh7!Ab4rtjZLds1@rSy<|74OM^`Dvj zowMGu<1Bl%Wy8}+du1FxP2Kyh>B60NwR0Oc*re&Rzk3NJ)=4I<-+e&!aCLlog4N|W zPZKQifP}`nH>KhwM{D1|=CSdUsJ7hUYf)|aLyDvNF6(m1zxmILO4#IMPez<@1;D_kTOh59UCA^xO@A${O$l&X_?GFE>@379R zS@d)LvxHf^P5&41#q3z{L;uBrR?bQPoyr|WgjN2p;)|(V@KgW6fvK)+{}0_?m?0+l zXSD^#!wELKv-^M69#i<8{yDu^;NILu`<2Wd`C|WC_!Q>O{9&Gb z(kCok?O!C{g4&xu)U6xJQ=iO#!EkSK<$*uJ-y}avyyNMpoyWZKe5t~>TE06syX(d4 z_1Tl=KX2%&z1;oiul$>aW&WoB&Q`VGocwL&vHjN>W2blhVV4c~w&GO%0mjt!Q-5Y} soqp#x_s9K34txK-`jannVSVk?odpWtEcwpJ&CBdfJNlD7yRL#80Mmaa&;S4c literal 0 HcmV?d00001 diff --git a/Assets/AlarmSign.png b/Assets/AlarmSign.png new file mode 100644 index 0000000000000000000000000000000000000000..548f4d877dd092f63ebac169b234e9636bbd93b2 GIT binary patch literal 750 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U|Qkn;uumf z=k1-1LE45qt%-*nPCx$e&$NHCnd^!(Zz^u&Y}&X~`Q?ABHm2KF(|C%DqnUvwU<0r2 z?Gb%vu8 zRNW5Dycze@c7i2?aeBqA?+(|lmF@c4zp1~eM0!@_AH8CZOMMM9jcqS*# zPXt`J9kP>-z8AUvrNe`4I+f|Gc_8RI>xHCD4!D;)yiN7=gxE)qKDnF$N zq_a9LsjuZV`e!ivM93JRQ+`AcaLkCc`8w zeVY+bRpqp~PggN`Z2h-F=U>PkB?giDMOPIg%$PL(*=V0HDr1=O`?as_ 1000) break; @@ -143,8 +135,8 @@ public partial class Layer : Node3D Vector2I position = GetSmallestPossibilities(); while (true) { - string keyword = ""; - if (position.X == 0 || position.X == layerSize - 1 || position.Y == 0 || position.Y == layerSize - 1) + string keyword; + if (position.X == 0 || position.X == layerSize - 1 || position.Y == 0 || position.Y == layerSize - 1) { keyword = tiles[position.X, position.Y].Collapse("border"); } @@ -152,11 +144,7 @@ public partial class Layer : Node3D { keyword = tiles[position.X, position.Y].Collapse(""); } - if (keyword == "ERR") - { - GD.Print("Error in WFC during collapse!"); - return false; - } + if (keyword == "ERR") return false; if (keyword != "") { NewPropagate(position); @@ -169,11 +157,7 @@ public partial class Layer : Node3D continue; } safetyCounter++; - if (safetyCounter == layerSize * layerSize) - { - GD.Print("Error in WFC, overflow!"); - return false; - } + if (safetyCounter == layerSize * layerSize) return false; } if (updateFailed) return false; //Spawn is a tile border, redo world generation @@ -224,7 +208,6 @@ public partial class Layer : Node3D if (updateCount == int.MaxValue) { - GD.Print("WFC Error! No meshes left"); updateFailed = true; return; } diff --git a/Scripts/Helpers/Placeholder.cs b/Scripts/Helpers/Placeholder.cs index 23d72ab..79031dd 100644 --- a/Scripts/Helpers/Placeholder.cs +++ b/Scripts/Helpers/Placeholder.cs @@ -8,6 +8,5 @@ public class Placeholder public Placeholder(string name, Vector3 pos){ this.name = name.Split("_")[0]; this.pos = pos; - GD.Print($"Generated placeholder {this.name}"); } } \ No newline at end of file diff --git a/Scripts/Helpers/WFC.cs b/Scripts/Helpers/WFC.cs index ee13d75..038a5f1 100644 --- a/Scripts/Helpers/WFC.cs +++ b/Scripts/Helpers/WFC.cs @@ -186,7 +186,6 @@ public class WFC } } - if (safetyCounter > layer.Length * 2) GD.PrintErr("Loop too long"); return result; } diff --git a/Scripts/World.cs b/Scripts/World.cs index d2bf97b..48a4f79 100644 --- a/Scripts/World.cs +++ b/Scripts/World.cs @@ -43,8 +43,6 @@ public partial class World : Node3D map = new Layer[ruinSize]; GenerateWorld(); - GD.Print("World generated"); - HandleRenderData(BuildRenderData(0)); } @@ -96,7 +94,6 @@ public partial class World : Node3D private void GenerateWorld() { - DateTime now = DateTime.Now; for (int layer = 0; layer < ruinSize; layer++) { layerNode = layerPrefab.Instantiate(); @@ -104,7 +101,6 @@ public partial class World : Node3D layerNode.SetupLayer(layerSize, layer, tileMeshes); map[layer] = layerNode; } - GD.Print("Time for map generation: " + (DateTime.Now - now).Seconds); } private List BuildRenderData(int layerIndex)