Skip to content

Commit

Permalink
Merge pull request #4 from worth12/combine_minigames
Browse files Browse the repository at this point in the history
Combine minigames
  • Loading branch information
worth12 authored Nov 16, 2024
2 parents b975ec1 + 83f3ef0 commit 6bf30a5
Show file tree
Hide file tree
Showing 23 changed files with 482 additions and 25 deletions.
6 changes: 3 additions & 3 deletions Assets/1386638.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://detip01cpqwrw"
path="res://.godot/imported/1386638.png-eed5336e3ae3f35a0bf92e1f536e69ec.ctex"
path="res://.godot/imported/1386638.png-ec87bb02c54d47afdaa7836c5730b643.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/1386638.png"
dest_files=["res://.godot/imported/1386638.png-eed5336e3ae3f35a0bf92e1f536e69ec.ctex"]
source_file="res://assets/1386638.png"
dest_files=["res://.godot/imported/1386638.png-ec87bb02c54d47afdaa7836c5730b643.ctex"]

[params]

Expand Down
Binary file added Assets/8445773.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/8445773.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://323ardcs5sob"
path="res://.godot/imported/8445773.png-ca18c642f76fff1061e9e38b30bc9b69.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/8445773.png"
dest_files=["res://.godot/imported/8445773.png-ca18c642f76fff1061e9e38b30bc9b69.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/8445903.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/8445903.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ddmx7jqqi8dld"
path="res://.godot/imported/8445903.png-8ca6bcf12c5a5c13602203f1b3412cad.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/8445903.png"
dest_files=["res://.godot/imported/8445903.png-8ca6bcf12c5a5c13602203f1b3412cad.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/8445922.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/8445922.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://vfh5vxn2you8"
path="res://.godot/imported/8445922.png-de7e8c3b9957bb0d0a7895e917341d84.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/8445922.png"
dest_files=["res://.godot/imported/8445922.png-de7e8c3b9957bb0d0a7895e917341d84.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/cute-planner-sticker-png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/cute-planner-sticker-png.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://1bwo58fmeotm"
path="res://.godot/imported/cute-planner-sticker-png.png-053e9600851f732a493e5055c0e077a3.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/cute-planner-sticker-png.png"
dest_files=["res://.godot/imported/cute-planner-sticker-png.png-053e9600851f732a493e5055c0e077a3.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/hand-drawn-coffee-background_23-2148051414.jpg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://hufmgcy5m027"
path="res://.godot/imported/hand-drawn-coffee-background_23-2148051414.jpg-f424ca983716c335aafb90eaef7853f0.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/hand-drawn-coffee-background_23-2148051414.jpg"
dest_files=["res://.godot/imported/hand-drawn-coffee-background_23-2148051414.jpg-f424ca983716c335aafb90eaef7853f0.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
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
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b25ttw00d1l3h"
path="res://.godot/imported/pngtree-close-up-shot-of-beige-coffee-foam-capturing-its-rich-texture-image_13850230.png-519089f58d8ede645d6473503018e9fe.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/pngtree-close-up-shot-of-beige-coffee-foam-capturing-its-rich-texture-image_13850230.png"
dest_files=["res://.godot/imported/pngtree-close-up-shot-of-beige-coffee-foam-capturing-its-rich-texture-image_13850230.png-519089f58d8ede645d6473503018e9fe.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cou2v08k0j0wg"
path="res://.godot/imported/vector-cartoon-wooden-texture-background-600nw-2145003917.png-5da24a678e312663c5b985f72bb2bebd.ctex"
path="res://.godot/imported/vector-cartoon-wooden-texture-background-600nw-2145003917.png-661e37f2c43bc8c40a2f89fe1516e161.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/vector-cartoon-wooden-texture-background-600nw-2145003917.png"
dest_files=["res://.godot/imported/vector-cartoon-wooden-texture-background-600nw-2145003917.png-5da24a678e312663c5b985f72bb2bebd.ctex"]
source_file="res://assets/vector-cartoon-wooden-texture-background-600nw-2145003917.png"
dest_files=["res://.godot/imported/vector-cartoon-wooden-texture-background-600nw-2145003917.png-661e37f2c43bc8c40a2f89fe1516e161.ctex"]

[params]

Expand Down
31 changes: 17 additions & 14 deletions Scenes/control.tscn → Scenes/Coffee.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=3 uid="uid://u0jqml7awiuv"]

[ext_resource type="Script" path="res://Scripts/Coffee_Pouring_Minigame.gd" id="1_mejo2"]
[ext_resource type="Texture2D" uid="uid://detip01cpqwrw" path="res://Assets/1386638.png" id="2_pm21e"]
[ext_resource type="Texture2D" uid="uid://cou2v08k0j0wg" path="res://Assets/vector-cartoon-wooden-texture-background-600nw-2145003917.png" id="2_xc4wm"]
[ext_resource type="Texture2D" uid="uid://detip01cpqwrw" path="res://assets/1386638.png" id="2_pm21e"]
[ext_resource type="Texture2D" uid="uid://cou2v08k0j0wg" path="res://assets/vector-cartoon-wooden-texture-background-600nw-2145003917.png" id="2_xc4wm"]

[node name="Control" type="Control"]
layout_mode = 3
Expand All @@ -16,10 +16,10 @@ pourSpeed = 60.0

[node name="Cup" type="TextureRect" parent="."]
layout_mode = 0
offset_left = 296.0
offset_top = 120.0
offset_right = 552.0
offset_bottom = 320.0
offset_left = 184.0
offset_top = 168.0
offset_right = 440.0
offset_bottom = 368.0
texture = ExtResource("2_pm21e")

[node name="Coffee" type="ColorRect" parent="Cup"]
Expand All @@ -42,10 +42,10 @@ color = Color(0.897064, 0, 0.225493, 1)

[node name="TargetLabel" type="Label" parent="."]
layout_mode = 0
offset_left = 664.0
offset_top = 88.0
offset_right = 930.0
offset_bottom = 175.0
offset_left = 160.0
offset_top = 56.0
offset_right = 426.0
offset_bottom = 143.0

[node name="ResultLabel" type="Label" parent="."]
layout_mode = 0
Expand All @@ -57,10 +57,10 @@ horizontal_alignment = 1

[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 0
offset_left = 695.0
offset_top = 182.0
offset_right = 896.0
offset_bottom = 248.0
offset_left = 528.0
offset_top = 232.0
offset_right = 729.0
offset_bottom = 298.0
texture = ExtResource("2_xc4wm")
expand_mode = 3
stretch_mode = 1
Expand All @@ -74,3 +74,6 @@ offset_bottom = 66.0
theme_override_colors/font_color = Color(0, 0, 0, 1)
horizontal_alignment = 1
vertical_alignment = 1

[node name="PointLight2D" type="PointLight2D" parent="."]
position = Vector2(898.391, 512.399)
Loading

0 comments on commit 6bf30a5

Please sign in to comment.