Skip to content

Commit 412cad9

Browse files
committed
Added a bunch of tweaks from working on my own game, again. Tests are totally broken, I need to re-create all the assets.
1 parent 54f8bcf commit 412cad9

File tree

98 files changed

+133
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+133
-490
lines changed

Tests/TestAssets/test network2.tres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ SubResource("Resource_v8tc7"): [SubResource("Resource_db82r"), SubResource("Reso
8989
SubResource("Resource_jo586"): [SubResource("Resource_mwx71"), SubResource("Resource_nx3rg")],
9090
SubResource("Resource_tji6t"): [SubResource("Resource_nx3rg"), SubResource("Resource_0vmae")]
9191
}
92-
portals = Array[Resource("res://addons/network_utility/Scripts/network_portal.gd")]([])
92+
portals = Array[Resource("res://addons/network_utility/Scripts/Scripts/network_portal.gd")]([])

Tests/TestAssets/test_coven_1.tres

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[gd_resource type="Resource" script_class="Coven" load_steps=2 format=3 uid="uid://wu88rgegya0d"]
22

3-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven.gd" id="1_o0b4r"]
3+
[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven.gd" id="1_46xw2"]
44

55
[resource]
6-
script = ExtResource("1_o0b4r")
7-
coven_id = &"gut_test_coven_1"
6+
script = ExtResource("1_46xw2")
7+
coven_id = &"test_coven_1"
88
other_coven_opinions = {}
99
hidden_from_player = false
1010
ranks = {}

Tests/TestAssets/test_coven_2.tres

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[gd_resource type="Resource" script_class="Coven" load_steps=2 format=3 uid="uid://bl6r48ooyuucl"]
22

3-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven.gd" id="1_oq7fp"]
3+
[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven.gd" id="1_hwahn"]
44

55
[resource]
6-
script = ExtResource("1_oq7fp")
7-
coven_id = &"gut_test_coven_2"
6+
script = ExtResource("1_hwahn")
7+
coven_id = &"test_coven_2"
88
other_coven_opinions = {}
99
hidden_from_player = false
1010
ranks = {}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[gd_resource type="Resource" script_class="CovenRankData" load_steps=3 format=3]
1+
[gd_resource type="Resource" script_class="CovenRankData" load_steps=3 format=3 uid="uid://bwovdkegfjpv"]
22

3-
[ext_resource type="Resource" uid="uid://wu88rgegya0d" path="res://tests/TestAssets/test_coven_1.tres" id="1_1c6ad"]
4-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven_rank_data.gd" id="1_2fiw6"]
3+
[ext_resource type="Resource" uid="uid://bl6r48ooyuucl" path="res://Tests/TestAssets/test_coven_2.tres" id="1_qintl"]
4+
[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven_rank_data.gd" id="2_x5jrx"]
55

66
[resource]
7-
script = ExtResource("1_2fiw6")
8-
coven = ExtResource("1_1c6ad")
7+
script = ExtResource("2_x5jrx")
8+
coven = ExtResource("1_qintl")
99
rank = 0

Tests/TestAssets/test_dummy.tres

Lines changed: 9 additions & 237 deletions
Original file line numberDiff line numberDiff line change
@@ -1,239 +1,11 @@
1-
[gd_resource type="Resource" script_class="NPCData" load_steps=30 format=3]
1+
[gd_resource type="Resource" script_class="NPCData" load_steps=2 format=3 uid="uid://cibls8lu1jcs3"]
22

3-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Data/npc_data.gd" id="1_5mc0v"]
4-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_damage_module.gd" id="1_i4yub"]
5-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/goap_behavior.gd" id="1_snrm6"]
6-
[ext_resource type="Script" path="res://tests/TestAssets/test_conditional_goap_behavior.gd" id="2_k10rr"]
7-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_interact_response.gd" id="2_ts27d"]
8-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_threat_response.gd" id="3_gqrf7"]
9-
[ext_resource type="PackedScene" uid="uid://24i73ycvxysf" path="res://test_npc_prefab.tscn" id="4_eio35"]
10-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/System/timestamp.gd" id="5_rhswb"]
11-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Schedules/sandbox_schedule.gd" id="6_i1yqi"]
12-
[ext_resource type="Script" path="res://addons/skelerealms/scripts/Schedules/continuity_condition.gd" id="7_8uc5l"]
13-
14-
[sub_resource type="Resource" id="Resource_43uvo"]
15-
script = ExtResource("1_snrm6")
16-
id = &"action a"
17-
prerequisites = {}
18-
effects = {
19-
"objective1": true
20-
}
21-
cost = 1.0
22-
duration = 0.0
23-
24-
[sub_resource type="Resource" id="Resource_oqbhy"]
25-
script = ExtResource("1_snrm6")
26-
id = &"action d"
27-
prerequisites = {
28-
"objective1": true
29-
}
30-
effects = {
31-
"objective2": true
32-
}
33-
cost = 2.0
34-
duration = 0.0
35-
36-
[sub_resource type="Resource" id="Resource_66r5m"]
37-
script = ExtResource("1_snrm6")
38-
id = &"action b"
39-
prerequisites = {
40-
"objective1": true
41-
}
42-
effects = {
43-
"objective2": true
44-
}
45-
cost = 1.0
46-
duration = 0.0
47-
48-
[sub_resource type="Resource" id="Resource_hjg4o"]
49-
script = ExtResource("1_snrm6")
50-
id = &"action c"
51-
prerequisites = {
52-
"objective2": true
53-
}
54-
effects = {
55-
"goal": true
56-
}
57-
cost = 1.0
58-
duration = 0.0
59-
60-
[sub_resource type="Resource" id="Resource_ax50k"]
61-
script = ExtResource("2_k10rr")
62-
id = &"action e"
63-
prerequisites = {
64-
"objective1": true
65-
}
66-
effects = {
67-
"objective2": true
68-
}
69-
cost = 0.5
70-
duration = 0.0
71-
72-
[sub_resource type="Resource" id="Resource_56wkf"]
73-
script = ExtResource("1_snrm6")
74-
id = &"action f"
75-
prerequisites = {
76-
"objective2": true
77-
}
78-
effects = {
79-
"priority": true
80-
}
81-
cost = 1.0
82-
duration = 0.0
83-
84-
[sub_resource type="Resource" id="Resource_g8o8h"]
85-
script = ExtResource("1_i4yub")
86-
sharp_modifier = 1.0
87-
piercing_modifier = 1.0
88-
blunt_modifier = 1.0
89-
poison_modifier = 1.0
90-
magic_modifier = 1.0
91-
light_modifier = 1.0
92-
frost_modifier = 1.0
93-
flame_modifier = 1.0
94-
plant_modifier = 1.0
95-
stamina_modifier = 1.0
96-
will_modifier = 1.0
97-
98-
[sub_resource type="Resource" id="Resource_hr8l8"]
99-
script = ExtResource("2_ts27d")
100-
101-
[sub_resource type="Resource" id="Resource_o8fm3"]
102-
script = ExtResource("3_gqrf7")
103-
aggression = 2
104-
attack_threshold = -50
105-
confidence = 2
106-
assistance = 1
107-
assistance_threshold = 0
108-
friendly_fire_behavior = 1
109-
warn_radius = 20.0
110-
attack_radius = 8.0
111-
112-
[sub_resource type="Resource" id="Resource_8cp1i"]
113-
script = ExtResource("5_rhswb")
114-
compare = 2
115-
minute = 0
116-
hour = 0
117-
day = 0
118-
week = 0
119-
month = 0
120-
year = 0
121-
122-
[sub_resource type="Resource" id="Resource_15g4i"]
123-
script = ExtResource("5_rhswb")
124-
compare = 2
125-
minute = 0
126-
hour = 2
127-
day = 0
128-
week = 0
129-
month = 0
130-
year = 0
131-
132-
[sub_resource type="Resource" id="Resource_gv71r"]
133-
script = ExtResource("6_i1yqi")
134-
energy = 0.0
135-
can_swim = false
136-
can_sit = true
137-
can_eat = true
138-
can_sleep = true
139-
can_engage_conversation = true
140-
use_idle_points = true
141-
be_at_location = true
142-
location_position = Vector3(0, 0, 0)
143-
location_world = ""
144-
target_radius = 25.0
145-
name = "sandbox 1"
146-
from = SubResource("Resource_8cp1i")
147-
to = SubResource("Resource_15g4i")
148-
priority = 0.0
149-
150-
[sub_resource type="Resource" id="Resource_p04li"]
151-
script = ExtResource("5_rhswb")
152-
compare = 2
153-
minute = 0
154-
hour = 2
155-
day = 0
156-
week = 0
157-
month = 0
158-
year = 0
159-
160-
[sub_resource type="Resource" id="Resource_4lnbe"]
161-
script = ExtResource("5_rhswb")
162-
compare = 2
163-
minute = 0
164-
hour = 8
165-
day = 0
166-
week = 0
167-
month = 0
168-
year = 0
169-
170-
[sub_resource type="Resource" id="Resource_hjuw6"]
171-
script = ExtResource("6_i1yqi")
172-
energy = 0.0
173-
can_swim = false
174-
can_sit = true
175-
can_eat = true
176-
can_sleep = true
177-
can_engage_conversation = true
178-
use_idle_points = true
179-
be_at_location = true
180-
location_position = Vector3(0, 0, 0)
181-
location_world = ""
182-
target_radius = 25.0
183-
name = "sandbox 2"
184-
from = SubResource("Resource_p04li")
185-
to = SubResource("Resource_4lnbe")
186-
priority = 0.0
187-
188-
[sub_resource type="Resource" id="Resource_titkw"]
189-
script = ExtResource("7_8uc5l")
190-
flag = "test"
191-
value = 1.0
192-
193-
[sub_resource type="Resource" id="Resource_forwd"]
194-
script = ExtResource("5_rhswb")
195-
compare = 2
196-
minute = 0
197-
hour = 2
198-
day = 0
199-
week = 0
200-
month = 0
201-
year = 0
202-
203-
[sub_resource type="Resource" id="Resource_8ca1i"]
204-
script = ExtResource("5_rhswb")
205-
compare = 2
206-
minute = 0
207-
hour = 8
208-
day = 0
209-
week = 0
210-
month = 0
211-
year = 0
212-
213-
[sub_resource type="Resource" id="Resource_oy7bn"]
214-
script = ExtResource("6_i1yqi")
215-
energy = 0.0
216-
can_swim = false
217-
can_sit = true
218-
can_eat = true
219-
can_sleep = true
220-
can_engage_conversation = true
221-
use_idle_points = true
222-
be_at_location = true
223-
location_position = Vector3(0, 0, 0)
224-
location_world = ""
225-
target_radius = 25.0
226-
name = "schedule overridden"
227-
from = SubResource("Resource_forwd")
228-
to = SubResource("Resource_8ca1i")
229-
condition = SubResource("Resource_titkw")
230-
priority = 2.0
3+
[ext_resource type="Script" path="res://addons/skelerealms/scripts/data/npc_data.gd" id="1_lf44e"]
2314

2325
[resource]
233-
script = ExtResource("1_5mc0v")
234-
prefab = ExtResource("4_eio35")
235-
schedule = Array[Resource("res://addons/skelerealms/scripts/Schedules/schedule_event.gd")]([SubResource("Resource_gv71r"), SubResource("Resource_hjuw6"), SubResource("Resource_oy7bn")])
236-
covens = Array[Resource("res://addons/skelerealms/scripts/Covens/coven_rank_data.gd")]([])
6+
script = ExtResource("1_lf44e")
7+
schedule = Array[Resource("res://addons/skelerealms/scripts/schedules/schedule_event.gd")]([])
8+
covens = Array[Resource("res://addons/skelerealms/scripts/covens/coven_rank_data.gd")]([])
2379
default_player_opinion = 0
23810
loyalty = 0
23911
essential = true
@@ -243,7 +15,7 @@ unique = true
24315
affects_stealth_meter = true
24416
start_dialogue_node = ""
24517
interactive = true
246-
relationships = Array[Resource("res://addons/skelerealms/scripts/Relationships/relationship.gd")]([])
247-
modules = Array[Object]([SubResource("Resource_g8o8h"), SubResource("Resource_hr8l8"), SubResource("Resource_o8fm3")])
248-
goap_actions = Array[ExtResource("1_snrm6")]([SubResource("Resource_43uvo"), SubResource("Resource_oqbhy"), SubResource("Resource_66r5m"), SubResource("Resource_hjg4o"), SubResource("Resource_ax50k"), SubResource("Resource_56wkf")])
249-
id = "test_dummy"
18+
relationships = Array[Resource("res://addons/skelerealms/scripts/relationships/relationship.gd")]([])
19+
modules = null
20+
goap_actions = Array[Resource("res://addons/skelerealms/scripts/ai/goap_behavior.gd")]([])
21+
id = ""

addons/skelerealms/scripts/AI/perception_fsm/machine_perception.gd

Lines changed: 0 additions & 36 deletions
This file was deleted.

addons/skelerealms/scripts/AI/perception_fsm/state_aware_invisible.gd

Lines changed: 0 additions & 29 deletions
This file was deleted.

addons/skelerealms/scripts/AI/perception_fsm/state_aware_visible.gd

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)