diff --git a/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 new file mode 100644 index 0000000..f8f302f --- /dev/null +++ b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 @@ -0,0 +1,3 @@ +source_md5="ad86b83e2fd56ca2374f293cbcb17853" +dest_md5="a7728af58a624b5da2e618b0c71442f4" + diff --git a/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex new file mode 100644 index 0000000..01240ee Binary files /dev/null and b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex differ diff --git a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 index f135665..aa8754d 100644 --- a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 +++ b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 @@ -1,3 +1,3 @@ -source_md5="c59ab7db07786b45336a08776bb2c650" -dest_md5="eaf951160d0c5c460c91c4973d34864e" +source_md5="4de648abb772dd3fb3dbe1f8e48f6efa" +dest_md5="eddab9bfc554f2cac9d4f7deee59d744" diff --git a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex index 2f82bad..f877b74 100644 Binary files a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex and b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex differ diff --git a/game.gd b/game.gd index fd8037a..b038488 100644 --- a/game.gd +++ b/game.gd @@ -8,7 +8,7 @@ onready var viewport_container = get_parent().get_node("Main/Control/ViewportCon var golds = 0 var stars = [false,false,false,false,false] var shards = 0 -var arrows = 1 +var arrows = 0 var score = 0 #Audio Channels onready var ac_jump = $JumpSound diff --git a/graphics/barrier/barrier_2px.png b/graphics/barrier/barrier_2px.png new file mode 100644 index 0000000..dd12d47 Binary files /dev/null and b/graphics/barrier/barrier_2px.png differ diff --git a/graphics/barrier/barrier_2px.png.import b/graphics/barrier/barrier_2px.png.import new file mode 100644 index 0000000..cc510ca --- /dev/null +++ b/graphics/barrier/barrier_2px.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/barrier/barrier_2px.png" +dest_files=[ "res://.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=1 +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/graphics/tiles/grass.png b/graphics/tiles/grass.png index 925e6ae..c04444b 100644 Binary files a/graphics/tiles/grass.png and b/graphics/tiles/grass.png differ diff --git a/maps/map01.tscn b/maps/map01.tscn index 34c7a7c..8ba183c 100644 --- a/maps/map01.tscn +++ b/maps/map01.tscn @@ -14,7 +14,7 @@ [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=14] -[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=15] +[ext_resource path="res://objects/barrier/barrier.tscn" type="PackedScene" id=15] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 128 ) @@ -36,7 +36,7 @@ __meta__ = { tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327687, 2, 1, 327689, 2, 0, 327695, 2, 2, 327696, 2, 2, 327702, 2, 3, 327703, 2, 3, 393219, 0, 65536, 393220, 0, 65537, 393221, 0, 65537, 393222, 0, 65537, 393223, 0, 65537, 393224, 0, 65537, 393225, 0, 65537, 393226, 0, 65537, 393227, 0, 65538, 393230, 0, 65536, 393231, 0, 65537, 393232, 0, 65537, 393233, 0, 65538, 393236, 0, 65536, 393237, 0, 65537, 393238, 0, 65537, 393239, 0, 65537, 393240, 0, 65537, 393241, 0, 65538, 589844, 0, 65536, 589845, 0, 65537, 589846, 0, 65537, 589847, 0, 65537, 589848, 0, 65537, 589849, 0, 65538, 655370, 2, 2, 655373, 2, 0, 720904, 0, 65536, 720905, 0, 65537, 720906, 0, 65537, 720907, 0, 65537, 720908, 0, 65537, 720909, 0, 65537, 720910, 0, 65537, 720911, 0, 65538, 851969, 0, 65536, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65537, 851973, 0, 65538, 851987, 2, 1, 851989, 2, 2, 917521, 0, 65536, 917522, 0, 65537, 917523, 0, 65537, 917524, 0, 65537, 917525, 0, 65537, 917526, 0, 65537, 917527, 0, 65537, 917528, 0, 65537, 917529, 0, 65537, 917530, 0, 65537, 917531, 0, 65537, 917532, 0, 65538, 1114152, 0, 131072, 1114153, 0, 0, 1114154, 0, 131073, 1179649, 0, 65536, 1179650, 0, 65537, 1179651, 0, 65538, 1179654, 0, 65536, 1179655, 0, 65537, 1179656, 0, 65537, 1179657, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1179660, 0, 65537, 1179661, 0, 65537, 1179662, 0, 65538, 1179688, 0, 2, 1179689, 0, 1, 1179690, 536870912, 2, 1245202, 2, 2, 1245224, 0, 2, 1245225, 0, 1, 1245226, 536870912, 2, 1310736, 0, 131072, 1310737, 536870912, 0, 1310738, 536870912, 0, 1310739, 536870912, 0, 1310740, 0, 131073, 1310760, 0, 2, 1310761, 0, 1, 1310762, 536870912, 2, 1376257, 2, 0, 1376261, 2, 1, 1376263, 2, 2, 1376266, 2, 2, 1376269, 2, 3, 1376271, 0, 131072, 1376272, 0, 131075, 1376273, 536870912, 1, 1376274, 536870912, 1, 1376275, 536870912, 1, 1376276, 0, 131074, 1376277, 0, 131073, 1376281, 2, 1, 1376296, 0, 2, 1376297, 0, 1, 1376298, 536870912, 2, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 131075, 1441808, 0, 1, 1441809, 0, 1, 1441810, 0, 1, 1441811, 0, 1, 1441812, 0, 1, 1441813, 0, 131074, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 131075, 1441833, 0, 1, 1441834, 0, 131074, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1, 1507360, 0, 1, 1507361, 0, 1, 1507362, 0, 1, 1507363, 0, 1, 1507364, 0, 1, 1507365, 0, 1, 1507366, 0, 1, 1507367, 0, 1, 1507368, 0, 1, 1507369, 0, 1, 1507370, 0, 1, 1507371, 0, 1, 1507372, 0, 1, 1507373, 0, 1, 1507374, 0, 1, 1507375, 0, 1, 1507376, 0, 1, 1507377, 0, 1, 1507378, 0, 1, 1507379, 0, 1, 1507380, 0, 1, 1507381, 0, 1, 1507382, 0, 1, 1507383, 0, 1, 1507384, 0, 1, 1507385, 0, 1, 1507386, 0, 1, 1507387, 0, 1, 1507388, 0, 1, 1507389, 0, 1, 1507390, 0, 1, 1507391, 0, 1, 1507392, 0, 1, 1507393, 0, 1, 1507394, 0, 1, 1507395, 0, 1, 1507396, 0, 1, 1507397, 0, 1, 1507398, 0, 1, 1507399, 0, 1, 1507400, 0, 1, 1507401, 0, 1, 1507402, 0, 1, 1507403, 0, 1, 1507404, 0, 1, 1507405, 0, 1, 1507406, 0, 1, 1507407, 0, 1, 1507408, 0, 1, 1507409, 0, 1, 1507410, 0, 1, 1507411, 0, 1, 1507412, 0, 1, 1507413, 0, 1, 1507414, 0, 1, 1507415, 0, 1, 1507416, 0, 1, 1507417, 0, 1, 1507418, 0, 1, 1507419, 0, 1, 1507420, 0, 1, 1507421, 0, 1, 1507422, 0, 1, 1507423, 0, 1 ) +tile_data = PoolIntArray( 327687, 2, 1, 327689, 2, 0, 327696, 2, 2, 327702, 2, 3, 327703, 2, 3, 393219, 0, 65536, 393220, 0, 65537, 393221, 0, 65537, 393222, 0, 65537, 393223, 0, 65537, 393224, 0, 65537, 393225, 0, 65537, 393226, 0, 65537, 393227, 0, 65538, 393231, 0, 65536, 393232, 0, 65537, 393233, 0, 65538, 393236, 0, 65536, 393237, 0, 65537, 393238, 0, 65537, 393239, 0, 65537, 393240, 0, 65537, 393241, 0, 65538, 589844, 0, 65536, 589845, 0, 65537, 589846, 0, 65537, 589847, 0, 65537, 589848, 0, 65537, 589849, 0, 65538, 655368, 0, 65536, 655369, 0, 65537, 655370, 0, 65537, 655371, 0, 65537, 655372, 0, 65537, 655373, 0, 65538, 720906, 0, 196611, 786442, 0, 196610, 851968, 0, 65537, 851969, 0, 65537, 851970, 0, 65537, 851971, 0, 65537, 851972, 0, 65537, 851973, 0, 65538, 851978, 0, 65539, 851987, 2, 1, 851989, 2, 2, 917514, 0, 65537, 917515, 0, 65537, 917516, 0, 65537, 917517, 0, 65537, 917518, 0, 65537, 917519, 0, 65537, 917520, 0, 65537, 917521, 0, 65537, 917522, 0, 65537, 917523, 0, 65537, 917524, 0, 65537, 917525, 0, 65537, 917526, 0, 65537, 917527, 0, 65537, 917528, 0, 65537, 917529, 0, 65537, 917530, 0, 65537, 917531, 0, 65537, 917532, 0, 65538, 1114152, 0, 131072, 1114153, 0, 0, 1114154, 0, 131073, 1179649, 0, 65536, 1179650, 0, 65537, 1179651, 0, 65538, 1179654, 0, 65536, 1179655, 0, 65537, 1179656, 0, 65537, 1179657, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1179660, 0, 65537, 1179661, 0, 65537, 1179662, 0, 65538, 1179688, 0, 2, 1179689, 0, 1, 1179690, 536870912, 2, 1245202, 2, 2, 1245207, 0, 196611, 1245224, 0, 2, 1245225, 0, 1, 1245226, 536870912, 2, 1310736, 0, 131072, 1310737, 536870912, 0, 1310738, 536870912, 0, 1310739, 536870912, 0, 1310740, 0, 131073, 1310743, 1073741824, 196611, 1310760, 0, 2, 1310761, 0, 1, 1310762, 536870912, 2, 1376257, 2, 0, 1376261, 2, 1, 1376263, 2, 2, 1376266, 2, 2, 1376269, 2, 3, 1376271, 0, 131072, 1376272, 0, 131075, 1376273, 536870912, 1, 1376274, 536870912, 1, 1376275, 536870912, 1, 1376276, 0, 131074, 1376277, 0, 131073, 1376279, 0, 65539, 1376281, 2, 1, 1376296, 0, 2, 1376297, 0, 1, 1376298, 536870912, 2, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 131075, 1441808, 0, 1, 1441809, 0, 1, 1441810, 0, 1, 1441811, 0, 1, 1441812, 0, 1, 1441813, 0, 131074, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 131075, 1441833, 0, 1, 1441834, 0, 131074, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1, 1507360, 0, 1, 1507361, 0, 1, 1507362, 0, 1, 1507363, 0, 1, 1507364, 0, 1, 1507365, 0, 1, 1507366, 0, 1, 1507367, 0, 1, 1507368, 0, 1, 1507369, 0, 1, 1507370, 0, 1, 1507371, 0, 1, 1507372, 0, 1, 1507373, 0, 1, 1507374, 0, 1, 1507375, 0, 1, 1507376, 0, 1, 1507377, 0, 1, 1507378, 0, 1, 1507379, 0, 1, 1507380, 0, 1, 1507381, 0, 1, 1507382, 0, 1, 1507383, 0, 1, 1507384, 0, 1, 1507385, 0, 1, 1507386, 0, 1, 1507387, 0, 1, 1507388, 0, 1, 1507389, 0, 1, 1507390, 0, 1, 1507391, 0, 1, 1507392, 0, 1, 1507393, 0, 1, 1507394, 0, 1, 1507395, 0, 1, 1507396, 0, 1, 1507397, 0, 1, 1507398, 0, 1, 1507399, 0, 1, 1507400, 0, 1, 1507401, 0, 1, 1507402, 0, 1, 1507403, 0, 1, 1507404, 0, 1, 1507405, 0, 1, 1507406, 0, 1, 1507407, 0, 1, 1507408, 0, 1, 1507409, 0, 1, 1507410, 0, 1, 1507411, 0, 1, 1507412, 0, 1, 1507413, 0, 1, 1507414, 0, 1, 1507415, 0, 1, 1507416, 0, 1, 1507417, 0, 1, 1507418, 0, 1, 1507419, 0, 1, 1507420, 0, 1, 1507421, 0, 1, 1507422, 0, 1, 1507423, 0, 1 ) [node name="Water" type="TileMap" parent="."] tile_set = ExtResource( 10 ) @@ -50,7 +50,7 @@ position = Vector2( 32, 160 ) tile_set = ExtResource( 7 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 327707, 1, 0, 393243, 1, 0, 458779, 1, 0, 524315, 1, 0, 589851, 1, 0, 655387, 1, 0, 720923, 1, 0, 786459, 1, 0, 851995, 1, 0, 983047, 1, 0, 1048583, 1, 0, 1114119, 1, 0 ) +tile_data = PoolIntArray( 327707, 1, 0, 393243, 1, 0, 458779, 1, 0, 524315, 1, 0, 589851, 1, 0, 655363, 1, 0, 655387, 1, 0, 720899, 1, 0, 720923, 1, 0, 786435, 1, 0, 786459, 1, 0, 851995, 1, 0, 917511, 1, 0, 983047, 1, 0, 1048583, 1, 0, 1114119, 1, 0 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] @@ -66,18 +66,31 @@ shape = SubResource( 1 ) [node name="Platforms" type="Node2D" parent="."] [node name="Ladder" parent="Platforms" instance=ExtResource( 2 )] -position = Vector2( 56, 120 ) +position = Vector2( 56, 112 ) +scale = Vector2( 1, 4 ) + +[node name="Ladder3" parent="Platforms" instance=ExtResource( 2 )] +position = Vector2( 24, 80 ) scale = Vector2( 1, 3 ) [node name="Ladder2" parent="Platforms" instance=ExtResource( 2 )] position = Vector2( 216, 40 ) scale = Vector2( 1, 9 ) +[node name="Barrier" parent="Platforms" instance=ExtResource( 15 )] +position = Vector2( 107, 86 ) +scale = Vector2( 1, 26 ) +cost = 20 +label_offset = Vector2( 0, 4 ) + [node name="Collectibles" type="Node2D" parent="."] [node name="Shard" parent="Collectibles" instance=ExtResource( 12 )] position = Vector2( 32, 40 ) +[node name="Shard2" parent="Collectibles" instance=ExtResource( 12 )] +position = Vector2( 88, 104 ) + [node name="Gold" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 48, 40 ) @@ -118,17 +131,14 @@ position = Vector2( 160, 104 ) position = Vector2( 176, 104 ) [node name="Gold15" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 112, 80 ) +position = Vector2( 96, 72 ) [node name="Gold17" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 72, 80 ) +position = Vector2( 72, 72 ) [node name="Gold19" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 16, 96 ) -[node name="Gold20" parent="Collectibles" instance=ExtResource( 5 )] -position = Vector2( 24, 96 ) - [node name="Star" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 16, 136 ) @@ -139,37 +149,37 @@ color = 1 [node name="Gold21" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 32, 96 ) -[node name="Arrow" parent="Collectibles" instance=ExtResource( 15 )] -position = Vector2( 192, 168 ) - [node name="Enemies" type="Node2D" parent="."] [node name="Slime" parent="Enemies" instance=ExtResource( 11 )] position = Vector2( 208, 104 ) scale = Vector2( -1, 1 ) -[node name="Slime3" parent="Enemies" instance=ExtResource( 11 )] -position = Vector2( 232, 168 ) -scale = Vector2( -1, 1 ) - -[node name="Slime4" parent="Enemies" instance=ExtResource( 11 )] -position = Vector2( 264, 168 ) -scale = Vector2( -1, 1 ) - [node name="Bat" parent="Enemies" instance=ExtResource( 13 )] -position = Vector2( 104, 48 ) -left_up_boundry = 3.0 +position = Vector2( 152, 48 ) +left_up_boundry = 4.0 +right_down_boundry = 2.0 + +[node name="Bat2" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 48, 104 ) +left_up_boundry = 4.0 right_down_boundry = 2.0 [node name="Slime2" parent="Enemies" instance=ExtResource( 11 )] position = Vector2( 192, 64 ) [node name="Snake" parent="Enemies" instance=ExtResource( 14 )] -position = Vector2( 96, 80 ) -left_up_boundry = 3.0 -right_down_boundry = 3.0 +position = Vector2( 88, 72 ) +left_up_boundry = 2.0 +right_down_boundry = 2.0 speed = 35 +[node name="Snake2" parent="Enemies" instance=ExtResource( 14 )] +position = Vector2( 216, 168 ) +left_up_boundry = 4.0 +right_down_boundry = 4.0 +speed = 60 + [node name="ColorRect2" type="ColorRect" parent="."] margin_left = 512.0 margin_right = 768.0 diff --git a/objects/barrier/barrier.gd b/objects/barrier/barrier.gd index 9ff227d..b8c07bd 100644 --- a/objects/barrier/barrier.gd +++ b/objects/barrier/barrier.gd @@ -1,15 +1,24 @@ extends Node2D export var cost = 0 +export var label_offset = Vector2.ZERO onready var label = $Label +onready var sprite = $Sprite +onready var hitbox = $StaticBody2D/CollisionShape2D func _ready(): + if scale.y != 1: + sprite.set_region_rect(Rect2(0,0,4,scale.y)) + hitbox.scale.y = scale.y + scale.y = 1 + #Label label.visible = true label.set_text(str(cost)) + label.rect_position.y = scale.y / 2 func _physics_process(delta): #Open - if Game.golds >= cost: $AnimationPlayer.play("open") + if Game.golds >= cost: queue_free() func _on_AnimationPlayer_animation_finished(anim_name): if anim_name == "open": diff --git a/objects/barrier/barrier.tscn b/objects/barrier/barrier.tscn index 3f6bea0..659d351 100644 --- a/objects/barrier/barrier.tscn +++ b/objects/barrier/barrier.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://objects/barrier/barrier.gd" type="Script" id=1] -[ext_resource path="res://graphics/barrier/barrier.png" type="Texture" id=2] +[ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2] [ext_resource path="res://fonts/2ndpuberty..fnt" type="BitmapFont" id=3] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 2, 8 ) +extents = Vector2( 2, 0.5 ) [sub_resource type="Animation" id=4] resource_name = "initial" @@ -97,12 +97,12 @@ script = ExtResource( 1 ) texture = ExtResource( 2 ) centered = false region_enabled = true -region_rect = Rect2( 0, 0, 16, 16 ) +region_rect = Rect2( 0, 0, 4, 1 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2( 8, 8 ) +position = Vector2( 2, 0.5 ) shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] @@ -110,13 +110,12 @@ anims/initial = SubResource( 4 ) anims/open = SubResource( 3 ) [node name="Label" type="Label" parent="."] -visible = false -margin_left = -12.0 +margin_left = -18.0 margin_top = -15.0 -margin_right = 28.0 +margin_right = 22.0 margin_bottom = 5.0 theme = SubResource( 5 ) -text = "0" +text = "00" align = 1 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"] diff --git a/objects/enemy/snake.tscn b/objects/enemy/snake.tscn index 2b49e3e..e880c35 100644 --- a/objects/enemy/snake.tscn +++ b/objects/enemy/snake.tscn @@ -26,7 +26,7 @@ animations = [ { } ] [sub_resource type="RectangleShape2D" id=5] -extents = Vector2( 8, 8 ) +extents = Vector2( 5.5, 6 ) [node name="Snake" type="Node2D"] script = ExtResource( 3 ) @@ -39,9 +39,9 @@ frame = 1 playing = true [node name="Area2D" type="Area2D" parent="."] -visible = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2( 0.5, 2 ) shape = SubResource( 5 ) [connection signal="area_entered" from="Area2D" to="." method="_on_Area2D_area_entered"] diff --git a/objects/ladder/ladder.tscn b/objects/ladder/ladder.tscn index b6d45b0..5a7524c 100644 --- a/objects/ladder/ladder.tscn +++ b/objects/ladder/ladder.tscn @@ -17,7 +17,9 @@ position = Vector2( 4, 4 ) shape = SubResource( 1 ) [node name="LeftSnap" type="Position2D" parent="."] +visible = false position = Vector2( 0, 4 ) [node name="RightSnap" type="Position2D" parent="."] +visible = false position = Vector2( 8, 4 ) diff --git a/objects/player/player.gd b/objects/player/player.gd index 55cb246..4efbe3e 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -14,6 +14,7 @@ enum State {IDLE,WALK,JUMP,FALL,STUNNED,CLIMB,SWORD,SHOOT} var current_state = State.IDLE ##Runtime var axis = Vector2.ZERO #Current direction being held +var trail_color = Color(0.25,0,1,0.4) #Physics var velocity = Vector2.ZERO var walk_speed = 50 @@ -66,9 +67,7 @@ func _physics_process(delta): #Apply velocity move_and_slide(velocity,Vector2.UP) #Debug - if Input.is_action_pressed("debug_move_player"): - position = get_viewport().get_mouse_position() - print(get_viewport().get_mouse_position()) + debug() func _process_idle(): if anims.get_current_animation() != "idle": anims.play("idle") @@ -246,3 +245,8 @@ func _on_AnimationPlayer_animation_finished(anim_name): else: current_state = State.FALL return +func debug(): + #Move player to mouse + if Input.is_action_pressed("debug_move_player"): + position = get_viewport().get_mouse_position() + print(get_viewport().get_mouse_position()) diff --git a/objects/player/player.tscn b/objects/player/player.tscn index e638906..c98125b 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -15,7 +15,8 @@ [ext_resource path="res://scripts/recolor.tres" type="Shader" id=13] [ext_resource path="res://graphics/player/sg_doublejump.png" type="Texture" id=14] -[sub_resource type="ShaderMaterial" id=27] +[sub_resource type="ShaderMaterial" id=38] +resource_local_to_scene = true shader = ExtResource( 4 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true @@ -598,8 +599,10 @@ extents = Vector2( 6, 7 ) [node name="Player" type="KinematicBody2D"] script = ExtResource( 1 ) +[node name="Trail" type="Node" parent="."] + [node name="Sprite" type="Sprite" parent="."] -material = SubResource( 27 ) +material = SubResource( 38 ) texture = ExtResource( 3 ) region_enabled = true region_rect = Rect2( 0, 0, 20, 20 ) diff --git a/tilesets/t_grass.tres b/tilesets/t_grass.tres index 3c5cdad..bb02561 100644 --- a/tilesets/t_grass.tres +++ b/tilesets/t_grass.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=15 format=2] +[gd_resource type="TileSet" load_steps=18 format=2] [ext_resource path="res://graphics/tiles/grass.png" type="Texture" id=1] @@ -41,12 +41,21 @@ points = PoolVector2Array( 8, 0, 8, 0, 8, 8, 8, 8 ) [sub_resource type="ConvexPolygonShape2D" id=13] points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=14] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=15] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=16] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + [resource] 0/name = "grass.png 0" 0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 0, 0, 32, 24 ) +0/region = Rect2( 0, 0, 32, 32 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) 0/autotile/tile_size = Vector2( 8, 8 ) @@ -140,6 +149,24 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) "one_way_margin": 1.0, "shape": SubResource( 13 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 14 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 15 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 16 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 0/z_index = 0 1/name = "grass.png 1"