From 3b52ec2cbf2b901b911c361cd3ae23856b76c7f3 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Mon, 9 Jan 2023 22:51:49 -0500 Subject: [PATCH] turned off camera smoothing --- maps/cave.tscn | 42 +++++++++++-------------- objects/Camera2D.tscn | 1 - objects/enemy/enemy_speedup_in_range.gd | 1 + objects/enemy/snail.tscn | 5 +-- objects/player/player.tscn | 1 + objects/rock/rock.gd | 2 ++ project.godot | 5 +++ 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/maps/cave.tscn b/maps/cave.tscn index a740182..4005228 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,51 +1,45 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 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] [ext_resource path="res://objects/rock/rock.tscn" type="PackedScene" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] -[ext_resource path="res://objects/death tile/death_tile.tscn" type="PackedScene" id=6] +[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/enemy/snail.tscn" type="PackedScene" id=7] [ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8] -[ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=9] [node name="Map" type="Node2D"] -[node name="CanvasLayer" parent="." instance=ExtResource( 4 )] +[node name="Camera2D" parent="." instance=ExtResource( 6 )] -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite" type="Sprite" parent="Camera2D"] position = Vector2( 128, 96 ) texture = ExtResource( 8 ) -[node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 158, 135 ) +[node name="CanvasLayer" parent="." instance=ExtResource( 4 )] -[node name="TileMap" type="TileMap" parent="."] +[node name="Enemies" type="Node2D" parent="."] + +[node name="Snail" parent="Enemies" instance=ExtResource( 7 )] +position = Vector2( 88, 171 ) +left_up_boundry = 3.0 +right_down_boundry = 3.0 + +[node name="Player" parent="." instance=ExtResource( 1 )] +position = Vector2( 32, 166 ) + +[node name="Ground" type="TileMap" parent="."] tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) +collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1310741, 0, 131072, 1310742, 0, 131073, 1376268, 0, 262144, 1376274, 0, 262144, 1376276, 0, 131072, 1376277, 0, 0, 1376278, 0, 0, 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, 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 ) - -[node name="Snail" parent="." instance=ExtResource( 7 )] -position = Vector2( 204, 171 ) -left_up_boundry = 6.0 -right_down_boundry = 6.0 +tile_data = PoolIntArray( 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 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 ) [node name="Rock" parent="." instance=ExtResource( 3 )] position = Vector2( 138, 144 ) -[node name="Area2D" parent="." instance=ExtResource( 6 )] -position = Vector2( 40, 168 ) - -[node name="Area2D2" parent="." instance=ExtResource( 6 )] -position = Vector2( 64, 168 ) - [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 1376261, 1, 0, 1376264, 1, 0 ) - -[node name="Slime" parent="." instance=ExtResource( 9 )] -position = Vector2( 122, 168 ) diff --git a/objects/Camera2D.tscn b/objects/Camera2D.tscn index 0752310..593286a 100644 --- a/objects/Camera2D.tscn +++ b/objects/Camera2D.tscn @@ -5,6 +5,5 @@ [node name="Camera2D" type="Camera2D"] offset = Vector2( 128, 96 ) current = true -smoothing_enabled = true smoothing_speed = 8.0 script = ExtResource( 1 ) diff --git a/objects/enemy/enemy_speedup_in_range.gd b/objects/enemy/enemy_speedup_in_range.gd index 7df60c4..a2e7df6 100644 --- a/objects/enemy/enemy_speedup_in_range.gd +++ b/objects/enemy/enemy_speedup_in_range.gd @@ -25,6 +25,7 @@ func _physics_process(delta): else: move_up_and_down(delta) #Speed up if in raycast if raycast.get_collider() != null: + Debug.print(raycast.get_collider()) if raycast.get_collider().is_in_group("player"): go_fast = true timer.set_wait_time(0.5) diff --git a/objects/enemy/snail.tscn b/objects/enemy/snail.tscn index 0a5ef80..57608bc 100644 --- a/objects/enemy/snail.tscn +++ b/objects/enemy/snail.tscn @@ -30,7 +30,8 @@ extents = Vector2( 4, 4 ) [node name="Snail" type="Node2D"] script = ExtResource( 3 ) -slower_speed = 10 +slower_speed = 30 +faster_speed = 80 [node name="AnimatedSprite" type="AnimatedSprite" parent="."] material = SubResource( 1 ) @@ -46,8 +47,8 @@ shape = SubResource( 5 ) [node name="RayCast2D" type="RayCast2D" parent="Area2D"] enabled = true cast_to = Vector2( 32, 0 ) +collision_mask = 8 collide_with_areas = true -collide_with_bodies = false [node name="Timer" type="Timer" parent="."] wait_time = 0.5 diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 1e9f671..41db1bf 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -617,6 +617,7 @@ region_rect = Rect2( 0, 0, 32, 32 ) [node name="Area2D" type="Area2D" parent="." groups=["player"]] position = Vector2( 0, 3 ) +collision_layer = 9 [node name="CollisionShape2D2" type="CollisionShape2D" parent="Area2D"] position = Vector2( 0.5, 2 ) diff --git a/objects/rock/rock.gd b/objects/rock/rock.gd index c34d587..5d3db7e 100644 --- a/objects/rock/rock.gd +++ b/objects/rock/rock.gd @@ -7,6 +7,8 @@ func _physics_process(delta): #Gravity velocity.y = 100 velocity.x = 0 + else: + velocity.y = 0 move_and_slide(velocity,Vector2.UP) velocity.x = 0 diff --git a/project.godot b/project.godot index eb08b9d..a6cc4b3 100644 --- a/project.godot +++ b/project.godot @@ -119,6 +119,11 @@ debug_show={ ] } +[layer_names] + +2d_physics/layer_1="general" +2d_physics/layer_4="vision" + [physics] common/enable_pause_aware_picking=true