Added a bunch of tweaks from working on my own game, again. Tests are…

… totally broken, I need to re-create all the assets.

Tests/TestAssets/test network2.tres

@@ -89,4 +89,4 @@ SubResource("Resource_v8tc7"): [SubResource("Resource_db82r"), SubResource("Reso
 SubResource("Resource_jo586"): [SubResource("Resource_mwx71"), SubResource("Resource_nx3rg")],
 SubResource("Resource_tji6t"): [SubResource("Resource_nx3rg"), SubResource("Resource_0vmae")]
 }
-portals = Array[Resource("res://addons/network_utility/Scripts/network_portal.gd")]([])
+portals = Array[Resource("res://addons/network_utility/Scripts/Scripts/network_portal.gd")]([])

Tests/TestAssets/test_coven_1.tres

@@ -1,10 +1,10 @@
 [gd_resource type="Resource" script_class="Coven" load_steps=2 format=3 uid="uid://wu88rgegya0d"]
 
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven.gd" id="1_o0b4r"]
+[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven.gd" id="1_46xw2"]
 
 [resource]
-script = ExtResource("1_o0b4r")
-coven_id = &"gut_test_coven_1"
+script = ExtResource("1_46xw2")
+coven_id = &"test_coven_1"
 other_coven_opinions = {}
 hidden_from_player = false
 ranks = {}

Tests/TestAssets/test_coven_2.tres

@@ -1,10 +1,10 @@
 [gd_resource type="Resource" script_class="Coven" load_steps=2 format=3 uid="uid://bl6r48ooyuucl"]
 
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven.gd" id="1_oq7fp"]
+[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven.gd" id="1_hwahn"]
 
 [resource]
-script = ExtResource("1_oq7fp")
-coven_id = &"gut_test_coven_2"
+script = ExtResource("1_hwahn")
+coven_id = &"test_coven_2"
 other_coven_opinions = {}
 hidden_from_player = false
 ranks = {}

Tests/TestAssets/test_coven_rank_data_1.tres

@@ -1,9 +1,9 @@
-[gd_resource type="Resource" script_class="CovenRankData" load_steps=3 format=3]
+[gd_resource type="Resource" script_class="CovenRankData" load_steps=3 format=3 uid="uid://bwovdkegfjpv"]
 
-[ext_resource type="Resource" uid="uid://wu88rgegya0d" path="res://tests/TestAssets/test_coven_1.tres" id="1_1c6ad"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Covens/coven_rank_data.gd" id="1_2fiw6"]
+[ext_resource type="Resource" uid="uid://bl6r48ooyuucl" path="res://Tests/TestAssets/test_coven_2.tres" id="1_qintl"]
+[ext_resource type="Script" path="res://addons/skelerealms/scripts/covens/coven_rank_data.gd" id="2_x5jrx"]
 
 [resource]
-script = ExtResource("1_2fiw6")
-coven = ExtResource("1_1c6ad")
+script = ExtResource("2_x5jrx")
+coven = ExtResource("1_qintl")
 rank = 0

Tests/TestAssets/test_dummy.tres

@@ -1,239 +1,11 @@
-[gd_resource type="Resource" script_class="NPCData" load_steps=30 format=3]
+[gd_resource type="Resource" script_class="NPCData" load_steps=2 format=3 uid="uid://cibls8lu1jcs3"]
 
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Data/npc_data.gd" id="1_5mc0v"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_damage_module.gd" id="1_i4yub"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/goap_behavior.gd" id="1_snrm6"]
-[ext_resource type="Script" path="res://tests/TestAssets/test_conditional_goap_behavior.gd" id="2_k10rr"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_interact_response.gd" id="2_ts27d"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/AI/Modules/default_threat_response.gd" id="3_gqrf7"]
-[ext_resource type="PackedScene" uid="uid://24i73ycvxysf" path="res://test_npc_prefab.tscn" id="4_eio35"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/System/timestamp.gd" id="5_rhswb"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Schedules/sandbox_schedule.gd" id="6_i1yqi"]
-[ext_resource type="Script" path="res://addons/skelerealms/scripts/Schedules/continuity_condition.gd" id="7_8uc5l"]
-
-[sub_resource type="Resource" id="Resource_43uvo"]
-script = ExtResource("1_snrm6")
-id = &"action a"
-prerequisites = {}
-effects = {
-"objective1": true
-}
-cost = 1.0
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_oqbhy"]
-script = ExtResource("1_snrm6")
-id = &"action d"
-prerequisites = {
-"objective1": true
-}
-effects = {
-"objective2": true
-}
-cost = 2.0
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_66r5m"]
-script = ExtResource("1_snrm6")
-id = &"action b"
-prerequisites = {
-"objective1": true
-}
-effects = {
-"objective2": true
-}
-cost = 1.0
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_hjg4o"]
-script = ExtResource("1_snrm6")
-id = &"action c"
-prerequisites = {
-"objective2": true
-}
-effects = {
-"goal": true
-}
-cost = 1.0
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_ax50k"]
-script = ExtResource("2_k10rr")
-id = &"action e"
-prerequisites = {
-"objective1": true
-}
-effects = {
-"objective2": true
-}
-cost = 0.5
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_56wkf"]
-script = ExtResource("1_snrm6")
-id = &"action f"
-prerequisites = {
-"objective2": true
-}
-effects = {
-"priority": true
-}
-cost = 1.0
-duration = 0.0
-
-[sub_resource type="Resource" id="Resource_g8o8h"]
-script = ExtResource("1_i4yub")
-sharp_modifier = 1.0
-piercing_modifier = 1.0
-blunt_modifier = 1.0
-poison_modifier = 1.0
-magic_modifier = 1.0
-light_modifier = 1.0
-frost_modifier = 1.0
-flame_modifier = 1.0
-plant_modifier = 1.0
-stamina_modifier = 1.0
-will_modifier = 1.0
-
-[sub_resource type="Resource" id="Resource_hr8l8"]
-script = ExtResource("2_ts27d")
-
-[sub_resource type="Resource" id="Resource_o8fm3"]
-script = ExtResource("3_gqrf7")
-aggression = 2
-attack_threshold = -50
-confidence = 2
-assistance = 1
-assistance_threshold = 0
-friendly_fire_behavior = 1
-warn_radius = 20.0
-attack_radius = 8.0
-
-[sub_resource type="Resource" id="Resource_8cp1i"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 0
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_15g4i"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 2
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_gv71r"]
-script = ExtResource("6_i1yqi")
-energy = 0.0
-can_swim = false
-can_sit = true
-can_eat = true
-can_sleep = true
-can_engage_conversation = true
-use_idle_points = true
-be_at_location = true
-location_position = Vector3(0, 0, 0)
-location_world = ""
-target_radius = 25.0
-name = "sandbox 1"
-from = SubResource("Resource_8cp1i")
-to = SubResource("Resource_15g4i")
-priority = 0.0
-
-[sub_resource type="Resource" id="Resource_p04li"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 2
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_4lnbe"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 8
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_hjuw6"]
-script = ExtResource("6_i1yqi")
-energy = 0.0
-can_swim = false
-can_sit = true
-can_eat = true
-can_sleep = true
-can_engage_conversation = true
-use_idle_points = true
-be_at_location = true
-location_position = Vector3(0, 0, 0)
-location_world = ""
-target_radius = 25.0
-name = "sandbox 2"
-from = SubResource("Resource_p04li")
-to = SubResource("Resource_4lnbe")
-priority = 0.0
-
-[sub_resource type="Resource" id="Resource_titkw"]
-script = ExtResource("7_8uc5l")
-flag = "test"
-value = 1.0
-
-[sub_resource type="Resource" id="Resource_forwd"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 2
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_8ca1i"]
-script = ExtResource("5_rhswb")
-compare = 2
-minute = 0
-hour = 8
-day = 0
-week = 0
-month = 0
-year = 0
-
-[sub_resource type="Resource" id="Resource_oy7bn"]
-script = ExtResource("6_i1yqi")
-energy = 0.0
-can_swim = false
-can_sit = true
-can_eat = true
-can_sleep = true
-can_engage_conversation = true
-use_idle_points = true
-be_at_location = true
-location_position = Vector3(0, 0, 0)
-location_world = ""
-target_radius = 25.0
-name = "schedule overridden"
-from = SubResource("Resource_forwd")
-to = SubResource("Resource_8ca1i")
-condition = SubResource("Resource_titkw")
-priority = 2.0
+[ext_resource type="Script" path="res://addons/skelerealms/scripts/data/npc_data.gd" id="1_lf44e"]
 
 [resource]
-script = ExtResource("1_5mc0v")
-prefab = ExtResource("4_eio35")
-schedule = Array[Resource("res://addons/skelerealms/scripts/Schedules/schedule_event.gd")]([SubResource("Resource_gv71r"), SubResource("Resource_hjuw6"), SubResource("Resource_oy7bn")])
-covens = Array[Resource("res://addons/skelerealms/scripts/Covens/coven_rank_data.gd")]([])
+script = ExtResource("1_lf44e")
+schedule = Array[Resource("res://addons/skelerealms/scripts/schedules/schedule_event.gd")]([])
+covens = Array[Resource("res://addons/skelerealms/scripts/covens/coven_rank_data.gd")]([])
 default_player_opinion = 0
 loyalty = 0
 essential = true
@@ -243,7 +15,7 @@ unique = true
 affects_stealth_meter = true
 start_dialogue_node = ""
 interactive = true
-relationships = Array[Resource("res://addons/skelerealms/scripts/Relationships/relationship.gd")]([])
-modules = Array[Object]([SubResource("Resource_g8o8h"), SubResource("Resource_hr8l8"), SubResource("Resource_o8fm3")])
-goap_actions = Array[ExtResource("1_snrm6")]([SubResource("Resource_43uvo"), SubResource("Resource_oqbhy"), SubResource("Resource_66r5m"), SubResource("Resource_hjg4o"), SubResource("Resource_ax50k"), SubResource("Resource_56wkf")])
-id = "test_dummy"
+relationships = Array[Resource("res://addons/skelerealms/scripts/relationships/relationship.gd")]([])
+modules = null
+goap_actions = Array[Resource("res://addons/skelerealms/scripts/ai/goap_behavior.gd")]([])
+id = ""