From 0f40d57a2296cb222dec80ad66a7bbaa68ed99e2 Mon Sep 17 00:00:00 2001
From: Miloslav Ciz <drummyfish@disroot.org>
Date: Tue, 11 Mar 2025 15:18:27 +0100
Subject: [PATCH] Adjust maps

---
 assets.h   | 59 ++++++++++++++++++++++++++++++------------------------
 data       |  5 +++++
 renderer.h |  2 +-
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/assets.h b/assets.h
index b0bac13..be0e658 100644
--- a/assets.h
+++ b/assets.h
@@ -262,26 +262,27 @@ static const char *LCR_internalDataFile =
 
   /* tiny maps, max:
     - 400 character string
-    - 512 blocks
-    - 1024 vertices
-    - 1500 triangles */
+    - 512 (0x200) blocks
+    - 1024 (0x400) vertices
+    - 1536 (0x600) triangles */
 
   // TINY MAP 1:
 
   "#MLCtiny1;4321 0 :*G1b:+n9H:!I1H"
   // start
-  ":=D0b:f71i"
+  ":=E0b:f61i"
   ":^D1bJ:f11i:^J1bL:f11i"
   ":^D0bJ-:f11i:^J0bL-:f11i"
   ":^E1s:f511"
   ":>E0k:f513"
   // slope:
-  ":^p3v:fk11"
-  ":^o4w:fk11:^o3w-I:fk11"
-  ":^n5x:fk11:^n4x-I:fk11"
-  ":^m6y:fk11:^m5y-I:fk11"
-  ":^l7z :fk11 :^l6z-I :fk11"
-  ":^k8A :fk11 :^k7A-I :fk11"
+  ":^C2vI-:f611"
+  ":^p3v:fj11"
+  ":^o4w:fj11:^o3w-I:fj11"
+  ":^n5x:fj11:^n4x-I:fj11"
+  ":^m6y:fj11:^m5y-I:fj11"
+  ":^l7z :fj11 :^l6z-I :fj11"
+  ":^k8A :fj11 :^k7A-I :fj11"
   ":=k8B:f419:=o8F:f415:^k9K2I:f611:^k8K2I-:f611" // top
   ":=y0F1:fb15:^y0F1:fb11:^y0J1I:fb11"            // end
 
@@ -314,25 +315,31 @@ static const char *LCR_internalDataFile =
   // TINY MAP 3:
 
   "#MLCtiny3;4321 2"
-  ":*B2vJ"
+  ":*M2AJ"
   // box:
-  ":=n0s:fida"
-  ":=n6s2:fi1a"
-  ":xo2t:fgm8"
-  ":^ocs2:fg11:vncs2L"
-  ":^ocB2I:fg11:vEcs2I"
-  ":^nct2J:f118:vncB2"
-  ":^Ect2L:f118:vEcB2J"
-  ":xo1w:fg12"
+  ":=C2w:faca"
+  ":=C6w2:fa1a"
+  ":=H2w2:f1ca"
+  ":=C0z:fb14"
+  ":xA2x:fgo8"
+  ":^C2w-:fb11:^C1x-:fb11:^C0z-:fb11"
+  ":^C0C-I:fb11:^C1E-I:fb11:^C2F-I:fb11"
+  ":vC2wL-:vC2F-:vM2wI-:vM2FJ-"
+  // top:
+  ":^Few2:f411:^FeF2I:f411"
+  ":vFew2L:vFeF2:vJew2I:vJeF2J"
+  // vertical corners:
+  ":AC3w|:f1b1:AM3w:f1b1"
+  ":AC3FI:f1b1:AM3FL:f1b1"
   // ramps:
-  ":]o2tI:fg11:|o3tI:fg11"
-  ":'o1uI:fg11"
-  ":<o1vI:fg11"
-  ":]o2A:fg11:|o3A:fg11"
-  ":'o1z:fg11"
-  ":<o1y:fg11"
+  ":]C2xI:fb11:|C3xI:fb11"
+  ":'C1yI:fb11"
+  ":<C1zI:fb11"
+  ":]C2E:fb11:|C3E:fb11"
+  ":'C1D:fb11"
+  ":<C1C:fb11"
   // finish:
-  ":!vdt:!vdA"
+  ":!Hex:!HeE"
 
   // TINY MAP 4:
 
diff --git a/data b/data
index 480194f..2850e2c 100644
--- a/data
+++ b/data
@@ -38,3 +38,8 @@ finish
 #Rtestmap;00testmap;88676224 000193:0011:0029:0121:0019:0061:0f9:0051:0049:0081:00f9:0028:000:0078:0049:0011:0039:0051:00f00044:0026:0122:0020:0052:0070:038:0029:00c8:0159
 #RLCtiny1;00LCtiny1;8ecff5c0 000531:0011:03a9:0041:0179:0021:059:0031:0039:0091:0049:0031:023:0041:0013:0051:0053:0041:00230051:0043:0031:0064:0016:0022:026:01a4:002c:0040:0042:0013:008:0053:0102:0050:0021:0049:00e1:043:0091:0049:01a8:0119:0130:002:0026:0082:0048:0039:0111:00500022:0036:0132:0018:0049:0151:033:0121:00c3:0041:0059:0041:00d:0048:0050
 #RLCtiny1;00LCtiny1;8ecff5c0 0000513:04f1:0199:0031:01e9:0021:01a9:00e1:0069:0011:0193:0041:00a3:0031:0093:0061:0033:0071:0095:0071:0019:0038:0149:0068:0069:00b8:0129:0068:0010:0032:0026:00d2:002a:0018:0079:0141:0043:0061:0073:0071:00b5:0041:0049:0098:0089:00d1:0049:0071:0053:0041:00a3:0031:00b9:0041
+#RLCtiny1;00LCtiny1;7e39e006 0000355:0011:0339:0031:0159:0031:00d9:0071:0039:0061:0079:0051:0039:0031:01d3:0061:0023:0041:0033:0031:0063:0025:0037:0022:00b6:00bc:0050:0032:0013:0151:0023:00b1:0089:0041:0093:0031:0085:0031:0033:0081:00d3:0031:00a3:0041:0099:0031:00a3:0031
+#RLCtiny3;00LCtiny3;fd8b8070 0000128:0011:01a3:00e1:0053:0051:0043:0041:0053:0031
+#BLCtiny3;
+#RLCtiny3;00LCtiny3;31438a8e 0000557:0011:0173:0071:0023:0061:0063:0051:0023:0051:0033:0041:0023:0041:0053:0031:0023:0061:0023:0101:02b9:0051:0103:0051:0023:0041:0023:0121:00a3:0061:0033:00a1:0249:0041:0143:0011:0023:0181:00a5:0031:0043:0181:00b9:0011:00e3:0041:0023:0041:0053:0091:0033:0041:0023:0041:0023:0031:0023:0041:0053:0061:0033:0041:0203:0041:00b9:0011
+#RLCtiny3;00LCtiny3;3fdcf185 0001606:4d01:00a3:0061:0043:0071:0053:0041:0043:0031:0033:0091:0053:0171:0053:0041:0075:0031:0053:0031:0033:0091:0033:0071:0089:0031:0083:0031:0023:01b1:00d3:00a1:0043:0061:0023:0061:0103:01c1:0025:0051:0043:00f1:00c9:0041:0059:0041:00c9:0021:0089:0041
diff --git a/renderer.h b/renderer.h
index 7043ce8..1815df6 100644
--- a/renderer.h
+++ b/renderer.h
@@ -1002,8 +1002,8 @@ uint8_t _LCR_buildMapModel(void)
 
   _LCR_cullHiddenMapTris();
   LCR_LOG1("map model built, verts/tris:");
-  LCR_LOG1_NUM(LCR_renderer.mapModel.triangleCount);
   LCR_LOG1_NUM(LCR_renderer.mapModel.vertexCount);
+  LCR_LOG1_NUM(LCR_renderer.mapModel.triangleCount);
 
   return 1;
 }