mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-17 02:23:48 +00:00
Converted doors and dialogue starters to area2d
This commit is contained in:
parent
def0f40007
commit
f873cba98b
9 changed files with 63 additions and 12 deletions
|
|
@ -3,7 +3,7 @@ using System;
|
|||
using System.Diagnostics;
|
||||
using Cirno.Scripts;
|
||||
|
||||
public partial class Activable : Node2D, IActivable
|
||||
public partial class Activable : Area2D, IActivable
|
||||
{
|
||||
public virtual void Activate(ActivationType activationType = ActivationType.Toggle)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ size = Vector2(32, 32)
|
|||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_f2rl6"]
|
||||
size = Vector2(32, 32)
|
||||
|
||||
[node name="Area2D" type="Area2D"]
|
||||
[node name="Area2D" type="Area2D" groups=["Solid"]]
|
||||
collision_layer = 64
|
||||
collision_mask = 154
|
||||
script = ExtResource("1_emfh4")
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ size = Vector2(8, 48)
|
|||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_f2rl6"]
|
||||
size = Vector2(8, 48)
|
||||
|
||||
[node name="Area2D" type="Area2D"]
|
||||
[node name="Area2D" type="Area2D" groups=["Solid"]]
|
||||
collision_layer = 64
|
||||
collision_mask = 154
|
||||
script = ExtResource("1_e61bg")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=31 format=4 uid="uid://bv451a8wgty4u"]
|
||||
[gd_scene load_steps=33 format=4 uid="uid://bv451a8wgty4u"]
|
||||
|
||||
[ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_8tmoj"]
|
||||
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"]
|
||||
|
|
@ -31,6 +31,10 @@
|
|||
[ext_resource type="Script" path="res://Scripts/Activables/DialogueStarter.cs" id="29_pvkri"]
|
||||
[ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="30_8fdby"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_l22r0"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_8wuck"]
|
||||
|
||||
[node name="GameScene" type="Node2D" node_paths=PackedStringArray("PlayerSpawnMarker")]
|
||||
position = Vector2(38, 39)
|
||||
script = ExtResource("1_8tmoj")
|
||||
|
|
@ -171,6 +175,9 @@ position = Vector2(-948, -29)
|
|||
IsEnabled = true
|
||||
Target = NodePath("../Teleporter5")
|
||||
|
||||
[node name="Area2D" parent="Factory Tilemaps" instance=ExtResource("12_i7i2m")]
|
||||
position = Vector2(-710, -459)
|
||||
|
||||
[node name="CameraController" type="Camera2D" parent="."]
|
||||
script = ExtResource("6_t8ide")
|
||||
pixel_snap = false
|
||||
|
|
@ -230,14 +237,21 @@ position = Vector2(-1096, -23)
|
|||
|
||||
[node name="AreaTrigger" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("28_6au4t")]
|
||||
position = Vector2(-1487, -354)
|
||||
Target = NodePath("../DialogueStarter")
|
||||
Target = NodePath("")
|
||||
OneTime = true
|
||||
|
||||
[node name="DialogueStarter" type="Node2D" parent="." node_paths=PackedStringArray("_dialogueEndActivationTargets")]
|
||||
[node name="DialogueStarter" type="Area2D" parent="." node_paths=PackedStringArray("_dialogueEndActivationTargets")]
|
||||
position = Vector2(-1544, -320)
|
||||
collision_layer = 0
|
||||
collision_mask = 0
|
||||
monitoring = false
|
||||
monitorable = false
|
||||
script = ExtResource("29_pvkri")
|
||||
_dialogueEndActivationTargets = [NodePath("../Rumia"), NodePath("../Factory Tilemaps/HorizontalDoor3")]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="DialogueStarter"]
|
||||
shape = SubResource("CircleShape2D_l22r0")
|
||||
|
||||
[node name="ControlPad" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("12_hfkf1")]
|
||||
position = Vector2(-1515, -316)
|
||||
Target = NodePath("../Factory Tilemaps/HorizontalDoor3")
|
||||
|
|
@ -253,13 +267,21 @@ position = Vector2(-808, -168)
|
|||
Target = NodePath("TestDialogueStarter")
|
||||
OneTime = true
|
||||
|
||||
[node name="TestDialogueStarter" type="Node2D" parent="AreaTrigger2" node_paths=PackedStringArray("_dialogueEndActivationTargets")]
|
||||
[node name="TestDialogueStarter" type="Area2D" parent="AreaTrigger2" node_paths=PackedStringArray("_dialogueEndActivationTargets")]
|
||||
position = Vector2(-28, -113)
|
||||
collision_layer = 0
|
||||
collision_mask = 0
|
||||
monitoring = false
|
||||
monitorable = false
|
||||
script = ExtResource("29_pvkri")
|
||||
_trackName = "testintro"
|
||||
_dialogueEndActivationTargets = []
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="AreaTrigger2/TestDialogueStarter"]
|
||||
shape = SubResource("CircleShape2D_8wuck")
|
||||
disabled = true
|
||||
|
||||
[node name="Rumia" parent="." instance=ExtResource("19_acobs")]
|
||||
position = Vector2(-1478, -506)
|
||||
position = Vector2(-1465, -512)
|
||||
|
||||
[editable path="Factory Tilemaps/Camera"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue