diff --git a/graphics/enemy/roller_fiend.png b/graphics/enemy/rolling_fiend.png similarity index 100% rename from graphics/enemy/roller_fiend.png rename to graphics/enemy/rolling_fiend.png diff --git a/graphics/enemy/roller_fiend.png.import b/graphics/enemy/rolling_fiend.png.import similarity index 69% rename from graphics/enemy/roller_fiend.png.import rename to graphics/enemy/rolling_fiend.png.import index 22de4d8..ee468b4 100644 --- a/graphics/enemy/roller_fiend.png.import +++ b/graphics/enemy/rolling_fiend.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/roller_fiend.png-2f4ff517749815b6378d9070bb47d63f.stex" +path="res://.import/rolling_fiend.png-37d32239fa865317d5d7b0f286feba62.stex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/enemy/roller_fiend.png" -dest_files=[ "res://.import/roller_fiend.png-2f4ff517749815b6378d9070bb47d63f.stex" ] +source_file="res://graphics/enemy/rolling_fiend.png" +dest_files=[ "res://.import/rolling_fiend.png-37d32239fa865317d5d7b0f286feba62.stex" ] [params] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index b42e348..9d68f17 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=26 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] @@ -13,12 +13,8 @@ [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] -[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=14] -[ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16] [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=17] -[ext_resource path="res://objects/enemy/mine.tscn" type="PackedScene" id=18] -[ext_resource path="res://objects/enemy/explosion.tscn" type="PackedScene" id=19] [ext_resource path="res://objects/enemy/tin.tscn" type="PackedScene" id=20] [ext_resource path="res://graphics/enemy/sawblade.png" type="Texture" id=21] [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=22] @@ -70,7 +66,7 @@ tile_set = ExtResource( 3 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 393234, 0, 65537, 393235, 0, 65537, 393240, 0, 65537, 393241, 0, 65537, 983064, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 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, 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 ) +tile_data = PoolIntArray( 196630, 1, 0, 262166, 1, 0, 327702, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 589846, 1, 0, 655382, 1, 0, 983062, 0, 65536, 983063, 0, 65537, 983064, 0, 65537, 983065, 0, 65537, 983066, 0, 65537, 983067, 0, 65537, 983068, 0, 65537, 983069, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 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, 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 ) [node name="Rock" parent="." instance=ExtResource( 9 )] position = Vector2( 120, 152 ) @@ -94,12 +90,16 @@ position = Vector2( 216, 168 ) position = Vector2( 104, 120 ) [node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 104, 110 ) +position = Vector2( 173, 64 ) [node name="Ladder3" parent="." instance=ExtResource( 8 )] position = Vector2( 40, 136 ) scale = Vector2( 1, 5 ) +[node name="Ladder4" parent="." instance=ExtResource( 8 )] +position = Vector2( 176, 24 ) +scale = Vector2( 1, 8 ) + [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) @@ -132,14 +132,6 @@ delay = 1.5 position = Vector2( 48, 88 ) delay = 2.0 -[node name="FallingBlock" parent="." instance=ExtResource( 14 )] -position = Vector2( 192, 112 ) - -[node name="MovingPlatform2" parent="." instance=ExtResource( 15 )] -position = Vector2( 176, 48 ) -left_up_boundry = 2.0 -right_down_boundry = 2.0 - [node name="RespawnPoint" parent="." instance=ExtResource( 16 )] position = Vector2( 88, 160 ) @@ -147,17 +139,6 @@ position = Vector2( 88, 160 ) position = Vector2( 0, -4 ) shape = SubResource( 1 ) -[node name="Mine" parent="." instance=ExtResource( 18 )] -position = Vector2( 232, 144 ) - -[node name="Explosion" parent="." instance=ExtResource( 19 )] -position = Vector2( 112, 40 ) - -[node name="Tin" parent="." instance=ExtResource( 20 )] -position = Vector2( 168, 96 ) -up_boundary = 3.0 -down_boundary = 3.0 - [node name="Tin2" parent="." instance=ExtResource( 20 )] position = Vector2( 32, 72 ) up_boundary = 3.0 @@ -191,6 +172,7 @@ position = Vector2( 48, 120 ) [node name="AnimatedSprite" parent="RollingFiend" index="0"] visible = false +frame = 0 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"] material = SubResource( 4 ) diff --git a/objects/enemy/rolling_fiend.gd b/objects/enemy/rolling_fiend.gd index 216e8bb..7f23f22 100644 --- a/objects/enemy/rolling_fiend.gd +++ b/objects/enemy/rolling_fiend.gd @@ -27,7 +27,8 @@ func _physics_process(delta): floor_direction = posmod(floor_direction - offset, DIRS.size()) elif is_on_surface(DIRS[move_dir]): floor_direction = move_dir - position += DIRS[posmod(floor_direction + offset, DIRS.size())] * move_speed * delta + if Engine.time_scale > 0.5: #fixes stuttering when slowing down time + position += DIRS[posmod(floor_direction + offset, DIRS.size())] * move_speed * delta func is_on_surface(dir): var space_state = get_world_2d().direct_space_state diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index 9739c64..c74e108 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://graphics/enemy/roller_fiend.png" type="Texture" id=2] +[ext_resource path="res://graphics/enemy/rolling_fiend.png" type="Texture" id=2] [ext_resource path="res://objects/enemy/rolling_fiend.gd" type="Script" id=3] [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4]