diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-16 16:21:52 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-16 16:21:52 +0200 |
| commit | 95978fc3006c01dc76be653e7e6106e4426ce2eb (patch) | |
| tree | 267a31ceb655a389f2a65302f7a2915ceb462b49 | |
| parent | 7c83fe7eeaac3736d5a59b270bbbbde59780e536 (diff) | |
| parent | ae5b594523f8e8df7f09f9d0d13932bc922aef59 (diff) | |
| download | hurrycurry-95978fc3006c01dc76be653e7e6106e4426ce2eb.tar hurrycurry-95978fc3006c01dc76be653e7e6106e4426ce2eb.tar.bz2 hurrycurry-95978fc3006c01dc76be653e7e6106e4426ce2eb.tar.zst | |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
| -rw-r--r-- | light-client/assets/palette.csv | 1 | ||||
| -rw-r--r-- | light-client/assets/textures/book.ta | 18 | ||||
| -rw-r--r-- | light-client/assets/textures/foodprocessor.ta | 26 | ||||
| -rw-r--r-- | light-client/assets/textures/plate.ta | 59 | ||||
| -rw-r--r-- | light-client/assets/textures/pot_back.ta | 20 | ||||
| -rw-r--r-- | light-client/assets/textures/pot_front.ta | 20 | ||||
| -rw-r--r-- | light-client/assets/textures/strawberry.ta | 23 | ||||
| -rw-r--r-- | light-client/assets/tiles.ini | 11 |
8 files changed, 140 insertions, 38 deletions
diff --git a/light-client/assets/palette.csv b/light-client/assets/palette.csv index 985d23ab..87376994 100644 --- a/light-client/assets/palette.csv +++ b/light-client/assets/palette.csv @@ -119,3 +119,4 @@ $,255,0,254,255 ŧ,0,0,255,255 ø,63,0,127,255 ¤,0,0,127,255 +°,255,255,255,128 diff --git a/light-client/assets/textures/book.ta b/light-client/assets/textures/book.ta new file mode 100644 index 00000000..b9ca1ad6 --- /dev/null +++ b/light-client/assets/textures/book.ta @@ -0,0 +1,18 @@ +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +33333333333333 +$$$$$$$$$$$$$$ +$GGGGGGGGGGGG +$cccccccccccc +$$$$$$$$$$$$$$ diff --git a/light-client/assets/textures/foodprocessor.ta b/light-client/assets/textures/foodprocessor.ta new file mode 100644 index 00000000..b487ac67 --- /dev/null +++ b/light-client/assets/textures/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]]]]]]]]h]]h +[]]h]]mmmm]]h]]h +]]]h]mrrrrm]h]]h +]]]hmrrrrrrmhhh] +]]]hrrrrrrrrh]]] +]]]hrrrrrrrrh]]] +]]]hrrrrrrrrh]]] +]]]]hrrrrrrh]]]] +]]]]]hrrrrh]]]]] +[]]]]]hhhh]]]]][ +[]]]]]]]]]]]]]][ +[[[]]]]]]]]]][[[ +{{{{{{{{{{{{{{{{ +{{{{{{{{{{{{{{{{ +{{{{{{{{{{{{{{{{ +{{{{{{{{{{{{{{{{ +{{{{{{{{{{{{{{{{ diff --git a/light-client/assets/textures/plate.ta b/light-client/assets/textures/plate.ta index 6766989f..15d66e0c 100644 --- a/light-client/assets/textures/plate.ta +++ b/light-client/assets/textures/plate.ta @@ -1,36 +1,23 @@ - - ffffffffffff - fffjjjjjjjjfff - fffjjjjjjjjjjjjfff - fffjjjjjjjjjjjjjjjff - fffjjjffffffffffffjjff - fffjjfffffffffffffffjjff - ffjjfffffffffffffffffjjff - ffjfffffffffffffffffffjff - ffffffffffffffffffffffffff - fffffffffffffffffffffffffff - fffffffffffffffffffffffffff - fffffffffffffffffffffffffff - fffffffffffffffffffffffffff - fffffffffffffffffffffffffff - ffffffffffffffffffffffffff - fffffffffffffffffffffffjf - fjfffffffffffffffffffffj - jjfffffffffffffffffffj - jjfffffffffffffffffj - jjffffffffffffffjj - jjjffffffffffjjj - jjjjjjjjjjjj - jjjjjj - - - - - - - - - - - - + ffffffffffff + fffjjjjjjjjfff + fffjjjjjjjjjjjjfff + fffjjjjjjjjjjjjjjjff + fffjjjffffffffffffjjff + fffjjfffffffffffffffjjff + ffjjfffffffffffffffffjjff + ffjfffffffffffffffffffjff + ffffffffffffffffffffffffff + fffffffffffffffffffffffffff + fffffffffffffffffffffffffff + fffffffffffffffffffffffffff + fffffffffffffffffffffffffff + fffffffffffffffffffffffffff + ffffffffffffffffffffffffff + fffffffffffffffffffffffjf + fjfffffffffffffffffffffj + jjfffffffffffffffffffj + jjfffffffffffffffffj + jjffffffffffffffjj + jjjffffffffffjjj + jjjjjjjjjjjj + jjjjjj diff --git a/light-client/assets/textures/pot_back.ta b/light-client/assets/textures/pot_back.ta new file mode 100644 index 00000000..85456a40 --- /dev/null +++ b/light-client/assets/textures/pot_back.ta @@ -0,0 +1,20 @@ + jjjjjj + jjjmmmmmmjjj + jmmmmmmmmmmmmj + jmmmmmmmmmmmmmmj + mmmmmmmmmmmmmmmm + mmmmmmmmmmmmmmm + mmmmmmmmmmmmm + mmmmmm + + + + + + + + + + + + diff --git a/light-client/assets/textures/pot_front.ta b/light-client/assets/textures/pot_front.ta new file mode 100644 index 00000000..ccfdf15e --- /dev/null +++ b/light-client/assets/textures/pot_front.ta @@ -0,0 +1,20 @@ + + + + + j j + jj jj +mmjjj jjjmm +m mjjjjj jjjhjj j +mmmjjjjjjjjjjjjjhhjjjj + mjjjjjjjjjjjhjhhjj + mmjjjjjjjjjjhjhhjj + mmmjjjjjjjjjhjhhjj + mmmmjjjjjjjjhjhjjm + mmmmmmjjjjjjhjhjjm + mmmmmmjjjjjhjjmmm + mmmmmmmjjjjjjmmm + mmmmmmmmmmmmmmm + mmmmmmmmmmmmm + mmmmmmmmm + mmmmm diff --git a/light-client/assets/textures/strawberry.ta b/light-client/assets/textures/strawberry.ta new file mode 100644 index 00000000..8c3e0282 --- /dev/null +++ b/light-client/assets/textures/strawberry.ta @@ -0,0 +1,23 @@ + Ø›ßŁŁ + łłCCCC + Ø CłVCBC + CCCCVBC + Ø› ØØ/ØØCBBC + ØłłŁŁŁ›łØłłCBC + CCłßłŁ /VCCC + CCBVBBߣØ//CCC + CBBBBCCßØ//CV + CBVBBCC/ Ø /CC + C BBBBCVC/ Ø / + CC BBCCCC// + CCB //VC///// ØØŁ + CCVBB /////// ßłłCC + CCCBBC////// ŁßCCBBBC + CCCCBV/// ›CVCBBBBCC + C//CCCC ›ØłCCCBBBVBC + //VC/C Øł///CVCBBBC + /////C //V/CCCBBC + ›///ß/ /////CCVBC + ›łß ///////C +ØłłłØØß + łł diff --git a/light-client/assets/tiles.ini b/light-client/assets/tiles.ini index a43c4c62..b06398a9 100644 --- a/light-client/assets/tiles.ini +++ b/light-client/assets/tiles.ini @@ -27,6 +27,13 @@ path=path tree=tree tomato-crate=crate_back,tomato~x8~y6,crate_front +raw-steak-crate=crate_back,steak_raw~x8~y6,crate_front +flour-crate=crate_back,flour~x8~y6,crate_front +leek-crate=crate_back,leek~x8~y6,crate_front +rice-crate=crate_back,rice~x8~y6,crate_front +fish-crate=crate_back,fish~x8~y6,crate_front +coconut-crate=crate_back,coconut~x8~y6,crate_front +strawberry-crate=crate_back,strawberry~x8~y6,crate_front -book=counter -cuttingboard=counter +book=counter,book +cuttingboard=counter,cutting_board |