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

NPC Fix

Browse source
This commit is contained in:
Marco 2025-03-11 10:48:15 +01:00
commit b5315904f4
6 changed files with 96 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

151
Scenes/Maps/RebelBase.tscn → Scenes/Actors/RebelBase.tscn
View file

File diff suppressed because one or more lines are too long

9
Scenes/Maps/Level2.tscn
View file

@ -16,7 +16,6 @@
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"]
[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="10_4nd4a"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="11_7an4p"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="13_ehuec"]
[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="14_s23f3"]
[ext_resource type="PackedScene" uid="uid://oi8svqsspcsj" path="res://Scenes/Interactable/ScriptableMovementSensor.tscn" id="16_ehuec"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="16_s23f3"]
@ -31,6 +30,7 @@
[ext_resource type="Script" uid="uid://c8hd02ggvk1p2" path="res://Scripts/Actors/AlarmTeleporterActorSpawner.cs" id="24_uh2op"]
[ext_resource type="PackedScene" uid="uid://bc054js8ep2b" path="res://Scenes/Actors/FairyGuard_New.tscn" id="25_nb1db"]
[ext_resource type="PackedScene" uid="uid://bjskkeb3ppcs8" path="res://Scenes/Actors/Turret360.tscn" id="26_g2ms1"]
[ext_resource type="PackedScene" uid="uid://cvctgw8eo2f7e" path="res://Scenes/Items/SpiderBomb_Pickup.tscn" id="27_577wb"]
[ext_resource type="PackedScene" uid="uid://bjb1xv0ny1qim" path="res://Scenes/Props/Chair.tscn" id="27_mq37i"]
[ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="31_nb1db"]
@ -108,7 +108,7 @@ position = Vector2(196, 296)
[node name="MotionSensor" parent="Tilemaps/Actors" instance=ExtResource("16_ehuec")]
position = Vector2(254, 296)
Events = Array[ExtResource("13_ehuec")]([SubResource("Resource_s23f3")])
Events = [SubResource("Resource_s23f3")]
[node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(205, 292)
@ -129,7 +129,7 @@ position = Vector2(504, 468)
[node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")]
position = Vector2(226, 486)
Events = Array[ExtResource("13_ehuec")]([SubResource("Resource_qi6uc")])
Events = [SubResource("Resource_qi6uc")]
[node name="WallEmitter" parent="Tilemaps/Actors" instance=ExtResource("21_qi6uc")]
position = Vector2(264, 482)
@ -167,6 +167,9 @@ Direction = 0
position = Vector2(173.208, 279.099)
Direction = 0
[node name="SpiderBomb" parent="Tilemaps/Actors" instance=ExtResource("27_577wb")]
position = Vector2(132, 361)
[node name="CameraController" type="Camera2D" parent="."]
script = ExtResource("7_lxkiw")
pixel_snap = false

2
Scenes/Maps/PlayerFSMTest.tscn
View file

@ -49,7 +49,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_u1i8n")
EggIndex = 0
StartingEquipment = []
StartingEquipment = Array[ExtResource("5_u1i8n")]([])
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"]
size = Vector2(30, 52.5)

21
Scenes/Maps/Tutorial.tscn
View file

@ -1,7 +1,8 @@
[gd_scene load_steps=51 format=4 uid="uid://bpnahwxmjgb6t"]
[gd_scene load_steps=52 format=4 uid="uid://bpnahwxmjgb6t"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_0xhda"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2m462"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_bnfdx"]
@ -38,7 +39,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_g48r8")
EggIndex = 0
StartingEquipment = []
StartingEquipment = Array[ExtResource("3_0xhda")]([])
[sub_resource type="Resource" id="Resource_hppa0"]
script = ExtResource("14_wc2f3")
@ -58,12 +59,12 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_ierdo"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_intro"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_8yymf"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_switch"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_dbad5"]
@ -74,7 +75,7 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_f3qhg"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_gun"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_ulu4a"]
@ -83,22 +84,22 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_35vjh"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_barrels"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_p02qj"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_teleporter_1"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_t62sp"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_teleporter_2"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_m71ef"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_repeater"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_54a43"]
@ -109,7 +110,7 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_8phm4"]
script = ExtResource("22_nyb1x")
TimelineName = "tutorial_cameras"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_7uxja"]

3
Scripts/Activables/NPC.cs
View file

@ -17,7 +17,8 @@ public partial class NPC : Area2D, IInteractable
_scriptable = new ScriptableBase();
_scriptable.Events = Events;
this.CallDeferred("add_child", _scriptable);
// Add as sibling so relative paths still work
GetParent().CallDeferred("add_child", _scriptable);
}
public bool Activate(ActivationType activationType = ActivationType.Toggle)

7
Scripts/Activables/ScriptableBase.cs
View file

@ -44,7 +44,6 @@ public partial class ScriptableBase : Node2D, IActivable
if (!CurrentEvent.WaitForCompletion || CurrentEvent.IsComplete())
{
// This loops
//_currentEventIndex = (_currentEventIndex + 1) % Events.Count;
_currentEventIndex++;
if (_currentEventIndex >= Events.Count)
{
@ -56,12 +55,6 @@ public partial class ScriptableBase : Node2D, IActivable
CurrentEvent.Start(this);
}
// if (_currentHealth <= CurrentPhase.Threshold && currentPhaseIndex + 1 < Phases.Count)
// {
// currentPhaseIndex++;
// _bossHud.SpellCardName = CurrentPhase.PhaseName;
// StartPhase(CurrentPhase);
// }
}
public bool Activate(ActivationType activationType = ActivationType.Toggle)