adjusted mine hitbox

maps/abyss.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=2]
+[gd_scene load_steps=30 format=2]
 
 [ext_resource path="res://maps/map.gd" type="Script" id=1]
 [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2]
@@ -8,14 +8,20 @@
 [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=6]
 [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=7]
 [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=8]
-[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9]
+[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9]
 [ext_resource path="res://tilesets/t_abyss.tres" type="TileSet" id=10]
 [ext_resource path="res://objects/enemy/mine.tscn" type="PackedScene" id=11]
 [ext_resource path="res://scripts/random_spawner.gd" type="Script" id=12]
 [ext_resource path="res://objects/environment/bubble/bubble.tscn" type="PackedScene" id=13]
 [ext_resource path="res://objects/enemy/squig.tscn" type="PackedScene" id=14]
-[ext_resource path="res://objects/enemy/antlion.tscn" type="PackedScene" id=15]
+[ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=15]
-[ext_resource path="res://objects/enemy/eel.tscn" type="PackedScene" id=16]
+[ext_resource path="res://objects/enemy/turtle.tscn" type="PackedScene" id=16]
+[ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=17]
+[ext_resource path="res://objects/enemy/eel.tscn" type="PackedScene" id=18]
+[ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=19]
+[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=20]
+[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=21]
+[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=22]
 
 [sub_resource type="CanvasItemMaterial" id=12]
 blend_mode = 3
@@ -33,6 +39,21 @@ extents = Vector2( 4, 320 )
 [sub_resource type="RectangleShape2D" id=8]
 extents = Vector2( 128, 4 )
 
+[sub_resource type="Curve2D" id=13]
+_data = {
+"points": PoolVector2Array( 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 32, 8, 0, 0, 0, 0, 32, 16, 0, 0, 0, 0, 24, 24, 0, 0, 0, 0, 16, 24, 0, 0, 0, 0, 8, 24, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, -8, 24, 0, 0, 0, 0, -16, 16, 0, 0, 0, 0, -16, 8, 0, 0, 0, 0, -8, 0, 0, 0, 0, 0, 8, 0 )
+}
+
+[sub_resource type="Curve2D" id=14]
+_data = {
+"points": PoolVector2Array( 0, 0, 0, 0, 8, -24, 0, 0, 0, 0, 8, -32, 0, 0, 0, 0, 8, -40, 0, 0, 0, 0, 16, -40, 0, 0, 0, 0, 64, -40, 0, 0, 0, 0, 72, -40, 0, 0, 0, 0, 72, -16, 0, 0, 0, 0, 72, -8, 0, 0, 0, 0, 8, -8, 0, 0, 0, 0, 8, -24 )
+}
+
+[sub_resource type="Curve2D" id=15]
+_data = {
+"points": PoolVector2Array( 0, 0, 0, 0, 16, 0, -1.65178, -0.117984, 1.65178, 0.117984, 24, 0, -9.7927, -4.36542, 9.7927, 4.36542, 48, 0, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 72, 24, 0.315336, -2.20735, -0.315336, 2.20735, 72, 40, 7.98852, -4.51982, -7.98852, 4.51982, 64, 48, 4.83736, -3.42154, -4.83736, 3.42154, 8, 48, 1.17984, 5.42728, -1.17984, -5.42728, -8, 40, -14.3028, -3.44325, 14.3028, 3.44325, 0, 0, 0, 0, 0, 0, 16, 0 )
+}
+
 [node name="Map" type="Node2D" groups=["map"]]
 pause_mode = 1
 script = ExtResource( 1 )
@@ -102,7 +123,7 @@ __meta__ = {
 song_name = "♫Moon Trail"
 
 [node name="Player" parent="." instance=ExtResource( 8 )]
-position = Vector2( 16, 56 )
+position = Vector2( 16, 40 )
 
 [node name="LevelBorders" type="StaticBody2D" parent="."]
 __meta__ = {
@@ -129,50 +150,158 @@ z_index = -30
 tile_set = ExtResource( 10 )
 cell_size = Vector2( 8, 8 )
 format = 1
-tile_data = PoolIntArray( 524287, 1, 1, 458752, 1, 2, 458753, 1, 2, 458754, 1, 2, 458755, 1, 2, 458756, 1, 2, 458757, 1, 3, 458770, 1, 1, 458771, 1, 3, 524302, 1, 1, 524303, 1, 3, 589835, 1, 0, 655368, 1, 0, 655375, 2, 2, 720911, 2, 2, 786441, 2, 0, 786443, 2, 0, 786445, 2, 1, 786447, 2, 2, 786448, 2, 1, 786450, 2, 2, 851976, 0, 1, 851977, 0, 2, 851978, 0, 2, 851979, 0, 2, 851980, 0, 2, 851981, 0, 2, 851982, 0, 2, 851983, 0, 2, 851984, 0, 2, 851985, 0, 2, 851986, 0, 2, 851987, 0, 196611, 917511, 0, 196609, 917512, 0, 65538, 917513, 0, 65538, 917514, 0, 65538, 917515, 0, 65538, 917516, 0, 65538, 917517, 0, 65538, 917518, 0, 65538, 917519, 0, 65538, 917520, 0, 65538, 917521, 0, 65538, 917522, 0, 65539, 983048, 0, 131073, 983049, 0, 131074, 983050, 0, 65538, 983051, 0, 65538, 983052, 0, 65538, 983053, 0, 65538, 983054, 0, 65538, 983055, 0, 65538, 983056, 0, 65538, 983057, 0, 65538, 983058, 0, 131075, 1048586, 0, 131073, 1048587, 0, 131074, 1048588, 0, 65538, 1048589, 0, 65538, 1048590, 0, 65538, 1048591, 0, 65538, 1048592, 0, 65538, 1048593, 0, 131075, 1114124, 0, 131073, 1114125, 0, 131074, 1114126, 0, 131074, 1114127, 0, 131074, 1114128, 0, 131075, 2162710, 2, 3, 2228243, 1, 1, 2228244, 1, 2, 2228245, 1, 2, 2228246, 1, 2, 2228247, 1, 2, 2228248, 1, 2, 2228249, 1, 2, 2228250, 1, 3, 2293787, 1, 0, 2359307, 1, 1, 2359308, 1, 3, 2424836, 1, 1, 2424837, 1, 2, 2424838, 1, 2, 2424839, 1, 2, 2424840, 1, 2, 2424841, 1, 2, 2424842, 1, 3 )
+tile_data = PoolIntArray( 327680, 0, 196609, 327681, 0, 196610, 327682, 0, 196610, 327683, 0, 196610, 327684, 0, 196610, 327685, 0, 196610, 327686, 0, 196611, 327704, 0, 1, 327705, 0, 196610, 327706, 0, 196610, 327707, 0, 196610, 327708, 0, 3, 327711, 0, 0, 393240, 0, 65536, 393244, 0, 65536, 393247, 0, 65536, 458764, 0, 0, 458767, 0, 0, 458776, 0, 65536, 458780, 0, 65536, 458783, 0, 65536, 524300, 0, 65536, 524303, 0, 131073, 524304, 0, 196610, 524305, 0, 196610, 524306, 0, 196610, 524307, 0, 196610, 524308, 0, 196610, 524309, 0, 196610, 524310, 0, 196610, 524311, 0, 196610, 524312, 0, 131075, 524316, 0, 65536, 524319, 0, 65536, 589830, 0, 196609, 589831, 0, 196610, 589832, 0, 196610, 589833, 0, 196610, 589834, 0, 196610, 589835, 0, 196610, 589836, 0, 65539, 589852, 0, 65536, 589855, 0, 65536, 655372, 0, 65536, 655388, 0, 65536, 655391, 0, 65536, 720908, 0, 131073, 720909, 0, 3, 720924, 0, 65536, 720927, 0, 65536, 786445, 0, 131073, 786446, 0, 3, 786460, 0, 65536, 786463, 0, 65536, 851982, 0, 131073, 851983, 0, 3, 851986, 0, 196609, 851987, 0, 196610, 851988, 0, 196610, 851989, 0, 196611, 851996, 0, 65536, 851999, 0, 65536, 917506, 0, 196609, 917507, 0, 196610, 917508, 0, 3, 917519, 0, 65536, 917532, 0, 65536, 917535, 0, 65536, 983044, 0, 65536, 983055, 0, 65537, 983056, 0, 196610, 983057, 0, 196610, 983058, 0, 196610, 983059, 0, 196610, 983060, 0, 196610, 983061, 0, 196610, 983062, 0, 196610, 983063, 0, 196610, 983064, 0, 196610, 983065, 0, 196611, 983068, 0, 131072, 983071, 0, 131072, 1048580, 0, 65536, 1048591, 0, 65536, 1114116, 0, 65536, 1114127, 0, 65536, 1179652, 0, 131073, 1179653, 0, 196610, 1179654, 0, 196610, 1179655, 0, 196610, 1179656, 0, 196610, 1179657, 0, 196610, 1179658, 0, 196610, 1179659, 0, 196610, 1179660, 0, 196611, 1179663, 0, 65536, 1245199, 0, 65536, 1310735, 0, 65536, 1376258, 0, 196609, 1376259, 0, 196610, 1376260, 0, 196610, 1376261, 0, 196610, 1376262, 0, 196610, 1376263, 0, 196610, 1376264, 0, 196610, 1376265, 0, 196610, 1376266, 0, 196610, 1376267, 0, 196610, 1376268, 0, 196610, 1376269, 0, 196610, 1376270, 0, 196610, 1376271, 0, 65539, 1376273, 0, 196609, 1376274, 0, 196610, 1376275, 0, 196610, 1376276, 0, 196611, 1441807, 0, 65536, 1507343, 0, 65536, 1572879, 0, 65536, 1638415, 0, 65536, 1703951, 0, 65536, 1769487, 0, 65536, 1835023, 0, 65536, 1835031, 0, 1, 1835032, 0, 196610, 1835033, 0, 196611, 1835035, 0, 196609, 1835036, 0, 196610, 1835037, 0, 196610, 1835038, 0, 196610, 1835039, 0, 196611, 1900559, 0, 65536, 1900566, 0, 1, 1900567, 0, 131075, 1966092, 0, 196609, 1966093, 0, 196610, 1966094, 0, 196610, 1966095, 0, 131075, 1966100, 0, 1, 1966101, 0, 196610, 1966102, 0, 131075, 2031636, 0, 65536, 2097172, 0, 131072, 2162717, 0, 1, 2162718, 0, 196610, 2162719, 0, 196611, 2228250, 0, 196608, 2228253, 0, 65536, 2293789, 0, 65536, 2359319, 0, 196609, 2359320, 0, 196610, 2359321, 0, 196610, 2359322, 0, 196611, 2359325, 0, 131072, 2424852, 0, 196609, 2424853, 0, 196611 )
 
 [node name="Ladders" type="TileMap" parent="Tilemaps"]
 z_index = 10
 tile_set = ExtResource( 6 )
 cell_size = Vector2( 8, 8 )
 format = 1
-tile_data = PoolIntArray( 393233, 0, 131074, 458769, 0, 131074, 524305, 0, 131074, 589841, 0, 131074, 655377, 0, 131074, 720913, 0, 131074, 786449, 0, 131074 )
+
+[node name="Death" type="TileMap" parent="Tilemaps" groups=["death"]]
+tile_set = ExtResource( 15 )
+cell_size = Vector2( 8, 8 )
+collision_layer = 32
+format = 1
+tile_data = PoolIntArray( 458768, 1, 0, 458769, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 1, 0, 458773, 1, 0, 458774, 1, 0, 458775, 1, 0, 917520, 1, 0, 917521, 1, 0, 917522, 1, 0, 917523, 1, 0, 917524, 1, 0, 917525, 1, 0, 917526, 1, 0, 917527, 1, 0, 917528, 1, 0, 917529, 1, 0 )
 
 [node name="Ladders" type="Node2D" parent="."]
 
-[node name="Ladder" parent="Ladders" instance=ExtResource( 9 )]
-position = Vector2( 136, 48 )
-scale = Vector2( 1, 7 )
-
 [node name="Enemies" type="Node2D" parent="."]
 
-[node name="Antlion" parent="Enemies" instance=ExtResource( 15 )]
-position = Vector2( 80, 256 )
-
-[node name="Eel" parent="Enemies" instance=ExtResource( 16 )]
-position = Vector2( 200, 80 )
-
 [node name="Mines" type="Node2D" parent="Enemies"]
 
 [node name="Mine" parent="Enemies/Mines" instance=ExtResource( 11 )]
-position = Vector2( 96, 32 )
+position = Vector2( 48, 120 )
-
-[node name="Mine2" parent="Enemies/Mines" instance=ExtResource( 11 )]
-position = Vector2( 48, 80 )
 
 [node name="Mine3" parent="Enemies/Mines" instance=ExtResource( 11 )]
-position = Vector2( 144, 24 )
+position = Vector2( 216, 256 )
 
-[node name="Mine4" parent="Enemies/Mines" instance=ExtResource( 11 )]
+[node name="Mine2" parent="Enemies/Mines" instance=ExtResource( 11 )]
-position = Vector2( 72, 48 )
+position = Vector2( 72, 96 )
 
 [node name="Squigs" type="Node2D" parent="Enemies"]
 
 [node name="Squig" parent="Enemies/Squigs" instance=ExtResource( 14 )]
-position = Vector2( 176, 336 )
+position = Vector2( 112, 416 )
 
 [node name="Squig2" parent="Enemies/Squigs" instance=ExtResource( 14 )]
 position = Vector2( 200, 432 )
 
 [node name="Squig3" parent="Enemies/Squigs" instance=ExtResource( 14 )]
 position = Vector2( 88, 528 )
+
+[node name="Turtle" parent="Enemies" instance=ExtResource( 16 )]
+position = Vector2( 56, 40 )
+right_down_boundary = 9.0
+speed = 30
+spike_delay = 4.0
+
+[node name="Eel" parent="Enemies" instance=ExtResource( 18 )]
+position = Vector2( 152, 96 )
+segments = 2
+speed = 100.0
+
+[node name="Path2D" parent="Enemies/Eel" index="0"]
+curve = SubResource( 13 )
+
+[node name="Eel2" parent="Enemies" instance=ExtResource( 18 )]
+position = Vector2( 144, 256 )
+segments = 2
+speed = 50.0
+
+[node name="Path2D" parent="Enemies/Eel2" index="0"]
+curve = SubResource( 14 )
+
+[node name="PathFollow2D" parent="Enemies/Eel2/Path2D" index="0"]
+position = Vector2( 8, -24 )
+rotation = -1.5708
+
+[node name="Eel3" parent="Enemies" instance=ExtResource( 18 )]
+position = Vector2( 40, 112 )
+
+[node name="Path2D" parent="Enemies/Eel3" index="0"]
+curve = SubResource( 15 )
+
+[node name="Collectibles" type="Node2D" parent="."]
+
+[node name="Star" parent="Collectibles" instance=ExtResource( 17 )]
+position = Vector2( 88, 136 )
+
+[node name="Star2" parent="Collectibles" instance=ExtResource( 17 )]
+position = Vector2( 208, 56 )
+color = 1
+
+[node name="Key" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 32, 32 )
+
+[node name="Key2" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 48, 32 )
+
+[node name="Key3" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 32, 104 )
+
+[node name="Key5" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 80, 64 )
+
+[node name="Key7" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 192, 32 )
+
+[node name="Key8" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 224, 32 )
+
+[node name="Key12" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 232, 56 )
+
+[node name="Key13" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 232, 88 )
+
+[node name="Key14" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 232, 120 )
+
+[node name="Key9" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 104, 80 )
+
+[node name="Key10" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 112, 88 )
+
+[node name="Key11" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 120, 96 )
+
+[node name="Key6" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 56, 64 )
+
+[node name="Key4" parent="Collectibles" instance=ExtResource( 21 )]
+position = Vector2( 16, 104 )
+
+[node name="Shard" parent="Collectibles" instance=ExtResource( 22 )]
+position = Vector2( 148, 152 )
+
+[node name="Star3" parent="Collectibles" instance=ExtResource( 17 )]
+position = Vector2( 240, 256 )
+color = 2
+
+[node name="Environment" type="Node2D" parent="."]
+
+[node name="TurningPlatform" parent="Environment" instance=ExtResource( 20 )]
+position = Vector2( 168, 40 )
+time = 30.0
+
+[node name="MovingPlatform" parent="Environment" instance=ExtResource( 19 )]
+position = Vector2( 212, 104 )
+scale = Vector2( 2, 1 )
+left_up_boundary = 4.0
+move_direction = 1
+
+[node name="MovingPlatform2" parent="Environment" instance=ExtResource( 19 )]
+position = Vector2( 240, 168 )
+scale = Vector2( 2, 1 )
+speed = 40
+left_up_boundary = 8.0
+
+[node name="Rock" parent="Environment" instance=ExtResource( 9 )]
+position = Vector2( 224, 216 )
+
+[editable path="Enemies/Eel"]
+[editable path="Enemies/Eel2"]
+[editable path="Enemies/Eel3"]

maps/test_room.tscn

@@ -135,13 +135,13 @@ position = Vector2( 48, 120 )
 
 [node name="AnimatedSprite" parent="RollingFiend" index="0"]
 visible = false
+frame = 1
 
 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"]
 material = SubResource( 4 )
 position = Vector2( 4, 4 )
 z_index = -3
 frames = SubResource( 5 )
-frame = 1
 playing = true
 
 [node name="Steam" parent="." instance=ExtResource( 23 )]
@@ -214,3 +214,4 @@ speed = 10
 position = Vector2( 120, 56 )
 
 [editable path="RollingFiend"]
+[editable path="Eel"]

objects/enemy/mine.tscn

@@ -5,7 +5,7 @@
 [ext_resource path="res://graphics/enemy/chain.png" type="Texture" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 8, 8 )
+extents = Vector2( 7, 7.5 )
 
 [sub_resource type="Animation" id=2]
 length = 0.001
@@ -91,6 +91,7 @@ position = Vector2( 8, 8 )
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
+position = Vector2( 0, 0.5 )
 shape = SubResource( 1 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]