diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-17 00:44:10 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-17 00:44:10 +0200 |
| commit | e7ec9fe217ed0603901f169573f95fefa45fe1de (patch) | |
| tree | 4d332fff090862cc28578a6a7d0e2c858b0863ef | |
| parent | e52bc1f04b8b651f71ef290b044d8d8b45b8b073 (diff) | |
| parent | cd679169f8e049b3f3ce890c97d62fa72a4e4eb5 (diff) | |
| download | hurrycurry-e7ec9fe217ed0603901f169573f95fefa45fe1de.tar hurrycurry-e7ec9fe217ed0603901f169573f95fefa45fe1de.tar.bz2 hurrycurry-e7ec9fe217ed0603901f169573f95fefa45fe1de.tar.zst | |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
| -rw-r--r-- | pixel-client/assets/items.ini | 3 | ||||
| -rw-r--r-- | pixel-client/assets/misc.ini | 6 | ||||
| -rw-r--r-- | pixel-client/assets/textures/conveyor.ta | 38 | ||||
| -rw-r--r-- | pixel-client/assets/textures/conveyor_arrow_left.ta | 38 | ||||
| -rw-r--r-- | pixel-client/assets/textures/conveyor_arrow_up.ta | 38 | ||||
| -rw-r--r-- | pixel-client/assets/textures/mochi_dough.ta | 8 | ||||
| -rw-r--r-- | pixel-client/assets/textures/strawberry_mochi.ta | 15 | ||||
| -rw-r--r-- | pixel-client/assets/tiles.ini | 1 |
8 files changed, 147 insertions, 0 deletions
diff --git a/pixel-client/assets/items.ini b/pixel-client/assets/items.ini index dbefdda9..7fcff029 100644 --- a/pixel-client/assets/items.ini +++ b/pixel-client/assets/items.ini @@ -36,6 +36,7 @@ tomato-juice-pot=pot_back,tomato_juice_in_pot~x2~y7,pot_front leek-tomato-juice-pot=pot_back,tomato_juice_in_pot~x2~y7,leek_in_pot~x5~y11,pot_front rice-pot=pot_back,rice_in_pot~x3~y11,pot_front cooked-rice-pot=pot_back,rice_cooked_in_pot~x3~y11,pot_front +mochi-dough-pot=pot_back,mochi_dough~x6~y10,pot_front sliced-tomato=tomato_slice @@ -45,6 +46,8 @@ burned=burned dough=dough bread-slice=bread_slice nigiri=nigiri_rice,fish_slice~y4 +mochi-dough=mochi_dough +strawberry-mochi=strawberry_mochi glass=glass diff --git a/pixel-client/assets/misc.ini b/pixel-client/assets/misc.ini index 60a91e77..e1c118d9 100644 --- a/pixel-client/assets/misc.ini +++ b/pixel-client/assets/misc.ini @@ -5,3 +5,9 @@ interact-target-thick=interact_target_thick interact-target-thin=interact_target_thin solid=solid particle=particle + +conveyor-arrow=conveyor_arrow_up +conveyor-arrow=ns:conveyor_arrow_up~vflip +conveyor-arrow=sn:conveyor_arrow_up +conveyor-arrow=ew:conveyor_arrow_left +conveyor-arrow=we:conveyor_arrow_left~hflip diff --git a/pixel-client/assets/textures/conveyor.ta b/pixel-client/assets/textures/conveyor.ta new file mode 100644 index 00000000..453e2048 --- /dev/null +++ b/pixel-client/assets/textures/conveyor.ta @@ -0,0 +1,38 @@ +rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr +rorrprrrprrorrprrrorprorprrrorro +rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr +rrprrrprrrprrrorrprrrprrrprrrprr +rrorrrprrrorrrprrprrrorrrorrrorr +rrprrrorrrorrrorrprrrprrrorrrorr +rrprrrorrrprrrorrorrrprrrorrrorr +rrprrrorrrorrrorrorrrorrrorrrprr +rrorrrprrrprrrprrorrrprrrorrrprr +rrprrrprrrprrrprrorrrprrrprrrorr +rrprrrorrrprrrorrprrrprrrprrrorr +rrorrrprrrorrrprrprrrprrrprrrprr +rrprrrprrrprrrprrpprrprrrprrrprr +rrorrrprrrorrrorrrprrorrrorrrprr +rrorrrorrrorrrprrrprrorrrorrrprr +rrorrrorrrorrrprrrprrorrrorrrorr +rrorrrorrrorrrprrrprrorrrprrrorr +rrprrrorrrprrrorrrprrprrrprrrorr +rrprrrorrrprrrorrrprrprrrprrrorr +rrorrrprrrprrrorrrprrprrrprrrprr +rrprrrprrrprrrprrrprrprrrprrrprr +rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr +porrprrrorprrprprrorrrrrorprprpr +rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr +jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj +jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj + + + + + + + + + + + + diff --git a/pixel-client/assets/textures/conveyor_arrow_left.ta b/pixel-client/assets/textures/conveyor_arrow_left.ta new file mode 100644 index 00000000..ab03864b --- /dev/null +++ b/pixel-client/assets/textures/conveyor_arrow_left.ta @@ -0,0 +1,38 @@ + + uu uu + uuu uuu + uuu uuu + uuu uuu + uuu uuu + uuuu uuu + uuu uuu + uuu uuu + uuu uuu + uuu uuu + uuu uuu + uuu uu + uuu uuu + uuu uuu + uuu uuu + uuu uuu + uuu uuu + uuuu uuu + uuuu uuu + uuu uuu + uu uu + + + + + + + + + + + + + + + + diff --git a/pixel-client/assets/textures/conveyor_arrow_up.ta b/pixel-client/assets/textures/conveyor_arrow_up.ta new file mode 100644 index 00000000..8f51d6c9 --- /dev/null +++ b/pixel-client/assets/textures/conveyor_arrow_up.ta @@ -0,0 +1,38 @@ + + vv + vvvv + vvvvvv + vvv vvv + vvv vvv + vvv vvv + vvv vvv + vvv vvv + vvv vvv + vvv vvv + vv vv + vv + vvvv + vvvvvv + vvvvvvvv + vvvv vvvv + vvvv vvvv + vvv vvvvv + vvvv vvvv + vvvv vvvv + vv vv + + + + + + + + + + + + + + + + diff --git a/pixel-client/assets/textures/mochi_dough.ta b/pixel-client/assets/textures/mochi_dough.ta new file mode 100644 index 00000000..55b6b016 --- /dev/null +++ b/pixel-client/assets/textures/mochi_dough.ta @@ -0,0 +1,8 @@ + )))) + ))))))) + ))))))))) +)))))))))) +)))))))))) +E)))))))) + EEE)))EE + EEEE diff --git a/pixel-client/assets/textures/strawberry_mochi.ta b/pixel-client/assets/textures/strawberry_mochi.ta new file mode 100644 index 00000000..3dcd079e --- /dev/null +++ b/pixel-client/assets/textures/strawberry_mochi.ta @@ -0,0 +1,15 @@ + Ø› ØØ + ØłłŁŁŁ›ł + CCłßłŁ + CCBVBBߣ + CBBBBCCß + CBVBBCC/ + BBBBCVC/ + ))BBCCCC// +)))/VC///// +))))/////))) +)))))))))))) +E))))))))))) + E))))))))EE + EEE)))EE + EEEE diff --git a/pixel-client/assets/tiles.ini b/pixel-client/assets/tiles.ini index 64070276..c5cd50b3 100644 --- a/pixel-client/assets/tiles.ini +++ b/pixel-client/assets/tiles.ini @@ -52,3 +52,4 @@ stove=counter,stove freezer=freezer trash=trash oven=oven +conveyor=counter,conveyor |