Skip to content

Commit

Permalink
finishing the UI, more decorations, animations on candy harvest
Browse files Browse the repository at this point in the history
Cod3lta committed Dec 19, 2021
1 parent 9f3f36d commit fcddc29
Showing 176 changed files with 2,204 additions and 391 deletions.
Binary file added assets/candy/mandarin-big-singleframe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/candy/mandarin-big-singleframe.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/mandarin-big-singleframe.png-157212eb09341fcc2ed0048f9401d73f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/candy/mandarin-big-singleframe.png"
dest_files=[ "res://.import/mandarin-big-singleframe.png-157212eb09341fcc2ed0048f9401d73f.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added assets/candy/mandarin-small-singleframe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/candy/mandarin-small-singleframe.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/mandarin-small-singleframe.png-80aa154df379ee60d9eb0084d1c6e63c.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/candy/mandarin-small-singleframe.png"
dest_files=[ "res://.import/mandarin-small-singleframe.png-80aa154df379ee60d9eb0084d1c6e63c.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added assets/candy/peanut-big-singleframe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-6.png-25c9bd375e12bd38c0bd23d146dc6887.stex"
path="res://.import/peanut-big-singleframe.png-bf44c0dd943165d303440e046272da6d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-6.png"
dest_files=[ "res://.import/barrier-6.png-25c9bd375e12bd38c0bd23d146dc6887.stex" ]
source_file="res://assets/candy/peanut-big-singleframe.png"
dest_files=[ "res://.import/peanut-big-singleframe.png-bf44c0dd943165d303440e046272da6d.stex" ]

[params]

@@ -20,14 +20,15 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/candy/peanut-small-singleframe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/candy/peanut-small-singleframe.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/peanut-small-singleframe.png-b8d3a7aa99f5f1e9a6e7db4eacc78305.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/candy/peanut-small-singleframe.png"
dest_files=[ "res://.import/peanut-small-singleframe.png-b8d3a7aa99f5f1e9a6e7db4eacc78305.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added assets/player/girl-red-run-export-export.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/player/girl-red-run-export-export.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/girl-red-run-export-export.png-a5e60194773b337518a10a558c2a7051.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/player/girl-red-run-export-export.png"
dest_files=[ "res://.import/girl-red-run-export-export.png-a5e60194773b337518a10a558c2a7051.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added assets/player/girl-red-run-export.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/player/girl-red-run-export.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/girl-red-run-export.png-619175a1cfc60d336ca6fe587b006405.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/player/girl-red-run-export.png"
dest_files=[ "res://.import/girl-red-run-export.png-619175a1cfc60d336ca6fe587b006405.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
34 changes: 0 additions & 34 deletions assets/world/deco/barrier-7.png.import

This file was deleted.

1 change: 1 addition & 0 deletions assets/world/deco/barriers.png.import
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/world/deco/furnitures.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-10.png-38889aee52b758a8c9cf1be68cbe81fd.stex"
path="res://.import/furnitures.png-57c2fd1cd2267119a9b40605d202c5e7.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-10.png"
dest_files=[ "res://.import/barrier-10.png-38889aee52b758a8c9cf1be68cbe81fd.stex" ]
source_file="res://assets/world/deco/furnitures.png"
dest_files=[ "res://.import/furnitures.png-57c2fd1cd2267119a9b40605d202c5e7.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/world/deco/rocks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/board.png-575278ae0cc5facefca0d536a8175a10.stex"
path="res://.import/rocks.png-250a6f3d445e86e3430d0a121805332e.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/board.png"
dest_files=[ "res://.import/board.png-575278ae0cc5facefca0d536a8175a10.stex" ]
source_file="res://assets/world/deco/rocks.png"
dest_files=[ "res://.import/rocks.png-250a6f3d445e86e3430d0a121805332e.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-1.png-403167aa2802cc7437ddb387a1b9868a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-1.png"
dest_files=[ "res://.import/barrier-1.png-403167aa2802cc7437ddb387a1b9868a.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-10.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-10.png-b10af0a307b5019d12418c4a902a5c81.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-10.png"
dest_files=[ "res://.import/barrier-10.png-b10af0a307b5019d12418c4a902a5c81.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-11.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-11.png-14382c69d382a1c212e694e30a90d755.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-11.png"
dest_files=[ "res://.import/barrier-11.png-14382c69d382a1c212e694e30a90d755.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-12.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-12.png-af0ef18233b910df6acd8d97c7159121.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-12.png"
dest_files=[ "res://.import/barrier-12.png-af0ef18233b910df6acd8d97c7159121.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-2.png-6bcdc675f9f1dc5d3f24ef64bc87fdce.stex"
path="res://.import/barrier-2.png-3babd36281d505ed2b8b323511921316.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-2.png"
dest_files=[ "res://.import/barrier-2.png-6bcdc675f9f1dc5d3f24ef64bc87fdce.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-2.png"
dest_files=[ "res://.import/barrier-2.png-3babd36281d505ed2b8b323511921316.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-3.png-2817a5354ce19e2054dbafc032cf9eb6.stex"
path="res://.import/barrier-3.png-d763d28711a06f5e79889c0d6307df9b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-3.png"
dest_files=[ "res://.import/barrier-3.png-2817a5354ce19e2054dbafc032cf9eb6.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-3.png"
dest_files=[ "res://.import/barrier-3.png-d763d28711a06f5e79889c0d6307df9b.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-4.png-1e98f38bd72960ad27b25da82dfe78df.stex"
path="res://.import/barrier-4.png-c8df6b65c11e5509a3c543c9cc5fda00.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-4.png"
dest_files=[ "res://.import/barrier-4.png-1e98f38bd72960ad27b25da82dfe78df.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-4.png"
dest_files=[ "res://.import/barrier-4.png-c8df6b65c11e5509a3c543c9cc5fda00.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-5.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-5.png-92ffac94111994451af85159c1b4676b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-5.png"
dest_files=[ "res://.import/barrier-5.png-92ffac94111994451af85159c1b4676b.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/barrier-6.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/barrier-6.png-641b3a7bcc84645cabf95b8e59e8709d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/barrier-6.png"
dest_files=[ "res://.import/barrier-6.png-641b3a7bcc84645cabf95b8e59e8709d.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-5.png-8201b9c71f720694eb0d1f921072be1b.stex"
path="res://.import/barrier-7.png-1788d5299cd5e95de3911d054bee1b1b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-5.png"
dest_files=[ "res://.import/barrier-5.png-8201b9c71f720694eb0d1f921072be1b.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-7.png"
dest_files=[ "res://.import/barrier-7.png-1788d5299cd5e95de3911d054bee1b1b.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-8.png-556a8193c28de07ca68b7c14c9770d19.stex"
path="res://.import/barrier-8.png-7449f90ffdf511667e23edd999b99cc2.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-8.png"
dest_files=[ "res://.import/barrier-8.png-556a8193c28de07ca68b7c14c9770d19.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-8.png"
dest_files=[ "res://.import/barrier-8.png-7449f90ffdf511667e23edd999b99cc2.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-9.png-35f4ba99e580f6aae7f23307362e288f.stex"
path="res://.import/barrier-9.png-e24ecb624cd38c24aca6ce35b28fd07b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-9.png"
dest_files=[ "res://.import/barrier-9.png-35f4ba99e580f6aae7f23307362e288f.stex" ]
source_file="res://assets/world/deco/single_frames/barrier-9.png"
dest_files=[ "res://.import/barrier-9.png-e24ecb624cd38c24aca6ce35b28fd07b.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-12.png-5342588beac9943ff32a388c7ac0eda0.stex"
path="res://.import/board.png-1052ab54737792e77832f46300c46c30.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-12.png"
dest_files=[ "res://.import/barrier-12.png-5342588beac9943ff32a388c7ac0eda0.stex" ]
source_file="res://assets/world/deco/single_frames/board.png"
dest_files=[ "res://.import/board.png-1052ab54737792e77832f46300c46c30.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes.
File renamed without changes
35 changes: 35 additions & 0 deletions assets/world/deco/single_frames/clock.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/clock.png-a7e8d59cbdfc234e398df347c457ff4c.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/single_frames/clock.png"
dest_files=[ "res://.import/clock.png-a7e8d59cbdfc234e398df347c457ff4c.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/dark-table.png-8bcfeb1fe2c72ded6b36bf2561819e8d.stex"
path="res://.import/dark-table.png-3d2e2418a0a15b631d6ca4effc255141.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/dark-table.png"
dest_files=[ "res://.import/dark-table.png-8bcfeb1fe2c72ded6b36bf2561819e8d.stex" ]
source_file="res://assets/world/deco/single_frames/dark-table.png"
dest_files=[ "res://.import/dark-table.png-3d2e2418a0a15b631d6ca4effc255141.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/desk-student-north.png-7743c7f37f1bc0e9c50a9b427eb6e25b.stex"
path="res://.import/desk-student-north.png-53b4587d084cd7511b3ec2c4c730806d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/desk-student-north.png"
dest_files=[ "res://.import/desk-student-north.png-7743c7f37f1bc0e9c50a9b427eb6e25b.stex" ]
source_file="res://assets/world/deco/single_frames/desk-student-north.png"
dest_files=[ "res://.import/desk-student-north.png-53b4587d084cd7511b3ec2c4c730806d.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/desk-student-south.png-2bb0a9c7ae773bef51dd06c09ad547d7.stex"
path="res://.import/desk-student-south.png-a1c06d7b889e1b8d0aec32502de2290e.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/desk-student-south.png"
dest_files=[ "res://.import/desk-student-south.png-2bb0a9c7ae773bef51dd06c09ad547d7.stex" ]
source_file="res://assets/world/deco/single_frames/desk-student-south.png"
dest_files=[ "res://.import/desk-student-south.png-a1c06d7b889e1b8d0aec32502de2290e.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/door-horisontal-left.png-dccd65440baa671796c6543568a36e57.stex"
path="res://.import/door-horisontal-left.png-373b80f89f16171902d17fb3856a07ec.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/door-horisontal-left.png"
dest_files=[ "res://.import/door-horisontal-left.png-dccd65440baa671796c6543568a36e57.stex" ]
source_file="res://assets/world/deco/single_frames/door-horisontal-left.png"
dest_files=[ "res://.import/door-horisontal-left.png-373b80f89f16171902d17fb3856a07ec.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/door-horisontal-right.png-df720d4f36138219973a279680214940.stex"
path="res://.import/door-horisontal-right.png-fbe5f29d3b30bee96dae5c02b7e79693.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/door-horisontal-right.png"
dest_files=[ "res://.import/door-horisontal-right.png-df720d4f36138219973a279680214940.stex" ]
source_file="res://assets/world/deco/single_frames/door-horisontal-right.png"
dest_files=[ "res://.import/door-horisontal-right.png-fbe5f29d3b30bee96dae5c02b7e79693.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/door-vertical-left.png-e5d34c2ab861d6a2119ce3cf1379783b.stex"
path="res://.import/door-vertical-left.png-ade2a63e71fec588b8b8036c83ac39b3.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/door-vertical-left.png"
dest_files=[ "res://.import/door-vertical-left.png-e5d34c2ab861d6a2119ce3cf1379783b.stex" ]
source_file="res://assets/world/deco/single_frames/door-vertical-left.png"
dest_files=[ "res://.import/door-vertical-left.png-ade2a63e71fec588b8b8036c83ac39b3.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/door-vertical-right.png-75f4144558730d63df2ec96d9d10c423.stex"
path="res://.import/door-vertical-right.png-2397d4dd1992bbad8694ebc77c90ac1d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/door-vertical-right.png"
dest_files=[ "res://.import/door-vertical-right.png-75f4144558730d63df2ec96d9d10c423.stex" ]
source_file="res://assets/world/deco/single_frames/door-vertical-right.png"
dest_files=[ "res://.import/door-vertical-right.png-2397d4dd1992bbad8694ebc77c90ac1d.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-1-shadow.png-b9527fd2f5857624ca606cd9c9990eb7.stex"
path="res://.import/rock-1-shadow.png-8737d45aca861290787cc01f6593f842.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-1-shadow.png"
dest_files=[ "res://.import/rock-1-shadow.png-b9527fd2f5857624ca606cd9c9990eb7.stex" ]
source_file="res://assets/world/deco/single_frames/rock-1-shadow.png"
dest_files=[ "res://.import/rock-1-shadow.png-8737d45aca861290787cc01f6593f842.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-1.png-6cbe39b391defa8d6d6e7bf074fa2a66.stex"
path="res://.import/rock-1.png-9971ec555c6756d844ef98c0b2480c83.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-1.png"
dest_files=[ "res://.import/rock-1.png-6cbe39b391defa8d6d6e7bf074fa2a66.stex" ]
source_file="res://assets/world/deco/single_frames/rock-1.png"
dest_files=[ "res://.import/rock-1.png-9971ec555c6756d844ef98c0b2480c83.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-2-shadow.png-97742c4568bf776b8492219aa059b1fa.stex"
path="res://.import/rock-2-shadow.png-3c5478bd7790a7758bdd2c96cfcac94b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-2-shadow.png"
dest_files=[ "res://.import/rock-2-shadow.png-97742c4568bf776b8492219aa059b1fa.stex" ]
source_file="res://assets/world/deco/single_frames/rock-2-shadow.png"
dest_files=[ "res://.import/rock-2-shadow.png-3c5478bd7790a7758bdd2c96cfcac94b.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-2.png-4c11e4fe3d8a70cc0b58d1fc2c3beb78.stex"
path="res://.import/rock-2.png-028bec8b878ac96dee62a5d8fa4222c2.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-2.png"
dest_files=[ "res://.import/rock-2.png-4c11e4fe3d8a70cc0b58d1fc2c3beb78.stex" ]
source_file="res://assets/world/deco/single_frames/rock-2.png"
dest_files=[ "res://.import/rock-2.png-028bec8b878ac96dee62a5d8fa4222c2.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-3-shadow.png-2b585f587df1fc0521930a3841240f56.stex"
path="res://.import/rock-3-shadow.png-d900259b87385cc6bd04abbc8e720440.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-3-shadow.png"
dest_files=[ "res://.import/rock-3-shadow.png-2b585f587df1fc0521930a3841240f56.stex" ]
source_file="res://assets/world/deco/single_frames/rock-3-shadow.png"
dest_files=[ "res://.import/rock-3-shadow.png-d900259b87385cc6bd04abbc8e720440.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-3.png-341f572df65226987ad6c478ed089f95.stex"
path="res://.import/rock-3.png-60ec78dac8a0076270c3d1ad40408c53.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-3.png"
dest_files=[ "res://.import/rock-3.png-341f572df65226987ad6c478ed089f95.stex" ]
source_file="res://assets/world/deco/single_frames/rock-3.png"
dest_files=[ "res://.import/rock-3.png-60ec78dac8a0076270c3d1ad40408c53.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-4-shadow.png-856423dc7dfa37b72a1d44590f0928c4.stex"
path="res://.import/rock-4-shadow.png-7fe8efc4f0ec47e6574e365394dc1eba.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-4-shadow.png"
dest_files=[ "res://.import/rock-4-shadow.png-856423dc7dfa37b72a1d44590f0928c4.stex" ]
source_file="res://assets/world/deco/single_frames/rock-4-shadow.png"
dest_files=[ "res://.import/rock-4-shadow.png-7fe8efc4f0ec47e6574e365394dc1eba.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/rock-4.png-baeff66ef2d66d102f408a60e960fd5b.stex"
path="res://.import/rock-4.png-0f30bed9f87d79009df7f40d67e6be24.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/rock-4.png"
dest_files=[ "res://.import/rock-4.png-baeff66ef2d66d102f408a60e960fd5b.stex" ]
source_file="res://assets/world/deco/single_frames/rock-4.png"
dest_files=[ "res://.import/rock-4.png-0f30bed9f87d79009df7f40d67e6be24.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes.
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/shelf.png-5f5bcf50a62d1182b83fd926503429e3.stex"
path="res://.import/shelf.png-585249a422fdbbd08d47bf6c77b849fc.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/shelf.png"
dest_files=[ "res://.import/shelf.png-5f5bcf50a62d1182b83fd926503429e3.stex" ]
source_file="res://assets/world/deco/single_frames/shelf.png"
dest_files=[ "res://.import/shelf.png-585249a422fdbbd08d47bf6c77b849fc.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-1.png-74cd785cf417fde5d641a112c61731f4.stex"
path="res://.import/snow-1.png-8d263160e3c1306d360b3ef1ca5c2879.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-1.png"
dest_files=[ "res://.import/snow-1.png-74cd785cf417fde5d641a112c61731f4.stex" ]
source_file="res://assets/world/deco/single_frames/snow-1.png"
dest_files=[ "res://.import/snow-1.png-8d263160e3c1306d360b3ef1ca5c2879.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-2.png-7024d46524dfd9d1df882a7f288598bb.stex"
path="res://.import/snow-2.png-08516a5d65fa93d5a5b6ea57ff96cbe9.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-2.png"
dest_files=[ "res://.import/snow-2.png-7024d46524dfd9d1df882a7f288598bb.stex" ]
source_file="res://assets/world/deco/single_frames/snow-2.png"
dest_files=[ "res://.import/snow-2.png-08516a5d65fa93d5a5b6ea57ff96cbe9.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-3.png-2ddde60e5dd21564216feafda07dffec.stex"
path="res://.import/snow-3.png-1a8a2cf44fdc8068aa4e13b65d03b22b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-3.png"
dest_files=[ "res://.import/snow-3.png-2ddde60e5dd21564216feafda07dffec.stex" ]
source_file="res://assets/world/deco/single_frames/snow-3.png"
dest_files=[ "res://.import/snow-3.png-1a8a2cf44fdc8068aa4e13b65d03b22b.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-4.png-3b33946dfbbcd94fafb061037d677575.stex"
path="res://.import/snow-4.png-11196bd7c6823b6e85b2a89952cd84c1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-4.png"
dest_files=[ "res://.import/snow-4.png-3b33946dfbbcd94fafb061037d677575.stex" ]
source_file="res://assets/world/deco/single_frames/snow-4.png"
dest_files=[ "res://.import/snow-4.png-11196bd7c6823b6e85b2a89952cd84c1.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-5.png-65d7deb04085cf60e04fe518cc69a7a9.stex"
path="res://.import/snow-5.png-60ea924cb44337c41e82937a827d7dd9.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-5.png"
dest_files=[ "res://.import/snow-5.png-65d7deb04085cf60e04fe518cc69a7a9.stex" ]
source_file="res://assets/world/deco/single_frames/snow-5.png"
dest_files=[ "res://.import/snow-5.png-60ea924cb44337c41e82937a827d7dd9.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-6.png-edf36e85945eb13fea21f6eb64edc142.stex"
path="res://.import/snow-6.png-ae1f7b6a45f96bba307148df4a5e4785.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-6.png"
dest_files=[ "res://.import/snow-6.png-edf36e85945eb13fea21f6eb64edc142.stex" ]
source_file="res://assets/world/deco/single_frames/snow-6.png"
dest_files=[ "res://.import/snow-6.png-ae1f7b6a45f96bba307148df4a5e4785.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/snow-7.png-8221128101be9cf3f9dd5d42929f3315.stex"
path="res://.import/snow-7.png-34656fd386c0f26d2e2ec1d0d1a3149f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/snow-7.png"
dest_files=[ "res://.import/snow-7.png-8221128101be9cf3f9dd5d42929f3315.stex" ]
source_file="res://assets/world/deco/single_frames/snow-7.png"
dest_files=[ "res://.import/snow-7.png-34656fd386c0f26d2e2ec1d0d1a3149f.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-1-shadow.png-e9d1d823d4a6305dc1bcc68151af8680.stex"
path="res://.import/tree-1-shadow.png-dbf2aea5c574f80cafca19ae5d564a2c.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-1-shadow.png"
dest_files=[ "res://.import/tree-1-shadow.png-e9d1d823d4a6305dc1bcc68151af8680.stex" ]
source_file="res://assets/world/deco/single_frames/tree-1-shadow.png"
dest_files=[ "res://.import/tree-1-shadow.png-dbf2aea5c574f80cafca19ae5d564a2c.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-1.png-dfe913469aeabbdd8473c04c4e3fba30.stex"
path="res://.import/tree-1.png-99f61c103c565103e4dee3f646a9d0ba.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-1.png"
dest_files=[ "res://.import/tree-1.png-dfe913469aeabbdd8473c04c4e3fba30.stex" ]
source_file="res://assets/world/deco/single_frames/tree-1.png"
dest_files=[ "res://.import/tree-1.png-99f61c103c565103e4dee3f646a9d0ba.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-2-shadow.png-9555bcfe251d97a002a9677960ee891c.stex"
path="res://.import/tree-2-shadow.png-fe4cb64744ea9e18b294de5f9d0701f3.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-2-shadow.png"
dest_files=[ "res://.import/tree-2-shadow.png-9555bcfe251d97a002a9677960ee891c.stex" ]
source_file="res://assets/world/deco/single_frames/tree-2-shadow.png"
dest_files=[ "res://.import/tree-2-shadow.png-fe4cb64744ea9e18b294de5f9d0701f3.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-2.png-931780033483001593f710c57b0f9283.stex"
path="res://.import/tree-2.png-139046cc7e54e28562290e59360dc6c6.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-2.png"
dest_files=[ "res://.import/tree-2.png-931780033483001593f710c57b0f9283.stex" ]
source_file="res://assets/world/deco/single_frames/tree-2.png"
dest_files=[ "res://.import/tree-2.png-139046cc7e54e28562290e59360dc6c6.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-3-shadow.png-9d4857e3f724b8b6034b5b97b2cc1b62.stex"
path="res://.import/tree-3-shadow.png-2dc26c6af135f75bc565aba82fb59ee4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-3-shadow.png"
dest_files=[ "res://.import/tree-3-shadow.png-9d4857e3f724b8b6034b5b97b2cc1b62.stex" ]
source_file="res://assets/world/deco/single_frames/tree-3-shadow.png"
dest_files=[ "res://.import/tree-3-shadow.png-2dc26c6af135f75bc565aba82fb59ee4.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-3.png-4b151207d43ba46fb131d64bbc579556.stex"
path="res://.import/tree-3.png-b303419f4d035a1433d0575ea3bb3c23.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-3.png"
dest_files=[ "res://.import/tree-3.png-4b151207d43ba46fb131d64bbc579556.stex" ]
source_file="res://assets/world/deco/single_frames/tree-3.png"
dest_files=[ "res://.import/tree-3.png-b303419f4d035a1433d0575ea3bb3c23.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-4-shadow.png-edfcb60d17988abf5e2d6cf0df571de7.stex"
path="res://.import/tree-4-shadow.png-bf3f8b5d77618bc999b1f72697f4e756.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-4-shadow.png"
dest_files=[ "res://.import/tree-4-shadow.png-edfcb60d17988abf5e2d6cf0df571de7.stex" ]
source_file="res://assets/world/deco/single_frames/tree-4-shadow.png"
dest_files=[ "res://.import/tree-4-shadow.png-bf3f8b5d77618bc999b1f72697f4e756.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-4.png-19b001565e5bb59e5b5d8348e4b8150c.stex"
path="res://.import/tree-4.png-209535c914864ab46fbd7120fc489f71.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-4.png"
dest_files=[ "res://.import/tree-4.png-19b001565e5bb59e5b5d8348e4b8150c.stex" ]
source_file="res://assets/world/deco/single_frames/tree-4.png"
dest_files=[ "res://.import/tree-4.png-209535c914864ab46fbd7120fc489f71.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-5-shadow.png-03fa080cc59fde5fd077bb59fd7c29e3.stex"
path="res://.import/tree-5-shadow.png-f9d8a975216946f19f4956a0a046a0d4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-5-shadow.png"
dest_files=[ "res://.import/tree-5-shadow.png-03fa080cc59fde5fd077bb59fd7c29e3.stex" ]
source_file="res://assets/world/deco/single_frames/tree-5-shadow.png"
dest_files=[ "res://.import/tree-5-shadow.png-f9d8a975216946f19f4956a0a046a0d4.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-5.png-15ea44108537171ca3febfee6ce1d78b.stex"
path="res://.import/tree-5.png-46495742a6714e7b7bb80d5a2dbde3a0.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-5.png"
dest_files=[ "res://.import/tree-5.png-15ea44108537171ca3febfee6ce1d78b.stex" ]
source_file="res://assets/world/deco/single_frames/tree-5.png"
dest_files=[ "res://.import/tree-5.png-46495742a6714e7b7bb80d5a2dbde3a0.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-6-shadow.png-324220a67c415e54d6e90c774582e177.stex"
path="res://.import/tree-6-shadow.png-2bc68f8a85a202245e30ca41d87c5f84.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-6-shadow.png"
dest_files=[ "res://.import/tree-6-shadow.png-324220a67c415e54d6e90c774582e177.stex" ]
source_file="res://assets/world/deco/single_frames/tree-6-shadow.png"
dest_files=[ "res://.import/tree-6-shadow.png-2bc68f8a85a202245e30ca41d87c5f84.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
File renamed without changes
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/tree-6.png-51ba557e8013338f2d3e7f8bc35d4426.stex"
path="res://.import/tree-6.png-d52ce0b6fe06a1e36271d13facadf780.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/tree-6.png"
dest_files=[ "res://.import/tree-6.png-51ba557e8013338f2d3e7f8bc35d4426.stex" ]
source_file="res://assets/world/deco/single_frames/tree-6.png"
dest_files=[ "res://.import/tree-6.png-d52ce0b6fe06a1e36271d13facadf780.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/world/deco/snow.png
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-1.png-40dcda5ef814a4ffc10f63f2d16f9140.stex"
path="res://.import/snow.png-9cdec63bcdd09d9ab6ac3c99c7b69fd1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-1.png"
dest_files=[ "res://.import/barrier-1.png-40dcda5ef814a4ffc10f63f2d16f9140.stex" ]
source_file="res://assets/world/deco/snow.png"
dest_files=[ "res://.import/snow.png-9cdec63bcdd09d9ab6ac3c99c7b69fd1.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/world/deco/trees-shadows.png
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/barrier-11.png-15c5165a69f1bd8c990ca070bc73251a.stex"
path="res://.import/trees-shadows.png-77aa216beca787dcb1b77faa38b827c6.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/barrier-11.png"
dest_files=[ "res://.import/barrier-11.png-15c5165a69f1bd8c990ca070bc73251a.stex" ]
source_file="res://assets/world/deco/trees-shadows.png"
dest_files=[ "res://.import/trees-shadows.png-77aa216beca787dcb1b77faa38b827c6.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Binary file added assets/world/deco/trees.png
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/clock.png-3582aa52ebf315920c6c8370695bec56.stex"
path="res://.import/trees.png-78ab6fd73f930b8558de449897413819.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/world/deco/clock.png"
dest_files=[ "res://.import/clock.png-3582aa52ebf315920c6c8370695bec56.stex" ]
source_file="res://assets/world/deco/trees.png"
dest_files=[ "res://.import/trees.png-78ab6fd73f930b8558de449897413819.stex" ]

[params]

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
15 changes: 11 additions & 4 deletions project.godot
Original file line number Diff line number Diff line change
@@ -22,22 +22,27 @@ _global_script_classes=[ {
"base": "Candy",
"class": "MandarinLarge",
"language": "GDScript",
"path": "res://src/actors/candy/types/mandarinLarge.gd"
"path": "res://src/actors/candy/types/mandarinLarge/mandarinLarge.gd"
}, {
"base": "Candy",
"class": "MandarinSmall",
"language": "GDScript",
"path": "res://src/actors/candy/types/mandarinSmall.gd"
"path": "res://src/actors/candy/types/mandarinSmall/mandarinSmall.gd"
}, {
"base": "Control",
"class": "Menu",
"language": "GDScript",
"path": "res://src/ui/menus/menu.gd"
}, {
"base": "Candy",
"class": "PeanutLarge",
"language": "GDScript",
"path": "res://src/actors/candy/types/peanutLarge.gd"
"path": "res://src/actors/candy/types/peanutLarge/peanutLarge.gd"
}, {
"base": "Candy",
"class": "PeanutSmall",
"language": "GDScript",
"path": "res://src/actors/candy/types/peanutSmall.gd"
"path": "res://src/actors/candy/types/peanutSmall/peanutSmall.gd"
}, {
"base": "KinematicBody2D",
"class": "Player",
@@ -54,6 +59,7 @@ _global_script_class_icons={
"Game": "",
"MandarinLarge": "res://assets/candy/mandarin-big.png",
"MandarinSmall": "res://assets/candy/mandarin-small.png",
"Menu": "",
"PeanutLarge": "res://assets/candy/peanut-big.png",
"PeanutSmall": "res://assets/candy/peanut-small.png",
"Player": "",
@@ -73,6 +79,7 @@ config/icon="res://assets/brand/temp-logo.png"
Database="*res://src/scripts/database.gd"
Gamestate="*res://src/scripts/gamestate.gd"
ConnectionManager="*res://src/scripts/client/connectionManager.gd"
CandyPlacer="*res://src/scripts/server/trails/candyPlacer.gd"

[display]

14 changes: 13 additions & 1 deletion src/actors/candy/candy.gd
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ puppet var puppet_targeted_pos = Vector2.ZERO

var points: int = 0
var sprite_frame: SpriteFrames = null
var explosion_material: ParticlesMaterial = null


"""########################################
@@ -37,7 +38,8 @@ func _ready():
self.set_network_master(1)
set_process(false)

func set_candy_sprite_frame(sprite_frame: SpriteFrames):
func set_candy_type_properties():
$Explosion.set_process_material(self.explosion_material)
$AnimatedSprite.set_sprite_frames(self.sprite_frame)


@@ -54,6 +56,7 @@ func _process(delta):
rset_unreliable("puppet_targeted_pos", targeted_position)
else:
self.targeted_position = self.puppet_targeted_pos

self.position = lerp(self.position, self.targeted_position, 0.1)


@@ -115,4 +118,13 @@ func delete():


remote func delete_candy_client(candy_name):
$Explosion.emitting = true
var particle_material = $Explosion.process_material as ParticlesMaterial
var dir2: Vector2 = targeted_position - position
var dir3: Vector3 = Vector3(dir2.x, dir2.y, 0).normalized()
particle_material.direction = dir3
$AnimatedSprite.set_visible(false)
$TimerExplosion.start()

func _on_TimerExplosion_timeout():
self.queue_free()
24 changes: 20 additions & 4 deletions src/actors/candy/candy.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]

[ext_resource path="res://src/actors/candy/candy.gd" type="Script" id=1]
[ext_resource path="res://src/actors/candy/types/peanutSmall.tres" type="SpriteFrames" id=2]
[ext_resource path="res://src/actors/candy/types/peanutSmall/peanutSmall.tres" type="SpriteFrames" id=2]
[ext_resource path="res://assets/light.png" type="Texture" id=3]
[ext_resource path="res://src/actors/candy/types/peanutSmall/explosionPeanutSmall.tres" type="Material" id=4]

[sub_resource type="CircleShape2D" id=1]
radius = 31.142
@@ -15,18 +16,33 @@ script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )

[node name="Explosion" type="Particles2D" parent="."]
position = Vector2( -50, -40 )
scale = Vector2( 10, 10 )
emitting = false
amount = 20
lifetime = 0.5
one_shot = true
explosiveness = 1.0
local_coords = false
process_material = ExtResource( 4 )

[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
position = Vector2( 0, 10 )
scale = Vector2( 10, 10 )
frames = ExtResource( 2 )
animation = "idle"
frame = 5
frame = 2
playing = true

[node name="Light2D" type="Light2D" parent="."]
visible = false
texture = ExtResource( 3 )
texture_scale = 0.41
color = Color( 0.92549, 0.807843, 0.337255, 0.498039 )
energy = 0.39
shadow_enabled = true
shadow_gradient_length = 6.7

[node name="TimerExplosion" type="Timer" parent="."]

[connection signal="timeout" from="TimerExplosion" to="." method="_on_TimerExplosion_timeout"]
14 changes: 0 additions & 14 deletions src/actors/candy/types/mandarinLarge.gd

This file was deleted.

46 changes: 46 additions & 0 deletions src/actors/candy/types/mandarinLarge/explosionMandarinLarge.tres

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions src/actors/candy/types/mandarinLarge/mandarinLarge.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
extends Candy

class_name MandarinLarge, "res://assets/candy/mandarin-big.png"


# Called when the node enters the scene tree for the first time.
func _ready():
points = 15
sprite_frame = preload("res://src/actors/candy/types/mandarinLarge/mandarinLarge.tres")
explosion_material = preload("res://src/actors/candy/types/mandarinLarge/explosionMandarinLarge.tres")
set_candy_type_properties()
File renamed without changes.
11 changes: 0 additions & 11 deletions src/actors/candy/types/mandarinSmall.gd

This file was deleted.

46 changes: 46 additions & 0 deletions src/actors/candy/types/mandarinSmall/explosionMandarinSmall.tres

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/actors/candy/types/mandarinSmall/mandarinSmall.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
extends Candy

class_name MandarinSmall, "res://assets/candy/mandarin-small.png"


# Called when the node enters the scene tree for the first time.
func _ready():
points = 5
sprite_frame = preload("res://src/actors/candy/types/mandarinSmall/mandarinSmall.tres")
explosion_material = preload("res://src/actors/candy/types/mandarinSmall/explosionMandarinSmall.tres")
set_candy_type_properties()

File renamed without changes.
15 changes: 0 additions & 15 deletions src/actors/candy/types/peanutLarge.gd

This file was deleted.

46 changes: 46 additions & 0 deletions src/actors/candy/types/peanutLarge/explosionPeanutLarge.tres

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions src/actors/candy/types/peanutLarge/peanutLarge.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
extends Candy

class_name PeanutLarge, "res://assets/candy/peanut-big.png"


# Called when the node enters the scene tree for the first time.
func _ready():
points = 10
sprite_frame = preload("res://src/actors/candy/types/peanutLarge/peanutLarge.tres")
explosion_material = preload("res://src/actors/candy/types/peanutLarge/explosionPeanutLarge.tres")
set_candy_type_properties()
File renamed without changes.
15 changes: 0 additions & 15 deletions src/actors/candy/types/peanutSmall.gd

This file was deleted.

46 changes: 46 additions & 0 deletions src/actors/candy/types/peanutSmall/explosionPeanutSmall.tres

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions src/actors/candy/types/peanutSmall/peanutSmall.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
extends Candy

class_name PeanutSmall, "res://assets/candy/peanut-small.png"


# Called when the node enters the scene tree for the first time.
func _ready():
points = 1
sprite_frame = preload("res://src/actors/candy/types/peanutSmall/peanutSmall.tres")
explosion_material = preload("res://src/actors/candy/types/peanutSmall/explosionPeanutSmall.tres")
set_candy_type_properties()
File renamed without changes.
11 changes: 8 additions & 3 deletions src/actors/player/player.gd
Original file line number Diff line number Diff line change
@@ -18,8 +18,9 @@ var joystick_velocity = Vector2.ZERO

var trail: Array = Array()

var player_name = ""
var speed = 500
var player_name := ""
var points_earned := 0
var speed := 500
var gender = null
var team = null
var flip_h = false
@@ -57,6 +58,10 @@ func _ready():
# Team is red, the player will also detect black candies
$CandiesCollider.set_collision_mask_bit(4, true)

# Hide the nametag of the player we're playing
if is_network_master():
$NameTag.visible = false



"""########################################
@@ -181,7 +186,7 @@ func _on_CandiesCollider_area_entered(candy: Area2D):
c.take(self)

# Set the candy's color
for id in Gamestate.get_players_list():
for id in Gamestate.get_clients_list():
c.rpc_id(id, "set_color_team", bool(self.team))
c.set_color_team(bool(self.team))

2 changes: 1 addition & 1 deletion src/actors/player/player.tscn
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ position = Vector2( 0, -20 )
scale = Vector2( 10, 10 )
frames = ExtResource( 2 )
animation = "idle"
frame = 3
frame = 2
playing = true

[node name="Camera" type="Camera2D" parent="."]
62 changes: 53 additions & 9 deletions src/game.gd
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ signal update_progressbar

func init(players_init: Dictionary):
randomize()
set_network_master(1)

init_client(players_init)

@@ -91,7 +92,7 @@ func init_server():
self.add_child(trails)
trails.init($YSort/Players)
$YSort/Map.connect("player_arrived_at_home", self, "add_points")
$YSort/Map.connect("player_arrived_at_home", trails, "clear_trail")
$YSort/Map.connect("player_arrived_at_home", trails, "animate_candies_collect")

func set_main_player():
# Connects the joystick's signal to the player of this instance
@@ -104,7 +105,7 @@ func set_main_player():


"""########################################
START / END GAME
START GAME
########################################"""


@@ -115,20 +116,60 @@ func _ready():


func play_music():
pass #$AudioStreamPlayer.play(0)
$AudioStreamPlayer.play(0)


"""########################################
END GAME
########################################"""


func _on_GeneralTimer_timeout():
# Game ended
get_tree().get_root().add_child(load("res://src/ui/menus/game-ended/gameEnded.tscn").instance())
get_node("/root/Game").queue_free()

# Save the game's results on the device
#Database.save_points()
var team_winner: int = 0
var points_by_player = {}

if get_tree().is_network_server():
# define which team won
# 0 -> red / 1 -> black / -1 -> equality
team_winner = int(points['black'] > points['red'])
if points['black'] == points['red']: team_winner = -1

# count the players points
for player in $YSort/Players.get_children():
points_by_player[player.get_name()] = {
"points": player.points_earned,
"name": player.player_name}

# Send the message to everyone
for id in Gamestate.get_clients_list():
rpc_id(id, "game_ended", team_winner, points_by_player)
game_ended(team_winner, points_by_player)

# Delete the Game node
self.queue_free()


remote func game_ended(team_winner, points_by_player):
var menu_container = load("res://src/ui/menus/menuContainer.tscn").instance()
menu_container.get_node("MarginContainer/Home").queue_free()
get_tree().get_root().add_child(menu_container)

menu_container.set_menu("res://src/ui/menus/game-ended/gameEnded.tscn", Vector2.UP, [
team_winner, points_by_player])

# Delete the Game node
self.queue_free()


"""########################################
SLOTS
########################################"""

# Only called on the server
# Add points to a team
func add_points(player: KinematicBody2D):
assert(get_tree().is_network_server())

@@ -139,10 +180,13 @@ func add_points(player: KinematicBody2D):
player.team_e.RED: self.points['red'] += points
player.team_e.BLACK: self.points['black'] += points

for id in Gamestate.get_clients_list():
rpc_id(id, "update_progressbar_client", self.points)
player.points_earned += points

emit_signal("update_progressbar", self.points)
var points_progress_bar = self.points.duplicate()
for id in Gamestate.get_clients_list():
rpc_id(id, "update_progressbar_client", points_progress_bar)
emit_signal("update_progressbar", points_progress_bar)


remote func update_progressbar_client(points: Dictionary):
emit_signal("update_progressbar", points)
10 changes: 9 additions & 1 deletion src/levels/levelDemo/levelDemo.gd
Original file line number Diff line number Diff line change
@@ -3,9 +3,17 @@ extends YSort
signal player_arrived_at_home


func _on_home_body_entered(body):
func _on_ZoneRed_body_entered(body):
if not get_tree().is_network_server(): return
if not body is Player: return
if not body.team == Player.team_e.RED: return

emit_signal("player_arrived_at_home", body)


func _on_ZoneBlack_body_entered(body):
if not get_tree().is_network_server(): return
if not body is Player: return
if not body.team == Player.team_e.BLACK: return

emit_signal("player_arrived_at_home", body)
738 changes: 730 additions & 8 deletions src/levels/levelDemo/levelDemo.tscn

Large diffs are not rendered by default.

29 changes: 25 additions & 4 deletions src/scripts/database.gd
Original file line number Diff line number Diff line change
@@ -7,26 +7,47 @@ extends Node

const candies = {
'peanutSmall': {
'file': preload("res://src/actors/candy/types/peanutSmall.gd"),
'file': preload("res://src/actors/candy/types/peanutSmall/peanutSmall.gd"),
'chance' : 0.75
},
'mandarinSmall': {
'file': preload("res://src/actors/candy/types/mandarinSmall.gd"),
'file': preload("res://src/actors/candy/types/mandarinSmall/mandarinSmall.gd"),
'chance' : 0.18
},
'peanutLarge': {
'file': preload("res://src/actors/candy/types/peanutLarge.gd"),
'file': preload("res://src/actors/candy/types/peanutLarge/peanutLarge.gd"),
'chance' : 0.05
},
'mandarinLarge': {
'file': preload("res://src/actors/candy/types/mandarinLarge.gd"),
'file': preload("res://src/actors/candy/types/mandarinLarge/mandarinLarge.gd"),
'chance' : 0.02
},
}


const PLAYER_LINE_DISTANCE_DRAW = 100
const DISTANCE_BETWEEN_CANDIES = 120


"""########################################
PLAYER
########################################"""


const MIN_PLAYERS = 1
var player_name = ""

func get_player_name():
if player_name == "":
return "username"
return player_name


"""########################################
DEVICE MEMORY
########################################"""


# Save data on the device
func save_points():
pass
8 changes: 4 additions & 4 deletions src/scripts/gamestate.gd
Original file line number Diff line number Diff line change
@@ -152,15 +152,15 @@ func get_server_only():
#################################################"""


func join_game(ip, new_player_name):
func join_game(ip):
self.server_only = false
self.players.clear()

var peer = NetworkedMultiplayerENet.new()
peer.create_client(ip, DEFAULT_PORT)
get_tree().set_network_peer(peer)

self.player_name = new_player_name
self.player_name = Database.get_player_name()
self.register_player(self.player_name)


@@ -191,11 +191,11 @@ func _connected_fail():


# This instance clicked the "host" button
func host_and_play_game(new_player_name):
func host_and_play_game():
self.server_only = false
self.host_game()

self.player_name = new_player_name
self.player_name = Database.get_player_name()
self.register_player(self.player_name)


8 changes: 6 additions & 2 deletions src/scripts/server/candySpawners/candySpawners.gd
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ extends Node


var spawners = Array()
var candy_id := 0


func init(spawners_list: Array):
@@ -24,12 +25,14 @@ func _on_Timer_timeout():
# Choose a random spawner and a candy type
var spawner:Position2D = available_spawners[randi() % available_spawners.size()]
var type: String = get_random_candy_type()
var name: String = "Candy" + str(candy_id)
candy_id += 1

spawner.spawned = true

for id in Gamestate.get_clients_list():
spawner.rpc_id(id, "spawn_candy", type)
spawner.spawn_candy(type)
spawner.rpc_id(id, "spawn_candy", type, name)
spawner.spawn_candy(type, name)


func get_random_candy_type() -> String:
@@ -45,6 +48,7 @@ func get_random_candy_type() -> String:
if val > chances[i] and val < chances[i+1]:
return Database.candies.keys()[i]

assert(false) # This line sould not be reached
return Database.candies.keys()[0]


3 changes: 2 additions & 1 deletion src/scripts/server/candySpawners/spawner.gd
Original file line number Diff line number Diff line change
@@ -6,8 +6,9 @@ export var spawned := false
var candy_scene := preload("res://src/actors/candy/candy.tscn")


remote func spawn_candy(type: String):
remote func spawn_candy(type: String, name: String):
var candy = self.candy_scene.instance()
candy.set_name(name)

# candy parameters
candy.init(self.position, type)
52 changes: 52 additions & 0 deletions src/scripts/server/trails/candyPlacer.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
extends Node

# Place the candies on the line (based on the parameters in the Database
# singleton) and returns the candies that are offsetting in the beginnning
# of the line
func place(trail: Line2D, candies: Array, offset = 0) -> Array:
# the remaining length on the trail until the next candy
var remaining_dist: int = Database.DISTANCE_BETWEEN_CANDIES + offset
# the index of the current point in on the player's trail
var i: int = 0
var segment_lengh = distance_between_trail_points(trail, i)
var end_of_trail: bool = false

var offsetting_candies = Array()

for c in candies: # for each candy the player has picked up
while remaining_dist > segment_lengh and not end_of_trail:
remaining_dist -= segment_lengh
if trail.points.size()-1 < i+2:
end_of_trail = true
else:
i += 1
segment_lengh = distance_between_trail_points(trail, i)

# place the candy somewhere in this segment of the line

# div by zero protection
if segment_lengh == 0:
segment_lengh = 1
var factor = remaining_dist / segment_lengh
if end_of_trail: factor = 1

# If the candy is too much before the trail, it's considered as being
# at home
if factor < -5.0:
offsetting_candies.append(c)


c.targeted_position = lerp(trail.points[i], trail.points[i+1], factor)

# calculate the remaining distance for the next candy to place
remaining_dist = Database.DISTANCE_BETWEEN_CANDIES + remaining_dist

return offsetting_candies


# Returns the distance between the points i and i+1
func distance_between_trail_points(trail: Line2D, i: int) -> float :
return sqrt(
pow(trail.points[i].x - trail.points[i+1].x, 2) +
pow(trail.points[i].y - trail.points[i+1].y, 2)
)
20 changes: 20 additions & 0 deletions src/scripts/server/trails/collector.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
extends Line2D

var candies := Array()
var offset := 0
var speed := 25

func _process(delta):
offset -= speed
var candies_at_home: Array = CandyPlacer.place(self, candies, offset)

# Remove the candies that are at home
for c in candies_at_home:
c = c as Candy
candies.erase(c)
c.delete()
offset += Database.DISTANCE_BETWEEN_CANDIES

if candies.size() == 0:
queue_free()

7 changes: 7 additions & 0 deletions src/scripts/server/trails/collector.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://src/scripts/server/trails/collector.gd" type="Script" id=1]

[node name="Collector" type="Line2D"]
default_color = Color( 1, 1, 1, 0 )
script = ExtResource( 1 )
87 changes: 14 additions & 73 deletions src/scripts/server/trails/trails.gd
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
extends Node2D


const PLAYER_LINE_DISTANCE_DRAW = 100
const DISTANCE_BETWEEN_CANDIES = 120
const collector_scene: Resource = preload("res://src/scripts/server/trails/collector.tscn")


"""########################################
@@ -39,9 +37,6 @@ func _process(delta):

# Place the candies
self.place_candies(players)

# Collect the candies which have to be collected
self.collect_candies(players)


"""########################################
@@ -57,7 +52,7 @@ func place_trails(players):
var last_last_point = line.points[1]
line.set_point_position(0, p.position)
if not line.points.empty():
if p.position.distance_to(last_last_point) > PLAYER_LINE_DISTANCE_DRAW:
if p.position.distance_to(last_last_point) > Database.PLAYER_LINE_DISTANCE_DRAW:
line.add_point(p.position, 0)


@@ -69,84 +64,30 @@ func place_trails(players):
func place_candies(players):
for p in players.get_children():
var trail: Line2D = get_tree().get_root().get_node("Game/Trails/" + p.get_name())
var candies: Array = p.trail

# the remaining length on the trail until the next candy
var remaining_dist: int = self.DISTANCE_BETWEEN_CANDIES
# the index of the current point in on the player's trail
var i: int = 0
var segment_lengh = distance_between_trail_points(trail, i)
var end_of_trail: bool = false

for c in p.trail: # for each candy the player has picked up
while remaining_dist > segment_lengh and not end_of_trail:
remaining_dist -= segment_lengh
if trail.points.size()-1 < i+2:
end_of_trail = true
else:
i += 1
segment_lengh = distance_between_trail_points(trail, i)

# place the candy somewhere in this segment of the line

# div by zero protection
if segment_lengh == 0:
segment_lengh = 1
var factor = remaining_dist / segment_lengh
if end_of_trail: factor = 1

c.targeted_position = lerp(trail.points[i], trail.points[i+1], factor)

# calculate the remaining distance for the next candy to place
remaining_dist = self.DISTANCE_BETWEEN_CANDIES + remaining_dist


# Returns the distance between the points i and i+10
func distance_between_trail_points(trail: Line2D, i: int) -> float :
return sqrt(
pow(trail.points[i].x - trail.points[i+1].x, 2) +
pow(trail.points[i].y - trail.points[i+1].y, 2)
)


"""########################################
COLLECT CANDIES
########################################"""


func collect_candies(players: Node2D):
pass
CandyPlacer.place(trail, candies)


"""########################################
SLOTS
########################################"""


func clear_trail(player: Player):
func animate_candies_collect(player: Player):
assert(get_tree().is_network_server())

var line_2d: Line2D = get_node(player.get_name())

var collector: Line2D = collector_scene.instance()
collector.candies = player.trail.duplicate(true)
collector.points = line_2d.points
collector.set_name("Collect" + player.get_name().capitalize())
$Collecting.add_child(collector)

# Reset the player's line
line_2d.clear_points()
line_2d.add_point(player.get_position())
line_2d.add_point(player.get_position())

for c in player.trail:
c = c as Candy
c.delete()
# Clear the player's candies trail
player.trail.clear()

# TODO animate candies collection
"""
var old_line_2d = get_node(player.get_name())
var new_line_2d = Line2D.new()

old_line_2d.set_name(old_line_2d.get_name() + "_collect_candies")
remove_child(old_line_2d)
$Collect.add_child(old_line_2d)

new_line_2d.set_name(str(player.get_name()))
new_line_2d.set_default_color(Color(1, 1, 1, 0.5))
add_child(new_line_2d)
new_line_2d.add_point(player.get_position())
new_line_2d.add_point(player.get_position())
"""
2 changes: 1 addition & 1 deletion src/scripts/server/trails/trails.tscn
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
[node name="Trails" type="Node2D"]
script = ExtResource( 1 )

[node name="Collect" type="Node2D" parent="."]
[node name="Collecting" type="Node2D" parent="."]
19 changes: 16 additions & 3 deletions src/ui/components/progressBar/progressBar.gd
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
extends Control

onready var tween = $HBoxContainer/Tween
onready var progress_bar = $HBoxContainer/ProgressBar

func update_progressbar(points: Dictionary):
$HBoxContainer/LabelRed.set_text(str(points['red']))
$HBoxContainer/LabelBlack.set_text(str(points['black']))
if points['red'] != 0 or points['black'] != 0:
var ratio: float = float(points['red']) / float(points['red'] + points['black'])
$HBoxContainer/ProgressBar.set_value(ratio)

# Div by zero protection
if points['red'] == 0 and points['black'] == 0:
points['red'] = 1
points['black'] = 1

var old_value = progress_bar.value
var new_value = float(points['red']) / (float(points['red'] + points['black']))

tween.interpolate_property(
progress_bar, "value", old_value, new_value, 0.5,
Tween.TRANS_QUAD, Tween.EASE_IN_OUT)
#$HBoxContainer/ProgressBar.set_value(ratio)
tween.start()


func _on_ProgressBar_value_changed(value):
20 changes: 11 additions & 9 deletions src/ui/components/progressBar/progressBar.tscn
Original file line number Diff line number Diff line change
@@ -64,19 +64,19 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -280.0
margin_left = -510.0
margin_top = -35.0
margin_right = 280.0
margin_right = 510.0
margin_bottom = 35.0
custom_constants/separation = 10
__meta__ = {
"_edit_use_anchors_": false
}

[node name="LabelRed" type="Label" parent="HBoxContainer"]
margin_right = 70.0
margin_right = 300.0
margin_bottom = 70.0
rect_min_size = Vector2( 70, 0 )
rect_min_size = Vector2( 300, 0 )
theme = ExtResource( 1 )
text = "0"
align = 2
@@ -85,9 +85,9 @@ __meta__ = {
}

[node name="ProgressBar" type="ProgressBar" parent="HBoxContainer"]
margin_left = 80.0
margin_left = 310.0
margin_top = 20.0
margin_right = 480.0
margin_right = 710.0
margin_bottom = 50.0
rect_min_size = Vector2( 400, 30 )
size_flags_vertical = 4
@@ -105,16 +105,18 @@ visibility_rect = Rect2( -15, -15, 50, 30 )
process_material = SubResource( 6 )

[node name="LabelBlack" type="Label" parent="HBoxContainer"]
margin_left = 490.0
margin_right = 560.0
margin_left = 720.0
margin_right = 1020.0
margin_bottom = 70.0
rect_min_size = Vector2( 70, 0 )
rect_min_size = Vector2( 300, 0 )
theme = ExtResource( 1 )
text = "0"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Tween" type="Tween" parent="HBoxContainer"]

[node name="ProgressBar2" type="ProgressBar" parent="."]
anchor_left = 0.5
anchor_top = 0.5
8 changes: 3 additions & 5 deletions src/ui/menus/choose-join-local/chooseJoinLocal.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
extends Control

signal set_menu(path)
extends Menu

onready var ip_address = $PopupIpAdress/VBoxContainer/HBoxContainer/LineEdit
onready var error_label = $PopupIpAdress/VBoxContainer/Error
@@ -20,7 +18,7 @@ func _on_ButtonOpenPopup_pressed():


func _on_ButtonCreateServer_pressed():
Gamestate.host_and_play_game("Placeholder name")
Gamestate.host_and_play_game()
emit_signal("set_menu", "res://src/ui/menus/waiting-room/WaitingRoom.tscn", Vector2.RIGHT)


@@ -30,7 +28,7 @@ func _on_ButtonJoinServer_pressed():
return

error_label.text = ""
Gamestate.join_game(ip_address.text, "Placeholder name")
Gamestate.join_game(ip_address.text)


func on_connection_success():
11 changes: 8 additions & 3 deletions src/ui/menus/choose-mode/ChooseMode.gd
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
extends VBoxContainer

signal set_menu(path)
extends Menu

func _ready():
if Database.get_player_name() != "":
$HBoxContainer/ButtonSetPseudo.text = Database.get_player_name()

func _on_ButtonBack_pressed():
emit_signal("set_menu", "res://src/ui/menus/home/Home.tscn", Vector2.UP)


func _on_ButtonLocal_pressed():
emit_signal("set_menu", "res://src/ui/menus/choose-join-local/chooseJoinLocal.tscn", Vector2.RIGHT)


func _on_ButtonSetPseudo_pressed():
emit_signal("set_menu", "res://src/ui/menus/set-player-name/setPlayerName.tscn", Vector2.UP)
10 changes: 10 additions & 0 deletions src/ui/menus/choose-mode/ChooseMode.tscn
Original file line number Diff line number Diff line change
@@ -23,6 +23,15 @@ margin_bottom = 109.0
custom_fonts/font = ExtResource( 2 )
text = "SchoolBoyBattle"

[node name="ButtonSetPseudo" type="Button" parent="HBoxContainer"]
margin_left = 919.0
margin_top = 9.0
margin_right = 1280.0
margin_bottom = 99.0
size_flags_horizontal = 10
size_flags_vertical = 4
text = "Pseudonyme"

[node name="GridContainer" type="HBoxContainer" parent="."]
margin_top = 129.0
margin_right = 1280.0
@@ -76,5 +85,6 @@ margin_bottom = 720.0
size_flags_horizontal = 0
text = "Retour"

[connection signal="pressed" from="HBoxContainer/ButtonSetPseudo" to="." method="_on_ButtonSetPseudo_pressed"]
[connection signal="pressed" from="GridContainer/VBoxContainer2/ButtonLocal" to="." method="_on_ButtonLocal_pressed"]
[connection signal="pressed" from="ButtonBack" to="." method="_on_ButtonBack_pressed"]
38 changes: 38 additions & 0 deletions src/ui/menus/game-ended/gameEnded.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
extends Menu



func _ready():
pass

func init(parameters):
show_game_results(parameters)

remote func show_game_results(parameters):
var boss_red = $VBoxContainer/HBoxContainer/BossRed
var boss_black = $VBoxContainer/HBoxContainer/BossBlack
var label_win = $VBoxContainer/LabelWinner
var results_list = $VBoxContainer/HBoxContainer/VBoxContainer/ItemList

var team_winner = parameters[0]
var points_by_player = parameters[1]

# The winner team
match(team_winner):
0: # Red team won the game
label_win.set_text("St-Nicolas a gagné !")
label_win.align = Label.ALIGN_LEFT
boss_black.set_visible(false)
1: # Black team won the game
label_win.set_text("Père Fouettard a gagné !")
label_win.align = Label.ALIGN_RIGHT
boss_red.set_visible(false)
-1: # Ex-aeco
label_win.set_text("Ex-aeco !")

# The players result
for p in points_by_player.values():
results_list.add_item(p["name"] + " : " + str(p["points"]))

func _on_ButtonBack_pressed():
emit_signal("set_menu", "res://src/ui/menus/choose-mode/ChooseMode.tscn", Vector2.LEFT)
215 changes: 214 additions & 1 deletion src/ui/menus/game-ended/gameEnded.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,221 @@
[gd_scene format=2]
[gd_scene load_steps=12 format=2]

[ext_resource path="res://assets/themes/main_theme.tres" type="Theme" id=1]
[ext_resource path="res://assets/themes/fonts/large.tres" type="DynamicFont" id=2]
[ext_resource path="res://src/ui/menus/game-ended/gameEnded.gd" type="Script" id=3]
[ext_resource path="res://assets/player/idle/boy-red-idle.png" type="Texture" id=4]
[ext_resource path="res://assets/bosses/idle/boss-black-idle.png" type="Texture" id=5]
[ext_resource path="res://assets/bosses/idle/boss-red-idle.png" type="Texture" id=6]
[ext_resource path="res://assets/player/idle/girl-black-idle.png" type="Texture" id=7]
[ext_resource path="res://assets/player/idle/girl-red-idle.png" type="Texture" id=8]
[ext_resource path="res://assets/player/idle/boy-black-idle.png" type="Texture" id=9]

[sub_resource type="Animation" id=1]
resource_name = "characters_idle"
length = 1.2
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("BoyRed:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6, 0.8, 1 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("../BossBlack/GirlBlack:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0.11716, 0.31716, 0.51716, 0.71716, 0.91716, 1.11716 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("../BossBlack/BoyBlack:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6, 0.8, 1 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("GirlRed:frame")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0.150783, 0.350783, 0.550783, 0.750783, 0.950783, 1.15078 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}

[sub_resource type="Animation" id=2]
resource_name = "boss_idle"
length = 2.0
loop = true
step = 0.33
tracks/0/type = "value"
tracks/0/path = NodePath("BossRed:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.33, 0.66, 0.99, 1.32, 1.65 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("../BossBlack/BossBlack:frame")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0.264695, 0.594695, 0.924695, 1.2547, 1.5847, 1.9147 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 3, 4, 5 ]
}

[node name="GameEnded" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 1 )
script = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}

[node name="LabelWinner" type="Label" parent="VBoxContainer"]
margin_right = 1280.0
margin_bottom = 221.0
size_flags_horizontal = 3
custom_fonts/font = ExtResource( 2 )
text = "XXX
a gagné"
align = 1

[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 241.0
margin_right = 1280.0
margin_bottom = 720.0
size_flags_vertical = 3

[node name="BossRed" type="Control" parent="VBoxContainer/HBoxContainer"]
margin_left = 365.0
margin_top = 239.0
margin_right = 365.0
margin_bottom = 239.0
size_flags_horizontal = 10
size_flags_vertical = 4

[node name="GirlRed" type="Sprite" parent="VBoxContainer/HBoxContainer/BossRed"]
position = Vector2( -113.799, 96.4127 )
scale = Vector2( 10, 10 )
texture = ExtResource( 8 )
hframes = 6

[node name="BossRed" type="Sprite" parent="VBoxContainer/HBoxContainer/BossRed"]
position = Vector2( -219.242, -36.5466 )
scale = Vector2( 10, 10 )
texture = ExtResource( 6 )
hframes = 6

[node name="BoyRed" type="Sprite" parent="VBoxContainer/HBoxContainer/BossRed"]
position = Vector2( -305.693, 116.712 )
scale = Vector2( 10, 10 )
texture = ExtResource( 4 )
flip_h = true
hframes = 6
frame = 5

[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
margin_left = 385.0
margin_right = 895.0
margin_bottom = 479.0
size_flags_horizontal = 3

[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_right = 510.0
margin_bottom = 70.0
text = "Classement de la partie"

[node name="ItemList" type="ItemList" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 90.0
margin_right = 510.0
margin_bottom = 369.0
size_flags_vertical = 3

[node name="ButtonBack" type="Button" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 389.0
margin_right = 510.0
margin_bottom = 479.0
size_flags_vertical = 8
text = "Retour"

[node name="BossBlack" type="Control" parent="VBoxContainer/HBoxContainer"]
margin_left = 915.0
margin_top = 239.0
margin_right = 915.0
margin_bottom = 239.0
size_flags_horizontal = 2
size_flags_vertical = 4

[node name="GirlBlack" type="Sprite" parent="VBoxContainer/HBoxContainer/BossBlack"]
position = Vector2( 124.738, 96.1512 )
scale = Vector2( 10, 10 )
texture = ExtResource( 7 )
flip_h = true
hframes = 6
frame = 4

[node name="BossBlack" type="Sprite" parent="VBoxContainer/HBoxContainer/BossBlack"]
position = Vector2( 227.57, -44.3989 )
scale = Vector2( 10, 10 )
texture = ExtResource( 5 )
hframes = 6
frame = 5

[node name="BoyBlack" type="Sprite" parent="VBoxContainer/HBoxContainer/BossBlack"]
position = Vector2( 300.722, 120.401 )
scale = Vector2( 10, 10 )
texture = ExtResource( 9 )
hframes = 6
frame = 5

[node name="PlayersAnimation" type="AnimationPlayer" parent="VBoxContainer/HBoxContainer"]
root_node = NodePath("../BossRed")
autoplay = "characters_idle"
anims/characters_idle = SubResource( 1 )

[node name="BossesAnimation" type="AnimationPlayer" parent="VBoxContainer/HBoxContainer"]
root_node = NodePath("../BossRed")
autoplay = "boss_idle"
anims/boss_idle = SubResource( 2 )

[connection signal="pressed" from="VBoxContainer/HBoxContainer/VBoxContainer/ButtonBack" to="." method="_on_ButtonBack_pressed"]
10 changes: 5 additions & 5 deletions src/ui/menus/home/Home.gd
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
extends VBoxContainer

signal set_menu(path)

extends Menu

func _on_ButtonPlay_pressed():
emit_signal("set_menu", "res://src/ui/menus/choose-mode/ChooseMode.tscn", Vector2.DOWN)
if Database.player_name == "":
emit_signal("set_menu", "res://src/ui/menus/set-player-name/setPlayerName.tscn", Vector2.DOWN)
else:
emit_signal("set_menu", "res://src/ui/menus/choose-mode/ChooseMode.tscn", Vector2.DOWN)


func _on_PlayersAnimation_animation_finished(anim_name):
3 changes: 2 additions & 1 deletion src/ui/menus/home/Home.tscn
Original file line number Diff line number Diff line change
@@ -251,13 +251,14 @@ position = Vector2( -64.0723, 54.7284 )
scale = Vector2( 5, 5 )
texture = ExtResource( 6 )
hframes = 6
frame = 2

[node name="BossBlack" type="Sprite" parent="Characters"]
position = Vector2( 89.122, 55.3981 )
scale = Vector2( 5, 5 )
texture = ExtResource( 7 )
hframes = 6
frame = 5
frame = 1

[node name="GirlBlack" type="Sprite" parent="Characters"]
position = Vector2( 219.33, 108.127 )
5 changes: 5 additions & 0 deletions src/ui/menus/menu.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
extends Control

class_name Menu

signal set_menu(path, direction, parameters)
30 changes: 20 additions & 10 deletions src/ui/menus/menuContainer.gd
Original file line number Diff line number Diff line change
@@ -11,28 +11,37 @@ const TRANSITION_VECTOR_LENGTH = 30
func _ready():
connect_current_menu()


func set_menu(path: String, direction: Vector2 = Vector2(0, 1)):
# path : the path to the new menu to display
# direction : the direction of the transition to the new menu
# parameters : parameters that will be passed to the new menu's instance
func set_menu(path: String, direction: Vector2 = Vector2(0, 1), parameters: Array = []):
old_menu = current_menu
current_menu = load(path).instance()

if current_menu.has_method("init") and not parameters.empty():
current_menu.init(parameters)

transition_vector = direction * TRANSITION_VECTOR_LENGTH
animate_transition()

# Animate the old menu disappearing
func animate_transition():
if old_menu.is_queued_for_deletion():
current_menu.modulate.a = 0.0
current_menu.connect("ready", $TimerTransition, "start")
$MarginContainer.add_child(current_menu)
return

var tween_old_menu: Tween = get_node("TransitionOldMenu")
# Animate position
tween_old_menu.interpolate_property(
old_menu, "rect_position",
old_menu.get_position(), old_menu.get_position() - transition_vector,
TRANSITION_LENGTH, Tween.TRANS_CUBIC, Tween.EASE_IN
)
old_menu, "rect_position", old_menu.get_position(), old_menu.get_position() - transition_vector,
TRANSITION_LENGTH, Tween.TRANS_CUBIC, Tween.EASE_IN)

# Animate opacity
tween_old_menu.interpolate_property(
old_menu, "modulate:a",
modulate.a, 0.0,
TRANSITION_LENGTH, Tween.TRANS_EXPO, Tween.EASE_IN
)
old_menu, "modulate:a", modulate.a, 0.0,
TRANSITION_LENGTH, Tween.TRANS_EXPO, Tween.EASE_IN)
tween_old_menu.start()


@@ -62,6 +71,7 @@ func play_second_animation():
tween_new_menu.start()


# When all the animations are done
func _on_TransitionNewMenu_tween_all_completed():
connect_current_menu()

3 changes: 2 additions & 1 deletion src/ui/menus/menuContainer.tscn
Original file line number Diff line number Diff line change
@@ -47,12 +47,13 @@ anchor_bottom = 1.0
custom_constants/margin_right = 50
custom_constants/margin_top = 50
custom_constants/margin_left = 50
custom_constants/margin_bottom = 172
custom_constants/margin_bottom = 70
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Home" parent="MarginContainer" instance=ExtResource( 3 )]
margin_bottom = 650.0

[node name="TransitionOldMenu" type="Tween" parent="."]

12 changes: 12 additions & 0 deletions src/ui/menus/set-player-name/setPlayerName.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
extends Menu

func _ready():
$HBoxContainer2/LineEdit.text = Database.get_player_name()
$HBoxContainer2/LineEdit.grab_focus()

func _on_ButtonNext_pressed():
if $HBoxContainer2/LineEdit.text == "":
return

Database.player_name = $HBoxContainer2/LineEdit.text
emit_signal("set_menu", "res://src/ui/menus/choose-mode/ChooseMode.tscn", Vector2.DOWN)
38 changes: 38 additions & 0 deletions src/ui/menus/set-player-name/setPlayerName.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[gd_scene load_steps=3 format=2]

[ext_resource path="res://assets/themes/main_theme.tres" type="Theme" id=1]
[ext_resource path="res://src/ui/menus/set-player-name/setPlayerName.gd" type="Script" id=3]

[node name="SetPlayerName" type="VBoxContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
rect_pivot_offset = Vector2( -2059.52, -1052.06 )
theme = ExtResource( 1 )
script = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Label" type="Label" parent="."]
margin_right = 1280.0
margin_bottom = 70.0
text = "Définir un pseudonyme"
autowrap = true

[node name="HBoxContainer2" type="HBoxContainer" parent="."]
margin_top = 90.0
margin_right = 1280.0
margin_bottom = 180.0

[node name="LineEdit" type="LineEdit" parent="HBoxContainer2"]
margin_right = 958.0
margin_bottom = 90.0
size_flags_horizontal = 3

[node name="ButtonNext" type="Button" parent="HBoxContainer2"]
margin_left = 978.0
margin_right = 1280.0
margin_bottom = 90.0
text = "Continuer"

[connection signal="pressed" from="HBoxContainer2/ButtonNext" to="." method="_on_ButtonNext_pressed"]
4 changes: 1 addition & 3 deletions src/ui/menus/waiting-room/WaitingRoom.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
extends VBoxContainer

signal set_menu(path, direction)
extends Menu

onready var players_list = $GridContainer/VBoxContainer/ItemList
onready var start_button = $GridContainer/VBoxContainer2/ButtonStart

0 comments on commit fcddc29

Please sign in to comment.