From 2281627223495b6c1ed55f18c0cac8ec12fb0800 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 25 Mar 2023 15:35:46 -0400 Subject: [PATCH] renamed gold to key --- audio/sounds/a_hurt.ogg | Bin 5244 -> 0 bytes audio/sounds/a_hurt.ogg.import | 15 ------------ audio/sounds/a_jinjo.ogg | Bin 7997 -> 0 bytes audio/sounds/a_jinjo.ogg.import | 15 ------------ audio/sounds/gold.ogg.import | 15 ------------ audio/sounds/gold.wav | Bin 10188 -> 0 bytes audio/sounds/gold.wav.import | 23 ------------------- audio/sounds/{gold.ogg => key.ogg} | Bin audio/sounds/key.ogg.import | 15 ++++++++++++ autoloads/audio.gd | 2 +- maps/canopy.tscn | 2 +- maps/cave.tscn | 2 +- maps/hills.tscn | 2 +- maps/level_select.tscn | 2 +- maps/mountain.tscn | 2 +- maps/rust.tscn | 2 +- maps/station.tscn | 6 ++++- objects/collectibles/{gold.gd => key.gd} | 0 objects/collectibles/{gold.tscn => key.tscn} | 22 +++++++++--------- 19 files changed, 38 insertions(+), 87 deletions(-) delete mode 100644 audio/sounds/a_hurt.ogg delete mode 100644 audio/sounds/a_hurt.ogg.import delete mode 100644 audio/sounds/a_jinjo.ogg delete mode 100644 audio/sounds/a_jinjo.ogg.import delete mode 100644 audio/sounds/gold.ogg.import delete mode 100644 audio/sounds/gold.wav delete mode 100644 audio/sounds/gold.wav.import rename audio/sounds/{gold.ogg => key.ogg} (100%) create mode 100644 audio/sounds/key.ogg.import rename objects/collectibles/{gold.gd => key.gd} (100%) rename objects/collectibles/{gold.tscn => key.tscn} (87%) diff --git a/audio/sounds/a_hurt.ogg b/audio/sounds/a_hurt.ogg deleted file mode 100644 index fc50d2d5f30b79e0fba4fd8b9002f92e15795afc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5244 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 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 6bcae766290185cebd97f0364877d76416529469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7997 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 DuS2(E 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 940b6e6a3d04917902f3383eae5549b655862895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10188 zcmeI$`B&2U;>U5#4JA!QKoLa11w=taWsww@>YB}%wwO+fW-~2QPC8AC&9!XWZJKJT z(@ZlhQ+f4Tc4wTN9CJYg1qEc2MG(OaR8%zF%G>>PzW>Gd_;>fXJZwChlM?l(h2Zzf$9356UcsuMXI9Bioc#MO?_W14bF`HsG!E#_Z z-g(}6b=&H;6{HuWms83qh(1K${G0hV>uT54qN-3;>}qy(>+h|WWuj;%YkW^B*cPRXKVtxH>%7DbFAZdPqp9c?<=RPmpR|NL0HmlS z9}SHSjW@(M#9%lW&Y&~s?i<`Uw0_e1Nk8DyhD#fMWBkU*MdhOQ$@j^fTb)~X)$gjm zRClRvyneiXsdcG!pJJcl6!H|Zj8;b5k+vgEovuzN0(PYANI}LTV`HE(P=m}M3vUZ= zTWDBlfV_shUj1hEnbpQM*xOJz2jjToyKSnmLD?4>uocJ=Pl98QOVN zbyPLyJLkKfw4WqmikR2g*V%mlP68+4lju*PpZh=eFVGff`vv`ivz)UWW3#dO2ImH6 zNw6d+)0Sy(`QP&QjP{H!Oejp)$KJWAxx@i;urMzv8-u}-malX8>RtX;DOVj@5+Lgiggy#Xe*`WXTidiIxOQ!hY(0DhJEK zf=9q3O+8IL$^2wKkHg~}Z9CeQ+nL+hq-avq*lKM0aD8}ZTxZ-1)(aLrk)Bw~tYv;f z`G%5*&O;ZP3Qb>0zLE^`26+K(0d4!Z`?zlfZw2dB>s60Hk3d3#kWe099{-s2n000C zm9={qdl(1E2gntH6@ht%JVS;!L;Q&MhKeGFCg_J?%Y>9mS49!BKFoj;q@w+9W!`JHd12I&-h^uJFDTeJL8$4eA`>j_`Mp z?;`Kg?$T0OsjTsY@q`QU7vdKq79+0uT=lu2y`U}WF6lnNJHY#y`!lzJ-@s3oq)R*o zJO-=?DepSbyGnQ^ytMYT_T`S{ zjwET4^y1*fL1YjzsF++#{&?P0Bvd4PV0>WYQgf+JVNPLrGkG)WUUe_J3*Gf2??;{! zV5?xOAXA*q^rw`klyqD=4l{w7$Wi7fp9r4_ zyLeqZC7@Z@EG$))DuIVhKygsqM#@G?3B80~#w=sGtXyyLw!S?Vw_?Q(GStp3^n6g{I&RnsD&sT3Wqv9bb4q& zHXw5pItt79W&FC1x(*RAl9r@(0y%-iVdAj+G52FWp3P_mn!%1^$9*7vApQ{WL%=KJ zE2Bwjl4=AR!2*AQ-_qIASt2QswCGxNrQW69S@8LttV_ah#lggyph&JM%s6SCMi_G#^^;lIat`+NrdSOXdNmqGKc@L})*2kaa&pKco zu(~K+R0Fkv>K5k~=Mdu%gNeXI)FJ8+f)T+;b#HZVg}6ezt!rD?$IpYi%w3kR&)08r z+vfHi?mJv2DU)=DdWOo5WyijXeii-k9uqLQe*DZVNGuKT<0 zN^zw)OPQt2H|3l5L-s=^LnlLZBppc*BZ&DHFcCEoMGhf{w0pICeY}r6Qan<;7QYt9 zi{eFEiB{sR@>YcnhYde~J%Aa)3}K6;MN(!=X3QDN8A?%PQKU208SCWc(QIIr9YE&E5Br_m@6i^*r9llIjCbd#pDaFyn(E||!5sm0Z^e=CJd0V5e z(T~bUbD!EGDs%zE#GWE-pH_96&#Y^#jll~?hh&~XFBjHH5!f%B) zBbpKJ6Ydi=eKmcLL?9>9zl-?#0Fvy`W*B*Iec524o9C92wr#YwjhvFX!yUZ@jRAwsc`|A7R%yDK9KM%hm zY!UVz;U3{~fepM z8>7K!uqEsgwun$f&=R%8mk}=`c%i&dTc9m)(Y|OG7zIYEhN{6U@k*Y8r?9K+s*Q$? z2A@fv$p!cVybxE2iy%Z0;6ymFoKQ}P42cZ+BjAsKtG27Q#eu~Ex`wW4P&Oz#0J}B2 zHBrVW<8#|{+vfqF2UO##aT2@)pAwN0k%mvhU%+0#X2Y}LKTZBLxqV>!K#nFyv!{1Y zuNI)xDz(@_>|n`U$=nZ!9}r@k7`GF@6Q4)OBg}`*hxG*a1PlBGeuWc-6FP&=a7%Mb zgHRz<%YZyxo-SfIVz}0&)}<`4EKq?{;H2Tw@O*qe{@2i7Lp{-+XjflX-+zt$YwWV& zvSCy+s2>aVq5Yp)ru8OkhWmPW5euMT7f@)GV6t~9JPj1FkRHeo*t{46jW z91fhS$gIqZ{c)#kgYpo%cI$0*Zi&$Hn7nLu*4l01ONRb12|Y z0Lz8tk~^9^y3?@JaJuhwpHM5*hU!E0Hj~Y?Wpc~pbKmE_g{VT504u4P14N`*y1%raW2E+!%23hs2)-eWldyF zklo4dMX(~+ZscyHAKDL108}C?kw`ca4tz}o`%U^yrjDeJLO0QecTToB{C;*4RA&>#c00mS5J+bD*nl1BN=8LRF zR*hL>R*on~rT`cV#v-F72M}o?Cpj_ze0E`leLST)OUZ-Q_aqGDzjFaz}fh zJ+8Z7cPD{JAeD>CWf@rXQuNZ`!r;Pnz!bo|XkILOSM;uBxn=p$sz<9LoFbequDZDD z9z)FFY0{{OD F{14^}TrmIu 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 )