Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry

8 files changed, 202 insertions, 104 deletions

diff --git a/light-client/assets/textures/burned.ta b/light-client/assets/textures/burned.ta
index 3f46c8b1..fa13c7cb 100644
--- a/light-client/assets/textures/burned.ta
+++ b/light-client/assets/textures/burned.ta
@@ -1,5 +1,5 @@
   (D((((DD    
  ((>(>>>>(((  
-)(D>((Dt>>((D(
+((D>((Dt>>((D(
  ((((>tDtDD(( 
     ((((>(((  
diff --git a/light-client/assets/textures/counter_window_ns.ta b/light-client/assets/textures/counter_window_ns.ta
deleted file mode 100644
index f460cc10..00000000
--- a/light-client/assets/textures/counter_window_ns.ta
+++ /dev/null
@@ -1,47 +0,0 @@
-             LLLLLL             
-             LLLLLL             
-             LLLLLL             
-             LLLLLL             
-            LLLLLLLL            
-            LLLLLLLL            
-           LLLLLLLLLL           
-          LLLLLLLLLLLL          
-          LLLLLLLLLLLL          
-         LLLLLLLLLLLLLL         
-         LLLLLLLLLLLLLL         
-        LLLLLLLLLLLLLLLL        
-KKKJJJJJLLLLLLLLLLLLLLLLJJJJJKKK
-KJJJJJJJJLLLLLLLLLLLLLLJJJJJJJJK
-KJJJJJJJJLLLLLLLLLLLLLLJJJJJJJJK
-JJJJJJJJJJLLLLLLLLLLLLJJJJJJJJJK
-JJJJJJJJJJLLLLLLLLLLLLJJJJJJJJJK
-JJJJJJJJJJJLLLLLLLLLLJJJJJJJJJJJ
-JJJJJJJJJJJJLLLLLLLLJJJJJJJJJJJJ
-JJJJJJJJJJJJLLLLLLLLJJJJJJJJJJJJ
-JJJJJJJJJJJJJLLLLLLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLLLLLLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLLLLLLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLLLLLLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLLLLLLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJK
-KJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJJ
-KJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJK
-JJJJJJJJJJJJJLKKKKLJJJJJJJJJJJJK
-JKKKKKJJJJJJJLKKKKLJJJJJJJJKKKKK
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
diff --git a/light-client/assets/textures/counter_window_ns_bottom.ta b/light-client/assets/textures/counter_window_ns_bottom.ta
new file mode 100644
index 00000000..30db9f28
--- /dev/null
+++ b/light-client/assets/textures/counter_window_ns_bottom.ta
@@ -0,0 +1,48 @@
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+KKKJJJJJJJJJJJJJJJJJJJJJJJJJJKKK
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JKKKKKJJJJJJJJJJJJJJJJJJJJJKKKKK
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+                                
diff --git a/light-client/assets/textures/counter_window_ns_top.ta b/light-client/assets/textures/counter_window_ns_top.ta
new file mode 100644
index 00000000..8ac68858
--- /dev/null
+++ b/light-client/assets/textures/counter_window_ns_top.ta
@@ -0,0 +1,48 @@
+             LLLLLL             
+             LLLLLL             
+             LLLLLL             
+             LLLLLL             
+            LLLLLLLL            
+            LLLLLLLL            
+           LLLLLLLLLL           
+          LLLLLLLLLLLL          
+          LLLLLLLLLLLL          
+         LLLLLLLLLLLLLL         
+         LLLLLLLLLLLLLL         
+        LLLLLLLLLLLLLLLL        
+        LLLLLLLLLLLLLLLL        
+         LLLLLLLLLLLLLL         
+         LLLLLLLLLLLLLL         
+          LLLLLLLLLLLL          
+          LLLLLLLLLLLL          
+           LLLLLLLLLL           
+            LLLLLLLL            
+            LLLLLLLL            
+             LLLLLL             
+             LLLLLL             
+             LLLLLL             
+             LLLLLL             
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/counter_window_we.ta b/light-client/assets/textures/counter_window_we.ta
deleted file mode 100644
index 7e7b0e85..00000000
--- a/light-client/assets/textures/counter_window_we.ta
+++ /dev/null
@@ -1,48 +0,0 @@
-               LL               
-             LLLLLL             
-            LLLLLLLL            
-          LLLLLLLLLLLL          
-        LLLLLLLLLLLLLLLL        
-     LLLLLLLLLLLLLLLLLLLLLL     
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-cccccLLLLLLLLLLLLLLLLLLLLLLccccc
-ccccccccLLLLLLLLLLLLLLLLcccccccc
-ccJJJJJJJJLLLLLLLLLLLLJJJJJJJJcc
-ccJJJJJJJJJJLLLLLLLLJJJJJJJJJJcc
-ccJJJJJJJJJJJLLLLLLJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJLLJJJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJJJJJJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJJJJJJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJJJJJJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJJJJJJJJJJJJJJJJcc
-ccJJJJJJJJJJJJJJJJJJJJJJJJJJJJcc
-ffJJJJJJJJJJJJJJJJJJJJJJJJJJJJff
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
-KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
-JKKKKKKJJJJJJJJJJJJJJJJJJJKKKKKK
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
-PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPI
-IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
diff --git a/light-client/assets/textures/counter_window_we_bottom.ta b/light-client/assets/textures/counter_window_we_bottom.ta
new file mode 100644
index 00000000..8cce3e6a
--- /dev/null
+++ b/light-client/assets/textures/counter_window_we_bottom.ta
@@ -0,0 +1,48 @@
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+KJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJK
+JKKKKKKJJJJJJJJJJJJJJJJJJJKKKKKK
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/counter_window_we_top.ta b/light-client/assets/textures/counter_window_we_top.ta
new file mode 100644
index 00000000..b7113a01
--- /dev/null
+++ b/light-client/assets/textures/counter_window_we_top.ta
@@ -0,0 +1,48 @@
+               LL               
+             LLLLLL             
+            LLLLLLLL            
+          LLLLLLLLLLLL          
+        LLLLLLLLLLLLLLLL        
+     LLLLLLLLLLLLLLLLLLLLLL     
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+cccccLLLLLLLLLLLLLLLLLLLLLLccccc
+ccccccccLLLLLLLLLLLLLLLLcccccccc
+cc        LLLLLLLLLLLL        cc
+cc          LLLLLLLL          cc
+cc           LLLLLL           cc
+cc             LL             cc
+cc                            cc
+cc                            cc
+cc                            cc
+cc                            cc
+cc                            cc
+ff                            ff
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
diff --git a/light-client/assets/tiles.ini b/light-client/assets/tiles.ini
index e6adf4c5..87729108 100644
--- a/light-client/assets/tiles.ini
+++ b/light-client/assets/tiles.ini
@@ -1,8 +1,9 @@
 chair=floor,chair
 table=floor,table
 
-door=ns:floor,door_we
-door=we:floor,door_ns
+door=floor,door_we
+door=ns:floor,door_ns
+door=we:floor,door_we
 
 wall=:wall_ns
 wall=w:wall_ns
@@ -21,13 +22,13 @@ wall=wns:wall_wns
 wall=ens:wall_wns~hflip
 wall=wens:wall_wens
 
-wall-window=window
-wall-window=ns:wall_ns
-wall-window=we:window
+window=window
+window=ns:wall_ns
+window=we:window
 
-counter-window=counter_window_ns
-counter-window=ns:counter_window_ns
-counter-window=we:counter_window_we
+counter-window=we:counter_window_we_bottom,counter_window_we_top
+counter-window=ns:counter_window_ns_bottom,counter_window_ns_top
+counter-window=we:counter_window_we_bottom,counter_window_we_top
 
 floor=floor
 grass=grass