diff --git a/ressources/images/New Piskel (15).png b/ressources/images/New Piskel (15).png new file mode 100644 index 0000000..67bf5e0 Binary files /dev/null and b/ressources/images/New Piskel (15).png differ diff --git a/ressources/sons/tambour.mp3 b/ressources/sons/tambour.mp3 new file mode 100644 index 0000000..f6bbe90 Binary files /dev/null and b/ressources/sons/tambour.mp3 differ diff --git a/ressources/sons/tambour.mp3.import b/ressources/sons/tambour.mp3.import new file mode 100644 index 0000000..e4b2475 --- /dev/null +++ b/ressources/sons/tambour.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://y631cuj1gxus" +path="res://.godot/imported/tambour.mp3-674d8c190e28a91f37bfb684cfb61f18.mp3str" + +[deps] + +source_file="res://ressources/sons/tambour.mp3" +dest_files=["res://.godot/imported/tambour.mp3-674d8c190e28a91f37bfb684cfb61f18.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scenes/Room.tscn b/scenes/Room.tscn index 4f7d197..39c2dff 100644 --- a/scenes/Room.tscn +++ b/scenes/Room.tscn @@ -1,16 +1,35 @@ -[gd_scene load_steps=3 format=3 uid="uid://durhes43gex7a"] +[gd_scene load_steps=7 format=3 uid="uid://durhes43gex7a"] [ext_resource type="PackedScene" uid="uid://c7bfiw54rvaq2" path="res://scenes/player_melodie.tscn" id="1_cl1wt"] +[ext_resource type="Texture2D" uid="uid://ky4e7158gqf6" path="res://ressources/images/cgj_default_tile.svg" id="2_torsx"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_18mp2"] -size = Vector2(1280, 720) +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_1c4te"] +normal = Vector2(0, 1) +distance = -360.0 + +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_qq3vn"] +distance = -360.0 + +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_e1nqi"] +normal = Vector2(-1, 0) +distance = -640.0 + +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_ia1hi"] +normal = Vector2(1, 0) +distance = -640.0 [node name="Room" type="Node2D"] -[node name="Player_Melodie" parent="." instance=ExtResource("1_cl1wt")] -position = Vector2(0, -9) +[node name="TextureRect" type="TextureRect" parent="."] +offset_left = -640.0 +offset_top = -360.0 +offset_right = 640.0 +offset_bottom = 360.0 +texture = ExtResource("2_torsx") +stretch_mode = 1 -[node name="Camera2D" type="Camera2D" parent="."] +[node name="Player_Melodie" parent="." instance=ExtResource("1_cl1wt")] +scale = Vector2(4, 4) [node name="StaticBody2D" type="StaticBody2D" parent="."] diff --git a/scenes/player_melodie.tscn b/scenes/player_melodie.tscn index f869238..064f1dc 100644 --- a/scenes/player_melodie.tscn +++ b/scenes/player_melodie.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=4 format=3 uid="uid://c7bfiw54rvaq2"] [ext_resource type="Script" path="res://scripts/player_control.gd" id="1_7sg4g"] -[ext_resource type="Texture2D" uid="uid://b4viqupj5q0je" path="res://ressources/images/icon.svg" id="1_w50ia"] +[ext_resource type="Texture2D" uid="uid://uebyv8y862vt" path="res://ressources/images/melodie.svg" id="2_se13h"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_uwwdc"] -size = Vector2(32, 32) +size = Vector2(16, 32) [node name="Player_Melodie" type="CharacterBody2D"] script = ExtResource("1_7sg4g") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.25, 0.25) -texture = ExtResource("1_w50ia") +scale = Vector2(0.75, 0.75) +texture = ExtResource("2_se13h") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("RectangleShape2D_uwwdc") diff --git a/scripts/player_control.gd b/scripts/player_control.gd index c883ae7..8a7a012 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -25,7 +25,7 @@ func _process(delta: float) -> void: if direction != Vector2.ZERO: if direction.normalized() == previous_direction.normalized(): if direction.x != 0 and direction.y != 0: - boost_speed = min(boost_speed + acceleration / 8, (max_boost_speed - move_speed) / 8) + boost_speed = min(boost_speed + acceleration / 16, (max_boost_speed - move_speed) / 8) else: boost_speed = min(boost_speed + acceleration, max_boost_speed - move_speed) else: