From 5cf0c25fd76510175854af2ecd91358a8ae08d31 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 12 Jan 2022 21:42:19 +0100
Subject: [PATCH] Re-extracted the docs.

---
 doc_classes/AIFormation.xml                   |   17 +-
 doc_classes/ActionBarButtonEntry.xml          |   20 +-
 doc_classes/ActionBarEntry.xml                |   32 +-
 doc_classes/ActionBarProfile.xml              |   50 +-
 doc_classes/AuraApplyInfo.xml                 |    4 +-
 doc_classes/AuraData.xml                      |   52 +-
 doc_classes/AuraGroup.xml                     |    2 +-
 doc_classes/Bag.xml                           |  248 +-
 doc_classes/CharacterAtlas.xml                |    2 +-
 doc_classes/CharacterAtlasEntry.xml           |    2 +-
 doc_classes/CharacterBones.xml                |    2 +-
 doc_classes/CharacterSkeleton2D.xml           |  175 +-
 doc_classes/CharacterSkeleton3D.xml           |  216 +-
 doc_classes/CharacterSpec.xml                 |   80 +-
 doc_classes/ClassProfile.xml                  |   52 +-
 doc_classes/ComplexLevelStatData.xml          |   23 +-
 doc_classes/CraftRecipe.xml                   |   32 +-
 doc_classes/CraftRecipeHelper.xml             |    2 +-
 doc_classes/ESDragAndDrop.xml                 |    2 +-
 doc_classes/ESS.xml                           |  248 +-
 doc_classes/ESSEntitySpawner.xml              |   29 +-
 doc_classes/ESSMaterialCache.xml              |  161 +
 doc_classes/ESSMaterialCachePCM.xml           |   25 +
 doc_classes/ESSResourceDB.xml                 |  448 +--
 doc_classes/ESSResourceDBFolders.xml          |   37 +-
 doc_classes/ESSResourceDBMap.xml              |    2 +-
 doc_classes/ESSResourceDBStatic.xml           |    4 +-
 doc_classes/Entity.xml                        | 3572 ++++++-----------
 doc_classes/EntityAI.xml                      |  512 +--
 doc_classes/EntityClassData.xml               |  186 +-
 doc_classes/EntityCreateInfo.xml              |   34 +-
 doc_classes/EntityData.xml                    |   78 +-
 doc_classes/EntityDataContainer.xml           |   20 +-
 doc_classes/EntityEnums.xml                   |   14 +-
 doc_classes/EntityResource.xml                |  188 +-
 doc_classes/EntityResourceCostData.xml        |    2 +-
 doc_classes/EntityResourceCostDataHealth.xml  |    2 +-
 .../EntityResourceCostDataResource.xml        |    2 +-
 doc_classes/EntityResourceHealth.xml          |    5 +-
 doc_classes/EntityResourceSpeed.xml           |    5 +-
 doc_classes/EntitySkill.xml                   |   29 +-
 doc_classes/EntitySkillData.xml               |    2 +-
 doc_classes/EntitySpeciesData.xml             |  104 +-
 doc_classes/EquipmentData.xml                 |   17 +-
 doc_classes/InputProfile.xml                  |   32 +-
 doc_classes/InputProfileModifier.xml          |   68 +-
 doc_classes/InputProfileModifierEntry.xml     |    2 +-
 doc_classes/ItemContainerData.xml             |   26 +-
 doc_classes/ItemContainerDataEntry.xml        |    2 +-
 doc_classes/ItemEnums.xml                     |    2 +-
 doc_classes/ItemInstance.xml                  |  119 +-
 doc_classes/ItemTemplate.xml                  |  227 +-
 doc_classes/LevelStatData.xml                 |   26 +-
 doc_classes/LootDataBase.xml                  |   68 +-
 doc_classes/ModelVisual.xml                   |   32 +-
 doc_classes/ModelVisualEntry.xml              |   77 +-
 doc_classes/PlayerProfile.xml                 |   50 +-
 doc_classes/ProfileManager.xml                |   75 +-
 doc_classes/PropDataEntity.xml                |   19 +
 doc_classes/SimpleLevelStatData.xml           |   17 +-
 doc_classes/SkeletonModelEntry.xml            |    2 +-
 doc_classes/SpeciesInstance.xml               |   22 +-
 doc_classes/SpeciesModelData.xml              |  197 +-
 doc_classes/Spell.xml                         | 1492 +++++--
 doc_classes/SpellCastInfo.xml                 |   17 +-
 doc_classes/SpellCooldownManipulationData.xml |    2 +-
 doc_classes/SpellDamageInfo.xml               |   27 +-
 doc_classes/SpellEffectVisual.xml             |    2 +-
 doc_classes/SpellEffectVisualSimple.xml       |   18 +-
 doc_classes/SpellEnums.xml                    |    2 +-
 doc_classes/SpellFollowProjectile3D.xml       |    2 +-
 doc_classes/SpellHealInfo.xml                 |   29 +-
 doc_classes/StatData.xml                      |   65 +-
 doc_classes/VendorItemData.xml                |   20 +-
 doc_classes/VendorItemDataEntry.xml           |    2 +-
 doc_classes/XPData.xml                        |   78 -
 76 files changed, 4398 insertions(+), 5160 deletions(-)
 create mode 100644 doc_classes/ESSMaterialCache.xml
 create mode 100644 doc_classes/ESSMaterialCachePCM.xml
 create mode 100644 doc_classes/PropDataEntity.xml
 delete mode 100644 doc_classes/XPData.xml

diff --git a/doc_classes/AIFormation.xml b/doc_classes/AIFormation.xml
index f6716d2..26b9763 100644
--- a/doc_classes/AIFormation.xml
+++ b/doc_classes/AIFormation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AIFormation" inherits="Resource" version="3.2">
+<class name="AIFormation" inherits="Resource" version="3.5">
 	<brief_description>
 		Class for scriptable AI formations. Not yet used. Needs pet support.
 	</brief_description>
@@ -9,24 +9,19 @@
 	</tutorials>
 	<methods>
 		<method name="_get_position" qualifiers="virtual">
-			<return type="Vector3">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="Vector3" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_on_set_owner" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="get_position">
-			<return type="Vector3">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="Vector3" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ActionBarButtonEntry.xml b/doc_classes/ActionBarButtonEntry.xml
index 1a75788..65750e0 100644
--- a/doc_classes/ActionBarButtonEntry.xml
+++ b/doc_classes/ActionBarButtonEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ActionBarButtonEntry" inherits="Reference" version="3.2">
+<class name="ActionBarButtonEntry" inherits="Reference" version="3.5">
 	<brief_description>
 		Stores the data for an actionbar button. ProfileManager uses it.
 	</brief_description>
@@ -9,28 +9,23 @@
 	</tutorials>
 	<methods>
 		<method name="emit_change">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_owner">
-			<return type="ActionBarEntry">
-			</return>
+			<return type="ActionBarEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -47,8 +42,7 @@
 	</members>
 	<signals>
 		<signal name="changed">
-			<argument index="0" name="action_bar_button_entry" type="ActionBarButtonEntry">
-			</argument>
+			<argument index="0" name="action_bar_button_entry" type="ActionBarButtonEntry" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/ActionBarEntry.xml b/doc_classes/ActionBarEntry.xml
index ff0b740..b25bb23 100644
--- a/doc_classes/ActionBarEntry.xml
+++ b/doc_classes/ActionBarEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ActionBarEntry" inherits="Reference" version="3.2">
+<class name="ActionBarEntry" inherits="Reference" version="3.5">
 	<brief_description>
 		Stores the data for an actionbar. Also see [ProfileManager].
 	</brief_description>
@@ -9,50 +9,40 @@
 	</tutorials>
 	<methods>
 		<method name="emit_change">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_action_bar_entry_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_button">
-			<return type="ActionBarButtonEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ActionBarButtonEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_button_for_slotid">
-			<return type="ActionBarButtonEntry">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="ActionBarButtonEntry" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_owner">
-			<return type="ActionBarProfile">
-			</return>
+			<return type="ActionBarProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ActionBarProfile.xml b/doc_classes/ActionBarProfile.xml
index 0092c84..7cb39d9 100644
--- a/doc_classes/ActionBarProfile.xml
+++ b/doc_classes/ActionBarProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ActionBarProfile" inherits="Reference" version="3.2">
+<class name="ActionBarProfile" inherits="Reference" version="3.5">
 	<brief_description>
 		Stores all actionbar-related data for a class. Also see [ProfileManager].
 	</brief_description>
@@ -9,78 +9,62 @@
 	</tutorials>
 	<methods>
 		<method name="add_action_bar">
-			<return type="void">
-			</return>
-			<argument index="0" name="actionbar" type="ActionBarEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="actionbar" type="ActionBarEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_action_bars">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="emit_change">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_actionbar_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="other" type="ActionBarProfile">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="other" type="ActionBarProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_action_bar">
-			<return type="ActionBarEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ActionBarEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_action_bar_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_owner">
-			<return type="ClassProfile">
-			</return>
+			<return type="ClassProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="load_defaults">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_action_bar">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/AuraApplyInfo.xml b/doc_classes/AuraApplyInfo.xml
index 30f5906..b697d43 100644
--- a/doc_classes/AuraApplyInfo.xml
+++ b/doc_classes/AuraApplyInfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AuraApplyInfo" inherits="Reference" version="3.2">
+<class name="AuraApplyInfo" inherits="Reference" version="3.5">
 	<brief_description>
 		Helper class, which is used to apply an [Aura] to an [Entity].
 	</brief_description>
@@ -10,7 +10,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="aura" type="Aura" setter="set_aura" getter="get_aura">
+		<member name="aura" type="Spell" setter="set_aura" getter="get_aura">
 		</member>
 		<member name="caster" type="Entity" setter="caster_set" getter="caster_get">
 		</member>
diff --git a/doc_classes/AuraData.xml b/doc_classes/AuraData.xml
index 99eaa79..40c9243 100644
--- a/doc_classes/AuraData.xml
+++ b/doc_classes/AuraData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AuraData" inherits="Resource" version="3.2">
+<class name="AuraData" inherits="Resource" version="3.5">
 	<brief_description>
 		Stores an [Aura]'s runtime data on an [Entity].
 	</brief_description>
@@ -9,80 +9,64 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_from_send_array" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="arr" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arr" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_send_array" qualifiers="virtual">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="from_send_array">
-			<return type="void">
-			</return>
-			<argument index="0" name="arr" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arr" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="refresh">
-			<return type="void">
-			</return>
-			<argument index="0" name="remaining" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="remaining" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_remaining_absorb">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_send_array">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="aura" type="Aura" setter="set_aura" getter="get_aura">
+		<member name="aura" type="Spell" setter="set_aura" getter="get_aura">
 		</member>
 		<member name="aura_id" type="int" setter="set_aura_id" getter="get_aura_id" default="0">
 		</member>
diff --git a/doc_classes/AuraGroup.xml b/doc_classes/AuraGroup.xml
index 9cd758f..748b5c2 100644
--- a/doc_classes/AuraGroup.xml
+++ b/doc_classes/AuraGroup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="AuraGroup" inherits="Resource" version="3.2">
+<class name="AuraGroup" inherits="Resource" version="3.5">
 	<brief_description>
 		Used to make some [Aura]s override each other.
 	</brief_description>
diff --git a/doc_classes/Bag.xml b/doc_classes/Bag.xml
index 2e519f4..172b93c 100644
--- a/doc_classes/Bag.xml
+++ b/doc_classes/Bag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Bag" inherits="Resource" version="3.2">
+<class name="Bag" inherits="Resource" version="3.5">
 	<brief_description>
 		Stores [Entity] inventory.
 	</brief_description>
@@ -9,254 +9,190 @@
 	</tutorials>
 	<methods>
 		<method name="_add_item" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_add_item_at" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="signal" type="bool">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="signal" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_can_add_item" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_change_item_equip" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_item" qualifiers="virtual">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_item_count" qualifiers="virtual">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_size" qualifiers="virtual">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_valid_item_count" qualifiers="virtual">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_has_item" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemTemplate">
-			</argument>
-			<argument index="1" name="count" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemTemplate" />
+			<argument index="1" name="count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_is_full" qualifiers="virtual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_is_overburdened" qualifiers="virtual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_remove_item" qualifiers="virtual">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_remove_items" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemTemplate">
-			</argument>
-			<argument index="1" name="count" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemTemplate" />
+			<argument index="1" name="count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_set_size" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="size" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="size" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_swap_items" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item1_index" type="int">
-			</argument>
-			<argument index="1" name="item2_index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item1_index" type="int" />
+			<argument index="1" name="item2_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="add_item">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="add_item_at">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="signal" type="bool" default="true">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="signal" type="bool" default="true" />
 			<description>
 			</description>
 		</method>
 		<method name="can_add_item">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="change_item_equip">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="has_item">
-			<return type="bool">
-			</return>
-			<argument index="0" name="item" type="ItemTemplate">
-			</argument>
-			<argument index="1" name="count" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="item" type="ItemTemplate" />
+			<argument index="1" name="count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_full">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="is_overburdened">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_item">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_items">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemTemplate">
-			</argument>
-			<argument index="1" name="count" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemTemplate" />
+			<argument index="1" name="count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="swap_items">
-			<return type="void">
-			</return>
-			<argument index="0" name="item1_index" type="int">
-			</argument>
-			<argument index="1" name="item2_index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item1_index" type="int" />
+			<argument index="1" name="item2_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -269,70 +205,52 @@
 	</members>
 	<signals>
 		<signal name="change_item_equip">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="slot_id" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="slot_id" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</signal>
 		<signal name="item_added">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="item_count_changed">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="item_removed">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="item_swapped">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="slot_id_1" type="int">
-			</argument>
-			<argument index="2" name="slot_id_2" type="int">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="slot_id_1" type="int" />
+			<argument index="2" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="overburden_removed">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="overburdened">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="size_changed">
-			<argument index="0" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/CharacterAtlas.xml b/doc_classes/CharacterAtlas.xml
index e6ef807..f8b663e 100644
--- a/doc_classes/CharacterAtlas.xml
+++ b/doc_classes/CharacterAtlas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterAtlas" inherits="Resource" version="3.2">
+<class name="CharacterAtlas" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/CharacterAtlasEntry.xml b/doc_classes/CharacterAtlasEntry.xml
index f724b1c..a43eaba 100644
--- a/doc_classes/CharacterAtlasEntry.xml
+++ b/doc_classes/CharacterAtlasEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterAtlasEntry" inherits="Resource" version="3.2">
+<class name="CharacterAtlasEntry" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/CharacterBones.xml b/doc_classes/CharacterBones.xml
index 1849759..aafae28 100644
--- a/doc_classes/CharacterBones.xml
+++ b/doc_classes/CharacterBones.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterBones" inherits="Node2D" version="3.2">
+<class name="CharacterBones" inherits="Node2D" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/CharacterSkeleton2D.xml b/doc_classes/CharacterSkeleton2D.xml
index 43456d9..bc47a6e 100644
--- a/doc_classes/CharacterSkeleton2D.xml
+++ b/doc_classes/CharacterSkeleton2D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterSkeleton2D" inherits="Node2D" version="3.2">
+<class name="CharacterSkeleton2D" inherits="Node2D" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -7,52 +7,185 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="_build_model" qualifiers="virtual">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="_common_attach_point_index_get" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="point" type="int" />
+			<description>
+			</description>
+		</method>
 		<method name="add_model_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<description>
+			</description>
+		</method>
+		<method name="add_model_visual_entry">
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<argument index="1" name="ive" type="ModelVisualEntry" />
+			<description>
+			</description>
+		</method>
+		<method name="attach_point_count" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="attach_point_node_get">
+			<return type="Node" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="attach_point_path_get" qualifiers="const">
+			<return type="NodePath" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="attach_point_path_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="path" type="NodePath" />
+			<description>
+			</description>
+		</method>
+		<method name="bake_mesh_array_uv" qualifiers="const">
+			<return type="Array" />
+			<argument index="0" name="arr" type="Array" />
+			<argument index="1" name="tex" type="Texture" />
+			<argument index="2" name="mul_color" type="float" default="0.7" />
+			<description>
+			</description>
+		</method>
+		<method name="build_model">
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_model_visuals">
-			<return type="void">
-			</return>
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="common_attach_point_add">
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
+			<description>
+			</description>
+		</method>
+		<method name="common_attach_point_add_timed">
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
+			<argument index="2" name="time" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="common_attach_point_index_get">
+			<return type="int" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<description>
+			</description>
+		</method>
+		<method name="common_attach_point_node_get">
+			<return type="Node" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<description>
+			</description>
+		</method>
+		<method name="common_attach_point_remove">
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
+			<description>
+			</description>
+		</method>
+		<method name="get_animation_player">
+			<return type="AnimationPlayer" />
+			<description>
+			</description>
+		</method>
+		<method name="get_animation_tree">
+			<return type="AnimationTree" />
+			<description>
+			</description>
+		</method>
+		<method name="get_model_entry">
+			<return type="SkeletonModelEntry" />
+			<argument index="0" name="bone_index" type="int" />
+			<argument index="1" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="get_model_entry_count">
+			<return type="int" />
+			<argument index="0" name="bone_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_visual">
-			<return type="ModelVisual">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ModelVisual" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_visual_count">
-			<return type="int">
-			</return>
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="merge_mesh_array" qualifiers="const">
+			<return type="Array" />
+			<argument index="0" name="arr" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<description>
+			</description>
+		</method>
+		<method name="remove_model_visual_entry">
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<argument index="1" name="ive" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_visual_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="sort_layers">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="update_nodes">
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 	</methods>
 	<members>
+		<member name="animation_player_path" type="NodePath" setter="set_animation_player_path" getter="get_animation_player_path" default="NodePath(&quot;&quot;)">
+		</member>
+		<member name="animation_tree_path" type="NodePath" setter="set_animation_tree_path" getter="get_animation_tree_path" default="NodePath(&quot;&quot;)">
+		</member>
+		<member name="entity_type" type="int" setter="set_entity_type" getter="get_entity_type" default="0">
+		</member>
+		<member name="model_dirty" type="bool" setter="set_model_dirty" getter="get_model_dirty" default="false">
+		</member>
 		<member name="model_index" type="int" setter="set_model_index" getter="get_model_index" default="0">
 		</member>
 	</members>
diff --git a/doc_classes/CharacterSkeleton3D.xml b/doc_classes/CharacterSkeleton3D.xml
index 53f0dbf..ef0a203 100644
--- a/doc_classes/CharacterSkeleton3D.xml
+++ b/doc_classes/CharacterSkeleton3D.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterSkeleton3D" inherits="Spatial" version="3.2">
+<class name="CharacterSkeleton3D" inherits="Spatial" version="3.5">
 	<brief_description>
 		3d implementation for [CharacterSkeleton].
-		
+
 		Note: Most of the logic implementation for this is still in gdscript. It will be ported.
 	</brief_description>
 	<description>
@@ -11,228 +11,210 @@
 	</tutorials>
 	<methods>
 		<method name="_build_model" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_common_attach_point_index_get" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="point" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="point" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="add_model_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
 			<description>
 			</description>
 		</method>
 		<method name="add_model_visual_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
-			<argument index="1" name="ive" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<argument index="1" name="ive" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="attach_point_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="attach_point_node_get">
-			<return type="Node">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Node" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="attach_point_path_get" qualifiers="const">
-			<return type="NodePath">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="NodePath" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="attach_point_path_set">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="path" type="NodePath">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="path" type="NodePath" />
 			<description>
 			</description>
 		</method>
 		<method name="bake_mesh_array_uv" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="arr" type="Array">
-			</argument>
-			<argument index="1" name="tex" type="Texture">
-			</argument>
-			<argument index="2" name="mul_color" type="float" default="0.7">
-			</argument>
+			<return type="Array" />
+			<argument index="0" name="arr" type="Array" />
+			<argument index="1" name="tex" type="Texture" />
+			<argument index="2" name="mul_color" type="float" default="0.7" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_bone_index_get" qualifiers="const">
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_bone_index_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="bone_index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_transform_get" qualifiers="const">
+			<return type="Transform" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_transform_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="transform" type="Transform" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_user_transform_get" qualifiers="const">
+			<return type="Transform" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="bone_additional_mesh_transform_user_transform_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="transform" type="Transform" />
 			<description>
 			</description>
 		</method>
 		<method name="build_model">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_model_visuals">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="common_attach_point_add">
-			<return type="void">
-			</return>
-			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints">
-			</argument>
-			<argument index="1" name="scene" type="PackedScene">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
 			<description>
 			</description>
 		</method>
 		<method name="common_attach_point_add_timed">
-			<return type="void">
-			</return>
-			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints">
-			</argument>
-			<argument index="1" name="scene" type="PackedScene">
-			</argument>
-			<argument index="2" name="time" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
+			<argument index="2" name="time" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="common_attach_point_index_get">
-			<return type="int">
-			</return>
-			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
 			<description>
 			</description>
 		</method>
 		<method name="common_attach_point_node_get">
-			<return type="Node">
-			</return>
-			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints">
-			</argument>
+			<return type="Node" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
 			<description>
 			</description>
 		</method>
 		<method name="common_attach_point_remove">
-			<return type="void">
-			</return>
-			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints">
-			</argument>
-			<argument index="1" name="scene" type="PackedScene">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="point" type="int" enum="EntityEnums.CommonCharacterSkeletonPoints" />
+			<argument index="1" name="scene" type="PackedScene" />
 			<description>
 			</description>
 		</method>
 		<method name="get_animation_player">
-			<return type="AnimationPlayer">
-			</return>
+			<return type="AnimationPlayer" />
 			<description>
 			</description>
 		</method>
 		<method name="get_animation_tree">
-			<return type="AnimationTree">
-			</return>
+			<return type="AnimationTree" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_entry">
-			<return type="SkeletonModelEntry">
-			</return>
-			<argument index="0" name="bone_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
+			<return type="SkeletonModelEntry" />
+			<argument index="0" name="bone_index" type="int" />
+			<argument index="1" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_entry_count">
-			<return type="int">
-			</return>
-			<argument index="0" name="bone_index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="bone_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_visual">
-			<return type="ModelVisual">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ModelVisual" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_visual_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="merge_mesh_array" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="arr" type="Array">
-			</argument>
+			<return type="Array" />
+			<argument index="0" name="arr" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_visual_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="vis" type="ModelVisual">
-			</argument>
-			<argument index="1" name="ive" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="vis" type="ModelVisual" />
+			<argument index="1" name="ive" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_visual_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="sort_layers">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="update_nodes">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
@@ -242,6 +224,8 @@
 		</member>
 		<member name="animation_tree_path" type="NodePath" setter="set_animation_tree_path" getter="get_animation_tree_path" default="NodePath(&quot;&quot;)">
 		</member>
+		<member name="bone_additional_mesh_transform_count" type="int" setter="bone_additional_mesh_transform_set_count" getter="bone_additional_mesh_transform_get_count" default="0">
+		</member>
 		<member name="entity_type" type="int" setter="set_entity_type" getter="get_entity_type" default="0">
 		</member>
 		<member name="model_dirty" type="bool" setter="set_model_dirty" getter="get_model_dirty" default="false">
diff --git a/doc_classes/CharacterSpec.xml b/doc_classes/CharacterSpec.xml
index e78642d..852d774 100644
--- a/doc_classes/CharacterSpec.xml
+++ b/doc_classes/CharacterSpec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CharacterSpec" inherits="Resource" version="3.2">
+<class name="CharacterSpec" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains data for a character's specialization.
 	</brief_description>
@@ -10,90 +10,64 @@
 	</tutorials>
 	<methods>
 		<method name="get_num_columns" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="row" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_ranks" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
-			<argument index="1" name="culomn" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="row" type="int" />
+			<argument index="1" name="culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_talent">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
-			<argument index="1" name="culomn" type="int">
-			</argument>
-			<argument index="2" name="rank" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="row" type="int" />
+			<argument index="1" name="culomn" type="int" />
+			<argument index="2" name="rank" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_talent_with_id">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_talents">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="has_talent_with_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_columns">
-			<return type="void">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="row" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_ranks">
-			<return type="void">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
-			<argument index="1" name="culomn" type="int">
-			</argument>
-			<argument index="2" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="row" type="int" />
+			<argument index="1" name="culomn" type="int" />
+			<argument index="2" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_talent">
-			<return type="void">
-			</return>
-			<argument index="0" name="row" type="int">
-			</argument>
-			<argument index="1" name="culomn" type="int">
-			</argument>
-			<argument index="2" name="rank" type="int">
-			</argument>
-			<argument index="3" name="arg3" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="row" type="int" />
+			<argument index="1" name="culomn" type="int" />
+			<argument index="2" name="rank" type="int" />
+			<argument index="3" name="arg3" type="Spell" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ClassProfile.xml b/doc_classes/ClassProfile.xml
index 1d65e9f..030039e 100644
--- a/doc_classes/ClassProfile.xml
+++ b/doc_classes/ClassProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ClassProfile" inherits="Reference" version="3.2">
+<class name="ClassProfile" inherits="Reference" version="3.5">
 	<brief_description>
 		Contains all profile information for an [Entity]'s class. Related to [ProfileManager].
 	</brief_description>
@@ -9,62 +9,48 @@
 	</tutorials>
 	<methods>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_action_bar_profile">
-			<return type="ActionBarProfile">
-			</return>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_custom_data" qualifiers="const">
-			<return type="Variant">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="Variant" />
+			<argument index="0" name="name" type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="get_default_action_bar_profile">
+			<return type="ActionBarProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="get_input_profile">
-			<return type="InputProfile">
-			</return>
+			<return type="InputProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="has_custom_data" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_custom_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="set_custom_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="value" type="Variant">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="name" type="String" />
+			<argument index="1" name="value" type="Variant" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ComplexLevelStatData.xml b/doc_classes/ComplexLevelStatData.xml
index 22bfdef..a849690 100644
--- a/doc_classes/ComplexLevelStatData.xml
+++ b/doc_classes/ComplexLevelStatData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ComplexLevelStatData" inherits="LevelStatData" version="3.2">
+<class name="ComplexLevelStatData" inherits="LevelStatData" version="3.5">
 	<brief_description>
 		Per level stat information for an [Entity].
 	</brief_description>
@@ -9,24 +9,17 @@
 	</tutorials>
 	<methods>
 		<method name="get_stat_for_level">
-			<return type="int">
-			</return>
-			<argument index="0" name="main_stat" type="int">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="main_stat" type="int" />
+			<argument index="1" name="level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stat_for_level">
-			<return type="void">
-			</return>
-			<argument index="0" name="main_stat" type="int">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
-			<argument index="2" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="main_stat" type="int" />
+			<argument index="1" name="level" type="int" />
+			<argument index="2" name="value" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/CraftRecipe.xml b/doc_classes/CraftRecipe.xml
index 3809e8a..d5201f9 100644
--- a/doc_classes/CraftRecipe.xml
+++ b/doc_classes/CraftRecipe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CraftRecipe" inherits="Resource" version="3.2">
+<class name="CraftRecipe" inherits="Resource" version="3.5">
 	<brief_description>
 		Recipe data for the crafting system.
 	</brief_description>
@@ -9,38 +9,28 @@
 	</tutorials>
 	<methods>
 		<method name="get_required_material">
-			<return type="CraftRecipeHelper">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="CraftRecipeHelper" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_required_tool">
-			<return type="CraftRecipeHelper">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="CraftRecipeHelper" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_required_material">
-			<return type="void">
-			</return>
-			<argument index="0" name="mat" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="CraftRecipeHelper">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="mat" type="int" />
+			<argument index="1" name="arg1" type="CraftRecipeHelper" />
 			<description>
 			</description>
 		</method>
 		<method name="set_required_tool">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="CraftRecipeHelper">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<argument index="1" name="arg1" type="CraftRecipeHelper" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/CraftRecipeHelper.xml b/doc_classes/CraftRecipeHelper.xml
index 9307143..520b58f 100644
--- a/doc_classes/CraftRecipeHelper.xml
+++ b/doc_classes/CraftRecipeHelper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CraftRecipeHelper" inherits="Resource" version="3.2">
+<class name="CraftRecipeHelper" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains one item entry for [CraftRecipes]s
 	</brief_description>
diff --git a/doc_classes/ESDragAndDrop.xml b/doc_classes/ESDragAndDrop.xml
index 981cca9..d8c7471 100644
--- a/doc_classes/ESDragAndDrop.xml
+++ b/doc_classes/ESDragAndDrop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESDragAndDrop" inherits="Reference" version="3.2">
+<class name="ESDragAndDrop" inherits="Reference" version="3.5">
 	<brief_description>
 		Drag and drop helper class for the actionbars, and inventory.
 	</brief_description>
diff --git a/doc_classes/ESS.xml b/doc_classes/ESS.xml
index 064d822..a386d06 100644
--- a/doc_classes/ESS.xml
+++ b/doc_classes/ESS.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESS" inherits="Object" version="3.2">
+<class name="ESS" inherits="Object" version="3.5">
 	<brief_description>
 		The ESS singleton.
 	</brief_description>
@@ -12,177 +12,219 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="can_character_level_up">
+			<return type="bool" />
+			<argument index="0" name="current_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="can_class_level_up">
+			<return type="bool" />
+			<argument index="0" name="current_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="ensure_materials_loaded">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
 		<method name="equip_slot_get_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_slot_get_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_slot_get_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_slot_get_property_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_slot_get_property_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_slot_is_property" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="name" type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="get_character_xp">
+			<return type="int" />
+			<argument index="0" name="current_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="get_class_xp">
+			<return type="int" />
+			<argument index="0" name="current_level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="load_all">
-			<return type="void">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="load_entity_spawner">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="load_resource">
-			<return type="Resource">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;">
-			</argument>
+			<return type="Resource" />
+			<argument index="0" name="path" type="String" />
+			<argument index="1" name="type_hint" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
 		<method name="load_resource_db">
-			<return type="void">
-			</return>
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="material_add">
+			<return type="void" />
+			<argument index="0" name="value" type="Material" />
+			<description>
+			</description>
+		</method>
+		<method name="material_cache_get">
+			<return type="ESSMaterialCache" />
+			<argument index="0" name="key" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_cache_unref">
+			<return type="void" />
+			<argument index="0" name="key" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_get">
+			<return type="Material" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_get_num" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_remove">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="Material" />
+			<description>
+			</description>
+		</method>
+		<method name="materials_clear">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="materials_load">
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="request_entity_spawn">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="request_entity_spawn_deferred">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
-		<method name="setup">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource_db" type="ESSResourceDB">
-			</argument>
-			<argument index="1" name="entity_spawner" type="ESSEntitySpawner">
-			</argument>
+		<method name="set_character_xp">
+			<return type="void" />
+			<argument index="0" name="current_level" type="int" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="set_class_xp">
+			<return type="void" />
+			<argument index="0" name="current_level" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skeletons_bone_attachment_index_get" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skeletons_bone_attachments_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skeletons_bones_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skeletons_bones_index_get" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_property_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_property_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_is_property" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
@@ -194,13 +236,17 @@
 		</member>
 		<member name="auto_learn_spells" type="int" setter="set_auto_learn_spells" getter="get_auto_learn_spells" default="1">
 		</member>
-		<member name="automatic_class_levelups" type="bool" setter="set_automatic_class_levelups" getter="get_automatic_class_levelups" default="false">
-		</member>
 		<member name="automatic_load" type="bool" setter="set_automatic_load" getter="get_automatic_load" default="false">
 		</member>
-		<member name="entity_spawner" type="ESSEntitySpawner" setter="set_entity_spawner" getter="get_entity_spawner">
+		<member name="background_color" type="Color" setter="set_background_color" getter="get_background_color" default="Color( 0, 0, 0, 1 )">
 		</member>
-		<member name="entity_spawner_path" type="String" setter="set_entity_spawner_path" getter="get_entity_spawner_path" default="&quot;&quot;">
+		<member name="character_xp_data" type="PoolIntArray" setter="set_character_xp_data" getter="get_character_xp_data" default="PoolIntArray(  )">
+		</member>
+		<member name="class_xp_data" type="PoolIntArray" setter="set_class_xp_data" getter="get_class_xp_data" default="PoolIntArray(  )">
+		</member>
+		<member name="default_ess_material_cache_class" type="String" setter="set_default_ess_material_cache_class" getter="get_default_ess_material_cache_class" default="&quot;ESSMaterialCachePCM&quot;">
+		</member>
+		<member name="entity_spawner" type="ESSEntitySpawner" setter="set_entity_spawner" getter="get_entity_spawner">
 		</member>
 		<member name="entity_types" type="String" setter="entity_types_set" getter="entity_types_get" default="&quot;None,Creature,Totem,Idol,Humanoid,Mechanical,Beast,Dragonkin,Elemental,Ghost,Energy,Anomaly,Demon,Object&quot;">
 		</member>
@@ -208,11 +254,21 @@
 		</member>
 		<member name="equip_slots" type="PoolStringArray" setter="equip_slots_set" getter="equip_slots_get" default="PoolStringArray( &quot;Head&quot;, &quot;Neck&quot;, &quot;Shoulder&quot;, &quot;Chest&quot;, &quot;Gloves&quot;, &quot;Belt&quot;, &quot;Legs&quot;, &quot;Feet&quot;, &quot;Ring_1&quot;, &quot;Ring_2&quot;, &quot;Trinket_1&quot;, &quot;Trinket_2&quot;, &quot;Main_Hand&quot;, &quot;Off_Hand&quot; )">
 		</member>
+		<member name="keep_original_atlases" type="bool" setter="set_keep_original_atlases" getter="get_keep_original_atlases" default="false">
+		</member>
 		<member name="main_stat_count" type="int" setter="stat_set_main_stat_count" getter="stat_get_main_stat_count" default="5">
 		</member>
-		<member name="max_character_level" type="int" setter="set_max_character_level" getter="get_max_character_level" default="20">
+		<member name="margin" type="int" setter="set_margin" getter="get_margin" default="0">
 		</member>
-		<member name="max_class_level" type="int" setter="set_max_class_level" getter="get_max_class_level" default="40">
+		<member name="material_paths" type="PoolStringArray" setter="material_paths_set" getter="material_paths_get" default="PoolStringArray(  )">
+		</member>
+		<member name="materials" type="Array" setter="materials_set" getter="materials_get" default="[  ]">
+		</member>
+		<member name="max_atlas_size" type="int" setter="set_max_atlas_size" getter="get_max_atlas_size" default="1024">
+		</member>
+		<member name="max_character_level" type="int" setter="" getter="get_max_character_level" default="0">
+		</member>
+		<member name="max_class_level" type="int" setter="" getter="get_max_class_level" default="0">
 		</member>
 		<member name="model_visual_groups" type="String" setter="model_visual_groups_set" getter="model_visual_groups_get" default="&quot;None,Bodypart,Alt Bodypart,Attachment&quot;">
 		</member>
@@ -230,12 +286,12 @@
 		</member>
 		<member name="stats" type="PoolStringArray" setter="stats_set" getter="stats_get" default="PoolStringArray( &quot;Agility&quot;, &quot;Strength&quot;, &quot;Stamina&quot;, &quot;Intellect&quot;, &quot;Spirit&quot;, &quot;Health&quot;, &quot;Speed&quot;, &quot;Global Cooldown&quot;, &quot;Haste&quot; )">
 		</member>
+		<member name="texture_flags" type="int" setter="set_texture_flags" getter="get_texture_flags" default="5">
+		</member>
 		<member name="texture_layers" type="String" setter="texture_layers_set" getter="texture_layers_get" default="&quot;None,Skin,Underwear,Shirt,Clothes Base,Clothes 1,Clothes 2,Clothes 3,Clothes 4,Clothes 5,Belt,Tabard,Overlay&quot;">
 		</member>
 		<member name="use_class_xp" type="bool" setter="set_use_class_xp" getter="get_use_class_xp" default="false">
 		</member>
-		<member name="use_global_class_level" type="bool" setter="set_use_global_class_level" getter="get_use_global_class_level" default="false">
-		</member>
 		<member name="use_spell_points" type="bool" setter="set_use_spell_points" getter="get_use_spell_points" default="false">
 		</member>
 	</members>
diff --git a/doc_classes/ESSEntitySpawner.xml b/doc_classes/ESSEntitySpawner.xml
index b828753..b722239 100644
--- a/doc_classes/ESSEntitySpawner.xml
+++ b/doc_classes/ESSEntitySpawner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESSEntitySpawner" inherits="Resource" version="3.2">
+<class name="ESSEntitySpawner" inherits="Node" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,40 +8,27 @@
 	</tutorials>
 	<methods>
 		<method name="_request_entity_spawn" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_scene_tree" qualifiers="const">
-			<return type="SceneTree">
-			</return>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="request_entity_spawn">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="request_entity_spawn_deferred">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="on_entity_spawn">
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/ESSMaterialCache.xml b/doc_classes/ESSMaterialCache.xml
new file mode 100644
index 0000000..7a1c255
--- /dev/null
+++ b/doc_classes/ESSMaterialCache.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="ESSMaterialCache" inherits="Resource" version="3.5">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="_setup_material_albedo" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="texture" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="dec_ref_count">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="inc_ref_count">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="initial_setup_default">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="material_add">
+			<return type="void" />
+			<argument index="0" name="value" type="Material" />
+			<description>
+			</description>
+		</method>
+		<method name="material_get">
+			<return type="Material" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_get_num" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_lod_get">
+			<return type="Material" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_remove">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="material_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="Material" />
+			<description>
+			</description>
+		</method>
+		<method name="materials_clear">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="mutex_lock">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="mutex_locked">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="mutex_unlock">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="refresh_rects">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="setup_material_albedo">
+			<return type="void" />
+			<argument index="0" name="texture" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_add">
+			<return type="void" />
+			<argument index="0" name="texture" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_count">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_get">
+			<return type="Texture" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_get_atlas">
+			<return type="AtlasTexture" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_get_atlas_tex">
+			<return type="AtlasTexture" />
+			<argument index="0" name="index" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_get_uv_rect">
+			<return type="Rect2" />
+			<argument index="0" name="texture" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_remove">
+			<return type="void" />
+			<argument index="0" name="texture" type="Texture" />
+			<description>
+			</description>
+		</method>
+		<method name="texture_remove_index">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="textures_clear">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+	</methods>
+	<members>
+		<member name="initialized" type="bool" setter="set_initialized" getter="get_initialized" default="false">
+		</member>
+		<member name="mat_ref_count" type="int" setter="set_ref_count" getter="get_ref_count" default="0">
+		</member>
+		<member name="materials" type="Array" setter="materials_set" getter="materials_get" default="[  ]">
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc_classes/ESSMaterialCachePCM.xml b/doc_classes/ESSMaterialCachePCM.xml
new file mode 100644
index 0000000..cb67dff
--- /dev/null
+++ b/doc_classes/ESSMaterialCachePCM.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="ESSMaterialCachePCM" inherits="ESSMaterialCache" version="3.5">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<members>
+		<member name="background_color" type="Color" setter="set_background_color" getter="get_background_color" default="Color( 0, 0, 0, 1 )">
+		</member>
+		<member name="keep_original_atlases" type="bool" setter="set_keep_original_atlases" getter="get_keep_original_atlases" default="false">
+		</member>
+		<member name="margin" type="int" setter="set_margin" getter="get_margin" default="0">
+		</member>
+		<member name="max_atlas_size" type="int" setter="set_max_atlas_size" getter="get_max_atlas_size" default="1024">
+		</member>
+		<member name="texture_flags" type="int" setter="set_texture_flags" getter="get_texture_flags" default="5">
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc_classes/ESSResourceDB.xml b/doc_classes/ESSResourceDB.xml
index 4a19d37..eeb5cbf 100644
--- a/doc_classes/ESSResourceDB.xml
+++ b/doc_classes/ESSResourceDB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESSResourceDB" inherits="Resource" version="3.2">
+<class name="ESSResourceDB" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,606 +8,414 @@
 	</tutorials>
 	<methods>
 		<method name="_initialize" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="add_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Aura">
-			</argument>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="add_craft_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="add_entity_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="cls" type="EntityData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cls" type="EntityData" />
 			<description>
 			</description>
 		</method>
 		<method name="add_entity_resource">
-			<return type="void">
-			</return>
-			<argument index="0" name="cls" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cls" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="add_entity_resource_db">
-			<return type="void">
-			</return>
-			<argument index="0" name="other" type="ESSResourceDB">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="other" type="ESSResourceDB" />
 			<description>
 			</description>
 		</method>
 		<method name="add_entity_skill">
-			<return type="void">
-			</return>
-			<argument index="0" name="cls" type="EntitySkillData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cls" type="EntitySkillData" />
 			<description>
 			</description>
 		</method>
 		<method name="add_entity_species_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="pcd" type="EntitySpeciesData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="pcd" type="EntitySpeciesData" />
 			<description>
 			</description>
 		</method>
 		<method name="add_item_template">
-			<return type="void">
-			</return>
-			<argument index="0" name="item_template" type="ItemTemplate">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item_template" type="ItemTemplate" />
 			<description>
 			</description>
 		</method>
 		<method name="add_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="aura_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="aura_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="clear">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_recipe_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_recipe_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_data_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_data_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_resource_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_resource_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_skill_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_skill_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_species_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="entity_species_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_aura">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_aura_count">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_aura_index">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_aura_path">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_auras" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_craft_recipe">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="craft_recipe_id" type="int">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="craft_recipe_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_craft_recipe_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_craft_recipe_index">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_craft_recipe_path">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_craft_recipes" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_data">
-			<return type="EntityData">
-			</return>
-			<argument index="0" name="class_id" type="int">
-			</argument>
+			<return type="EntityData" />
+			<argument index="0" name="class_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_data_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_data_index">
-			<return type="EntityData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_data_path">
-			<return type="EntityData">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="EntityData" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_datas" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resource">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="class_id" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="class_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resource_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resource_index">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resource_path">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resources" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_skill">
-			<return type="EntitySkillData">
-			</return>
-			<argument index="0" name="class_id" type="int">
-			</argument>
+			<return type="EntitySkillData" />
+			<argument index="0" name="class_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_skill_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_skill_index">
-			<return type="EntitySkillData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntitySkillData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_skill_path">
-			<return type="EntitySkillData">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="EntitySkillData" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_skills" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_species_data">
-			<return type="EntitySpeciesData">
-			</return>
-			<argument index="0" name="pcd_id" type="int">
-			</argument>
+			<return type="EntitySpeciesData" />
+			<argument index="0" name="pcd_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_species_data_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_species_data_index">
-			<return type="EntitySpeciesData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntitySpeciesData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_species_data_path">
-			<return type="EntitySpeciesData">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="EntitySpeciesData" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_species_datas" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_template">
-			<return type="ItemTemplate">
-			</return>
-			<argument index="0" name="item_template_id" type="int">
-			</argument>
+			<return type="ItemTemplate" />
+			<argument index="0" name="item_template_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_template_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_template_index">
-			<return type="ItemTemplate">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemTemplate" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_template_path">
-			<return type="ItemTemplate">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="ItemTemplate" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_templates" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_skill_for_armor_type">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell_index">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell_path">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spells" qualifiers="const">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="initialize">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="item_template_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_template_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_auras">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="set_craft_recipes">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entity_datas">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entity_resources">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entity_skills">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entity_species_datas">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_item_templates">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_skill_for_armor_type">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="aura" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_spells">
-			<return type="void">
-			</return>
-			<argument index="0" name="recipe" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="recipe" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_id_to_path" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_path_to_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="path" type="String" />
 			<description>
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="skill_for_armor_type_0" type="Aura" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
+		<member name="skill_for_armor_type_0" type="Spell" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
 		</member>
-		<member name="skill_for_armor_type_1" type="Aura" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
+		<member name="skill_for_armor_type_1" type="Spell" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
 		</member>
-		<member name="skill_for_armor_type_2" type="Aura" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
+		<member name="skill_for_armor_type_2" type="Spell" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
 		</member>
-		<member name="skill_for_armor_type_3" type="Aura" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
+		<member name="skill_for_armor_type_3" type="Spell" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
 		</member>
-		<member name="skill_for_armor_type_4" type="Aura" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
-		</member>
-		<member name="xp_data" type="XPData" setter="set_xp_data" getter="get_xp_data">
+		<member name="skill_for_armor_type_4" type="Spell" setter="set_skill_for_armor_type" getter="get_skill_for_armor_type">
 		</member>
 	</members>
 	<constants>
diff --git a/doc_classes/ESSResourceDBFolders.xml b/doc_classes/ESSResourceDBFolders.xml
index a891676..1842994 100644
--- a/doc_classes/ESSResourceDBFolders.xml
+++ b/doc_classes/ESSResourceDBFolders.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESSResourceDBFolders" inherits="ESSResourceDBMap" version="3.2">
+<class name="ESSResourceDBFolders" inherits="ESSResourceDBMap" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,46 +8,31 @@
 	</tutorials>
 	<methods>
 		<method name="add_resource">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="Resource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="Resource" />
 			<description>
 			</description>
 		</method>
 		<method name="load_all">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="load_folder">
-			<return type="void">
-			</return>
-			<argument index="0" name="folder" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="folder" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="load_folders">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="load_resource">
-			<return type="Resource">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="load_xp_data">
-			<return type="void">
-			</return>
+			<return type="Resource" />
+			<argument index="0" name="path" type="String" />
+			<argument index="1" name="type_hint" type="String" default="&quot;&quot;" />
 			<description>
 			</description>
 		</method>
@@ -57,8 +42,6 @@
 		</member>
 		<member name="folders" type="PoolStringArray" setter="set_folders" getter="get_folders" default="PoolStringArray(  )">
 		</member>
-		<member name="xp_data_path" type="String" setter="set_xp_data_path" getter="get_xp_data_path" default="&quot;&quot;">
-		</member>
 	</members>
 	<constants>
 	</constants>
diff --git a/doc_classes/ESSResourceDBMap.xml b/doc_classes/ESSResourceDBMap.xml
index c703cf6..60adc9b 100644
--- a/doc_classes/ESSResourceDBMap.xml
+++ b/doc_classes/ESSResourceDBMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESSResourceDBMap" inherits="ESSResourceDB" version="3.2">
+<class name="ESSResourceDBMap" inherits="ESSResourceDB" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/ESSResourceDBStatic.xml b/doc_classes/ESSResourceDBStatic.xml
index 0261461..4f738f4 100644
--- a/doc_classes/ESSResourceDBStatic.xml
+++ b/doc_classes/ESSResourceDBStatic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ESSResourceDBStatic" inherits="ESSResourceDB" version="3.2">
+<class name="ESSResourceDBStatic" inherits="ESSResourceDB" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -9,8 +9,6 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="auras" type="Array" setter="set_auras" getter="get_auras" default="[  ]">
-		</member>
 		<member name="craft_recipes" type="Array" setter="set_craft_recipes" getter="get_craft_recipes" default="[  ]">
 		</member>
 		<member name="entity_datas" type="Array" setter="set_entity_datas" getter="get_entity_datas" default="[  ]">
diff --git a/doc_classes/Entity.xml b/doc_classes/Entity.xml
index 6c97f5d..2f66be5 100644
--- a/doc_classes/Entity.xml
+++ b/doc_classes/Entity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Entity" inherits="Node" version="3.2">
+<class name="Entity" inherits="Node" version="3.5">
 	<brief_description>
 		Represents an [Entity] inside the world. Entities can be players, mobs, chests, or any kind of interactable things.
 	</brief_description>
@@ -12,3691 +12,2783 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="_body_changed" qualifiers="virtual">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
 		<method name="_canc_interact" qualifiers="virtual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_cans_interact" qualifiers="virtual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_character_talent_sreceive_learn_request" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="character_talent_row" type="int">
-			</argument>
-			<argument index="2" name="character_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="character_talent_row" type="int" />
+			<argument index="2" name="character_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_character_talent_sreceive_reset_request" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_class_talent_sreceive_learn_request" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="class_talent_row" type="int">
-			</argument>
-			<argument index="2" name="class_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="class_talent_row" type="int" />
+			<argument index="2" name="class_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_class_talent_sreceive_reset_request" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_con_character_talent_learned" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_con_character_talent_reset" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_con_class_talent_learned" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_con_class_talent_reset" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_con_target_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_crafts" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_applyc_item" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_applys_item" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_can_equip_item" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_con_fail" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_con_success" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_deapplyc_item" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_deapplys_item" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_should_deny" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_son_fail" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_son_success" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equips" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_getc_relation_to" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="to" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="to" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_gets_relation_to" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="to" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="to" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_initialize" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="_isc_target_in_interact_range" qualifiers="virtual">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="_iss_target_in_interact_range" qualifiers="virtual">
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="_item_uses" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="item_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_moved" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_caura" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_ccast" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_ccharacter_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_cclass_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cdamage" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cdeath" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_centity_resource_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_centity_resource_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cgcd_finished" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cgcd_started" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="gcd" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="gcd" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cheal" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_clevel_up" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cmouse_enter" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cmouse_exit" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_ctargeted" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cuntargeted" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cxp_gained" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_saura" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scast" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_scharacter_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_sclass_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sdamage" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sdeath" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sentity_resource_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sgcd_finished" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sgcd_started" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="gcd" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="gcd" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sheal" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_slevel_up" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sxp_gained" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_setup" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_sinteract" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_character_talent_learned" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_character_talent_reset" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_class_talent_learned" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_class_talent_reset" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_target_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
+			<description>
+			</description>
+		</method>
+		<method name="_vendor_item_sbuy" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="count" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_vendor_item_ssell" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="adds_state_ref">
-			<return type="void">
-			</return>
-			<argument index="0" name="state_index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="state_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_addc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_getc">
-			<return type="AuraData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="AuraData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_gets">
-			<return type="AuraData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="AuraData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_gets_by">
-			<return type="AuraData">
-			</return>
-			<argument index="0" name="caster" type="Node">
-			</argument>
-			<argument index="1" name="aura_id" type="int">
-			</argument>
+			<return type="AuraData" />
+			<argument index="0" name="caster" type="Node" />
+			<argument index="1" name="aura_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_gets_with_group_by">
-			<return type="AuraData">
-			</return>
-			<argument index="0" name="caster" type="Node">
-			</argument>
-			<argument index="1" name="aura_group" type="AuraGroup">
-			</argument>
+			<return type="AuraData" />
+			<argument index="0" name="caster" type="Node" />
+			<argument index="1" name="aura_group" type="AuraGroup" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_dispelled">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_dispelled_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_exact">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_exact_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_expired">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_expired_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removec_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removes_dispelled">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removes_exact">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removes_expired">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="aura_removess_with_group">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura_group" type="AuraGroup">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura_group" type="AuraGroup" />
 			<description>
 			</description>
 		</method>
 		<method name="canc_interact">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="cans_interact">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_delayc">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_delays">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_failc">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_fails">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_finishc">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_finishs">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_interruptc">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_interrupts">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_is_castingc">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_is_castings">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_spell_successc">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_spell_successc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_spell_successs">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_startc">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_startc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_starts">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_getc">
-			<return type="float">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_getc_index">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_gets">
-			<return type="float">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_gets_index">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="category_cooldown_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cdamage_dealt_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="cdealt_damage_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="cdealt_heal_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="cequip_applys_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_cclear">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_crequest_learn">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="character_talent_row" type="int">
-			</argument>
-			<argument index="2" name="character_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="character_talent_row" type="int" />
+			<argument index="2" name="character_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_crequest_reset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_creset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_getc">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_gets">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="character_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="character_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_sreceive_learn_request">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="character_talent_row" type="int">
-			</argument>
-			<argument index="2" name="character_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="character_talent_row" type="int" />
+			<argument index="2" name="character_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_sreceive_reset_request">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talent_sreset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="character_talents_sclear">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cheal_dealt_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_cclear">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_crequest_learn">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="class_talent_row" type="int">
-			</argument>
-			<argument index="2" name="class_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="class_talent_row" type="int" />
+			<argument index="2" name="class_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_crequest_reset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_creset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_getc">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_gets">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="class_talent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="class_talent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_sreceive_learn_request">
-			<return type="void">
-			</return>
-			<argument index="0" name="spec_index" type="int">
-			</argument>
-			<argument index="1" name="class_talent_row" type="int">
-			</argument>
-			<argument index="2" name="class_talent_culomn" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spec_index" type="int" />
+			<argument index="1" name="class_talent_row" type="int" />
+			<argument index="2" name="class_talent_culomn" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_sreceive_reset_request">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talent_sreset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="class_talents_sclear">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_getc">
-			<return type="float">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_getc_index">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_gets">
-			<return type="float">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_gets_index">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="cooldown_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="copen_window">
-			<return type="void">
-			</return>
-			<argument index="0" name="window_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="window_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_addc_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_addc_recipe_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_adds_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_adds_recipe_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_crequest">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_getc_recipe">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="craft_recipe" type="int">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="craft_recipe" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_getc_recipe_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_gets_recipe">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_gets_recipe_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_gets_recipe_id">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="CraftRecipe" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_hasc_recipe">
-			<return type="bool">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_hasc_recipe_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_hass_recipe">
-			<return type="bool">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_hass_recipe_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_removec_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_removec_recipe_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_removes_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="craft_removes_recipe_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="crafts">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="creceive_stat">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="ccurrent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="ccurrent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="crequest_interact">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="data_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="EntityDataContainer">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="EntityDataContainer" />
 			<description>
 			</description>
 		</method>
 		<method name="data_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="EntityDataContainer">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="EntityDataContainer" />
 			<description>
 			</description>
 		</method>
 		<method name="data_getc">
-			<return type="EntityDataContainer">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityDataContainer" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="data_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="data_gets">
-			<return type="EntityDataContainer">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityDataContainer" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="data_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="data_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="data_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="diec">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="dies">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_applys_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_can_equip_item">
-			<return type="bool">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_cfail">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_con_fail">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_con_success">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_crequest">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_csuccess">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_deapplyc_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_deapplys_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_getc_slot">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_gets_slot">
-			<return type="ItemInstance">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemInstance" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_should_deny">
-			<return type="bool">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_son_fail">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_son_success">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="old_item" type="ItemInstance" />
+			<argument index="3" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equips">
-			<return type="void">
-			</return>
-			<argument index="0" name="equip_slot" type="int">
-			</argument>
-			<argument index="1" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="equip_slot" type="int" />
+			<argument index="1" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="gcd_hasc" qualifiers="const">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="gcd_hass" qualifiers="const">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="gcd_startc">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="gcd_starts">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="get_action_bar_profile">
-			<return type="ActionBarProfile">
-			</return>
+			<return type="ActionBarProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="get_body">
-			<return type="Node">
-			</return>
+			<return type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="get_body_2d">
-			<return type="Node2D">
-			</return>
+			<return type="Node2D" />
 			<description>
 			</description>
 		</method>
 		<method name="get_body_3d">
-			<return type="Spatial">
-			</return>
+			<return type="Spatial" />
 			<description>
 			</description>
 		</method>
 		<method name="get_character_skeleton">
-			<return type="Node">
-			</return>
+			<return type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="get_maunal_process" qualifiers="const">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="get_transform_2d" qualifiers="const">
-			<return type="Transform2D">
-			</return>
-			<argument index="0" name="only_stored" type="bool" default="false">
-			</argument>
+			<return type="Transform2D" />
+			<argument index="0" name="only_stored" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="get_transform_3d" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<argument index="0" name="only_stored" type="bool" default="false">
-			</argument>
+			<return type="Transform" />
+			<argument index="0" name="only_stored" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="getc_health">
-			<return type="EntityResource">
-			</return>
+			<return type="EntityResource" />
+			<description>
+			</description>
+		</method>
+		<method name="getc_is_controlled">
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="getc_relation_to">
-			<return type="int" enum="EntityEnums.EntityRelationType">
-			</return>
-			<argument index="0" name="to" type="Node">
-			</argument>
+			<return type="int" enum="EntityEnums.EntityRelationType" />
+			<argument index="0" name="to" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="getc_speed">
-			<return type="EntityResource">
-			</return>
+			<return type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="gets_health">
-			<return type="EntityResource">
-			</return>
+			<return type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="gets_relation_to">
-			<return type="int" enum="EntityEnums.EntityRelationType">
-			</return>
-			<argument index="0" name="to" type="Node">
-			</argument>
+			<return type="int" enum="EntityEnums.EntityRelationType" />
+			<argument index="0" name="to" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="gets_speed">
-			<return type="EntityResource">
-			</return>
+			<return type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="instance_body">
-			<return type="void">
-			</return>
-			<argument index="0" name="arg0" type="EntityData">
-			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arg0" type="EntityData" />
+			<argument index="1" name="arg1" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="is_deserialized">
-			<return type="bool">
-			</return>
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="isc_target_in_interact_range">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="iss_target_in_interact_range">
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="item_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="item_addc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="item_data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="item_data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="item_cchange_count">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="new_count" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="new_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_cdeny_remove">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_cdeny_swap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_crequest_remove">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_crequest_swap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_crequest_use">
-			<return type="void">
-			</return>
-			<argument index="0" name="item_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="item_uses">
-			<return type="void">
-			</return>
-			<argument index="0" name="item_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="item_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="items_swapc">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="items_swaps">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
-		<method name="levelup_ccharacter">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+		<method name="levelupc">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
-		<method name="levelup_cclass">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="levelup_scharacter">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="levelup_sclass">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+		<method name="levelups">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="loot_crequest">
-			<return type="void">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="lootc">
-			<return type="void">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="loots">
-			<return type="void">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="moved">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_caura">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccast">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccategory_cooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccategory_cooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_ccategory_cooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccategory_cooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
-		<method name="notification_ccharacter_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_cclass_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_ccooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+		<method name="notification_ccategory_cooldown_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_ccooldown_added">
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cdamage">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cdeath">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_centity_resource_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_centity_resource_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cgcd_finished">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cgcd_started">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cheal">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_clevel_up">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cmouse_enter">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cmouse_exit">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cstat_changed">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ctargeted">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cuntargeted">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_cxp_gained">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_item_sadded">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_item_sremoved">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_item_sscount_changed">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_items_sswapped">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="slot_id_1" type="int">
-			</argument>
-			<argument index="2" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="slot_id_1" type="int" />
+			<argument index="2" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_saura">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scast">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_scharacter_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_sclass_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_scooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_scooldown_added">
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sdamage">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sdeath">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sentity_resource_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sentity_resource_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sgcd_finished">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sgcd_started">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sheal">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_slevel_up">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_soverburden_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_soverburdened">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sstat_changed">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sxp_gained">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_target_item_sadded">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_target_item_sremoved">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_target_item_sscount_changed">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
-			<argument index="2" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="item" type="ItemInstance" />
+			<argument index="2" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_target_items_sswapped">
-			<return type="void">
-			</return>
-			<argument index="0" name="bag" type="Bag">
-			</argument>
-			<argument index="1" name="slot_id_1" type="int">
-			</argument>
-			<argument index="2" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="bag" type="Bag" />
+			<argument index="1" name="slot_id_1" type="int" />
+			<argument index="2" name="slot_id_2" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="on_body_changed">
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_addc_path">
-			<return type="void">
-			</return>
-			<argument index="0" name="arg0" type="NodePath">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="arg0" type="NodePath" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_getc">
-			<return type="Entity">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Entity" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_gets">
-			<return type="Entity">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Entity" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_removec_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_removes_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="register_for_physics_process">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="removes_state_ref">
-			<return type="void">
-			</return>
-			<argument index="0" name="state_index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="state_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="palyer_resource" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="palyer_resource" type="int" />
+			<argument index="1" name="arg1" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_addc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="palyer_resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="palyer_resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_clearc">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_clears">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_creceive_curr_max">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="current" type="int">
-			</argument>
-			<argument index="2" name="max" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="current" type="int" />
+			<argument index="2" name="max" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_creceive_current">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="current" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="current" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_creceive_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_getc_id">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="type" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="type" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_getc_index">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_gets_id">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="type" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="type" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_gets_index">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_sends_curr_max">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="current" type="int">
-			</argument>
-			<argument index="2" name="max" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="current" type="int" />
+			<argument index="2" name="max" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_sends_current">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="current" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="current" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="resource_sends_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="sapply_passives_damage_deal">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="sapply_passives_damage_receive">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="sdeal_damage_to">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="sdeal_heal_to">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="seen_by_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="seen_by_gets">
-			<return type="Entity">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Entity" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="seen_by_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="seen_by_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="seen_by_removes_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="sees_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="sees_gets">
-			<return type="Entity">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Entity" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="sees_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="sees_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="sees_removes_index">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_body">
-			<return type="void">
-			</return>
-			<argument index="0" name="body" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="body" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="set_character_skeleton">
-			<return type="void">
-			</return>
-			<argument index="0" name="skeleton" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skeleton" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="set_maunal_process">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="bool">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_transform_2d">
-			<return type="void">
-			</return>
-			<argument index="0" name="transform" type="Transform2D">
-			</argument>
-			<argument index="1" name="only_stored" type="bool" default="false">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="transform" type="Transform2D" />
+			<argument index="1" name="only_stored" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="set_transform_3d">
-			<return type="void">
-			</return>
-			<argument index="0" name="transform" type="Transform">
-			</argument>
-			<argument index="1" name="only_stored" type="bool" default="false">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="transform" type="Transform" />
+			<argument index="1" name="only_stored" type="bool" default="false" />
 			<description>
 			</description>
 		</method>
 		<method name="setc_bag_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="setc_target_bag_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="setup">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="EntityCreateInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="EntityCreateInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="setup_actionbars">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="sinteract">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_addc_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<argument index="2" name="max_value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill_id" type="int" />
+			<argument index="1" name="value" type="int" />
+			<argument index="2" name="max_value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_changec">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill_id" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_changec_max">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill_id" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_getc">
-			<return type="EntitySkill">
-			</return>
-			<argument index="0" name="skill" type="int">
-			</argument>
+			<return type="EntitySkill" />
+			<argument index="0" name="skill" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_gets">
-			<return type="EntitySkill">
-			</return>
-			<argument index="0" name="skill" type="int">
-			</argument>
+			<return type="EntitySkill" />
+			<argument index="0" name="skill" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_hasc_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_hass_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_removec_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="skill_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_addc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_adds_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_casts">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_crequest_cast">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_getc">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="spell" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="spell" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_getc_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_gets">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="spell" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="spell" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_gets_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_hasc">
-			<return type="bool">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_hasc_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_hass">
-			<return type="bool">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_hass_id">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_learn_requestc">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_learns">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_removec_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="spell_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="ssend_open_window">
-			<return type="void">
-			</return>
-			<argument index="0" name="window_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="window_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="ssend_stat">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="ccurrent" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="ccurrent" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stake_damage">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="stake_heal">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_base" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_base_calculated" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_bonus" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_dirty" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_get_percent" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_getc_current" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_gets_current" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="base" type="float">
-			</argument>
-			<argument index="2" name="bonus" type="float">
-			</argument>
-			<argument index="3" name="percent" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="base" type="float" />
+			<argument index="2" name="bonus" type="float" />
+			<argument index="3" name="percent" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_mod_base">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_mod_bonus">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_mod_percent">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_recalculate">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_set_base">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_set_base_calculated">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_set_bonus">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_set_dirty">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_set_percent">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_setc_current">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_sets_current">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="target_crequest_change">
-			<return type="void">
-			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="path" type="NodePath" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_addc_rpc">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="item_data" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="item_data" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_cchange_count">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
-			<argument index="1" name="new_count" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<argument index="1" name="new_count" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_cdeny_remove">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_cdeny_swap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_crequest_swap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_removec">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_item_removes">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_items_cswap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_items_sswap">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id_1" type="int">
-			</argument>
-			<argument index="1" name="slot_id_2" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id_1" type="int" />
+			<argument index="1" name="slot_id_2" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="target_net_setc">
-			<return type="void">
-			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="path" type="NodePath" />
 			<description>
 			</description>
 		</method>
 		<method name="target_net_sets">
-			<return type="void">
-			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="path" type="NodePath" />
 			<description>
 			</description>
 		</method>
 		<method name="target_remove_crequest_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_id" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="update">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="vendor_item_buy_crequest">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="count" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="vendor_item_sbuy">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="count" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="vendor_item_sell_crequest">
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="vendor_item_ssell">
+			<return type="void" />
+			<argument index="0" name="slot_id" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="vrpc" qualifiers="vararg">
-			<return type="Variant">
-			</return>
-			<argument index="0" name="method" type="String">
-			</argument>
+			<return type="Variant" />
+			<argument index="0" name="method" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="xp_addc">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="xp_adds">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
@@ -3708,17 +2800,9 @@
 		</member>
 		<member name="body_path" type="NodePath" setter="set_body_path" getter="get_body_path" default="NodePath(&quot;&quot;)">
 		</member>
-		<member name="c_is_controlled" type="bool" setter="setc_is_controlled" getter="getc_is_controlled">
-		</member>
 		<member name="cbag" type="Bag" setter="setc_bag" getter="getc_bag">
 		</member>
-		<member name="ccharacter_level" type="int" setter="setc_character_level" getter="getc_character_level">
-		</member>
-		<member name="ccharacter_xp" type="int" setter="setc_character_xp" getter="getc_character_xp">
-		</member>
-		<member name="cclass_level" type="int" setter="setc_class_level" getter="getc_class_level">
-		</member>
-		<member name="cclass_xp" type="int" setter="setc_class_xp" getter="getc_class_xp">
+		<member name="centity_controller" type="int" setter="setc_entity_controller" getter="getc_entity_controller" enum="EntityEnums.EntityController" default="0">
 		</member>
 		<member name="centity_data" type="EntityData" setter="setc_entity_data" getter="getc_entity_data">
 		</member>
@@ -3748,6 +2832,8 @@
 		</member>
 		<member name="cis_pet" type="bool" setter="" getter="getc_is_pet">
 		</member>
+		<member name="clevel" type="int" setter="setc_level" getter="getc_level">
+		</member>
 		<member name="cmodel_index" type="int" setter="setc_model_index" getter="getc_model_index">
 		</member>
 		<member name="cmoney" type="int" setter="setc_money" getter="getc_money">
@@ -3762,6 +2848,8 @@
 		</member>
 		<member name="ctarget_bag" type="Bag" setter="setc_target_bag" getter="getc_target_bag">
 		</member>
+		<member name="cxp" type="int" setter="setc_xp" getter="getc_xp">
+		</member>
 		<member name="entity_data_id" type="int" setter="setc_entity_data_id" getter="getc_entity_data_id" default="0">
 		</member>
 		<member name="pet_gets_ai_state" type="int" setter="pet_sets_ai_state" getter="pet_gets_ai_state" enum="EntityEnums.AIStates" default="0">
@@ -3774,18 +2862,10 @@
 		</member>
 		<member name="scategory_cooldowns" type="Array" setter="scategory_cooldowns_set" getter="scategory_cooldowns_get" default="[  ]">
 		</member>
-		<member name="scharacter_level" type="int" setter="sets_character_level" getter="gets_character_level" default="1">
-		</member>
 		<member name="scharacter_talents" type="PoolIntArray" setter="scharacter_talents_set" getter="scharacter_talents_get" default="PoolIntArray(  )">
 		</member>
-		<member name="scharacter_xp" type="int" setter="sets_character_xp" getter="gets_character_xp" default="0">
-		</member>
-		<member name="sclass_level" type="int" setter="sets_class_level" getter="gets_class_level" default="1">
-		</member>
 		<member name="sclass_talents" type="PoolIntArray" setter="sclass_talents_set" getter="sclass_talents_get" default="PoolIntArray(  )">
 		</member>
-		<member name="sclass_xp" type="int" setter="sets_class_xp" getter="gets_class_xp" default="0">
-		</member>
 		<member name="scooldowns" type="Array" setter="scooldowns_set" getter="scooldowns_get" default="[  ]">
 		</member>
 		<member name="scraft_recipes" type="Array" setter="scraft_recipes_set" getter="scraft_recipes_get" default="[  ]">
@@ -3820,6 +2900,8 @@
 		</member>
 		<member name="sis_pet" type="bool" setter="" getter="gets_is_pet">
 		</member>
+		<member name="slevel" type="int" setter="sets_level" getter="gets_level" default="1">
+		</member>
 		<member name="smodel_index" type="int" setter="sets_model_index" getter="gets_model_index" default="0">
 		</member>
 		<member name="smoney" type="int" setter="sets_money" getter="gets_money" default="0">
@@ -3830,7 +2912,7 @@
 		</member>
 		<member name="spet_owner" type="Entity" setter="pet_sets_owner" getter="pet_gets_owner">
 		</member>
-		<member name="sresources" type="Array" setter="sresources_set" getter="sresources_get" default="[ Object(EntityResourceHealth,&quot;resource_local_to_scene&quot;:false,&quot;resource_name&quot;:&quot;&quot;,&quot;id&quot;:0,&quot;text_name&quot;:&quot;&quot;,&quot;current_value&quot;:0,&quot;max_value&quot;:0,&quot;script&quot;:null), Object(EntityResourceSpeed,&quot;resource_local_to_scene&quot;:false,&quot;resource_name&quot;:&quot;&quot;,&quot;id&quot;:0,&quot;text_name&quot;:&quot;&quot;,&quot;current_value&quot;:0,&quot;max_value&quot;:0,&quot;script&quot;:null) ]">
+		<member name="sresources" type="Array" setter="sresources_set" getter="sresources_get" default="[ Object(EntityResourceHealth,&quot;resource_local_to_scene&quot;:false,&quot;resource_name&quot;:&quot;&quot;,&quot;id&quot;:0,&quot;text_name&quot;:&quot;&quot;,&quot;current_value&quot;:0,&quot;max_value&quot;:0,&quot;stacking_mods&quot;:PoolRealArray(  ),&quot;non_stacking_mods&quot;:PoolRealArray(  ),&quot;script&quot;:null), Object(EntityResourceSpeed,&quot;resource_local_to_scene&quot;:false,&quot;resource_name&quot;:&quot;&quot;,&quot;id&quot;:0,&quot;text_name&quot;:&quot;&quot;,&quot;current_value&quot;:0,&quot;max_value&quot;:0,&quot;stacking_mods&quot;:PoolRealArray(  ),&quot;non_stacking_mods&quot;:PoolRealArray(  ),&quot;script&quot;:null) ]">
 		</member>
 		<member name="sseed" type="int" setter="sets_seed" getter="gets_seed" default="0">
 		</member>
@@ -3848,411 +2930,300 @@
 		</member>
 		<member name="starget_bag" type="Bag" setter="sets_target_bag" getter="gets_target_bag">
 		</member>
+		<member name="sxp" type="int" setter="sets_xp" getter="gets_xp" default="0">
+		</member>
 	</members>
 	<signals>
+		<signal name="body_changed">
+			<argument index="0" name="entity" type="Entity" />
+			<description>
+			</description>
+		</signal>
 		<signal name="cbag_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccategory_cooldown_added">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccategory_cooldown_removed">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccharacter_talent_learned">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="character_talent_id" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="character_talent_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccharacter_talent_reset">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cclass_talent_learned">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="class_talent_id" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="class_talent_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cclass_talent_reset">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccooldown_added">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccooldown_removed">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccraft_recipe_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ccraft_success">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</signal>
 		<signal name="centity_data_changed">
-			<argument index="0" name="data" type="EntityData">
-			</argument>
+			<argument index="0" name="data" type="EntityData" />
 			<description>
 			</description>
 		</signal>
 		<signal name="centity_resource_added">
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</signal>
 		<signal name="centity_resource_removed">
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cfree_spell_points_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="new_value" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="new_value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cgcd_finished">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cgcd_started">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cname_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="con_character_level_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="con_class_level_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_damage_dealt">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_damage_received">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_dealt_damage">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_dealt_heal">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_heal_dealt">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="con_heal_received">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</signal>
+		<signal name="con_level_changed">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="level" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="crafts_recipe_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="craft_recipe" type="CraftRecipe">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="craft_recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</signal>
 		<signal name="crafts_success">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="item" type="ItemInstance">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cskill_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cskill_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cskill_removed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cspell_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cspell_removed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</signal>
 		<signal name="cstate_changed">
-			<argument index="0" name="value" type="int">
-			</argument>
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ctarget_bag_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="ctarget_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="deserialized">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="diecd">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="diesd">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="equip_con_fail">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="equip_con_success">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="equip_son_fail">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="equip_son_success">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="equipment_changed">
-			<argument index="0" name="slot" type="int">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="isc_controlled_changed">
-			<argument index="0" name="value" type="bool">
-			</argument>
+			<argument index="0" name="slot" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_caura">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="aura_data" type="AuraData">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura_data" type="AuraData" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_ccast">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="spell_cast_info" type="SpellCastInfo">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="notification_ccharacter_level_up">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="notification_cclass_level_up">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="spell_cast_info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_cdamage">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_cheal">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</signal>
+		<signal name="notification_clevel_up">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
@@ -4273,294 +3244,225 @@
 			</description>
 		</signal>
 		<signal name="notification_cxp_gained">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_saura">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="aura_data" type="AuraData">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura_data" type="AuraData" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_scast">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="spell_cast_info" type="SpellCastInfo">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="notification_scharacter_level_up">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="notification_sclass_level_up">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="spell_cast_info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_sdamage">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_sheal">
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</signal>
+		<signal name="notification_slevel_up">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="notification_sxp_gained">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_open_container_winow_request">
+		<signal name="onc_entity_controller_changed">
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_open_loot_winow_request">
-			<description>
-			</description>
-		</signal>
-		<signal name="onc_open_vendor_winow_request">
+		<signal name="onc_open_winow_request">
+			<argument index="0" name="window_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sbag_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scategory_cooldown_added">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scategory_cooldown_removed">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scharacter_talent_learned">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="character_talent_id" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="character_talent_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scharacter_talent_reset">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sclass_talent_learned">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="class_talent_id" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="class_talent_id" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sclass_talent_reset">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scooldown_added">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="scooldown_removed">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sentity_data_changed">
-			<argument index="0" name="data" type="EntityData">
-			</argument>
+			<argument index="0" name="data" type="EntityData" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sentity_resource_added">
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sentity_resource_removed">
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sfree_spell_points_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="new_value" type="int">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="new_value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sgcd_finished">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sgcd_started">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sname_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</signal>
-		<signal name="son_character_level_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</signal>
-		<signal name="son_class_level_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="level" type="int">
-			</argument>
+		<signal name="son_damage_dealt">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="son_damage_received">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</signal>
+		<signal name="son_dealt_damage">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="son_dealt_heal">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="son_heal_dealt">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
 			<description>
 			</description>
 		</signal>
 		<signal name="son_heal_received">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</signal>
+		<signal name="son_level_changed">
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="level" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sskill_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sskill_removed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sspell_added">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sspell_removed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</signal>
 		<signal name="sstate_changed">
-			<argument index="0" name="value" type="int">
-			</argument>
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</signal>
 		<signal name="starget_bag_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="bag" type="Bag">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="bag" type="Bag" />
 			<description>
 			</description>
 		</signal>
 		<signal name="starget_changed">
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/EntityAI.xml b/doc_classes/EntityAI.xml
index 989a9a1..59ff912 100644
--- a/doc_classes/EntityAI.xml
+++ b/doc_classes/EntityAI.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityAI" inherits="Resource" version="3.2">
+<class name="EntityAI" inherits="Resource" version="3.5">
 	<brief_description>
 		You can implement AI for [Entities] with this.
 	</brief_description>
@@ -9,542 +9,364 @@
 	</tutorials>
 	<methods>
 		<method name="_equip_con_fail" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_con_success" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_should_deny" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_son_fail" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_equip_son_success" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_move" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_saura" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scast" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scategory_cooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scategory_cooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_scharacter_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="_notification_sclass_level_up" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scooldown_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scooldown_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="id" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sdamage" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sdeath" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sentity_resource_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sgcd_finished" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sgcd_started" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="gcd" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="gcd" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sheal" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_slevel_up" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sxp_gained" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_on_set_owner" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_pet_move" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_pet_update" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_update" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_con_fail">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_con_success">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_should_deny">
-			<return type="bool">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_son_fail">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="equip_son_success">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="equip_slot" type="int">
-			</argument>
-			<argument index="2" name="item" type="ItemInstance">
-			</argument>
-			<argument index="3" name="old_item" type="ItemInstance">
-			</argument>
-			<argument index="4" name="bag_slot" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_editor_description" qualifiers="const">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="move">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_saura">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="data" type="AuraData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scast">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scategory_cooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="category_cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_scharacter_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="notification_sclass_level_up">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="category_cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scooldown_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scooldown_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="cooldown" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="cooldown" type="int" />
+			<argument index="1" name="arg1" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sdamage">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sdeath">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sentity_resource_added">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sentity_resource_removed">
-			<return type="void">
-			</return>
-			<argument index="0" name="resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sgcd_finished">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sgcd_started">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="gcd" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="gcd" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sheal">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_slevel_up">
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_sxp_gained">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_move">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="pet_update">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_editor_description">
-			<return type="void">
-			</return>
-			<argument index="0" name="editor_description" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="editor_description" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="update">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/EntityClassData.xml b/doc_classes/EntityClassData.xml
index bb99b1a..16091bf 100644
--- a/doc_classes/EntityClassData.xml
+++ b/doc_classes/EntityClassData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityClassData" inherits="Resource" version="3.2">
+<class name="EntityClassData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains all of information for an [Entity]'s class. (Ingame class)
 	</brief_description>
@@ -9,214 +9,180 @@
 	</tutorials>
 	<methods>
 		<method name="_get_ai_instance" qualifiers="virtual">
-			<return type="EntityAI">
-			</return>
+			<return type="EntityAI" />
 			<description>
 			</description>
 		</method>
 		<method name="_setup_resources" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="get_ai">
-			<return type="EntityAI">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityAI" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_ai_instance">
-			<return type="EntityAI">
-			</return>
+			<return type="EntityAI" />
 			<description>
 			</description>
 		</method>
 		<method name="get_aura">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="get_craft_recipe">
+			<return type="CraftRecipe" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entity_resource" qualifiers="const">
-			<return type="EntityResource">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="EntityResource" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_ais">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_auras">
-			<return type="int">
-			</return>
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="get_num_craft_recipes" qualifiers="const">
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_entity_resources">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_specs">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_spells">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_start_spells">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spec" qualifiers="const">
-			<return type="CharacterSpec">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="CharacterSpec" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_start_spell">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_ai">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="action" type="EntityAI">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="action" type="EntityAI" />
 			<description>
 			</description>
 		</method>
 		<method name="set_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="aura" type="Spell" />
+			<description>
+			</description>
+		</method>
+		<method name="set_craft_recipe">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="recipe" type="CraftRecipe" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entity_resource">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="entity_resource" type="EntityResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="entity_resource" type="EntityResource" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_ais">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_auras">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_entity_resources">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_specs">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_spells">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_start_spells">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_spec">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="spec" type="CharacterSpec">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spec" type="CharacterSpec" />
 			<description>
 			</description>
 		</method>
 		<method name="set_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_start_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
@@ -226,26 +192,36 @@
 		</member>
 		<member name="auras" type="Array" setter="set_auras" getter="get_auras" default="[  ]">
 		</member>
+		<member name="craft_recipes" type="Array" setter="set_craft_recipes" getter="get_craft_recipes" default="[  ]">
+		</member>
 		<member name="entity_resources" type="Array" setter="set_entity_resources" getter="get_entity_resources" default="[  ]">
 		</member>
 		<member name="icon" type="Texture" setter="set_icon" getter="get_icon">
 		</member>
 		<member name="id" type="int" setter="set_id" getter="get_id" default="0">
 		</member>
+		<member name="item_container_data" type="ItemContainerData" setter="set_item_container_data" getter="get_item_container_data">
+		</member>
 		<member name="playstyle_type" type="int" setter="set_playstyle_type" getter="get_playstyle_type" enum="EntityEnums.EntityClassPlaystyleType" default="0">
 		</member>
 		<member name="specs" type="Array" setter="set_specs" getter="get_specs" default="[  ]">
 		</member>
 		<member name="spell_points_per_level" type="int" setter="set_spell_points_per_level" getter="get_spell_points_per_level" default="1">
 		</member>
+		<member name="spell_train_data" type="VendorItemData" setter="set_spell_train_data" getter="get_spell_train_data">
+		</member>
 		<member name="spells" type="Array" setter="set_spells" getter="get_spells" default="[  ]">
 		</member>
 		<member name="start_spells" type="Array" setter="set_start_spells" getter="get_start_spells" default="[  ]">
 		</member>
+		<member name="stat_data" type="StatData" setter="set_stat_data" getter="get_stat_data">
+		</member>
 		<member name="text_description" type="String" setter="set_text_description" getter="get_text_description" default="&quot;&quot;">
 		</member>
 		<member name="text_name" type="String" setter="set_name" getter="get_name" default="&quot;&quot;">
 		</member>
+		<member name="vendor_item_data" type="VendorItemData" setter="set_vendor_item_data" getter="get_vendor_item_data">
+		</member>
 	</members>
 	<constants>
 	</constants>
diff --git a/doc_classes/EntityCreateInfo.xml b/doc_classes/EntityCreateInfo.xml
index 5550a8a..b8667e5 100644
--- a/doc_classes/EntityCreateInfo.xml
+++ b/doc_classes/EntityCreateInfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityCreateInfo" inherits="Reference" version="3.2">
+<class name="EntityCreateInfo" inherits="Reference" version="3.5">
 	<brief_description>
 		Helper class used for [Entity] creation, and setup.
 	</brief_description>
@@ -9,45 +9,31 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="character_level" type="int" setter="set_character_level" getter="get_character_level" default="0">
-		</member>
-		<member name="character_xp" type="int" setter="set_character_xp" getter="get_character_xp" default="0">
-		</member>
 		<member name="class_id" type="int" setter="set_class_id" getter="get_class_id" default="0">
 		</member>
-		<member name="class_level" type="int" setter="set_class_level" getter="get_class_level" default="0">
-		</member>
-		<member name="class_xp" type="int" setter="set_class_xp" getter="get_class_xp" default="0">
-		</member>
 		<member name="created_entity" type="Entity" setter="set_created_entity" getter="get_created_entity">
 		</member>
 		<member name="entity_controller" type="int" setter="set_entity_controller" getter="get_entity_controller" enum="EntityEnums.EntityController" default="0">
@@ -58,10 +44,14 @@
 		</member>
 		<member name="guid" type="int" setter="set_guid" getter="get_guid" default="0">
 		</member>
+		<member name="level" type="int" setter="set_level" getter="get_level" default="0">
+		</member>
 		<member name="network_owner" type="int" setter="set_network_owner" getter="get_network_owner" default="0">
 		</member>
 		<member name="networked" type="bool" setter="set_networked" getter="get_networked" default="false">
 		</member>
+		<member name="node_name" type="String" setter="set_node_name" getter="get_node_name" default="&quot;&quot;">
+		</member>
 		<member name="parent_path" type="NodePath" setter="set_parent_path" getter="get_parent_path" default="NodePath(&quot;&quot;)">
 		</member>
 		<member name="player_name" type="String" setter="set_entity_name" getter="get_entity_name" default="&quot;&quot;">
@@ -74,6 +64,8 @@
 		</member>
 		<member name="transform2d" type="Transform2D" setter="set_transform2d" getter="get_transform2d" default="Transform2D( 1, 0, 0, 1, 0, 0 )">
 		</member>
+		<member name="xp" type="int" setter="set_xp" getter="get_xp" default="0">
+		</member>
 	</members>
 	<constants>
 	</constants>
diff --git a/doc_classes/EntityData.xml b/doc_classes/EntityData.xml
index 55fd74b..ca6f90a 100644
--- a/doc_classes/EntityData.xml
+++ b/doc_classes/EntityData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityData" inherits="Resource" version="3.2">
+<class name="EntityData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains all data for a given [Entity]. Think of this as all the data for a mob, or a player.
 	</brief_description>
@@ -9,82 +9,46 @@
 	</tutorials>
 	<methods>
 		<method name="_cans_interact" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_generate_name" qualifiers="virtual">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_ai_instance" qualifiers="virtual">
-			<return type="EntityAI">
-			</return>
+			<return type="EntityAI" />
 			<description>
 			</description>
 		</method>
 		<method name="_sinteract" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="cans_interact">
-			<return type="bool">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
 		<method name="generate_name">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_ai_instance">
-			<return type="EntityAI">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_craft_recipe">
-			<return type="CraftRecipe">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_num_craft_recipes" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_craft_recipe">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="recipe" type="CraftRecipe">
-			</argument>
+			<return type="EntityAI" />
 			<description>
 			</description>
 		</method>
 		<method name="sinteract">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Node">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Node" />
 			<description>
 			</description>
 		</method>
@@ -94,46 +58,32 @@
 		</member>
 		<member name="bag_size" type="int" setter="set_bag_size" getter="get_bag_size" default="0">
 		</member>
-		<member name="craft_recipes" type="Array" setter="set_craft_recipes" getter="get_craft_recipes" default="[  ]">
-		</member>
 		<member name="entity_class_data" type="EntityClassData" setter="set_entity_class_data" getter="get_entity_class_data">
 		</member>
-		<member name="entity_controller" type="int" setter="set_entity_controller" getter="get_entity_controller" enum="EntityEnums.EntityController" default="0">
-		</member>
 		<member name="entity_flags" type="int" setter="set_entity_flags" getter="get_entity_flags" default="0">
 		</member>
 		<member name="entity_interaction_type" type="int" setter="set_entity_interaction_type" getter="get_entity_interaction_type" enum="EntityEnums.EntityInteractionType" default="0">
 		</member>
 		<member name="entity_species_data" type="EntitySpeciesData" setter="set_entity_species_data" getter="get_entity_species_data">
 		</member>
-		<member name="entity_type" type="int" setter="set_entity_type" getter="get_entity_type" default="0">
-		</member>
 		<member name="equipment_data" type="EquipmentData" setter="set_equipment_data" getter="get_equipment_data">
 		</member>
-		<member name="formation" type="AIFormation" setter="set_formation" getter="get_formation">
-		</member>
 		<member name="id" type="int" setter="set_id" getter="get_id" default="0">
 		</member>
 		<member name="immunity_flags" type="int" setter="set_immunity_flags" getter="get_immunity_flags" default="0">
 		</member>
 		<member name="is_playable" type="bool" setter="set_is_playable" getter="get_is_playable" default="false">
 		</member>
-		<member name="item_container_data" type="ItemContainerData" setter="set_item_container_data" getter="get_item_container_data">
-		</member>
 		<member name="loot_db" type="LootDataBase" setter="set_loot_db" getter="get_loot_db">
 		</member>
 		<member name="money" type="int" setter="set_money" getter="get_money" default="0">
 		</member>
-		<member name="spell_train_data" type="VendorItemData" setter="set_spell_train_data" getter="get_spell_train_data">
-		</member>
-		<member name="stat_data" type="StatData" setter="set_stat_data" getter="get_stat_data">
+		<member name="species_instance" type="SpeciesInstance" setter="set_species_instance" getter="get_species_instance">
 		</member>
 		<member name="text_description" type="String" setter="set_text_description" getter="get_text_description" default="&quot;&quot;">
 		</member>
 		<member name="text_name" type="String" setter="set_name" getter="get_name" default="&quot;&quot;">
 		</member>
-		<member name="vendor_item_data" type="VendorItemData" setter="set_vendor_item_data" getter="get_vendor_item_data">
-		</member>
 	</members>
 	<constants>
 	</constants>
diff --git a/doc_classes/EntityDataContainer.xml b/doc_classes/EntityDataContainer.xml
index afce99e..9f02060 100644
--- a/doc_classes/EntityDataContainer.xml
+++ b/doc_classes/EntityDataContainer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityDataContainer" inherits="Resource" version="3.2">
+<class name="EntityDataContainer" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,30 +8,24 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/EntityEnums.xml b/doc_classes/EntityEnums.xml
index a797139..cf7b450 100644
--- a/doc_classes/EntityEnums.xml
+++ b/doc_classes/EntityEnums.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityEnums" inherits="Object" version="3.2">
+<class name="EntityEnums" inherits="Object" version="3.5">
 	<brief_description>
 		Contains lots of general-use enums for entities.
 	</brief_description>
@@ -216,9 +216,13 @@
 		</constant>
 		<constant name="ENITIY_INTERACTION_TYPE_LOOT" value="2" enum="EntityInteractionType">
 		</constant>
+		<constant name="ENITIY_INTERACTION_TYPE_TRAIN" value="4" enum="EntityInteractionType">
+		</constant>
+		<constant name="ENITIY_INTERACTION_TYPE_VENDOR" value="5" enum="EntityInteractionType">
+		</constant>
 		<constant name="ENITIY_INTERACTION_TYPE_USE" value="3" enum="EntityInteractionType">
 		</constant>
-		<constant name="ENITIY_INTERACTION_TYPE_NONE" value="4" enum="EntityInteractionType">
+		<constant name="ENITIY_INTERACTION_TYPE_NONE" value="6" enum="EntityInteractionType">
 		</constant>
 		<constant name="ENTITY_CLASS_PLAYSTYLE_TYPE_MELEE" value="0" enum="EntityClassPlaystyleType">
 		</constant>
@@ -234,7 +238,7 @@
 		</constant>
 		<constant name="ENTITY_WINDOW_VENDOR" value="2" enum="EntityWindows">
 		</constant>
-		<constant name="ENTITY_WINDOW_TRAINER" value="2" enum="EntityWindows">
+		<constant name="ENTITY_WINDOW_TRAINER" value="3" enum="EntityWindows">
 		</constant>
 		<constant name="ENTITY_RESOURCE_INDEX_HEALTH" value="0" enum="EntityResourceIndices">
 		</constant>
@@ -244,5 +248,9 @@
 		</constant>
 		<constant name="BASE_XP" value="50">
 		</constant>
+		<constant name="ENTITY_INTERACT_RANGE" value="4">
+		</constant>
+		<constant name="ENTITY_INTERACT_RANGE_SQUARED" value="16">
+		</constant>
 	</constants>
 </class>
diff --git a/doc_classes/EntityResource.xml b/doc_classes/EntityResource.xml
index 2250f9f..96a14e0 100644
--- a/doc_classes/EntityResource.xml
+++ b/doc_classes/EntityResource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResource" inherits="Resource" version="3.2">
+<class name="EntityResource" inherits="Resource" version="3.5">
 	<brief_description>
 		An instance of an entity resource. Resource in this context is things like mana.
 	</brief_description>
@@ -9,132 +9,182 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_gets_update_string" qualifiers="virtual">
-			<return type="String">
-			</return>
+			<return type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="_mods_changed" qualifiers="virtual">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="_non_stacking_mod_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_non_stacking_mod_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_cstat_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="statid" type="int">
-			</argument>
-			<argument index="1" name="curent" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="statid" type="int" />
+			<argument index="1" name="curent" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_sstat_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="statid" type="int">
-			</argument>
-			<argument index="1" name="curent" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="statid" type="int" />
+			<argument index="1" name="curent" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_onc_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_onc_target_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_ons_added" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_ons_target_changed" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="entity" type="Entity">
-			</argument>
-			<argument index="1" name="old_target" type="Entity">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entity" type="Entity" />
+			<argument index="1" name="old_target" type="Entity" />
 			<description>
 			</description>
 		</method>
 		<method name="_process_client" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_process_server" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_receivec_update_string" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="str" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="str" type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="_stacking_mod_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_stacking_mod_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
+			<description>
+			</description>
+		</method>
+		<method name="add_non_stacking_mod">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="add_stacking_mod">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
+			<description>
+			</description>
+		</method>
+		<method name="get_current_negative_non_stacking_mod_value" qualifiers="const">
+			<return type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="get_current_positive_non_stacking_mod_value" qualifiers="const">
+			<return type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="get_current_stacking_mod_value" qualifiers="const">
+			<return type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="mods_changed">
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="process_client">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="process_server">
-			<return type="void">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="refresh_current_non_stacking_mod_values">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="refresh_current_stacking_mod_value">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="remove_non_stacking_mod">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="remove_stacking_mod">
+			<return type="void" />
+			<argument index="0" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -148,10 +198,14 @@
 		</member>
 		<member name="max_value" type="int" setter="set_max_value" getter="get_max_value" default="0">
 		</member>
+		<member name="non_stacking_mods" type="PoolRealArray" setter="set_non_stacking_mods" getter="get_non_stacking_mods" default="PoolRealArray(  )">
+		</member>
 		<member name="owner" type="Entity" setter="set_owner" getter="get_owner">
 		</member>
 		<member name="should_process" type="bool" setter="set_should_process" getter="get_should_process">
 		</member>
+		<member name="stacking_mods" type="PoolRealArray" setter="set_stacking_mods" getter="get_stacking_mods" default="PoolRealArray(  )">
+		</member>
 		<member name="text_name" type="String" setter="set_text_name" getter="get_text_name" default="&quot;&quot;">
 		</member>
 	</members>
diff --git a/doc_classes/EntityResourceCostData.xml b/doc_classes/EntityResourceCostData.xml
index 66e89e2..c411ab7 100644
--- a/doc_classes/EntityResourceCostData.xml
+++ b/doc_classes/EntityResourceCostData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResourceCostData" inherits="Resource" version="3.2">
+<class name="EntityResourceCostData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains a resource cost. Resource in this context is things like mana.
 	</brief_description>
diff --git a/doc_classes/EntityResourceCostDataHealth.xml b/doc_classes/EntityResourceCostDataHealth.xml
index 2162074..d3977de 100644
--- a/doc_classes/EntityResourceCostDataHealth.xml
+++ b/doc_classes/EntityResourceCostDataHealth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResourceCostDataHealth" inherits="EntityResourceCostData" version="3.2">
+<class name="EntityResourceCostDataHealth" inherits="EntityResourceCostData" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/EntityResourceCostDataResource.xml b/doc_classes/EntityResourceCostDataResource.xml
index 6781caa..1c1ec9f 100644
--- a/doc_classes/EntityResourceCostDataResource.xml
+++ b/doc_classes/EntityResourceCostDataResource.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResourceCostDataResource" inherits="EntityResourceCostData" version="3.2">
+<class name="EntityResourceCostDataResource" inherits="EntityResourceCostData" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/EntityResourceHealth.xml b/doc_classes/EntityResourceHealth.xml
index afbe79d..3e7dade 100644
--- a/doc_classes/EntityResourceHealth.xml
+++ b/doc_classes/EntityResourceHealth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResourceHealth" inherits="EntityResource" version="3.2">
+<class name="EntityResourceHealth" inherits="EntityResource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,8 +8,7 @@
 	</tutorials>
 	<methods>
 		<method name="refresh">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/EntityResourceSpeed.xml b/doc_classes/EntityResourceSpeed.xml
index b73c1db..cf813ec 100644
--- a/doc_classes/EntityResourceSpeed.xml
+++ b/doc_classes/EntityResourceSpeed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntityResourceSpeed" inherits="EntityResource" version="3.2">
+<class name="EntityResourceSpeed" inherits="EntityResource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,8 +8,7 @@
 	</tutorials>
 	<methods>
 		<method name="refresh">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/EntitySkill.xml b/doc_classes/EntitySkill.xml
index f34fe1d..77f80a0 100644
--- a/doc_classes/EntitySkill.xml
+++ b/doc_classes/EntitySkill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntitySkill" inherits="Resource" version="3.2">
+<class name="EntitySkill" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains runtime skill data for an [Entity].
 	</brief_description>
@@ -10,30 +10,24 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -52,20 +46,17 @@
 	</members>
 	<signals>
 		<signal name="current_changed">
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="max_changed">
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
 		<signal name="skill_changed">
-			<argument index="0" name="skill" type="EntitySkill">
-			</argument>
+			<argument index="0" name="skill" type="EntitySkill" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/EntitySkillData.xml b/doc_classes/EntitySkillData.xml
index 1f0f134..aa6fb88 100644
--- a/doc_classes/EntitySkillData.xml
+++ b/doc_classes/EntitySkillData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntitySkillData" inherits="Resource" version="3.2">
+<class name="EntitySkillData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains skill data for an [Entity].
 	</brief_description>
diff --git a/doc_classes/EntitySpeciesData.xml b/doc_classes/EntitySpeciesData.xml
index 78f4422..69f1a8d 100644
--- a/doc_classes/EntitySpeciesData.xml
+++ b/doc_classes/EntitySpeciesData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EntitySpeciesData" inherits="Resource" version="3.2">
+<class name="EntitySpeciesData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains visual data for a species.
 	</brief_description>
@@ -9,138 +9,104 @@
 	</tutorials>
 	<methods>
 		<method name="_generate_name" qualifiers="virtual">
-			<return type="String">
-			</return>
-			<argument index="0" name="seed" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="seed" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="add_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="aura" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="aura" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="add_model_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="model_data" type="SpeciesModelData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="model_data" type="SpeciesModelData" />
 			<description>
 			</description>
 		</method>
 		<method name="add_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="generate_name">
-			<return type="String">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_aura" qualifiers="const">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_aura_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_data" qualifiers="const">
-			<return type="SpeciesModelData">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="SpeciesModelData" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_model_data_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell" qualifiers="const">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_spell_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_model_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_model_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="SpeciesModelData">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="SpeciesModelData" />
 			<description>
 			</description>
 		</method>
 		<method name="set_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="Spell" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/EquipmentData.xml b/doc_classes/EquipmentData.xml
index a2a2e6d..4a52b8d 100644
--- a/doc_classes/EquipmentData.xml
+++ b/doc_classes/EquipmentData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EquipmentData" inherits="Resource" version="3.2">
+<class name="EquipmentData" inherits="Resource" version="3.5">
 	<brief_description>
 		Stores equipment information.
 	</brief_description>
@@ -9,20 +9,15 @@
 	</tutorials>
 	<methods>
 		<method name="get_slot">
-			<return type="ItemTemplate">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemTemplate" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_slot">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="entry" type="ItemTemplate">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="entry" type="ItemTemplate" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/InputProfile.xml b/doc_classes/InputProfile.xml
index 1650c5b..b198653 100644
--- a/doc_classes/InputProfile.xml
+++ b/doc_classes/InputProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputProfile" inherits="Reference" version="3.2">
+<class name="InputProfile" inherits="Reference" version="3.5">
 	<brief_description>
 		Will store keybind information. [ProfileManager] related.
 	</brief_description>
@@ -8,7 +8,37 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="get_owner">
+			<return type="ClassProfile" />
+			<description>
+			</description>
+		</method>
+		<method name="load_defaults">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="load_to_projectsettings">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
+		<method name="save_from_projectsettings">
+			<return type="void" />
+			<description>
+			</description>
+		</method>
 	</methods>
+	<members>
+		<member name="data" type="Array" setter="set_data" getter="get_data" default="[  ]">
+		</member>
+	</members>
+	<signals>
+		<signal name="changed">
+			<description>
+			</description>
+		</signal>
+	</signals>
 	<constants>
 	</constants>
 </class>
diff --git a/doc_classes/InputProfileModifier.xml b/doc_classes/InputProfileModifier.xml
index 9de8f42..30e4a66 100644
--- a/doc_classes/InputProfileModifier.xml
+++ b/doc_classes/InputProfileModifier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputProfileModifier" inherits="Reference" version="3.2">
+<class name="InputProfileModifier" inherits="Reference" version="3.5">
 	<brief_description>
 		Stores data for bindable modifiers. Not yet implemented.
 	</brief_description>
@@ -9,94 +9,72 @@
 	</tutorials>
 	<methods>
 		<method name="add_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="entry" type="InputProfileModifierEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="entry" type="InputProfileModifierEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="add_modifier">
-			<return type="void">
-			</return>
-			<argument index="0" name="modifier" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="modifier" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_entries">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_modifiers">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entry">
-			<return type="InputProfileModifierEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="InputProfileModifierEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_entry_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_modifier">
-			<return type="String">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_modifier_count">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_modifier">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="InputProfileModifierEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="InputProfileModifierEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="set_modifier">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="String" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/InputProfileModifierEntry.xml b/doc_classes/InputProfileModifierEntry.xml
index 260c189..9f066e7 100644
--- a/doc_classes/InputProfileModifierEntry.xml
+++ b/doc_classes/InputProfileModifierEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="InputProfileModifierEntry" inherits="Reference" version="3.2">
+<class name="InputProfileModifierEntry" inherits="Reference" version="3.5">
 	<brief_description>
 		One key entry for a key.
 	</brief_description>
diff --git a/doc_classes/ItemContainerData.xml b/doc_classes/ItemContainerData.xml
index a37a516..3d8280a 100644
--- a/doc_classes/ItemContainerData.xml
+++ b/doc_classes/ItemContainerData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemContainerData" inherits="Resource" version="3.2">
+<class name="ItemContainerData" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,34 +8,26 @@
 	</tutorials>
 	<methods>
 		<method name="get_container_data">
-			<return type="ItemContainerDataEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemContainerDataEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_container_datas">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_container_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="container_data" type="ItemContainerDataEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="container_data" type="ItemContainerDataEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_container_datas">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ItemContainerDataEntry.xml b/doc_classes/ItemContainerDataEntry.xml
index 7d177d3..a28b8ca 100644
--- a/doc_classes/ItemContainerDataEntry.xml
+++ b/doc_classes/ItemContainerDataEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemContainerDataEntry" inherits="Resource" version="3.2">
+<class name="ItemContainerDataEntry" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/ItemEnums.xml b/doc_classes/ItemEnums.xml
index be7c5c6..ecda51d 100644
--- a/doc_classes/ItemEnums.xml
+++ b/doc_classes/ItemEnums.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemEnums" inherits="Object" version="3.2">
+<class name="ItemEnums" inherits="Object" version="3.5">
 	<brief_description>
 		Contains lots of general-use enums for items.
 	</brief_description>
diff --git a/doc_classes/ItemInstance.xml b/doc_classes/ItemInstance.xml
index b98aba7..d5262d6 100644
--- a/doc_classes/ItemInstance.xml
+++ b/doc_classes/ItemInstance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemInstance" inherits="Resource" version="3.2">
+<class name="ItemInstance" inherits="Resource" version="3.5">
 	<brief_description>
 		Runtime information for an item.
 	</brief_description>
@@ -9,148 +9,111 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_description" qualifiers="virtual">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="add_item_stat_modifier">
-			<return type="void">
-			</return>
-			<argument index="0" name="stat_id" type="int">
-			</argument>
-			<argument index="1" name="base_mod" type="int">
-			</argument>
-			<argument index="2" name="bonus_mod" type="int">
-			</argument>
-			<argument index="3" name="percent_mod" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="stat_id" type="int" />
+			<argument index="1" name="base_mod" type="int" />
+			<argument index="2" name="bonus_mod" type="int" />
+			<argument index="3" name="percent_mod" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_item_stat_modifiers">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_description">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_item_stat_modifier">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_base_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_bonus_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_percent_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_stat_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_base_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_bonus_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_percent_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_stat_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -167,14 +130,12 @@
 	</members>
 	<signals>
 		<signal name="stack_charges_changed">
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</signal>
 		<signal name="stack_size_changed">
-			<argument index="0" name="item" type="ItemInstance">
-			</argument>
+			<argument index="0" name="item" type="ItemInstance" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/ItemTemplate.xml b/doc_classes/ItemTemplate.xml
index 6981487..29c5ad2 100644
--- a/doc_classes/ItemTemplate.xml
+++ b/doc_classes/ItemTemplate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ItemTemplate" inherits="Resource" version="3.2">
+<class name="ItemTemplate" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains item information.
 	</brief_description>
@@ -9,296 +9,221 @@
 	</tutorials>
 	<methods>
 		<method name="_create_item_instance" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_description" qualifiers="virtual">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="create_item_instance">
-			<return type="ItemInstance">
-			</return>
+			<return type="ItemInstance" />
 			<description>
 			</description>
 		</method>
 		<method name="get_animator_weapon_type">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_aura">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_description">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_grants_spell">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_auras" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_grants_spells" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_required_skills" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_num_teaches_spells" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_required_skill">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_teaches_spell">
-			<return type="Spell">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="aura" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_grants_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_auras">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_grants_spells">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_num_teaches_spells">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_required_skill">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="aura" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="set_teaches_spell">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="spell" type="Spell">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_max_base_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_max_bonus_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_max_percent_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_min_base_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_min_bonus_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_min_percent_mod" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_scaling_factor" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_get_stat_id" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_max_base_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_max_bonus_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_max_percent_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_min_base_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_min_bonus_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_min_percent_mod">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_scaling_factor">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="stat_modifier_set_stat_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/LevelStatData.xml b/doc_classes/LevelStatData.xml
index a2783bb..8247efb 100644
--- a/doc_classes/LevelStatData.xml
+++ b/doc_classes/LevelStatData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LevelStatData" inherits="Resource" version="3.2">
+<class name="LevelStatData" inherits="Resource" version="3.5">
 	<brief_description>
 		Base class for storing level stat information for entities.
 	</brief_description>
@@ -9,26 +9,18 @@
 	</tutorials>
 	<methods>
 		<method name="_get_stat_diff" qualifiers="virtual">
-			<return type="int">
-			</return>
-			<argument index="0" name="main_stat" type="int">
-			</argument>
-			<argument index="1" name="old_level" type="int">
-			</argument>
-			<argument index="2" name="new_level" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="main_stat" type="int" />
+			<argument index="1" name="old_level" type="int" />
+			<argument index="2" name="new_level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_stat_diff">
-			<return type="int">
-			</return>
-			<argument index="0" name="stat" type="int">
-			</argument>
-			<argument index="1" name="old_level" type="int">
-			</argument>
-			<argument index="2" name="new_level" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="stat" type="int" />
+			<argument index="1" name="old_level" type="int" />
+			<argument index="2" name="new_level" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/LootDataBase.xml b/doc_classes/LootDataBase.xml
index 9c6b398..fa39fd9 100644
--- a/doc_classes/LootDataBase.xml
+++ b/doc_classes/LootDataBase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="LootDataBase" inherits="Resource" version="3.2">
+<class name="LootDataBase" inherits="Resource" version="3.5">
 	<brief_description>
 		Base class for storing loot information for entities.
 	</brief_description>
@@ -9,86 +9,64 @@
 	</tutorials>
 	<methods>
 		<method name="_get_loot" qualifiers="virtual">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item" qualifiers="const">
-			<return type="ItemTemplate">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ItemTemplate" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_item_chance" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_loot">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="get_loot_db" qualifiers="const">
-			<return type="LootDataBase">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="LootDataBase" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_loot_db_chance" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_item">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="ItemTemplate">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="ItemTemplate" />
 			<description>
 			</description>
 		</method>
 		<method name="set_item_chance">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_loot_db">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="LootDataBase">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="LootDataBase" />
 			<description>
 			</description>
 		</method>
 		<method name="set_loot_db_chance">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ModelVisual.xml b/doc_classes/ModelVisual.xml
index 130d9a2..849d402 100644
--- a/doc_classes/ModelVisual.xml
+++ b/doc_classes/ModelVisual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ModelVisual" inherits="Resource" version="3.2">
+<class name="ModelVisual" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains an item's visual information.
 	</brief_description>
@@ -9,42 +9,32 @@
 	</tutorials>
 	<methods>
 		<method name="add_visual_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="visual_entry" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="visual_entry" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="get_visual_entry" qualifiers="const">
-			<return type="ModelVisualEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ModelVisualEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_visual_entry_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_visual_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_visual_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/ModelVisualEntry.xml b/doc_classes/ModelVisualEntry.xml
index 218152d..7b62268 100644
--- a/doc_classes/ModelVisualEntry.xml
+++ b/doc_classes/ModelVisualEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ModelVisualEntry" inherits="Resource" version="3.2">
+<class name="ModelVisualEntry" inherits="Resource" version="3.5">
 	<brief_description>
 		One Entry for [ModelVisual].
 	</brief_description>
@@ -9,92 +9,67 @@
 	</tutorials>
 	<methods>
 		<method name="get_attachment">
-			<return type="PackedScene">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="PackedScene" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="Color" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_mesh">
-			<return type="MeshDataResource">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="MeshDataResource" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_texture">
-			<return type="Texture">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Texture" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="Transform" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_attachment">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="PackedScene">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<argument index="1" name="arg1" type="PackedScene" />
 			<description>
 			</description>
 		</method>
 		<method name="set_color">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="Color">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<argument index="1" name="arg1" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="set_mesh">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="MeshDataResource">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="MeshDataResource" />
 			<description>
 			</description>
 		</method>
 		<method name="set_texture">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="Texture">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="Texture" />
 			<description>
 			</description>
 		</method>
 		<method name="set_transform">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="Transform">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="Transform" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/PlayerProfile.xml b/doc_classes/PlayerProfile.xml
index 2e9253c..da0e305 100644
--- a/doc_classes/PlayerProfile.xml
+++ b/doc_classes/PlayerProfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="PlayerProfile" inherits="Reference" version="3.2">
+<class name="PlayerProfile" inherits="Reference" version="3.5">
 	<brief_description>
 		Stores the data for a player. Also see [ProfileManager].
 	</brief_description>
@@ -9,72 +9,57 @@
 	</tutorials>
 	<methods>
 		<method name="add_class_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="profile" type="ClassProfile">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="profile" type="ClassProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="clear_class_profiles">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="emit_change">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="get_class_profile">
-			<return type="ClassProfile">
-			</return>
-			<argument index="0" name="class_id" type="String">
-			</argument>
+			<return type="ClassProfile" />
+			<argument index="0" name="class_id" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="get_class_profile_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_class_profile_index">
-			<return type="ClassProfile">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ClassProfile" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="load_defaults">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_class_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -91,8 +76,7 @@
 	</members>
 	<signals>
 		<signal name="changed">
-			<argument index="0" name="profile" type="PlayerProfile">
-			</argument>
+			<argument index="0" name="profile" type="PlayerProfile" />
 			<description>
 			</description>
 		</signal>
diff --git a/doc_classes/ProfileManager.xml b/doc_classes/ProfileManager.xml
index dec785a..29de4d7 100644
--- a/doc_classes/ProfileManager.xml
+++ b/doc_classes/ProfileManager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ProfileManager" inherits="Object" version="3.2">
+<class name="ProfileManager" inherits="Object" version="3.5">
 	<brief_description>
 		Stores, saves, loads per class profile data.
 		Should be added as an autoload, or at least is should be in the scene before spawning entities.
@@ -10,104 +10,89 @@
 	</tutorials>
 	<methods>
 		<method name="_load" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="_save" qualifiers="virtual">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="adds_player_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="profile" type="PlayerProfile">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="profile" type="PlayerProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="clears_player_profiles">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="getc_player_profile">
-			<return type="PlayerProfile">
-			</return>
+			<return type="PlayerProfile" />
 			<description>
 			</description>
 		</method>
 		<method name="gets_player_profile_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="gets_player_profile_index">
-			<return type="PlayerProfile">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="PlayerProfile" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="load">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="load_defaults">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="load_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="name" type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="on_keybinds_changed">
+			<return type="void" />
+			<argument index="0" name="class_path" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="removes_player_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="save">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
 		<method name="save_profile">
-			<return type="void">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="name" type="String" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict" qualifiers="const">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -125,6 +110,10 @@
 			<description>
 			</description>
 		</signal>
+		<signal name="keybinds_changed">
+			<description>
+			</description>
+		</signal>
 	</signals>
 	<constants>
 	</constants>
diff --git a/doc_classes/PropDataEntity.xml b/doc_classes/PropDataEntity.xml
new file mode 100644
index 0000000..b32e885
--- /dev/null
+++ b/doc_classes/PropDataEntity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="PropDataEntity" inherits="PropDataEntry" version="3.5">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<members>
+		<member name="entity_data" type="EntityData" setter="set_entity_data" getter="get_entity_data">
+		</member>
+		<member name="level" type="int" setter="set_level" getter="get_level" default="1">
+		</member>
+	</members>
+	<constants>
+	</constants>
+</class>
diff --git a/doc_classes/SimpleLevelStatData.xml b/doc_classes/SimpleLevelStatData.xml
index a6170cf..15f702d 100644
--- a/doc_classes/SimpleLevelStatData.xml
+++ b/doc_classes/SimpleLevelStatData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SimpleLevelStatData" inherits="LevelStatData" version="3.2">
+<class name="SimpleLevelStatData" inherits="LevelStatData" version="3.5">
 	<brief_description>
 		Simple per-level [Stat] information for entities.
 	</brief_description>
@@ -9,20 +9,15 @@
 	</tutorials>
 	<methods>
 		<method name="get_stat_per_level">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="arg0" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_stat_per_level">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<argument index="1" name="arg1" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/SkeletonModelEntry.xml b/doc_classes/SkeletonModelEntry.xml
index f14fca6..8c6de9b 100644
--- a/doc_classes/SkeletonModelEntry.xml
+++ b/doc_classes/SkeletonModelEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SkeletonModelEntry" inherits="Reference" version="3.2">
+<class name="SkeletonModelEntry" inherits="Reference" version="3.5">
 	<brief_description>
 		Runtime model item entry helper for skeletons. Used by [CharacterSkeleton3D] for example.
 	</brief_description>
diff --git a/doc_classes/SpeciesInstance.xml b/doc_classes/SpeciesInstance.xml
index 00a0e63..121a58d 100644
--- a/doc_classes/SpeciesInstance.xml
+++ b/doc_classes/SpeciesInstance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpeciesInstance" inherits="Resource" version="3.2">
+<class name="SpeciesInstance" inherits="Resource" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -8,30 +8,24 @@
 	</tutorials>
 	<methods>
 		<method name="_from_dict" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="_to_dict" qualifiers="virtual">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
@@ -43,7 +37,7 @@
 		</member>
 		<member name="head_index" type="int" setter="set_head_index" getter="get_head_index" default="0">
 		</member>
-		<member name="id" type="int" setter="set_id" getter="get_id" default="116271120">
+		<member name="id" type="int" setter="set_id" getter="get_id" default="0">
 		</member>
 		<member name="skin_color_index" type="int" setter="set_skin_color_index" getter="get_skin_color_index" default="0">
 		</member>
diff --git a/doc_classes/SpeciesModelData.xml b/doc_classes/SpeciesModelData.xml
index d2a0e02..e355a3c 100644
--- a/doc_classes/SpeciesModelData.xml
+++ b/doc_classes/SpeciesModelData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpeciesModelData" inherits="Resource" version="3.2">
+<class name="SpeciesModelData" inherits="Resource" version="3.5">
 	<brief_description>
 		Stores model information for [EntitySpeciesData].
 	</brief_description>
@@ -9,240 +9,175 @@
 	</tutorials>
 	<methods>
 		<method name="add_color_customizable_slot_color">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="color_customizable_slot" type="Color">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="color_customizable_slot" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="add_customizable_slot_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="customizable_slot" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="customizable_slot" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="add_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="visual" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="visual" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_slot_bone_slot_mask" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_slot_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
+			<return type="Color" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_slot_colors" qualifiers="const">
-			<return type="PoolColorArray">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="PoolColorArray" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_slot_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_color_customizable_slot_texture_layer" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_customizable_slot_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_customizable_slot_entries" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="Array" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_customizable_slot_entry" qualifiers="const">
-			<return type="ModelVisualEntry">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
+			<return type="ModelVisualEntry" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_customizable_slot_entry_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="slot_index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_visual" qualifiers="const">
-			<return type="ModelVisualEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="ModelVisualEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_visual_count" qualifiers="const">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_visuals">
-			<return type="Array">
-			</return>
+			<return type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_color_customizable_slot_color">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_customizable_slot_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="remove_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_color_customizable_slot_bone_slot_mask">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_color_customizable_slot_color">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
-			<argument index="2" name="data" type="Color">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
+			<argument index="2" name="data" type="Color" />
 			<description>
 			</description>
 		</method>
 		<method name="set_color_customizable_slot_colors">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="colors" type="PoolColorArray">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="colors" type="PoolColorArray" />
 			<description>
 			</description>
 		</method>
 		<method name="set_color_customizable_slot_texture_layer">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_customizable_slot_entries">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="customizable_slots" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="customizable_slots" type="Array" />
 			<description>
 			</description>
 		</method>
 		<method name="set_customizable_slot_entry">
-			<return type="void">
-			</return>
-			<argument index="0" name="slot_index" type="int">
-			</argument>
-			<argument index="1" name="index" type="int">
-			</argument>
-			<argument index="2" name="data" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="slot_index" type="int" />
+			<argument index="1" name="index" type="int" />
+			<argument index="2" name="data" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="set_visual">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="data" type="ModelVisualEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="data" type="ModelVisualEntry" />
 			<description>
 			</description>
 		</method>
 		<method name="set_visuals">
-			<return type="void">
-			</return>
-			<argument index="0" name="visuals" type="Array">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="visuals" type="Array" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/Spell.xml b/doc_classes/Spell.xml
index 81d0c95..aefe697 100644
--- a/doc_classes/Spell.xml
+++ b/doc_classes/Spell.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Spell" inherits="Resource" version="3.2">
+<class name="Spell" inherits="Resource" version="3.5">
 	<brief_description>
 		Base [Spell] class. Contains data, and callbacks for spell scripts. Inherit from this to create spells with different functionality.
 	</brief_description>
@@ -8,409 +8,1335 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="_aura_calculate_initial_damage" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_calculate_initial_heal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_get_description" qualifiers="virtual">
+			<return type="String" />
+			<argument index="0" name="class_level" type="int" />
+			<argument index="1" name="character_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_removes_dispell" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_removes_expired" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sadd" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sapply" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sapply_passives_damage_deal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sapply_passives_damage_receive" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sapply_passives_heal_deal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sapply_passives_heal_receive" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sdeapply" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_sremove" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_aura_supdate" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraData" />
+			<argument index="1" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
 		<method name="_calculate_initial_damage" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_calculate_initial_heal" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_cast_finishs" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_cast_interrupts" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_cast_starts" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_cast_starts_triggered" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_aura_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_aura_refresh" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_aura_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_cast_failed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_cast_finished" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_cast_started" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_cast_state_changed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_damage_dealt" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_dealt_damage" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_dealt_heal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_heal_dealt" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_con_spell_cast_success" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_equip_con_fail" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_equip_con_success" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_equip_should_deny" qualifiers="virtual">
+			<return type="bool" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<description>
+			</description>
+		</method>
+		<method name="_equip_son_fail" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_equip_son_success" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="_get_description" qualifiers="virtual">
-			<return type="String">
-			</return>
-			<argument index="0" name="class_level" type="int">
-			</argument>
-			<argument index="1" name="character_level" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="class_level" type="int" />
+			<argument index="1" name="character_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_handle_aura_damage" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_handle_aura_heal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="spell_heal_info" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_handle_effect" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_handle_projectile" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_handle_spell_damage" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_handle_spell_heal" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_aura_ccast" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_aura_scast" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_caura" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_ccast" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_ccategory_cooldown_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_ccategory_cooldown_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_ccooldown_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_ccooldown_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cdamage" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cdeath" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_centity_resource_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_centity_resource_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cgcd_finished" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cgcd_started" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="gcd" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cheal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_clevel_up" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_cxp_gained" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_saura" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_notification_scast" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_scategory_cooldown_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_scategory_cooldown_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_scooldown_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_scooldown_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="id" type="int" />
+			<argument index="2" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sdamage" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sdeath" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sentity_resource_added" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sgcd_finished" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sgcd_started" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="gcd" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sheal" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
+			<argument index="2" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_slevel_up" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_notification_sxp_gained" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="_setup_aura_data" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_cast_damage_received" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_cast_player_moved" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_physics_process" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
-			<argument index="1" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
+			<argument index="1" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="_son_physics_process_aura" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_son_remove" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_son_remove_dispell" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="_son_remove_expired" qualifiers="virtual">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="_son_spell_hit" qualifiers="virtual">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_calculate_initial_damage">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_calculate_initial_heal">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_damage_set">
+			<return type="void" />
+			<argument index="0" name="min" type="int" />
+			<argument index="1" name="max" type="int" />
+			<argument index="2" name="can_crit" type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_get_description">
+			<return type="String" />
+			<argument index="0" name="class_level" type="int" />
+			<argument index="1" name="character_level" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_get_name_translated" qualifiers="const">
+			<return type="String" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_heal_set">
+			<return type="void" />
+			<argument index="0" name="min" type="int" />
+			<argument index="1" name="max" type="int" />
+			<argument index="2" name="can_crit" type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_is_talent" qualifiers="const">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_removes_dispell">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_removes_expired">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sadd">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sapply">
+			<return type="void" />
+			<argument index="0" name="info" type="AuraApplyInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sapply_passives_damage_deal">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sapply_passives_damage_receive">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sapply_passives_heal_deal">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sapply_passives_heal_receive">
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sdeapply">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_sremove">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_get_base_mod" qualifiers="const">
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_get_bonus_mod" qualifiers="const">
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_get_percent_mod" qualifiers="const">
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_get_stat" qualifiers="const">
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_set_base_mod">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_set_bonus_mod">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_set_percent_mod">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_stat_attribute_set_stat">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_supdate">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<argument index="1" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_get_notification_data" qualifiers="const">
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_get_notification_type" qualifiers="const">
+			<return type="int" enum="SpellEnums.TriggerNotificationType" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_get_spell" qualifiers="const">
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_get_trigger_type" qualifiers="const">
+			<return type="int" enum="SpellEnums.TriggerType" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_get_trigger_type_data" qualifiers="const">
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_set_notification_data">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_set_notification_type">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" enum="SpellEnums.TriggerNotificationType" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_set_spell">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="Spell" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_set_trigger_type">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" enum="SpellEnums.TriggerType" />
+			<description>
+			</description>
+		</method>
+		<method name="aura_trigger_set_trigger_type_data">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="calculate_initial_damage">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="calculate_initial_heal">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_finishs">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_interrupts">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_starts">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="cast_starts_triggered">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
-		<method name="caster_get_aura_apply">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+		<method name="equip_con_fail">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
-		<method name="caster_set_aura_apply">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+		<method name="equip_con_success">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="equip_should_deny">
+			<return type="bool" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<description>
+			</description>
+		</method>
+		<method name="equip_son_fail">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="equip_son_success">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="equip_slot" type="int" />
+			<argument index="2" name="item" type="ItemInstance" />
+			<argument index="3" name="old_item" type="ItemInstance" />
+			<argument index="4" name="bag_slot" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_description">
-			<return type="String">
-			</return>
-			<argument index="0" name="class_level" type="int">
-			</argument>
-			<argument index="1" name="character_level" type="int">
-			</argument>
+			<return type="String" />
+			<argument index="0" name="class_level" type="int" />
+			<argument index="1" name="character_level" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_name_translated" qualifiers="const">
-			<return type="String">
-			</return>
+			<return type="String" />
 			<description>
 			</description>
 		</method>
-		<method name="get_num_caster_aura_applys" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="handle_aura_damage">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
-		<method name="get_num_on_learn_auras" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_num_target_aura_applys" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_on_learn_aura">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_target_aura_apply">
-			<return type="Aura">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+		<method name="handle_aura_heal">
+			<return type="void" />
+			<argument index="0" name="aura_data" type="AuraData" />
+			<argument index="1" name="data" type="SpellHealInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_cooldown">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_effect">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_gcd">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_projectile">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_spell_damage">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellDamageInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellDamageInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="handle_spell_heal">
-			<return type="void">
-			</return>
-			<argument index="0" name="data" type="SpellHealInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="data" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="is_aura" qualifiers="const">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_aura_ccast">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_aura_scast">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_caura">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_ccast">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_ccategory_cooldown_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="int" />
+			<argument index="2" name="arg2" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_ccategory_cooldown_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="int" />
+			<argument index="2" name="arg2" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_ccooldown_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="int" />
+			<argument index="2" name="arg2" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_ccooldown_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="int" />
+			<argument index="2" name="arg2" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cdamage">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cdeath">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_centity_resource_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="EntityResource" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_centity_resource_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="EntityResource" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cgcd_finished">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cgcd_started">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cheal">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_clevel_up">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_cxp_gained">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_saura">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="data" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="notification_scast">
-			<return type="void">
-			</return>
-			<argument index="0" name="what" type="int">
-			</argument>
-			<argument index="1" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
-		<method name="set_num_caster_aura_applys">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+		<method name="notification_scategory_cooldown_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="category_cooldown" type="int" />
+			<argument index="2" name="arg2" type="float" />
 			<description>
 			</description>
 		</method>
-		<method name="set_num_on_learn_auras">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+		<method name="notification_scategory_cooldown_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="category_cooldown" type="int" />
+			<argument index="2" name="arg2" type="float" />
 			<description>
 			</description>
 		</method>
-		<method name="set_num_target_aura_applys">
-			<return type="void">
-			</return>
-			<argument index="0" name="value" type="int">
-			</argument>
+		<method name="notification_scooldown_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="cooldown" type="int" />
+			<argument index="2" name="arg2" type="float" />
 			<description>
 			</description>
 		</method>
-		<method name="set_on_learn_aura">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+		<method name="notification_scooldown_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="cooldown" type="int" />
+			<argument index="2" name="arg2" type="float" />
 			<description>
 			</description>
 		</method>
-		<method name="set_target_aura_apply">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="aura" type="Aura">
-			</argument>
+		<method name="notification_sdamage">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellDamageInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sdeath">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sentity_resource_added">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="EntityResource" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sentity_resource_removed">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="EntityResource" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sgcd_finished">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sgcd_started">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="gcd" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sheal">
+			<return type="void" />
+			<argument index="0" name="what" type="int" />
+			<argument index="1" name="aura" type="AuraData" />
+			<argument index="2" name="info" type="SpellHealInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_slevel_up">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="notification_sxp_gained">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="on_learn_cast_spells_num_get" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="on_learn_cast_spells_num_set">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="setup_aura_data">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<argument index="1" name="info" type="AuraApplyInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="son_cast_damage_received">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="son_cast_player_moved">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
 			<description>
 			</description>
 		</method>
 		<method name="son_physics_process">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
-			<argument index="1" name="delta" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
+			<argument index="1" name="delta" type="float" />
+			<description>
+			</description>
+		</method>
+		<method name="son_physics_process_aura">
+			<return type="void" />
+			<argument index="0" name="data" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="son_remove">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="son_remove_dispell">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
+			<description>
+			</description>
+		</method>
+		<method name="son_remove_expired">
+			<return type="void" />
+			<argument index="0" name="aura" type="AuraData" />
 			<description>
 			</description>
 		</method>
 		<method name="son_spell_hit">
-			<return type="void">
-			</return>
-			<argument index="0" name="info" type="SpellCastInfo">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="info" type="SpellCastInfo" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_caster_get">
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_caster_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_learn_get">
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_learn_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_target_get">
+			<return type="Spell" />
+			<argument index="0" name="index" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spell_cast_on_target_set">
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="spell" type="Spell" />
+			<description>
+			</description>
+		</method>
+		<method name="spells_cast_on_caster_num_get" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spells_cast_on_caster_num_set">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spells_cast_on_target_num_get" qualifiers="const">
+			<return type="int" />
+			<description>
+			</description>
+		</method>
+		<method name="spells_cast_on_target_num_set">
+			<return type="void" />
+			<argument index="0" name="value" type="int" />
 			<description>
 			</description>
 		</method>
@@ -426,14 +1352,100 @@
 		</member>
 		<member name="aoe_targetType" type="int" setter="set_aoe_target_type" getter="get_aoe_target_type" enum="SpellAOETargetType" default="0">
 		</member>
+		<member name="aura_ability_scale_data_id" type="int" setter="aura_set_ability_scale_data_id" getter="aura_get_ability_scale_data_id" default="1">
+		</member>
+		<member name="aura_absorb_damage_type" type="int" setter="aura_absorb_damage_set_type" getter="aura_absorb_damage_get_type" default="0">
+		</member>
+		<member name="aura_absorb_enabled" type="bool" setter="aura_absorb_set_enabled" getter="aura_absorb_get_enabled" default="false">
+		</member>
+		<member name="aura_absorb_max" type="int" setter="aura_absorb_set_max" getter="aura_absorb_get_max" default="0">
+		</member>
+		<member name="aura_absorb_min" type="int" setter="aura_absorb_set_min" getter="aura_absorb_get_min" default="0">
+		</member>
+		<member name="aura_absorb_scaling_curve" type="Curve" setter="aura_absorb_set_scaling_curve" getter="aura_absorb_get_scaling_curve">
+		</member>
+		<member name="aura_damage_can_crit" type="bool" setter="aura_damage_set_can_crit" getter="aura_damage_get_can_crit" default="false">
+		</member>
+		<member name="aura_damage_enabled" type="bool" setter="aura_damage_set_enabled" getter="aura_damage_get_enabled" default="false">
+		</member>
+		<member name="aura_damage_max" type="int" setter="aura_damage_set_max" getter="aura_damage_get_max" default="0">
+		</member>
+		<member name="aura_damage_min" type="int" setter="aura_damage_set_min" getter="aura_damage_get_min" default="0">
+		</member>
+		<member name="aura_damage_scaling_curve" type="Curve" setter="aura_damage_set_scaling_curve" getter="aura_damage_get_scaling_curve">
+		</member>
+		<member name="aura_damage_type" type="int" setter="aura_damage_set_type" getter="aura_damage_get_type" default="0">
+		</member>
+		<member name="aura_debuff" type="bool" setter="aura_set_is_debuff" getter="aura_get_is_debuff" default="false">
+		</member>
+		<member name="aura_diminishing_return_category" type="int" setter="aura_diminishing_return_category_set" getter="aura_diminishing_return_category_get" default="0">
+		</member>
+		<member name="aura_diminishing_return_enabled" type="bool" setter="aura_diminishing_return_enabled_set" getter="aura_diminishing_return_enabled_get" default="false">
+		</member>
+		<member name="aura_dispell_aura_types" type="int" setter="aura_dispell_set_aura_types" getter="aura_dispell_get_aura_types" default="0">
+		</member>
+		<member name="aura_dispell_count_max" type="int" setter="aura_dispell_set_count_max" getter="aura_dispell_get_count_max" default="0">
+		</member>
+		<member name="aura_dispell_count_min" type="int" setter="aura_dispell_set_count_min" getter="aura_dispell_get_count_min" default="0">
+		</member>
+		<member name="aura_dispell_enabled" type="bool" setter="aura_dispell_set_enabled" getter="aura_dispell_get_enabled" default="false">
+		</member>
+		<member name="aura_group" type="AuraGroup" setter="aura_set_aura_group" getter="aura_get_aura_group">
+		</member>
+		<member name="aura_heal_can_crit" type="bool" setter="aura_heal_set_can_crit" getter="aura_heal_get_can_crit" default="false">
+		</member>
+		<member name="aura_heal_enabled" type="bool" setter="aura_heal_set_enabled" getter="aura_heal_get_enabled" default="false">
+		</member>
+		<member name="aura_heal_max" type="int" setter="aura_heal_set_max" getter="aura_heal_get_max" default="0">
+		</member>
+		<member name="aura_heal_min" type="int" setter="aura_heal_set_min" getter="aura_heal_get_min" default="0">
+		</member>
+		<member name="aura_heal_scaling_curve" type="Curve" setter="aura_heal_set_scaling_curve" getter="aura_heal_get_scaling_curve">
+		</member>
+		<member name="aura_hide" type="bool" setter="aura_set_hide" getter="aura_get_hide" default="false">
+		</member>
+		<member name="aura_permanent" type="bool" setter="aura_set_permanent" getter="aura_get_permanent" default="false">
+		</member>
+		<member name="aura_resource_cost" type="EntityResourceCostData" setter="aura_set_resource_cost" getter="aura_get_resource_cost">
+		</member>
+		<member name="aura_resource_give" type="EntityResourceCostData" setter="aura_set_resource_give" getter="aura_get_resource_give">
+		</member>
+		<member name="aura_scale_with_level" type="bool" setter="aura_set_scale_with_level" getter="aura_get_scale_with_level" default="false">
+		</member>
+		<member name="aura_stat_attribute_count" type="int" setter="aura_stat_attribute_set_count" getter="aura_stat_attribute_get_count" default="0">
+		</member>
+		<member name="aura_states_add" type="int" setter="aura_set_add_states" getter="aura_get_add_states" default="0">
+		</member>
+		<member name="aura_states_remove_effects" type="int" setter="aura_set_remove_effects_with_states" getter="aura_get_remove_effects_with_states" default="0">
+		</member>
+		<member name="aura_states_supress" type="int" setter="aura_set_supress_states" getter="aura_get_supress_states" default="0">
+		</member>
+		<member name="aura_talent_required_spell" type="Spell" setter="aura_set_talent_required_spell" getter="aura_get_talent_required_spell">
+		</member>
+		<member name="aura_talent_required_talent" type="Spell" setter="aura_set_talent_required_talent" getter="aura_get_talent_required_talent">
+		</member>
+		<member name="aura_teaches_spell" type="Spell" setter="aura_set_teaches_spell" getter="aura_get_teaches_spell">
+		</member>
+		<member name="aura_text_description" type="String" setter="aura_set_text_description" getter="aura_get_text_description" default="&quot;&quot;">
+		</member>
+		<member name="aura_text_translation_key" type="String" setter="aura_set_text_translation_key" getter="aura_get_text_translation_key" default="&quot;&quot;">
+		</member>
+		<member name="aura_tick" type="float" setter="aura_set_tick" getter="aura_get_tick" default="0.0">
+		</member>
+		<member name="aura_time" type="float" setter="aura_set_time" getter="aura_get_time" default="0.0">
+		</member>
+		<member name="aura_trigger_count" type="int" setter="aura_trigger_set_count" getter="aura_trigger_get_count" default="0">
+		</member>
+		<member name="aura_type" type="int" setter="aura_set_aura_type" getter="aura_get_aura_type" enum="SpellEnums.AuraType" default="0">
+		</member>
+		<member name="aura_visual_spell_effects" type="SpellEffectVisual" setter="aura_set_visual_spell_effects" getter="aura_get_visual_spell_effects">
+		</member>
 		<member name="cast_can_move_while_casting" type="bool" setter="set_can_move_while_casting" getter="get_can_move_while_casting" default="false">
 		</member>
 		<member name="cast_cast_time" type="float" setter="cast_time_set" getter="cast_time_get" default="0.0">
 		</member>
 		<member name="cast_enabled" type="bool" setter="cast_time_set_enabled" getter="cast_time_get_enabled" default="false">
 		</member>
-		<member name="caster_aura_applys" type="Array" setter="caster_set_aura_applys" getter="caster_get_aura_applys" default="[  ]">
-		</member>
 		<member name="cooldown_cooldown" type="float" setter="set_cooldown" getter="get_cooldown" default="0.0">
 		</member>
 		<member name="cooldown_global_cooldown_enabled" type="bool" setter="set_global_cooldown_enabled" getter="get_global_cooldown_enabled" default="true">
@@ -488,8 +1500,6 @@
 		</member>
 		<member name="needs_target" type="bool" setter="set_needs_target" getter="get_needs_target" default="false">
 		</member>
-		<member name="on_learn_auras" type="Array" setter="set_on_learn_auras" getter="get_on_learn_auras" default="[  ]">
-		</member>
 		<member name="projectile_scene" type="PackedScene" setter="projectile_set_scene" getter="projectile_get_scene">
 		</member>
 		<member name="projectile_speed" type="float" setter="projectile_set_speed" getter="projectile_get_speed" default="0.0">
@@ -518,7 +1528,11 @@
 		</member>
 		<member name="spell_type" type="int" setter="spell_type_set" getter="spell_type_get" default="0">
 		</member>
-		<member name="target_aura_applys" type="Array" setter="set_target_aura_applys" getter="get_target_aura_applys" default="[  ]">
+		<member name="spells_cast_on_caster" type="Array" setter="spells_cast_on_caster_set" getter="spells_cast_on_caster_get" default="[  ]">
+		</member>
+		<member name="spells_cast_on_learn" type="Array" setter="spells_cast_on_learn_set" getter="spells_cast_on_learn_get" default="[  ]">
+		</member>
+		<member name="spells_cast_on_target" type="Array" setter="spells_cast_on_target_set" getter="spells_cast_on_target_get" default="[  ]">
 		</member>
 		<member name="target_relation_type" type="int" setter="set_target_relation_type" getter="get_target_relation_type" enum="TargetRelationType" default="2">
 		</member>
@@ -568,5 +1582,9 @@
 		</constant>
 		<constant name="SPELL_AOE_TARGET_TYPE_RANDOM" value="3" enum="SpellAOETargetType">
 		</constant>
+		<constant name="MAX_AURA_STATS" value="5">
+		</constant>
+		<constant name="MAX_TRIGGER_DATA" value="5">
+		</constant>
 	</constants>
 </class>
diff --git a/doc_classes/SpellCastInfo.xml b/doc_classes/SpellCastInfo.xml
index c8c3316..58c08cb 100644
--- a/doc_classes/SpellCastInfo.xml
+++ b/doc_classes/SpellCastInfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellCastInfo" inherits="Resource" version="3.2">
+<class name="SpellCastInfo" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains spell cast related information, for easy manipulation with auras, spell callbacks, etc.
 	</brief_description>
@@ -9,24 +9,19 @@
 	</tutorials>
 	<methods>
 		<method name="from_dict">
-			<return type="void">
-			</return>
-			<argument index="0" name="dict" type="Dictionary">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="dict" type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="to_dict">
-			<return type="Dictionary">
-			</return>
+			<return type="Dictionary" />
 			<description>
 			</description>
 		</method>
 		<method name="update_cast_time">
-			<return type="bool">
-			</return>
-			<argument index="0" name="delta" type="float">
-			</argument>
+			<return type="bool" />
+			<argument index="0" name="delta" type="float" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/SpellCooldownManipulationData.xml b/doc_classes/SpellCooldownManipulationData.xml
index 3901a35..6344895 100644
--- a/doc_classes/SpellCooldownManipulationData.xml
+++ b/doc_classes/SpellCooldownManipulationData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellCooldownManipulationData" inherits="Reference" version="3.2">
+<class name="SpellCooldownManipulationData" inherits="Reference" version="3.5">
 	<brief_description>
 		Contains data for easy spell cooldown manipulations. Not yet implemented.
 	</brief_description>
diff --git a/doc_classes/SpellDamageInfo.xml b/doc_classes/SpellDamageInfo.xml
index 27033e1..63c300a 100644
--- a/doc_classes/SpellDamageInfo.xml
+++ b/doc_classes/SpellDamageInfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellDamageInfo" inherits="Reference" version="3.2">
+<class name="SpellDamageInfo" inherits="Reference" version="3.5">
 	<brief_description>
 		Contains damage information. It is passed around in callbacks, so things can modify values. (absorbs, immunities etc.)
 	</brief_description>
@@ -9,8 +9,7 @@
 	</tutorials>
 	<methods>
 		<method name="reset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
@@ -18,15 +17,13 @@
 	<members>
 		<member name="amount_absorbed" type="int" setter="amount_absorbed_set" getter="amount_absorbed_get" default="0">
 		</member>
+		<member name="aura_source" type="Spell" setter="aura_source_set" getter="aura_source_get">
+		</member>
 		<member name="crit" type="bool" setter="crit_set" getter="crit_get" default="false">
 		</member>
 		<member name="damage" type="int" setter="damage_set" getter="damage_get" default="0">
 		</member>
-		<member name="damage_source" type="Reference" setter="source_set" getter="source_get">
-		</member>
-		<member name="damage_source_id" type="int" setter="source_set_id" getter="source_get_id" default="0">
-		</member>
-		<member name="damage_source_type" type="int" setter="source_set_type" getter="source_get_type" enum="SpellDamageInfo.DamageSourceType" default="0">
+		<member name="damage_type_get" type="int" setter="damage_type_set" getter="damage_type_get" default="0">
 		</member>
 		<member name="dealer" type="Entity" setter="dealer_set" getter="dealer_get">
 		</member>
@@ -34,15 +31,21 @@
 		</member>
 		<member name="receiver" type="Entity" setter="receiver_set" getter="receiver_get">
 		</member>
-		<member name="spell_type" type="int" setter="spell_type_set" getter="spell_type_get" enum="SpellEnums.SpellType" default="0">
+		<member name="source" type="Reference" setter="source_set" getter="source_get">
+		</member>
+		<member name="source_id" type="int" setter="source_set_id" getter="source_get_id" default="0">
+		</member>
+		<member name="source_type" type="int" setter="source_set_type" getter="source_get_type" default="0">
+		</member>
+		<member name="spell_source" type="Spell" setter="spell_source_set" getter="spell_source_get">
 		</member>
 	</members>
 	<constants>
-		<constant name="DAMAGE_SOURCE_UNKNOWN" value="0" enum="DamageSourceType">
+		<constant name="DAMAGE_SOURCE_UNKNOWN" value="0">
 		</constant>
-		<constant name="DAMAGE_SOURCE_SPELL" value="1" enum="DamageSourceType">
+		<constant name="DAMAGE_SOURCE_SPELL" value="1">
 		</constant>
-		<constant name="DAMAGE_SOURCE_AURA" value="2" enum="DamageSourceType">
+		<constant name="DAMAGE_SOURCE_AURA" value="2">
 		</constant>
 	</constants>
 </class>
diff --git a/doc_classes/SpellEffectVisual.xml b/doc_classes/SpellEffectVisual.xml
index a432a54..9fb1555 100644
--- a/doc_classes/SpellEffectVisual.xml
+++ b/doc_classes/SpellEffectVisual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellEffectVisual" inherits="Resource" version="3.2">
+<class name="SpellEffectVisual" inherits="Resource" version="3.5">
 	<brief_description>
 		Base class for storing spell visual information, like particle effects.
 	</brief_description>
diff --git a/doc_classes/SpellEffectVisualSimple.xml b/doc_classes/SpellEffectVisualSimple.xml
index 9ade666..a749247 100644
--- a/doc_classes/SpellEffectVisualSimple.xml
+++ b/doc_classes/SpellEffectVisualSimple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellEffectVisualSimple" inherits="SpellEffectVisual" version="3.2">
+<class name="SpellEffectVisualSimple" inherits="SpellEffectVisual" version="3.5">
 	<brief_description>
 		Simple implementation od [SpellEfectVisual].
 	</brief_description>
@@ -9,26 +9,22 @@
 	</tutorials>
 	<methods>
 		<method name="has_aura_effect_visual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="has_spell_cast_effect">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="has_spell_effect_visual">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="has_spell_spell_cast_finish_effect">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
@@ -36,13 +32,13 @@
 	<members>
 		<member name="aura_effect_visual" type="PackedScene" setter="set_aura_effect_visual" getter="get_aura_effect_visual">
 		</member>
-		<member name="aura_effect_visual_point" type="int" setter="set_aura_effect_visual_point" getter="get_aura_effect_visual_point" enum="EntityEnums.CommonCharacterSkeletonPoints" default="78729568">
+		<member name="aura_effect_visual_point" type="int" setter="set_aura_effect_visual_point" getter="get_aura_effect_visual_point" enum="EntityEnums.CommonCharacterSkeletonPoints" default="0">
 		</member>
 		<member name="effect_spell_cast_effect_id" type="PackedScene" setter="set_spell_cast_effect" getter="get_spell_cast_effect">
 		</member>
 		<member name="effect_spell_cast_finish_effect" type="PackedScene" setter="set_spell_cast_finish_effect" getter="get_spell_cast_finish_effect">
 		</member>
-		<member name="spell_cast_finish_effect_point" type="int" setter="set_spell_cast_finish_effect_point" getter="get_spell_cast_finish_effect_point" enum="EntityEnums.CommonCharacterSkeletonPoints" default="78729568">
+		<member name="spell_cast_finish_effect_point" type="int" setter="set_spell_cast_finish_effect_point" getter="get_spell_cast_finish_effect_point" enum="EntityEnums.CommonCharacterSkeletonPoints" default="0">
 		</member>
 		<member name="spell_effect_visual" type="PackedScene" setter="set_spell_effect_visual" getter="get_spell_effect_visual">
 		</member>
diff --git a/doc_classes/SpellEnums.xml b/doc_classes/SpellEnums.xml
index 80e99f7..477823e 100644
--- a/doc_classes/SpellEnums.xml
+++ b/doc_classes/SpellEnums.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellEnums" inherits="Object" version="3.2">
+<class name="SpellEnums" inherits="Object" version="3.5">
 	<brief_description>
 		Contains lots of general-use enums for spells.
 	</brief_description>
diff --git a/doc_classes/SpellFollowProjectile3D.xml b/doc_classes/SpellFollowProjectile3D.xml
index 3c2b3c3..72a2a71 100644
--- a/doc_classes/SpellFollowProjectile3D.xml
+++ b/doc_classes/SpellFollowProjectile3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellFollowProjectile3D" inherits="Spatial" version="3.2">
+<class name="SpellFollowProjectile3D" inherits="Spatial" version="3.5">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/doc_classes/SpellHealInfo.xml b/doc_classes/SpellHealInfo.xml
index 0e9c625..98df4ae 100644
--- a/doc_classes/SpellHealInfo.xml
+++ b/doc_classes/SpellHealInfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="SpellHealInfo" inherits="Reference" version="3.2">
+<class name="SpellHealInfo" inherits="Reference" version="3.5">
 	<brief_description>
 		Contains heal information. It is passed around in callbacks, so things can modify values. (absorbs, immunities etc.)
 	</brief_description>
@@ -9,8 +9,7 @@
 	</tutorials>
 	<methods>
 		<method name="reset">
-			<return type="void">
-			</return>
+			<return type="void" />
 			<description>
 			</description>
 		</method>
@@ -18,31 +17,35 @@
 	<members>
 		<member name="amount_absorbed" type="int" setter="amount_absorbed_set" getter="amount_absorbed_get" default="0">
 		</member>
+		<member name="aura_source" type="Spell" setter="aura_source_set" getter="aura_source_get">
+		</member>
 		<member name="crit" type="bool" setter="crit_set" getter="crit_get" default="false">
 		</member>
 		<member name="dealer" type="Entity" setter="dealer_set" getter="dealer_get">
 		</member>
 		<member name="heal" type="int" setter="heal_set" getter="heal_get" default="0">
 		</member>
-		<member name="heal_source" type="Reference" setter="source_set" getter="source_get">
+		<member name="heal_type_get" type="int" setter="heal_type_set" getter="heal_type_get" default="0">
 		</member>
-		<member name="heal_source_id" type="int" setter="source_set_id" getter="source_get_id" default="0">
-		</member>
-		<member name="heal_source_type" type="int" setter="source_set_type" getter="source_get_type" enum="SpellHealInfo.HealSourceType" default="0">
-		</member>
-		<member name="immune" type="bool" setter="set_immune" getter="get_immune" default="true">
+		<member name="immune" type="bool" setter="set_immune" getter="get_immune" default="false">
 		</member>
 		<member name="receiver" type="Entity" setter="receiver_set" getter="receiver_get">
 		</member>
-		<member name="spell_type" type="int" setter="spell_type_set" getter="spell_type_get" enum="SpellEnums.SpellType" default="0">
+		<member name="source" type="Reference" setter="source_set" getter="source_get">
+		</member>
+		<member name="source_id" type="int" setter="source_set_id" getter="source_get_id" default="0">
+		</member>
+		<member name="source_type" type="int" setter="source_set_type" getter="source_get_type" default="0">
+		</member>
+		<member name="spell_source" type="Spell" setter="spell_source_set" getter="spell_source_get">
 		</member>
 	</members>
 	<constants>
-		<constant name="HEAL_SOURCE_UNKNOWN" value="0" enum="HealSourceType">
+		<constant name="HEAL_SOURCE_UNKNOWN" value="0">
 		</constant>
-		<constant name="HEAL_SOURCE_SPELL" value="1" enum="HealSourceType">
+		<constant name="HEAL_SOURCE_SPELL" value="1">
 		</constant>
-		<constant name="HEAL_SOURCE_AURA" value="2" enum="HealSourceType">
+		<constant name="HEAL_SOURCE_AURA" value="2">
 		</constant>
 	</constants>
 </class>
diff --git a/doc_classes/StatData.xml b/doc_classes/StatData.xml
index b324bbc..f580e3b 100644
--- a/doc_classes/StatData.xml
+++ b/doc_classes/StatData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="StatData" inherits="Resource" version="3.2">
+<class name="StatData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains a [Stat]'s data.
 	</brief_description>
@@ -9,80 +9,59 @@
 	</tutorials>
 	<methods>
 		<method name="get_base">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_mod_stat_id">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_mod_stat_multiplier">
-			<return type="float">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="float" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_target_stat_id">
-			<return type="int">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="int" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="has_mod_stats">
-			<return type="bool">
-			</return>
+			<return type="bool" />
 			<description>
 			</description>
 		</method>
 		<method name="set_base">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="entry" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="entry" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_mod_stat_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_mod_stat_multiplier">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="float" />
 			<description>
 			</description>
 		</method>
 		<method name="set_target_stat_id">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="value" type="int" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/VendorItemData.xml b/doc_classes/VendorItemData.xml
index 4ed2fef..f9f4fc4 100644
--- a/doc_classes/VendorItemData.xml
+++ b/doc_classes/VendorItemData.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VendorItemData" inherits="Resource" version="3.2">
+<class name="VendorItemData" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains vendor item data for an [Entity]/[EntityData].
 	</brief_description>
@@ -9,26 +9,20 @@
 	</tutorials>
 	<methods>
 		<method name="get_num_vendor_datas">
-			<return type="int">
-			</return>
+			<return type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="get_vendor_data">
-			<return type="VendorItemDataEntry">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+			<return type="VendorItemDataEntry" />
+			<argument index="0" name="index" type="int" />
 			<description>
 			</description>
 		</method>
 		<method name="set_vendor_data">
-			<return type="void">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="vendor_data" type="VendorItemDataEntry">
-			</argument>
+			<return type="void" />
+			<argument index="0" name="index" type="int" />
+			<argument index="1" name="vendor_data" type="VendorItemDataEntry" />
 			<description>
 			</description>
 		</method>
diff --git a/doc_classes/VendorItemDataEntry.xml b/doc_classes/VendorItemDataEntry.xml
index 18faeec..d5700aa 100644
--- a/doc_classes/VendorItemDataEntry.xml
+++ b/doc_classes/VendorItemDataEntry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="VendorItemDataEntry" inherits="Resource" version="3.2">
+<class name="VendorItemDataEntry" inherits="Resource" version="3.5">
 	<brief_description>
 		Contains one entry for a [VendorItemData].
 	</brief_description>
diff --git a/doc_classes/XPData.xml b/doc_classes/XPData.xml
deleted file mode 100644
index c598855..0000000
--- a/doc_classes/XPData.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="XPData" inherits="Resource" version="3.2">
-	<brief_description>
-		Contains the XP values required to level up for entities.
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="can_character_level_up">
-			<return type="bool">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="can_class_level_up">
-			<return type="bool">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_character_max_level">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_character_xp">
-			<return type="int">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_class_max_level">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_class_xp">
-			<return type="int">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_character_xp">
-			<return type="void">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_class_xp">
-			<return type="void">
-			</return>
-			<argument index="0" name="level" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-	</methods>
-	<constants>
-	</constants>
-</class>