diff --git a/export_presets.cfg b/export_presets.cfg index 3fb5929..95b2372 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -7,7 +7,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../output/test_dumb_graphics_bug.exe" +export_path="../output/test_build.exe" script_export_mode=1 script_encryption_key="" @@ -16,7 +16,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" binary_format/64_bits=true -binary_format/embed_pck=false +binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false @@ -50,7 +50,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../demos/Hero Mark 2 2022 Demo/lin/hero mark 2_lin.x86_64" +export_path="../output/hero mark 2_lin.x86_64" script_export_mode=1 script_encryption_key="" @@ -59,7 +59,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" binary_format/64_bits=true -binary_format/embed_pck=false +binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false diff --git a/graphics/enemy/roller_fiend.png b/graphics/enemy/roller_fiend.png index 37c0410..a24e477 100644 Binary files a/graphics/enemy/roller_fiend.png and b/graphics/enemy/roller_fiend.png differ diff --git a/maps/cave.tscn b/maps/cave.tscn index d884609..0b91457 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -12,6 +12,9 @@ [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=10] [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/star.tscn" type="PackedScene" id=15] [node name="Map" type="Node2D"] script = ExtResource( 11 ) @@ -31,7 +34,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1310727, 0, 65537, 1310728, 0, 65537, 1310729, 0, 65537, 1310741, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 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, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 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, 0, 1441833, 0, 0, 1441834, 0, 0, 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, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 ) +tile_data = PoolIntArray( 655360, 0, 65537, 655361, 0, 65537, 655362, 0, 65537, 655363, 0, 65537, 655364, 0, 65537, 655365, 0, 65537, 655366, 0, 65537, 655367, 0, 65537, 655368, 0, 65537, 655369, 0, 65537, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1179648, 0, 65537, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1245205, 0, 65537, 1245206, 0, 65537, 1245207, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 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, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 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, 0, 1441833, 0, 0, 1441834, 0, 0, 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, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 166 ) @@ -52,6 +55,9 @@ scale = Vector2( 1, 10 ) [node name="Rock" parent="Platforms" instance=ExtResource( 3 )] position = Vector2( 138, 144 ) +[node name="Rock2" parent="Platforms" instance=ExtResource( 3 )] +position = Vector2( 176, 144 ) + [node name="Enemies" type="Node2D" parent="."] [node name="Snail" parent="Enemies" instance=ExtResource( 7 )] @@ -74,6 +80,38 @@ left_up_boundry = 4.0 right_down_boundry = 2.0 speed = 80 +[node name="RollingFiend" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 144, 96 ) + +[node name="Collectibles" type="Node2D" parent="."] + +[node name="Gold" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 64, 152 ) + +[node name="Gold2" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 80, 136 ) + +[node name="Gold3" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 88, 136 ) + +[node name="Gold4" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 80, 112 ) + +[node name="Gold5" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 48, 112 ) + +[node name="Gold7" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 24, 136 ) + +[node name="Gold8" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 8, 112 ) + +[node name="Gold6" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 64, 112 ) + +[node name="Star" parent="Collectibles" instance=ExtResource( 15 )] +position = Vector2( 8, 136 ) + [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) diff --git a/objects/enemy/climber.tscn b/objects/enemy/climber.tscn deleted file mode 100644 index cab1dcd..0000000 --- a/objects/enemy/climber.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=2] - -[node name="Climber" type="Node2D"] diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index fcc5e55..a25cfc4 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -25,28 +25,32 @@ extents = Vector2( 4, 4 ) [node name="RollingFiend" instance=ExtResource( 1 )] script = ExtResource( 3 ) +score_for_killing = 40 move_speed = 50.0 [node name="AnimatedSprite" type="AnimatedSprite" parent="." index="0"] +position = Vector2( 0, 1 ) frames = SubResource( 3 ) playing = true [node name="Hitbox" type="Area2D" parent="." index="1"] +position = Vector2( 0, 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" index="0"] rotation = -0.020475 shape = SubResource( 4 ) [node name="Raycasts" type="Node2D" parent="." index="2"] +position = Vector2( 0, 1 ) [node name="WallCast" type="RayCast2D" parent="Raycasts" index="0"] -position = Vector2( -8, 8 ) +position = Vector2( -7, 7 ) enabled = true -cast_to = Vector2( 0, -16 ) +cast_to = Vector2( 0, -14 ) [node name="FloorCast" type="RayCast2D" parent="Raycasts" index="1"] -position = Vector2( -8, 9 ) +position = Vector2( -7, 8 ) enabled = true -cast_to = Vector2( 16, 0 ) +cast_to = Vector2( 14, 0 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Area2D_area_entered"] diff --git a/objects/enemy/snail.tscn b/objects/enemy/snail.tscn index c3d77c2..a6a17c2 100644 --- a/objects/enemy/snail.tscn +++ b/objects/enemy/snail.tscn @@ -30,6 +30,7 @@ extents = Vector2( 4, 4 ) [node name="Snail" type="Node2D" groups=["enemy"]] script = ExtResource( 3 ) +score_for_killing = 30 slower_speed = 30 faster_speed = 80 @@ -37,6 +38,7 @@ faster_speed = 80 material = SubResource( 1 ) position = Vector2( 3, 3 ) frames = SubResource( 4 ) +frame = 1 playing = true [node name="Area2D" type="Area2D" parent="."] diff --git a/objects/player/player.tscn b/objects/player/player.tscn index ade526f..dd65bf2 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -601,6 +601,7 @@ extents = Vector2( 6, 7 ) [node name="Player" type="KinematicBody2D"] collision_layer = 2 +collision_mask = 5 script = ExtResource( 1 ) [node name="Trail" type="Node" parent="."] diff --git a/objects/rock/rock.tscn b/objects/rock/rock.tscn index d63cdf7..5888bbf 100644 --- a/objects/rock/rock.tscn +++ b/objects/rock/rock.tscn @@ -16,6 +16,7 @@ extents = Vector2( 5, 4.5 ) extents = Vector2( 5, 4.5 ) [node name="Rock" type="KinematicBody2D" groups=["pushable"]] +collision_layer = 4 script = ExtResource( 3 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/project.godot b/project.godot index 916c204..c622437 100644 --- a/project.godot +++ b/project.godot @@ -123,6 +123,7 @@ debug_show={ 2d_physics/layer_1="general" 2d_physics/layer_2="player" +2d_physics/layer_3="dynamic objects" 2d_physics/layer_4="vision" [physics] diff --git a/scripts/debug.gd b/scripts/debug.gd index 77fda4c..32880f4 100644 --- a/scripts/debug.gd +++ b/scripts/debug.gd @@ -58,9 +58,7 @@ func _physics_process(delta): Game.change_map(load("res://maps/level_select.tscn")) #Debug 2 if Input.is_action_just_pressed("debug_2"): - var save = ConfigFile.new() - save.load(str("user://file") + str(1) + str(".pr")) - Game.score = save.get_value(str(Game.current_level),"Score",0) + Engine.set_target_fps(1) func print(text): lines += 1