Merge branch 'master' of https://git.hugowillaume.com/Hurlu/PaintJam2020

Scene/EndGameWindow.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Scripts/EndGameWindow.gd" type="Script" id=1]
 [ext_resource path="res://Font/COMIC.tres" type="DynamicFont" id=2]
+[ext_resource path="res://Sounds/PaintJamEndGameTheme.wav" type="AudioStream" id=3]
 
 [node name="CanvasLayer" type="CanvasLayer"]
 layer = 100
@@ -98,5 +99,9 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 2 )
 text = "Quit"
+
+[node name="EndGameTheme" type="AudioStreamPlayer2D" parent="."]
+pause_mode = 2
+stream = ExtResource( 3 )
 [connection signal="pressed" from="Window/ColorRect/VBoxContainer/RestartButton" to="Window" method="_on_RestartButton_pressed"]
 [connection signal="pressed" from="Window/ColorRect/VBoxContainer/QuitButton" to="Window" method="_on_QuitButton_pressed"]

Scene/GameMap.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://Assets/Tiling/Tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Scene/HealthBar.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Scene/EndGameWindow.tscn" type="PackedScene" id=4]
 [ext_resource path="res://Scene/GameManager.tscn" type="PackedScene" id=5]
+[ext_resource path="res://Sounds/PaintJamMainTheme.wav" type="AudioStream" id=6]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 991.884, 66.2394 )
@@ -120,3 +121,7 @@ position = Vector2( 199.123, 592.532 )
 "spawn_point",
 ]]
 position = Vector2( 1730.27, 580.843 )
+
+[node name="MainTheme" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 6 )
+autoplay = true

Scene/Player.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=28 format=2]
+[gd_scene load_steps=29 format=2]
 
 [ext_resource path="res://Assets/spriteset test.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/Player.gd" type="Script" id=2]
 [ext_resource path="res://Assets/zétoile.png" type="Texture" id=3]
+[ext_resource path="res://Sounds/PaintJamPickupSound.wav" type="AudioStream" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 15.5015, 46.849 )
@@ -272,3 +273,6 @@ rotation = -0.639347
 scale = Vector2( 1.1136, 1.2906 )
 z_index = -1
 texture = ExtResource( 3 )
+
+[node name="PickupPlayer" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 4 )

Scene/TitleScreen.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Assets/titlescreen.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/TitleScreen.gd" type="Script" id=2]
 [ext_resource path="res://icon.png" type="Texture" id=3]
+[ext_resource path="res://Sounds/PaintJamTitleScreen.wav" type="AudioStream" id=4]
 
 [node name="TitleScreen" type="Node2D"]
 script = ExtResource( 2 )
@@ -44,5 +45,9 @@ margin_left = 164.0
 margin_right = 228.0
 margin_bottom = 64.0
 texture_normal = ExtResource( 3 )
+
+[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 4 )
+autoplay = true
 [connection signal="pressed" from="Sprite/MarginContainer/HBoxContainer/StartGameButton" to="." method="_on_StartGameButton_pressed"]
 [connection signal="pressed" from="Sprite/MarginContainer/HBoxContainer/QuitGameButton" to="." method="_on_QuitGame_pressed"]

Scripts/EndGameWindow.gd

@@ -1,6 +1,8 @@
 extends Control
 
 func showEndGameWindow(playerName):
+	var audioPlayer = get_parent().get_node("EndGameTheme")
+	audioPlayer.play()
 	get_tree().paused = true
 	self.visible = true
 	get_node("/root/World/CanvasLayer/Window/ColorRect/WinnerName").text = playerName

Scripts/PaintEffects/Upscale.gd

@@ -9,7 +9,7 @@ export var GrowDownTime = 1.0
 export var GrowUpFactor = 5
 
 #How much slower should the player become
-export var SlowFactor = 8
+export var SlowFactor = 6
 
 func GiantRoutine(player, delta):
 	var elapsed = delta

Scripts/Player.gd

@@ -34,6 +34,7 @@ var inputs = ["ui_up", "ui_right", "ui_down", "ui_left"]
 onready var animationPlayer = $AnimationPlayer
 onready var animationTree = $AnimationTree
 onready var animationState = animationTree.get("parameters/playback")
+onready var pickupPlayer = $PickupPlayer
 var healthBar = null
 
 func _ready():
@@ -120,5 +121,6 @@ func updatePaintEffects(delta):
 		coroutines.append(rout)
 
 func addCoroutine(routine):
+	pickupPlayer.play()
 	curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS
 	coroutines.append(routine)

Sounds/PaintJamEndGameTheme.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamEndGameTheme.wav-93291435a441dbb79376eeea70896a6c.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamEndGameTheme.wav"
+dest_files=[ "res://.import/PaintJamEndGameTheme.wav-93291435a441dbb79376eeea70896a6c.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamMainTheme.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamMainTheme.wav-0df26350225ae9496e0c55b79559d1b5.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamMainTheme.wav"
+dest_files=[ "res://.import/PaintJamMainTheme.wav-0df26350225ae9496e0c55b79559d1b5.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamPaintAction.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamPaintAction.wav-628e0ee25d48cba56492f2126fc09ba1.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamPaintAction.wav"
+dest_files=[ "res://.import/PaintJamPaintAction.wav-628e0ee25d48cba56492f2126fc09ba1.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamPickupSound.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamPickupSound.wav-b87eb76d400bdbe6d424c7058636baa3.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamPickupSound.wav"
+dest_files=[ "res://.import/PaintJamPickupSound.wav-b87eb76d400bdbe6d424c7058636baa3.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamSlowDown.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamSlowDown.wav-2753a83fa87c6d8f8e3fbaf7ed502857.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamSlowDown.wav"
+dest_files=[ "res://.import/PaintJamSlowDown.wav-2753a83fa87c6d8f8e3fbaf7ed502857.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamSpeedUp.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamSpeedUp.wav-c60a8d265095e3a011f55ec8394f510e.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamSpeedUp.wav"
+dest_files=[ "res://.import/PaintJamSpeedUp.wav-c60a8d265095e3a011f55ec8394f510e.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

Sounds/PaintJamTitleScreen.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/PaintJamTitleScreen.wav-f7d0e5c78d74637a67b5ea6ca28d87c2.sample"
+
+[deps]
+
+source_file="res://Sounds/PaintJamTitleScreen.wav"
+dest_files=[ "res://.import/PaintJamTitleScreen.wav-f7d0e5c78d74637a67b5ea6ca28d87c2.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0