diff --git a/Main.tscn b/Main.tscn index d22d2a9..50f848b 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=19 format=2] +[ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=1] [ext_resource path="res://src/playerC/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/Tiles/Assets/Assets.png" type="Texture" id=3] +[ext_resource path="res://assets/Music/platformer_level03_loop.ogg" type="AudioStream" id=4] [ext_resource path="res://src/CameraControl-Position2D.gd" type="Script" id=5] [sub_resource type="ConvexPolygonShape2D" id=2] @@ -133,6 +135,17 @@ b = Vector2( -1, 349 ) [node name="Main" type="Node2D"] +[node name="ParallaxBackground" type="ParallaxBackground" parent="."] +scroll_base_scale = Vector2( 0.4, 1 ) +scroll_limit_end = Vector2( 1300, 0 ) + +[node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] +motion_mirroring = Vector2( 500, 0 ) + +[node name="Bgmuck" type="Sprite" parent="ParallaxBackground/ParallaxLayer"] +texture = ExtResource( 1 ) +centered = false + [node name="TileMap" type="TileMap" parent="."] tile_set = SubResource( 1 ) cell_size = Vector2( 16, 16 ) @@ -188,3 +201,6 @@ shape = SubResource( 13 ) [node name="CollisionShape2D2" type="CollisionShape2D" parent="CameraBoundaries"] position = Vector2( 1281, 68 ) shape = SubResource( 13 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) diff --git a/assets/Backgrounds/bgmuck.png b/assets/Backgrounds/bgmuck.png new file mode 100644 index 0000000..8ecce74 Binary files /dev/null and b/assets/Backgrounds/bgmuck.png differ diff --git a/assets/Backgrounds/bgmuck.png.import b/assets/Backgrounds/bgmuck.png.import new file mode 100644 index 0000000..5e9fa3b --- /dev/null +++ b/assets/Backgrounds/bgmuck.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bgmuck.png-d4be388271ba394d1ddbac361f6ed992.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Backgrounds/bgmuck.png" +dest_files=[ "res://.import/bgmuck.png-d4be388271ba394d1ddbac361f6ed992.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/Music/platformer_level03_loop.ogg b/assets/Music/platformer_level03_loop.ogg new file mode 100644 index 0000000..36cf211 Binary files /dev/null and b/assets/Music/platformer_level03_loop.ogg differ diff --git a/assets/Music/platformer_level03_loop.ogg.import b/assets/Music/platformer_level03_loop.ogg.import new file mode 100644 index 0000000..60b2454 --- /dev/null +++ b/assets/Music/platformer_level03_loop.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/platformer_level03_loop.ogg-eb8ec48736a59637eb7f6b57e14483e5.oggstr" + +[deps] + +source_file="res://assets/Music/platformer_level03_loop.ogg" +dest_files=[ "res://.import/platformer_level03_loop.ogg-eb8ec48736a59637eb7f6b57e14483e5.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/assets/Sounds/crappy pew.wav b/assets/Sounds/crappy pew.wav new file mode 100644 index 0000000..1bfc278 Binary files /dev/null and b/assets/Sounds/crappy pew.wav differ diff --git a/assets/Sounds/crappy pew.wav.import b/assets/Sounds/crappy pew.wav.import new file mode 100644 index 0000000..7cae3e8 --- /dev/null +++ b/assets/Sounds/crappy pew.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/crappy pew.wav-617183b0efcd1daa3d0b0a4a6f318332.sample" + +[deps] + +source_file="res://assets/Sounds/crappy pew.wav" +dest_files=[ "res://.import/crappy pew.wav-617183b0efcd1daa3d0b0a4a6f318332.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_mode=1 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/src/playerC/Player-KinematicBody2D.gd b/src/playerC/Player-KinematicBody2D.gd index 71aa249..c7334f0 100644 --- a/src/playerC/Player-KinematicBody2D.gd +++ b/src/playerC/Player-KinematicBody2D.gd @@ -17,9 +17,17 @@ onready var player_hurtbox = $Hurtbox_Component/CollisionShape2D onready var gun = $Gun +onready var sound_effect_player = $AudioStreamPlayer + +var sound_effects = preload("res://src/playerC/resources/sound_effects.tres") + func _ready() -> void: movement_state_machine.init_animated_actor(self, movement_animations, player_move_component) player_move_component.player_number = player_number + sound_effect_player.stream = sound_effects.sounds["pew"] + #print(sounds.sounds["pew"]) + #sound_effects.play() + func _unhandled_input(event: InputEvent) -> void: movement_state_machine.process_input(event) @@ -72,3 +80,5 @@ func shoot_projectile(): var is_shooting = false is_shooting = gun.shoot(direction.x) +func play_sound(): + sound_effects.stream = "res://assets/Sounds/crappy pew.wav" diff --git a/src/playerC/Player.tscn b/src/playerC/Player.tscn index 603317c..a324865 100644 --- a/src/playerC/Player.tscn +++ b/src/playerC/Player.tscn @@ -512,3 +512,5 @@ one_shot = true points = PoolVector2Array( -5, 0, 5, 0 ) width = 2.0 default_color = Color( 1, 0.607843, 0, 1 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] diff --git a/src/playerC/resources/new_audiostreamsample.tres b/src/playerC/resources/new_audiostreamsample.tres new file mode 100644 index 0000000..6b6bcf9 --- /dev/null +++ b/src/playerC/resources/new_audiostreamsample.tres @@ -0,0 +1,3 @@ +[gd_resource type="AudioStreamSample" format=2] + +[resource] diff --git a/src/playerC/resources/sound_effects.tres b/src/playerC/resources/sound_effects.tres new file mode 100644 index 0000000..13e2842 --- /dev/null +++ b/src/playerC/resources/sound_effects.tres @@ -0,0 +1,14 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[sub_resource type="GDScript" id=1] +script/source = "extends Resource + +var sounds = { + \"pew\": preload(\"res://assets/Sounds/crappy pew.wav\") # for firing maybe +} + + +" + +[resource] +script = SubResource( 1 ) diff --git a/src/playerC/states/fire.gd b/src/playerC/states/fire.gd index 077ce94..6428b12 100644 --- a/src/playerC/states/fire.gd +++ b/src/playerC/states/fire.gd @@ -20,6 +20,8 @@ func enter() -> void: if modifier_stack_ref.has($"../attack") == false: $"../attack".enter() modifier_stack_ref.push_front($"../attack") + ##TODO: Hacky, don't do it this way. + parent.sound_effect_player.play() func process_input(_event: InputEvent) -> State: if move_component.wants_jump() and parent.is_on_floor():