maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-09 11:45:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Converted doors and dialogue starters to area2d

Browse source
This commit is contained in:
Marco 2025-02-07 10:01:07 +01:00
commit f873cba98b
9 changed files with 63 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cirno.sln.DotSettings.user
View file

@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArray_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FDecompilerCache_003Fdecompiler_003F4fd22cd129a84c16b5d8004b467c426f518800_003F67_003F90d26b57_003FArray_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABullet_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fed43dad990dc631ddea2fdab39f95a2741569684_003FBullet_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACanvasItem_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fe43c43ee5cdcf2c7c8ddb9366f75a76a3c61c77bf45ceac78721c269f3c360_003FCanvasItem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003F3c92637ae2e83da0a63791071c41eae291d594156062866d8621b7ed7245c_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnemy_005FScriptProperties_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FMaddo_003FAppData_003FLocal_003FJetBrains_003FShared_003FvAny_003FSourcesCache_003Fd6739058209280d46591ab296d6b49dfcf7ecd2_003FEnemy_005FScriptProperties_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

2
Scenes/Activable.cs
View file

@ -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)
{

2
Scenes/Door_Horizontal.tscn
View file

@ -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")

2
Scenes/Door_Vertical.tscn
View file

@ -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")

32
Scenes/test.tscn
View file

@ -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"]

2
Scripts/Actors/Boss.cs
View file

@ -26,8 +26,6 @@ public partial class Boss : Enemy, IActivable
_gameManager = this.GetGameManager();
_homePosition = this.GlobalPosition;
}
public override void _Process(double delta)

3
Scripts/Bullet.cs
View file

@ -67,8 +67,7 @@ public partial class Bullet : Area2D
// Debug.WriteLine("Collision with destroyable object body");
// QueueFree();
// }
}
private void _on_area_entered(Area2D area)

30
Tilesets/factory_tileset.tres
View file

@ -158,11 +158,23 @@ texture = ExtResource("1_70kxh")
2:5/0 = 0
2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:5/0 = 0
3:5/0/terrain_set = 0
3:5/0/terrain = 1
3:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:5/0/terrains_peering_bit/right_side = 1
3:5/0/terrains_peering_bit/bottom_side = 1
4:5/0 = 0
4:5/0/terrain_set = 0
4:5/0/terrain = 1
4:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:5/0/terrains_peering_bit/right_side = 1
4:5/0/terrains_peering_bit/left_side = 1
5:5/0 = 0
5:5/0/terrain_set = 0
5:5/0/terrain = 1
5:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:5/0/terrains_peering_bit/bottom_side = 1
5:5/0/terrains_peering_bit/left_side = 1
6:5/0 = 0
6:5/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_ajuv4")
7:5/0 = 0
@ -177,9 +189,17 @@ texture = ExtResource("1_70kxh")
2:6/0 = 0
2:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:6/0 = 0
3:6/0/terrain_set = 0
3:6/0/terrain = 1
3:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:6/0/terrains_peering_bit/bottom_side = 1
3:6/0/terrains_peering_bit/top_side = 1
5:6/0 = 0
5:6/0/terrain_set = 0
5:6/0/terrain = 1
5:6/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:6/0/terrains_peering_bit/bottom_side = 1
5:6/0/terrains_peering_bit/top_side = 1
6:6/0 = 0
6:6/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_3ass8")
7:6/0 = 0
@ -193,9 +213,17 @@ texture = ExtResource("1_70kxh")
2:7/0 = 0
2:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:7/0 = 0
3:7/0/terrain_set = 0
3:7/0/terrain = 1
3:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:7/0/terrains_peering_bit/right_side = 1
3:7/0/terrains_peering_bit/top_side = 1
5:7/0 = 0
5:7/0/terrain_set = 0
5:7/0/terrain = 1
5:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:7/0/terrains_peering_bit/left_side = 1
5:7/0/terrains_peering_bit/top_side = 1
6:7/0 = 0
6:7/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_2t186")
7:7/0 = 0
@ -354,6 +382,8 @@ physics_layer_1/collision_mask = 18
terrain_set_0/mode = 0
terrain_set_0/terrain_0/name = "Fence"
terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1)
terrain_set_0/terrain_1/name = "Pipes"
terrain_set_0/terrain_1/color = Color(0.5, 0.4375, 0.25, 1)
navigation_layer_0/layers = 1
sources/0 = SubResource("TileSetAtlasSource_jwf4b")
sources/1 = SubResource("TileSetScenesCollectionSource_qg3vu")

1
project.godot
View file

@ -85,6 +85,7 @@ enabled=PackedStringArray("res://addons/DebugGUI/plugin.cfg", "res://addons/dial
[global_group]
Interactable=""
Solid=""
[input]