diff --git a/audio/sounds/a_hurt.ogg b/audio/sounds/a_hurt.ogg deleted file mode 100644 index fc50d2d..0000000 Binary files a/audio/sounds/a_hurt.ogg and /dev/null differ diff --git a/audio/sounds/a_hurt.ogg.import b/audio/sounds/a_hurt.ogg.import deleted file mode 100644 index b009f5c..0000000 --- a/audio/sounds/a_hurt.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/a_hurt.ogg-a562e9409cf963b74445d6ea13ce9354.oggstr" - -[deps] - -source_file="res://audio/sounds/a_hurt.ogg" -dest_files=[ "res://.import/a_hurt.ogg-a562e9409cf963b74445d6ea13ce9354.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/sounds/a_jinjo.ogg b/audio/sounds/a_jinjo.ogg deleted file mode 100644 index 6bcae76..0000000 Binary files a/audio/sounds/a_jinjo.ogg and /dev/null differ diff --git a/audio/sounds/a_jinjo.ogg.import b/audio/sounds/a_jinjo.ogg.import deleted file mode 100644 index 128d757..0000000 --- a/audio/sounds/a_jinjo.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/a_jinjo.ogg-4b16bf4d913dc9acb601fc4cd65887c1.oggstr" - -[deps] - -source_file="res://audio/sounds/a_jinjo.ogg" -dest_files=[ "res://.import/a_jinjo.ogg-4b16bf4d913dc9acb601fc4cd65887c1.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/sounds/gold.ogg.import b/audio/sounds/gold.ogg.import deleted file mode 100644 index 05eee92..0000000 --- a/audio/sounds/gold.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/gold.ogg-29e530005bca2728138165989e3ad2ac.oggstr" - -[deps] - -source_file="res://audio/sounds/gold.ogg" -dest_files=[ "res://.import/gold.ogg-29e530005bca2728138165989e3ad2ac.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/sounds/gold.wav b/audio/sounds/gold.wav deleted file mode 100644 index 940b6e6..0000000 Binary files a/audio/sounds/gold.wav and /dev/null differ diff --git a/audio/sounds/gold.wav.import b/audio/sounds/gold.wav.import deleted file mode 100644 index 06ab71e..0000000 --- a/audio/sounds/gold.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/gold.wav-ee775767e0e2dcf9ee22b6f2f5807414.sample" - -[deps] - -source_file="res://audio/sounds/gold.wav" -dest_files=[ "res://.import/gold.wav-ee775767e0e2dcf9ee22b6f2f5807414.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=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/audio/sounds/gold.ogg b/audio/sounds/key.ogg similarity index 100% rename from audio/sounds/gold.ogg rename to audio/sounds/key.ogg diff --git a/audio/sounds/key.ogg.import b/audio/sounds/key.ogg.import new file mode 100644 index 0000000..3c2826d --- /dev/null +++ b/audio/sounds/key.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/key.ogg-abe49d91e24cd920d0fd05a7c445ad92.oggstr" + +[deps] + +source_file="res://audio/sounds/key.ogg" +dest_files=[ "res://.import/key.ogg-abe49d91e24cd920d0fd05a7c445ad92.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index d505ffc..0baca76 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -10,7 +10,7 @@ onready var ac_cheat = $CodeEntrySound onready var ac_boss = $BossSound onready var ac_shard = $ShardSound #Sounds -const a_gold = preload("res://audio/sounds/gold.ogg") +const a_gold = preload("res://audio/sounds/key.ogg") const a_arrow = preload("res://audio/sounds/a_egg_collect.ogg") const a_jump = preload("res://audio/sounds/jump.ogg") const a_star = preload("res://audio/sounds/star.ogg") diff --git a/maps/canopy.tscn b/maps/canopy.tscn index add8dab..172c4dd 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -10,7 +10,7 @@ [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=8] [ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/jumping_spider.tscn" type="PackedScene" id=10] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=11] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=14] diff --git a/maps/cave.tscn b/maps/cave.tscn index 48ae0ce..9611569 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -13,7 +13,7 @@ [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12] [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=13] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=14] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/enemy/tentacle.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17] diff --git a/maps/hills.tscn b/maps/hills.tscn index 50004e1..4ba3acb 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=3] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=4] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=5] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/backgrounds/blue_sky.png" type="Texture" id=7] [ext_resource path="res://tilesets/t_grass.tres" type="TileSet" id=8] diff --git a/maps/level_select.tscn b/maps/level_select.tscn index 9146260..ceace7b 100644 --- a/maps/level_select.tscn +++ b/maps/level_select.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=3] [ext_resource path="res://graphics/hud/levelselect_arrow.png" type="Texture" id=4] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=5] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=5] [ext_resource path="res://graphics/hud/levelselect_nexlevel.png" type="Texture" id=6] [ext_resource path="res://maps/level_select.gd" type="Script" id=7] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=8] diff --git a/maps/mountain.tscn b/maps/mountain.tscn index d6ee782..dfec61e 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=18] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=18] [ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=19] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=20] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=21] diff --git a/maps/rust.tscn b/maps/rust.tscn index 6461952..bf794a6 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -20,7 +20,7 @@ [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=18] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=19] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=20] -[ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=21] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=21] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=22] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=23] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=24] diff --git a/maps/station.tscn b/maps/station.tscn index c259275..81bf33a 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://maps/map.gd" type="Script" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] @@ -18,6 +18,7 @@ [ext_resource path="res://objects/enemy/tin.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=17] [ext_resource path="res://objects/environment/rock/crate.tscn" type="PackedScene" id=18] +[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=19] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 120 ) @@ -173,6 +174,9 @@ position = Vector2( 64, 72 ) [node name="Arrow2" parent="Collectibles" instance=ExtResource( 13 )] position = Vector2( 288, 16 ) +[node name="Shard" parent="Collectibles" instance=ExtResource( 19 )] +position = Vector2( 568, 16 ) + [node name="StaticBody2D" type="StaticBody2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] diff --git a/objects/collectibles/gold.gd b/objects/collectibles/key.gd similarity index 100% rename from objects/collectibles/gold.gd rename to objects/collectibles/key.gd diff --git a/objects/collectibles/gold.tscn b/objects/collectibles/key.tscn similarity index 87% rename from objects/collectibles/gold.tscn rename to objects/collectibles/key.tscn index d431723..d82968b 100644 --- a/objects/collectibles/gold.tscn +++ b/objects/collectibles/key.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://objects/collectibles/gold.gd" type="Script" id=1] -[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://graphics/collectibles/key.png" type="Texture" id=2] [ext_resource path="res://graphics/collectibles/30385.png" type="Texture" id=3] -[ext_resource path="res://graphics/collectibles/key.png" type="Texture" id=4] +[ext_resource path="res://objects/collectibles/key.gd" type="Script" id=4] [sub_resource type="ShaderMaterial" id=7] -shader = ExtResource( 2 ) +shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = false @@ -23,27 +23,27 @@ atlas = ExtResource( 3 ) region = Rect2( 20, 0, 10, 10 ) [sub_resource type="AtlasTexture" id=8] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 0, 0, 8, 9 ) [sub_resource type="AtlasTexture" id=9] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 8, 0, 8, 9 ) [sub_resource type="AtlasTexture" id=10] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 16, 0, 8, 9 ) [sub_resource type="AtlasTexture" id=11] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 24, 0, 8, 9 ) [sub_resource type="AtlasTexture" id=12] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 32, 0, 8, 9 ) [sub_resource type="AtlasTexture" id=13] -atlas = ExtResource( 4 ) +atlas = ExtResource( 2 ) region = Rect2( 40, 0, 8, 9 ) [sub_resource type="SpriteFrames" id=5] @@ -63,7 +63,7 @@ animations = [ { extents = Vector2( 4, 4 ) [node name="Gold" type="Node2D" groups=["gold"]] -script = ExtResource( 1 ) +script = ExtResource( 4 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] material = SubResource( 7 )