aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-07-16 18:52:35 +0200
committermetamuffin <metamuffin@disroot.org>2024-07-16 18:52:35 +0200
commit8fdc97c466bcb7c2ba0d1b5f4aa0aaf95063b74e (patch)
tree667b82fe251f9afaa30ca86909a973bfb00f3062
parent41aa862bd6753e9aedbf052a1299735ea1a63c48 (diff)
parent4be5accf7d1d664c19eb3946a85741b630979266 (diff)
downloadhurrycurry-8fdc97c466bcb7c2ba0d1b5f4aa0aaf95063b74e.tar
hurrycurry-8fdc97c466bcb7c2ba0d1b5f4aa0aaf95063b74e.tar.bz2
hurrycurry-8fdc97c466bcb7c2ba0d1b5f4aa0aaf95063b74e.tar.zst
Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry
-rw-r--r--light-client/assets/items.ini23
-rw-r--r--light-client/assets/textures/bread.ta16
-rw-r--r--light-client/assets/textures/bread_slice.ta21
-rw-r--r--light-client/assets/textures/burned.ta5
-rw-r--r--light-client/assets/textures/dough.ta16
-rw-r--r--light-client/assets/textures/rice_flour.ta5
-rw-r--r--light-client/assets/textures/rice_flour_foodprocessor.ta26
-rw-r--r--light-client/assets/textures/rice_foodprocessor.ta26
-rw-r--r--light-client/assets/textures/steak.ta20
-rw-r--r--light-client/assets/textures/steak_in_pot.ta9
-rw-r--r--light-client/assets/textures/steak_raw_in_pot.ta9
-rw-r--r--light-client/assets/textures/strawberry_icecream_foodprocessor.ta (renamed from light-client/assets/textures/strawberry-icecream-foodprocessor.ta)0
-rw-r--r--light-client/assets/textures/tomato_juice_in_pot.ta12
-rw-r--r--light-client/assets/textures/tomato_soup.ta18
-rw-r--r--light-client/assets/textures/tomato_soup_in_pot.ta16
-rw-r--r--light-client/assets/textures/wall_wen.ta1
-rw-r--r--light-client/assets/textures/wall_wens.ta15
-rw-r--r--light-client/assets/textures/wall_wes.ta1
-rw-r--r--light-client/assets/textures/wall_wns.ta1
-rw-r--r--light-client/assets/textures/wall_ws.ta1
20 files changed, 233 insertions, 8 deletions
diff --git a/light-client/assets/items.ini b/light-client/assets/items.ini
index 2e3b36ce..444f88f5 100644
--- a/light-client/assets/items.ini
+++ b/light-client/assets/items.ini
@@ -6,6 +6,10 @@ rice=rice
fish=fish
coconut=coconut
strawberry=strawberry
+burned=burned
+bread=bread
+dough=dough
+bread-slice=bread_slice
foodprocessor=foodprocessor
@@ -21,9 +25,19 @@ coconut-strawberry-puree-foodprocessor=coconut_strawberry_puree_foodprocessor
milk-strawberry-foodprocessor=milk_strawberry_foodprocessor
strawberry-shake-foodprocessor=strawberry_shake_foodprocessor
strawberry-icecream-foodprocessor=strawberry_icecream_foodprocessor
+rice-foodprocessor=rice_foodprocessor
+rice-flour-foodprocessor=rice_flour_foodprocessor
pot=pot_back,pot_front
+rice-flour-pot=pot_back,rice_flour,pot_front
+burned-pot=pot_back,burned,pot_front
+raw-steak-pot=pot_back,steak_raw_in_pot,pot_front
+steak-pot=pot_back,steak_in_pot,pot_front
+leek-pot=pot_back,leek,pot_front
+tomato-soup-pot=pot_back,tomato_soup_in_pot,pot_front
+tomato-juice-pot=pot_back,tomato_juice_in_pot,pot_front
+leek-tomato-juice-pot=pot_back,tomato_juice_in_pot,leek,pot_front
sliced-tomato=tomato_slice
@@ -31,7 +45,7 @@ sliced-fish=fish_slice
glass=glass
-strawberry-shake-glass = strawberry_shake_glass
+strawberry-shake-glass=strawberry_shake_glass
water-glass=water_glass
@@ -39,3 +53,10 @@ plate=plate
dirty-plate=plate_dirty
tomato-slice-plate=plate,tomato_slice~x8~y16
strawberry-icecream-plate=plate,strawberry_icecream
+steak-plate=plate,steak
+bread-slice-plate=plate,bread_slice
+bread-slice-steak-plate=plate,bread_slice,steak
+bread-slice-sliced-tomato-plate=plate,bread_slice,tomato_slice
+bread-slice-sliced-tomato-steak-plate=plate,bread_slice,steak,tomato_slice
+sliced-tomato-steak-plate=plate,steak,tomato_slice
+tomato-soup-plate=plate,tomato_soup
diff --git a/light-client/assets/textures/bread.ta b/light-client/assets/textures/bread.ta
new file mode 100644
index 00000000..5f4c8b85
--- /dev/null
+++ b/light-client/assets/textures/bread.ta
@@ -0,0 +1,16 @@
+ KKK
+ KKLLKKKKLLKK
+ LLLKKLLKKKLLLKKLL
+ KLLKKLLKKKKLLKKKLLLK
+ KKLLKKLLKKKLLKKKKLLKKK
+ KKLLKKKLLKKKLLKKKKLLKKK
+ KKLLKKKLKKKKLLKKKKLKKKKK
+ KKKLKKKKKKKKKKLKKKKLLKKKKK
+ KKKKKKKKKKKKKKKKKKKKKKKKKK
+LLKKKKKKKKKKKKKKKKKKKKKKKKL
+LLLKKKKKKKKKKKKKKKKKKKKKLLL
+LLLLLKKKKKKKKKKKKKKKKKLLLLL
+LLLLLLLLLLLLLLLLLLLLLLLLLLL
+ LLLLLLLLLLLLLLLLLLLLLLLLL
+ LLLLLLLLLLLLLLLLLLLLLLL
+ LLLLLLLLLLLLLLLLLLLLL
diff --git a/light-client/assets/textures/bread_slice.ta b/light-client/assets/textures/bread_slice.ta
new file mode 100644
index 00000000..ae3f98f7
--- /dev/null
+++ b/light-client/assets/textures/bread_slice.ta
@@ -0,0 +1,21 @@
+ LLLLLLLLLLLL
+ LLLLLLLLLLLLLLLL
+ LLLLLKKKKKKKKLLLLL
+ LLLLKKKKKKKKKKKKLLLL
+LLLLKKKKKKKKKKKKKLLLL
+LLLKKKKKKKKKKKKKKKLLLL
+LLLKKKKKKKKKKKKKKKKLLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLKKKKKKKKKKKKKKKKKKLL
+LLLKKKKKKKKKKKKKKKKLLL
+ LLLLLLLLLLLLLLLLLLLL
+ LLLLLLLLLLLLLLLLLL
diff --git a/light-client/assets/textures/burned.ta b/light-client/assets/textures/burned.ta
new file mode 100644
index 00000000..3f46c8b1
--- /dev/null
+++ b/light-client/assets/textures/burned.ta
@@ -0,0 +1,5 @@
+ (D((((DD
+ ((>(>>>>(((
+)(D>((Dt>>((D(
+ ((((>tDtDD((
+ ((((>(((
diff --git a/light-client/assets/textures/dough.ta b/light-client/assets/textures/dough.ta
new file mode 100644
index 00000000..157aaaf9
--- /dev/null
+++ b/light-client/assets/textures/dough.ta
@@ -0,0 +1,16 @@
+ FFF
+ FFHHFFFFHHFF
+ FHHFFHHFFFHHHFFHH
+ FHHFFHHFFFFHHFFFHHHF
+ FFHHFFHHFFFHHFFFFHHFFF
+ FFHHFFFHHFFFHHFFFFHHFFF
+ FFHHFFFHFFFFHHFFFFHFFFFF
+ FFFHFFFFFFFFFFHFFFFHHFFFFF
+ FFFFFFFFFFFFFFFFFFFFFFFFFF
+HHFFFFFFFFFFFFFFFFFFFFFFFFH
+HHHFFFFFFFFFFFFFFFFFFFFFHHH
+HHHHHFFFFFFFFFFFFFFFFFHHHHH
+HHHHHHHHHHHHHHHHHHHHHHHHHHH
+ HHHHHHHHHHHHHHHHHHHHHHHHH
+ HHHHHHHHHHHHHHHHHHHHHHH
+ HHHHHHHHHHHHHHHHHHHHH
diff --git a/light-client/assets/textures/rice_flour.ta b/light-client/assets/textures/rice_flour.ta
new file mode 100644
index 00000000..82ab2133
--- /dev/null
+++ b/light-client/assets/textures/rice_flour.ta
@@ -0,0 +1,5 @@
+ )E))))))
+ ))))))E))))
+)E))E)))))E))E
+ ))))))))))))
+ )E)))E))
diff --git a/light-client/assets/textures/rice_flour_foodprocessor.ta b/light-client/assets/textures/rice_flour_foodprocessor.ta
new file mode 100644
index 00000000..06017d8c
--- /dev/null
+++ b/light-client/assets/textures/rice_flour_foodprocessor.ta
@@ -0,0 +1,26 @@
+ hhhh
+ h°°°°h
+ h°°°°°°h
+ h°°°°°°°°h
+ hh°°°°°°hh
+ h°h°°°°h°h
+ h°°hhhh°°h
+ h°°°°°°°°hhh
+[[[h]]]]]]))h[[h
+[]]h]]]]]))Eh]]h
+[]]hE]mm))))h]]h
+]]]h))))))))h]]h
+]]]h)E)))E))hhh]
+]]]h))))))))h]]]
+]]]h))E)))))h]]]
+]]]h)))E))E)h]]]
+]]]]h))))))h]]]]
+]]]]]hE)))h]]]]]
+[]]]]]hhhh]]]]][
+[]]]]]]]]]]]]]][
+[[[]]]]]]]]]][[[
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
diff --git a/light-client/assets/textures/rice_foodprocessor.ta b/light-client/assets/textures/rice_foodprocessor.ta
new file mode 100644
index 00000000..58d79651
--- /dev/null
+++ b/light-client/assets/textures/rice_foodprocessor.ta
@@ -0,0 +1,26 @@
+ hhhh
+ h°°°°h
+ h°°°°°°h
+ h°°°°°°°°h
+ hh°°°°°°hh
+ h°h°°°°h°h
+ h°°hhhh°°h
+ h°°°°°°°°hhh
+[[[hE]]]])P]h[[h
+[]]h]])EE]]]h]]h
+[]]hP]EEPmE]h]]h
+]]]h]EEEEE)Eh]]h
+]]]hE)EPEErmhhh]
+]]]hEEEEE)EEh]]]
+]]]hEPEEEEE)h]]]
+]]]hEE)EEEEEh]]]
+]]]]hEEPEEPh]]]]
+]]]]]hEEE)h]]]]]
+[]]]]]hhhh]]]]][
+[]]]]]]]]]]]]]][
+[[[]]]]]]]]]][[[
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
+{{{{{{{{{{{{{{{{
diff --git a/light-client/assets/textures/steak.ta b/light-client/assets/textures/steak.ta
new file mode 100644
index 00000000..23f31da7
--- /dev/null
+++ b/light-client/assets/textures/steak.ta
@@ -0,0 +1,20 @@
+ LLLLL
+ KKKKKKKLLK
+ KKKxKKKKKKLLK
+ KKKKxLKKxKKKNLL
+ LLxKKKxLLLLLxKKNxNK
+ LLLxxxNKKLLLLLKKKxKK
+ LLxNNNLKLLKKxLKKKxKK
+ LLLxLLLKKLLKxLLLxxK
+ LLLxLLLLKLLKxLLNxxK
+ LxLLKKLLLKLKKxNNxK
+ xxLLxKKKLLLLKKxxxK
+ NNLLLLxKLLNNxxxxx
+ NxLKLLLKKKLxxxxxxx
+ NLLLKKLxKKKKxxxxxx
+ LLLLLLKKxKKKKxKxxxx
+NLLLLKKKKKKxKxxxxxxxxx
+NNKKKxxxxxxxxxLxx5xx
+xxxxxxxxxxxxxxxxLxxL
+xxxxxxxxxKxxxLx5xx5
+ Kxxxxx5xLx
diff --git a/light-client/assets/textures/steak_in_pot.ta b/light-client/assets/textures/steak_in_pot.ta
new file mode 100644
index 00000000..4aec1c5a
--- /dev/null
+++ b/light-client/assets/textures/steak_in_pot.ta
@@ -0,0 +1,9 @@
+ LLLLL
+ KKKKKKKL
+ KKKxKKKKKK
+ KKKKxLKKxKKK
+LxKKKxLLLLLxKK
+LLxxxNKKLLLLLK
+LxNNNLKLLKKxL
+LLxLLLKKLLKx
+ LLLLKL
diff --git a/light-client/assets/textures/steak_raw_in_pot.ta b/light-client/assets/textures/steak_raw_in_pot.ta
new file mode 100644
index 00000000..2eb5c53b
--- /dev/null
+++ b/light-client/assets/textures/steak_raw_in_pot.ta
@@ -0,0 +1,9 @@
+ BBBB
+ &&&&&&&
+ &&&Y&&&&&
+ &&&&YB&&Y&&
+BBY&&&YBBBBBY&
+BBBYYY/&&BBBBB
+BBY///B&BB&&Y
+BBBYBBB&&BB&
+ YBBBB&
diff --git a/light-client/assets/textures/strawberry-icecream-foodprocessor.ta b/light-client/assets/textures/strawberry_icecream_foodprocessor.ta
index af545930..af545930 100644
--- a/light-client/assets/textures/strawberry-icecream-foodprocessor.ta
+++ b/light-client/assets/textures/strawberry_icecream_foodprocessor.ta
diff --git a/light-client/assets/textures/tomato_juice_in_pot.ta b/light-client/assets/textures/tomato_juice_in_pot.ta
new file mode 100644
index 00000000..c8276921
--- /dev/null
+++ b/light-client/assets/textures/tomato_juice_in_pot.ta
@@ -0,0 +1,12 @@
+ zzzzzzzz
+ zzzzzzzzzzzz
+ zzzzzzzzzzzzzzz
+ zzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzzz
+zzzzzzzzzzzzzzzz
+ zzzzzzzzzzzzzz
+ zzzzzzzzzzz
diff --git a/light-client/assets/textures/tomato_soup.ta b/light-client/assets/textures/tomato_soup.ta
new file mode 100644
index 00000000..36be679e
--- /dev/null
+++ b/light-client/assets/textures/tomato_soup.ta
@@ -0,0 +1,18 @@
+ AAAAAAAA
+ AAAAAAAAAAAA
+ AAAA«AAAAßAAAAA
+ AAAAAAAAAAAAAAAAA
+ A«AAAAAΩAAAAAAAA«AA
+AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAΩAAAAA
+AAAΩAAAAßAAAAAAAAAAAA
+AAAAAAAAAAAA«AAAAAAAA
+AAAAAAAAAAAAAAAAAAßAA
+AAAAAAAAAAAAAAAAAAAA
+AA«AAAAAAAAAßAAAAAAA
+AAAAAAAΩAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAA
+ AAAAAAAAA«AAAAAA
+ AAAAAAAAAAAAA
+ AAAAAAAAAA
diff --git a/light-client/assets/textures/tomato_soup_in_pot.ta b/light-client/assets/textures/tomato_soup_in_pot.ta
new file mode 100644
index 00000000..da39044d
--- /dev/null
+++ b/light-client/assets/textures/tomato_soup_in_pot.ta
@@ -0,0 +1,16 @@
+ AAAAAAAA
+ AA«AAAAßAAAA
+ AAAAAAAAAAAAAAA
+«AAAAAΩAAAAAAAA«AA
+AAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAΩAAAA
+AΩAAAAßAAAAAAAAAAA
+AAAAAAAAAA«AAAAAAA
+AAAAAAAAAAAAAAAAßA
+AAAAAAAAAAAAAAAAAA
+«AAAAAAAAAßAAAAAAA
+AAAAAΩAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAA
+ AAAAAAA«AAAAAAA
+ AAAAAAAAAAAAAA
diff --git a/light-client/assets/textures/wall_wen.ta b/light-client/assets/textures/wall_wen.ta
index fd7c8bdf..a53f4b99 100644
--- a/light-client/assets/textures/wall_wen.ta
+++ b/light-client/assets/textures/wall_wen.ta
@@ -51,3 +51,4 @@ cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/wall_wens.ta b/light-client/assets/textures/wall_wens.ta
index f03dae86..54d6c397 100644
--- a/light-client/assets/textures/wall_wens.ta
+++ b/light-client/assets/textures/wall_wens.ta
@@ -10,12 +10,12 @@
jjjjjj
jjjjjj
jjjjjj
-jjjjjjjjjjjjjjjjjjj
-jjjjjjjjjjjjjjjjjjj
-jjjjjjjjjjjjjjjjjjj
-jjjjjjjjjjjjjjjjjjj
-jjjjjjjjjjjjjjjjjjj
-jjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
cccccccccccccjjjjjjccccccccccccc
cccccccccccccjjjjjjccccccccccccc
cccccccccccccjjjjjjccccccccccccc
@@ -27,7 +27,7 @@ cccccccccccccjjjjjjccccccccccccc
cccccccccccccjjjjjjccccccccccccc
cccccccccccccjjjjjjccccccccccccc
cccccccccccccjjjjjjccccccccccccc
-fffffffffffffjjjjjjccccccccccccc
+fffffffffffffjjjjjjfffffffffffff
cccccccccccccffffffccccccccccccc
cccccccccccccfjjjjfccccccccccccc
cccccccccccccfjjjjfccccccccccccc
@@ -51,3 +51,4 @@ cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/wall_wes.ta b/light-client/assets/textures/wall_wes.ta
index 10939371..78232ee1 100644
--- a/light-client/assets/textures/wall_wes.ta
+++ b/light-client/assets/textures/wall_wes.ta
@@ -45,3 +45,4 @@ cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/wall_wns.ta b/light-client/assets/textures/wall_wns.ta
index f03dae86..de0134f2 100644
--- a/light-client/assets/textures/wall_wns.ta
+++ b/light-client/assets/textures/wall_wns.ta
@@ -51,3 +51,4 @@ cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc
diff --git a/light-client/assets/textures/wall_ws.ta b/light-client/assets/textures/wall_ws.ta
index 76bd7374..bbdd75cd 100644
--- a/light-client/assets/textures/wall_ws.ta
+++ b/light-client/assets/textures/wall_ws.ta
@@ -45,3 +45,4 @@ cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccc