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

5 files changed, 35 insertions, 34 deletions

diff --git a/client/player/character/character.gd b/client/player/character/character.gd
index 701603a3..e64f9e42 100644
--- a/client/player/character/character.gd
+++ b/client/player/character/character.gd
@@ -79,10 +79,11 @@ func _process(delta):
 		play_animation(next_animation)
 
 func select_hairstyle(id: int):
+	var hairstyle_count = hairstyles.keys().size()
+	id = (id + hairstyle_count) % hairstyle_count
 	if id < 0:
 		to_customer()
 		id *= -1 # TODO: Select customer character
-	id = id % hairstyles.keys().size()
 	var target = hairstyles.keys()[id]
 	for k in hairstyles.keys():
 		if k == target:
diff --git a/pixel-client/assets/items.ini b/pixel-client/assets/items.ini
index 10bb2064..dbefdda9 100644
--- a/pixel-client/assets/items.ini
+++ b/pixel-client/assets/items.ini
@@ -26,16 +26,16 @@ 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_in_pot,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_in_pot,pot_front
-rice-pot=pot_back,rice_in_pot,pot_front
-cooked-rice-pot=pot_back,rice_cooked_in_pot,pot_front
+rice-flour-pot=pot_back,rice_flour~x4~y12,pot_front
+burned-pot=pot_back,burned~x4~y12,pot_front
+raw-steak-pot=pot_back,steak_raw_in_pot~x4~y11,pot_front
+steak-pot=pot_back,steak_in_pot~x4~y11,pot_front
+leek-pot=pot_back,leek_in_pot~x5~y11,pot_front
+tomato-soup-pot=pot_back,tomato_soup_in_pot~x2~y3,pot_front
+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
 
 
 sliced-tomato=tomato_slice
@@ -44,7 +44,7 @@ bread=bread
 burned=burned
 dough=dough
 bread-slice=bread_slice
-nigiri=nigiri_rice,fish_slice
+nigiri=nigiri_rice,fish_slice~y4
 
 
 glass=glass
@@ -53,14 +53,14 @@ water-glass=water_glass
 
 
 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
-nigiri-plate=plate,nigiri_rice,fish_slice
+dirty-plate=plate_dirty~y3
+tomato-slice-plate=plate,tomato_slice~x6~y5
+strawberry-icecream-plate=plate,strawberry_icecream~y6~x5
+steak-plate=plate,steak~y3
+bread-slice-plate=plate,bread_slice~x3~y2
+bread-slice-steak-plate=plate,bread_slice~x3~y2,steak~y3
+bread-slice-sliced-tomato-plate=plate,bread_slice~x3~y2,tomato_slice~x6~y5
+bread-slice-sliced-tomato-steak-plate=plate,bread_slice~x3~y2,steak~y3,tomato_slice~x6~y5
+sliced-tomato-steak-plate=plate,steak~y3,tomato_slice~x6~y5
+tomato-soup-plate=plate,tomato_soup~x4~y3
+nigiri-plate=plate,nigiri_rice~x4~y3,fish_slice~x4~y7
diff --git a/pixel-client/assets/textures/crate_back.ta b/pixel-client/assets/textures/crate_back.ta
index 2f434d67..3ef0ce14 100644
--- a/pixel-client/assets/textures/crate_back.ta
+++ b/pixel-client/assets/textures/crate_back.ta
@@ -1,4 +1,4 @@
-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
 NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
 NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
 NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
diff --git a/pixel-client/assets/textures/crate_front.ta b/pixel-client/assets/textures/crate_front.ta
index ff6e2d83..caeafdb9 100644
--- a/pixel-client/assets/textures/crate_front.ta
+++ b/pixel-client/assets/textures/crate_front.ta
@@ -1,4 +1,4 @@
-LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+                                
 L                              L
 L                              L
 L                              L
diff --git a/pixel-client/assets/tiles.ini b/pixel-client/assets/tiles.ini
index 87729108..64070276 100644
--- a/pixel-client/assets/tiles.ini
+++ b/pixel-client/assets/tiles.ini
@@ -35,17 +35,17 @@ grass=grass
 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
+tomato-crate=crate_back,tomato~x12~y6,tomato~x1~y13,tomato~x16~y20,crate_front
+raw-steak-crate=crate_back,steak_raw~x2~y13,crate_front
+flour-crate=crate_back,flour~y19,flour~x11~y22,flour~x10~y5~hflip,crate_front
+leek-crate=crate_back,leek~x6~y12,leek~x6~y3,leek~x2~y18,leek~x7~y17~hflip,leek~x10~y10,crate_front
+rice-crate=crate_back,rice~x2~y12,rice~x10~y5,crate_front
+fish-crate=crate_back,fish~x2~y5~hflip,fish~y16,fish~x5~y11,crate_front
+coconut-crate=crate_back,coconut~y13,coconut~x8~y3,crate_front
+strawberry-crate=crate_back,strawberry~x8~y6,strawberry~y12~vflip~hflip,crate_front
 
 counter=counter
-book=counter,book
+book=counter,book~x9~y17
 cuttingboard=counter,cutting_board
 sink=counter,sink
 stove=counter,stove