From 6968bbe72b2f5f9afb7343fd1fd1704ddc784307 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Sun, 2 Feb 2025 23:44:44 +0100 Subject: [PATCH] Camera change --- Scenes/Actors/Camera.tscn | 11 +++++++++-- Tilesets/factory_tileset.tres | 9 +++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Scenes/Actors/Camera.tscn b/Scenes/Actors/Camera.tscn index 52820fd3..fd3c3987 100644 --- a/Scenes/Actors/Camera.tscn +++ b/Scenes/Actors/Camera.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=3 uid="uid://c27co22bjym3c"] +[gd_scene load_steps=38 format=3 uid="uid://c27co22bjym3c"] [ext_resource type="Script" path="res://Scripts/Actors/Camera.cs" id="1_2qb38"] [ext_resource type="Texture2D" uid="uid://cpuffmksk41n4" path="res://Sprites/Actors/Camera.png" id="1_l5lfg"] @@ -277,10 +277,17 @@ animations = [{ "speed": 5.0 }] -[node name="Camera" type="Node2D"] +[sub_resource type="CircleShape2D" id="CircleShape2D_nkpag"] + +[node name="Camera" type="Area2D"] +collision_layer = 16 +collision_mask = 8 script = ExtResource("1_2qb38") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] sprite_frames = SubResource("SpriteFrames_dvf56") animation = &"full_scan" frame_progress = 0.779565 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_nkpag") diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres index 1b7714bc..0e122575 100644 --- a/Tilesets/factory_tileset.tres +++ b/Tilesets/factory_tileset.tres @@ -95,14 +95,15 @@ texture = ExtResource("1_70kxh") 0:1/0 = 0 0:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_l8pdw") 1:1/0 = 0 -1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) +1:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 2:1/0 = 0 +2:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 3:1/0 = 0 -3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -8, 8, 8, 8, 8, -8) +3:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:1/0 = 0 -4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) +4:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:1/0 = 0 -5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) +5:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:1/0 = 0 6:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_uanwu") 7:1/0 = 0