diff --git a/mini-game/MiniGame.gd b/mini-game/MiniGame.gd index 0fb5c9f..6a3f49e 100644 --- a/mini-game/MiniGame.gd +++ b/mini-game/MiniGame.gd @@ -33,6 +33,7 @@ func _ready(): func setup(mode: String, goal: int, difficulty: String, next_lose: String, next_win: String, version: int): + version = 4 game_goal = goal if(difficulty == "hard"): game_difficulty = "hard" diff --git a/mini-game/ressources/backgrounds/background.png b/mini-game/ressources/backgrounds/background.png deleted file mode 100644 index a32f0ff..0000000 Binary files a/mini-game/ressources/backgrounds/background.png and /dev/null differ diff --git a/mini-game/ressources/backgrounds/background.png.import b/mini-game/ressources/backgrounds/background.png.import deleted file mode 100644 index c18f0ca..0000000 --- a/mini-game/ressources/backgrounds/background.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background.png-505e23e85d466d6becabf2def4a53663.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://mini-game/ressources/backgrounds/background.png" -dest_files=[ "res://.import/background.png-505e23e85d466d6becabf2def4a53663.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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/road.png.import b/mini-game/ressources/backgrounds/bg1.png.import similarity index 69% rename from mini-game/ressources/backgrounds/road.png.import rename to mini-game/ressources/backgrounds/bg1.png.import index a7b6c84..c1bb367 100644 --- a/mini-game/ressources/backgrounds/road.png.import +++ b/mini-game/ressources/backgrounds/bg1.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/road.png-a47382164ab08d2b16ee5556b011c7ae.stex" +path="res://.import/bg1.png-8ae713bba3ad2ecc3258923cae812490.stex" metadata={ "vram_texture": false } [deps] -source_file="res://mini-game/ressources/backgrounds/road.png" -dest_files=[ "res://.import/road.png-a47382164ab08d2b16ee5556b011c7ae.stex" ] +source_file="res://mini-game/ressources/backgrounds/bg1.png" +dest_files=[ "res://.import/bg1.png-8ae713bba3ad2ecc3258923cae812490.stex" ] [params] diff --git a/mini-game/ressources/backgrounds/road3.png.import b/mini-game/ressources/backgrounds/bg2.png.import similarity index 68% rename from mini-game/ressources/backgrounds/road3.png.import rename to mini-game/ressources/backgrounds/bg2.png.import index bdd5a13..e6990e4 100644 --- a/mini-game/ressources/backgrounds/road3.png.import +++ b/mini-game/ressources/backgrounds/bg2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/road3.png-648b2e9aa7ca850c48819c6380f474a0.stex" +path="res://.import/bg2.png-ed986a1e6aeff7730721b86542dccb83.stex" metadata={ "vram_texture": false } [deps] -source_file="res://mini-game/ressources/backgrounds/road3.png" -dest_files=[ "res://.import/road3.png-648b2e9aa7ca850c48819c6380f474a0.stex" ] +source_file="res://mini-game/ressources/backgrounds/bg2.png" +dest_files=[ "res://.import/bg2.png-ed986a1e6aeff7730721b86542dccb83.stex" ] [params] diff --git a/mini-game/ressources/backgrounds/road2.png.import b/mini-game/ressources/backgrounds/bg3.png.import similarity index 68% rename from mini-game/ressources/backgrounds/road2.png.import rename to mini-game/ressources/backgrounds/bg3.png.import index bd307f4..85e1633 100644 --- a/mini-game/ressources/backgrounds/road2.png.import +++ b/mini-game/ressources/backgrounds/bg3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/road2.png-e0bf36dfcd897889f0653f61c752133d.stex" +path="res://.import/bg3.png-85672fb13dbe4d129faf660cb55f24ec.stex" metadata={ "vram_texture": false } [deps] -source_file="res://mini-game/ressources/backgrounds/road2.png" -dest_files=[ "res://.import/road2.png-e0bf36dfcd897889f0653f61c752133d.stex" ] +source_file="res://mini-game/ressources/backgrounds/bg3.png" +dest_files=[ "res://.import/bg3.png-85672fb13dbe4d129faf660cb55f24ec.stex" ] [params] diff --git a/mini-game/ressources/backgrounds/ground.png.import b/mini-game/ressources/backgrounds/bg4.png.import similarity index 68% rename from mini-game/ressources/backgrounds/ground.png.import rename to mini-game/ressources/backgrounds/bg4.png.import index 6dead30..b7b1ab1 100644 --- a/mini-game/ressources/backgrounds/ground.png.import +++ b/mini-game/ressources/backgrounds/bg4.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ground.png-4932cc62bec22f379d126a8ed00b8065.stex" +path="res://.import/bg4.png-aa6a9a6fa47fc463e4971b9c2630ff93.stex" metadata={ "vram_texture": false } [deps] -source_file="res://mini-game/ressources/backgrounds/ground.png" -dest_files=[ "res://.import/ground.png-4932cc62bec22f379d126a8ed00b8065.stex" ] +source_file="res://mini-game/ressources/backgrounds/bg4.png" +dest_files=[ "res://.import/bg4.png-aa6a9a6fa47fc463e4971b9c2630ff93.stex" ] [params] diff --git a/mini-game/ressources/backgrounds/bg5.png.import b/mini-game/ressources/backgrounds/bg5.png.import new file mode 100644 index 0000000..bf114b2 --- /dev/null +++ b/mini-game/ressources/backgrounds/bg5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bg5.png-2cd6ea5f2184bb027b7b24e45141bb4e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/bg5.png" +dest_files=[ "res://.import/bg5.png-2cd6ea5f2184bb027b7b24e45141bb4e.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/bg6.png.import b/mini-game/ressources/backgrounds/bg6.png.import new file mode 100644 index 0000000..0ef2ffa --- /dev/null +++ b/mini-game/ressources/backgrounds/bg6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bg6.png-e7c1c3681ff5618e64b93ab189acb346.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/bg6.png" +dest_files=[ "res://.import/bg6.png-e7c1c3681ff5618e64b93ab189acb346.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg1.png.import b/mini-game/ressources/backgrounds/fg1.png.import new file mode 100644 index 0000000..c1a84ae --- /dev/null +++ b/mini-game/ressources/backgrounds/fg1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg1.png-1223bd947bc074f762b942936a2c3080.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg1.png" +dest_files=[ "res://.import/fg1.png-1223bd947bc074f762b942936a2c3080.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg2.png.import b/mini-game/ressources/backgrounds/fg2.png.import new file mode 100644 index 0000000..6ca022e --- /dev/null +++ b/mini-game/ressources/backgrounds/fg2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg2.png-3c5c1093a1643c1ef511181761a72e0c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg2.png" +dest_files=[ "res://.import/fg2.png-3c5c1093a1643c1ef511181761a72e0c.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg3.png.import b/mini-game/ressources/backgrounds/fg3.png.import new file mode 100644 index 0000000..2b19cd6 --- /dev/null +++ b/mini-game/ressources/backgrounds/fg3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg3.png-ace556d90c80e77c61204459f3601219.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg3.png" +dest_files=[ "res://.import/fg3.png-ace556d90c80e77c61204459f3601219.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg4.png.import b/mini-game/ressources/backgrounds/fg4.png.import new file mode 100644 index 0000000..877db19 --- /dev/null +++ b/mini-game/ressources/backgrounds/fg4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg4.png-2d72d37b23620ce49094263e1cd72ade.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg4.png" +dest_files=[ "res://.import/fg4.png-2d72d37b23620ce49094263e1cd72ade.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg5.png.import b/mini-game/ressources/backgrounds/fg5.png.import new file mode 100644 index 0000000..bf750a4 --- /dev/null +++ b/mini-game/ressources/backgrounds/fg5.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg5.png-c061aecd9606bd3aa6f8c79d2f3080f1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg5.png" +dest_files=[ "res://.import/fg5.png-c061aecd9606bd3aa6f8c79d2f3080f1.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/fg6.png.import b/mini-game/ressources/backgrounds/fg6.png.import new file mode 100644 index 0000000..e706046 --- /dev/null +++ b/mini-game/ressources/backgrounds/fg6.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fg6.png-5d1e4f373d56fd25324325e27a4d63ab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://mini-game/ressources/backgrounds/fg6.png" +dest_files=[ "res://.import/fg6.png-5d1e4f373d56fd25324325e27a4d63ab.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/mini-game/ressources/backgrounds/ground.png b/mini-game/ressources/backgrounds/ground.png deleted file mode 100644 index 2a397b7..0000000 Binary files a/mini-game/ressources/backgrounds/ground.png and /dev/null differ diff --git a/mini-game/ressources/backgrounds/road.png b/mini-game/ressources/backgrounds/road.png deleted file mode 100644 index e0c4541..0000000 Binary files a/mini-game/ressources/backgrounds/road.png and /dev/null differ diff --git a/mini-game/ressources/backgrounds/road2.png b/mini-game/ressources/backgrounds/road2.png deleted file mode 100644 index 6dcb94d..0000000 Binary files a/mini-game/ressources/backgrounds/road2.png and /dev/null differ diff --git a/mini-game/ressources/backgrounds/road3.png b/mini-game/ressources/backgrounds/road3.png deleted file mode 100644 index 3851876..0000000 Binary files a/mini-game/ressources/backgrounds/road3.png and /dev/null differ diff --git a/mini-game/scenes/decor/ForegroundSprite.tscn b/mini-game/scenes/decor/ForegroundSprite.tscn index 7aaf036..c8aab14 100644 --- a/mini-game/scenes/decor/ForegroundSprite.tscn +++ b/mini-game/scenes/decor/ForegroundSprite.tscn @@ -1,8 +1,11 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=10 format=2] -[ext_resource path="res://mini-game/ressources/backgrounds/road3.png" type="Texture" id=1] [ext_resource path="res://mini-game/scenes/decor/ForegroundSprite.gd" type="Script" id=2] -[ext_resource path="res://mini-game/ressources/backgrounds/road.png" type="Texture" id=3] +[ext_resource path="res://mini-game/ressources/backgrounds/fg6.png" type="Texture" id=3] +[ext_resource path="res://mini-game/ressources/backgrounds/fg2.png" type="Texture" id=5] +[ext_resource path="res://mini-game/ressources/backgrounds/fg1.png" type="Texture" id=6] +[ext_resource path="res://mini-game/ressources/backgrounds/fg3.png" type="Texture" id=7] +[ext_resource path="res://mini-game/ressources/backgrounds/fg5.png" type="Texture" id=8] [sub_resource type="Shader" id=1] code = "shader_type canvas_item; @@ -21,15 +24,19 @@ void fragment(){ shader = SubResource( 1 ) shader_param/scroll_speed = 0.0 +[sub_resource type="StreamTexture" id=3] +flags = 4 +load_path = "res://.import/road3.png-648b2e9aa7ca850c48819c6380f474a0.stex" + [node name="ForegroundSprite" type="Sprite"] material = SubResource( 2 ) -texture = ExtResource( 1 ) +texture = SubResource( 3 ) offset = Vector2( 960, 540 ) script = ExtResource( 2 ) __meta__ = { "_editor_description_": "" } -textures = [ ExtResource( 1 ), ExtResource( 3 ) ] +textures = [ ExtResource( 6 ), ExtResource( 5 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 3 ) ] [node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."] position = Vector2( 1930, 540 ) diff --git a/mini-game/scenes/decor/background.tscn b/mini-game/scenes/decor/background.tscn index be7df5a..0a95f63 100644 --- a/mini-game/scenes/decor/background.tscn +++ b/mini-game/scenes/decor/background.tscn @@ -1,17 +1,22 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://mini-game/ressources/backgrounds/city.png" type="Texture" id=1] [ext_resource path="res://mini-game/scenes/decor/background.gd" type="Script" id=2] -[ext_resource path="res://mini-game/ressources/backgrounds/background.png" type="Texture" id=3] +[ext_resource path="res://mini-game/ressources/backgrounds/bg1.png" type="Texture" id=3] +[ext_resource path="res://mini-game/ressources/backgrounds/bg3.png" type="Texture" id=4] +[ext_resource path="res://mini-game/ressources/backgrounds/bg5.png" type="Texture" id=5] +[ext_resource path="res://mini-game/ressources/backgrounds/bg6.png" type="Texture" id=6] +[ext_resource path="res://mini-game/ressources/backgrounds/bg2.png" type="Texture" id=7] [node name="background" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 2 ) __meta__ = { -"_edit_use_anchors_": false +"_edit_use_anchors_": false, +"_editor_description_": "" } -textures = [ ExtResource( 1 ), ExtResource( 3 ) ] +textures = [ ExtResource( 3 ), ExtResource( 7 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ) ] [node name="TextureRect" type="TextureRect" parent="."] anchor_right = 1.0 diff --git a/mini-game/scenes/decor/foreground.tscn b/mini-game/scenes/decor/foreground.tscn index 51a8315..b66524d 100644 --- a/mini-game/scenes/decor/foreground.tscn +++ b/mini-game/scenes/decor/foreground.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://mini-game/scenes/decor/foreground.gd" type="Script" id=1] [ext_resource path="res://mini-game/scenes/decor/ForegroundSprite.tscn" type="PackedScene" id=2] -[sub_resource type="RectangleShape2D" id=3] +[sub_resource type="RectangleShape2D" id=1] extents = Vector2( 958.398, 78.6175 ) [node name="foreground" type="Node2D"] @@ -13,7 +13,7 @@ script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] position = Vector2( 960, 1080 ) -shape = SubResource( 3 ) +shape = SubResource( 1 ) [node name="ForegroundSprite" parent="." instance=ExtResource( 2 )]