postmerge

Assets/Rock T1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Rock T1.png-92a72d5e03b07b1292bf4a36c7061e28.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Rock T1.png"
+dest_files=[ "res://.import/Rock T1.png-92a72d5e03b07b1292bf4a36c7061e28.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Assets/Rock T2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Rock T2.png-b286d35720049655d70d5752eae22960.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Rock T2.png"
+dest_files=[ "res://.import/Rock T2.png-b286d35720049655d70d5752eae22960.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Assets/RubicCube.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/RubicCube.png-9186de3ac7e6096124ec148c9051d54a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/RubicCube.png"
+dest_files=[ "res://.import/RubicCube.png-9186de3ac7e6096124ec148c9051d54a.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Scene/FastTrail.tscn

@@ -3,6 +3,7 @@
 [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/FastTrail.gd" type="Script" id=2]
 [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3]
+[ext_resource path="res://Sounds/PaintJamSpeedUp.wav" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 88.8117, 26.2111 )
@@ -31,3 +32,5 @@ scale = Vector2( 1, 1.2 )
 texture = ExtResource( 3 )
 mode = 3
 range_item_cull_mask = 64
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )

Scene/Player.tscn

@@ -310,5 +310,5 @@ scale = Vector2( 1.1136, 1.2906 )
 z_index = -1
 texture = ExtResource( 5 )
 
-[node name="PickupPlayer" type="AudioStreamPlayer" parent="."]
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )

Scene/Rocher1.tscn

@@ -0,0 +1,14 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Assets/Rock T1.png" type="Texture" id=1]
+
+[node name="Rocher1" type="StaticBody2D"]
+
+[node name="Sprite" type="Sprite" parent="."]
+z_index = 20
+texture = ExtResource( 1 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+position = Vector2( 0.387421, 0 )
+z_index = 20
+polygon = PoolVector2Array( -7.63457, -11.7133, 4.8037, -11.9173, 8.88182, -9.67429, 11.7365, -5.39226, 12.5521, -0.702423, 15.8146, 2.15226, 16.0185, 9.08506, 12.3482, 11.5319, 6.43495, 12.5515, 3.98808, 11.1241, 1.54121, 12.1437, -9.87753, 12.5515, -13.9556, 9.49288, -14.9752, 1.74445, -14.3635, -3.3532, -10.8971, -9.26647 )

Scene/Rocher2.tscn

@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Assets/Rock T2.png" type="Texture" id=1]
+
+[node name="Rocher2" type="StaticBody2D"]
+
+[node name="Sprite" type="Sprite" parent="."]
+texture = ExtResource( 1 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( -2.78302, -31.5943, 3.65785, -23.6813, 9.73068, -22.5771, 12.8591, -16.5043, 13.9633, -6.56691, 12.4911, -1.41421, 8.62654, 4.10654, 13.5952, 12.7557, 15.2514, 20.1167, 11.939, 26.5576, 7.15434, 28.0298, -0.574722, 29.134, -9.40793, 29.318, -13.4565, 27.2937, -15.1127, 22.6931, -16.5849, 12.7557, -13.8245, 7.05095, -14.9287, 3.92252, -14.3766, -0.862129, -11.2482, -8.59119, -7.93572, -18.1605, -5.5434, -26.0736, -4.99133, -29.9381 )

Scene/SlowTrail.tscn

@@ -3,6 +3,7 @@
 [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/SlowTrail.gd" type="Script" id=2]
 [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3]
+[ext_resource path="res://Sounds/PaintJamSlowDown.wav" type="AudioStream" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 88.8117, 26.2111 )
@@ -30,3 +31,5 @@ scale = Vector2( 1, 1.2 )
 texture = ExtResource( 3 )
 mode = 3
 range_item_cull_mask = 512
+[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 3 )

Scripts/FastTrail.gd

@@ -1,5 +1,7 @@
 extends Node
 
+onready var audioPlayer = $AudioPlayer
+
 var fastFactor
 var lifetime = 5
 var elapsed = 0
@@ -11,6 +13,7 @@ onready var mask = $Mask
 func slow_player(victim):
 	if victim.is_in_group("Player"):
 		players.append(victim)
+		audioPlayer.play()
 	
 func unslow_player(victim):
 	players.remove(players.find(victim))

Scripts/Player.gd

@@ -48,12 +48,14 @@ 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
+onready var audioPlayer = $AudioPlayer
 onready var sprite = $Sprite
 onready var coll = $CollisionShape2D
 onready var conf = $ConfusionStars
 onready var pati = $Patins
 
+var streams = []
+
 var healthBar = null
 
 func _ready():
@@ -67,8 +69,12 @@ func _ready():
 	elif self.name == "Player2":
 		healthBar = get_tree().get_nodes_in_group("healthbar")[1]
 	healthBar.maxHealthUpdated(MAX_LIFE)
+	streams.append(load("res://Sounds/PaintJamPickupSound.wav"))
+	streams.append(load("res://Sounds/PaintJamPaintAction.wav"))
 
 func launch_slow():
+	audioPlayer.stream = streams[1]
+	audioPlayer.play()
 	if slow_cooldown_elapsed < slow_cooldown:
 		return
 	curLife -= 3	
@@ -88,6 +94,8 @@ func launch_slow():
 	world.add_child(inst)
 	
 func launch_fast():
+	audioPlayer.stream = streams[1]
+	audioPlayer.play()
 	if fast_cooldown_elapsed < fast_cooldown:
 		return
 	curLife -= 3
@@ -217,6 +225,7 @@ func updatePaintEffects(delta):
 	coroutines = updated + []
 
 func addCoroutine(routine):
-	pickupPlayer.play()
+	audioPlayer.stream = streams[0]
+	audioPlayer.play()
 	curLife = MAX_LIFE if (curLife + PICKUP_BONUS > MAX_LIFE) else curLife + PICKUP_BONUS
 	coroutines.append(routine)

Scripts/SlowTrail.gd

@@ -1,5 +1,7 @@
 extends Node
 
+onready var audioPlayer = $AudioPlayer
+
 var slowFactor
 var lifetime = 5
 var elapsed = 0
@@ -11,6 +13,7 @@ onready var mask = $Mask
 func slow_player(victim):	
 	if victim.is_in_group("Player"):
 		players.append(victim)
+		audioPlayer.play()
 	
 func unslow_player(victim):	
 	players.remove(players.find(victim))