Merged spell_script_gd and aura_script.

game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=3]
 

game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
 

game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3]
 

game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
 

game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=2]
 
 [resource]

game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=2]
 
 [resource]

game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2]
 
 [resource]

game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=2]
 
 [resource]

game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
 

game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
 

game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3]
 

game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=3]
 

game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3]
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=4]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5]
 [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=6]
 

game/project.godot

@@ -9,11 +9,6 @@
 config_version=4
 
 _global_script_classes=[ {
-"base": "Spell",
-"class": "AuraGD",
-"language": "GDScript",
-"path": "res://scripts/auras/aura_script.gd"
-}, {
 "base": "Reference",
 "class": "BrushPrefabs",
 "language": "GDScript",
@@ -265,7 +260,6 @@ _global_script_classes=[ {
 "path": "res://addons/world_generator/resources/zone.gd"
 } ]
 _global_script_class_icons={
-"AuraGD": "",
 "BrushPrefabs": "",
 "CharacterSkeketonAttachPoint": "",
 "ColorTile": "",

game/scripts/auras/SpeedModAura.gd

@@ -1,4 +1,4 @@
-extends "aura_script.gd"
+extends "res://scripts/spells/gd_spell_script.gd"
 
 export(bool) var does_stack : bool = true
 export(float) var mod_speed : float = 0

game/scripts/auras/SpellDamageModAura.gd

@@ -1,4 +1,4 @@
-extends "aura_script.gd"
+extends "res://scripts/spells/gd_spell_script.gd"
 
 export(String) var spell_name : String
 export(float) var mod_value : float

game/scripts/auras/aura_script.gd

@@ -1,98 +0,0 @@
-extends "res://scripts/spells/gd_spell_script.gd"
-class_name AuraGD
-
-# Copyright (c) 2019-2021 Péter Magyar
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-func _aura_sapply(info : AuraApplyInfo) -> void:
-#	var add : bool = false
-	var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
-
-	if ad == null:
-#		add = true
-		ad = AuraData.new()
-
-		setup_aura_data(ad, info);
-
-		for i in range(aura_stat_attribute_get_count()):
-			info.target.stat_mod(aura_stat_attribute_get_stat(id), aura_stat_attribute_get_base_mod(i), aura_stat_attribute_get_bonus_mod(i), aura_stat_attribute_get_percent_mod(i))
-
-		if aura_states_add != 0:
-			for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
-				var t : int = 1 << i
-
-				if aura_states_add & t != 0:
-					info.target.adds_state_ref(i)
-
-		info.target.aura_adds(ad);
-		
-		apply_mods(ad)
-	else:
-		ad.remaining_time = aura_time
-
-
-func _aura_sdeapply(data : AuraData) -> void:
-	for i in range(aura_stat_attribute_get_count()):
-		data.owner.stat_mod(aura_stat_attribute_get_stat(id), -aura_stat_attribute_get_base_mod(i), -aura_stat_attribute_get_bonus_mod(i), -aura_stat_attribute_get_percent_mod(i))
-
-	if aura_states_add != 0:
-		for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
-			var t : int = 1 << i
-
-			if aura_states_add & t != 0:
-				data.owner.removes_state_ref(i)
-				
-	deapply_mods(data)
-				
-func apply_mods(ad : AuraData):
-	pass
-	
-func deapply_mods(ad : AuraData):
-	pass
-	
-func _con_aura_added(data : AuraData) -> void:
-	if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
-		return
-	
-	var bse : SpellEffectVisualBasic = aura_visual_spell_effects as SpellEffectVisualBasic
-		
-	if bse != null:
-		if bse.root_aura_effect != null:
-			if bse.root_aura_effect_time < 0.00001:
-				data.owner.get_character_skeleton().root_attach_point.add_effect(bse.root_aura_effect)
-			else:
-				data.owner.get_character_skeleton().root_attach_point.add_effect_timed(bse.root_aura_effect, bse.root_aura_effect_time)
-
-		if bse.torso_aura_effect != null:
-			if bse.torso_aura_effect_time < 0.00001:
-				data.owner.get_character_skeleton().torso_attach_point.add_effect(bse.torso_aura_effect)
-			else:
-				data.owner.get_character_skeleton().torso_attach_point.add_effect_timed(bse.torso_aura_effect, bse.torso_aura_effect_time)
-
-func _con_aura_removed(data : AuraData) -> void:
-	var bse : SpellEffectVisualBasic = aura_visual_spell_effects as SpellEffectVisualBasic
-		
-	if bse != null:
-		if bse.root_aura_effect != null and bse.root_aura_effect_time < 0.00001:
-			data.owner.get_character_skeleton().root_attach_point.remove_effect(bse.root_aura_effect)
-			
-		if bse.torso_aura_effect != null and bse.torso_aura_effect_time < 0.00001:
-			data.owner.get_character_skeleton().torso_attach_point.remove_effect(bse.torso_aura_effect)
-

game/scripts/spells/gd_spell_script.gd

@@ -280,3 +280,80 @@ func _notification_ccast(what, info):
 
 func _son_spell_hit(info):
 	handle_effect(info)
+
+
+func _aura_sapply(info : AuraApplyInfo) -> void:
+#	var add : bool = false
+	var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
+
+	if ad == null:
+#		add = true
+		ad = AuraData.new()
+
+		setup_aura_data(ad, info);
+
+		for i in range(aura_stat_attribute_get_count()):
+			info.target.stat_mod(aura_stat_attribute_get_stat(id), aura_stat_attribute_get_base_mod(i), aura_stat_attribute_get_bonus_mod(i), aura_stat_attribute_get_percent_mod(i))
+
+		if aura_states_add != 0:
+			for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
+				var t : int = 1 << i
+
+				if aura_states_add & t != 0:
+					info.target.adds_state_ref(i)
+
+		info.target.aura_adds(ad);
+		
+		apply_mods(ad)
+	else:
+		ad.remaining_time = aura_time
+
+
+func _aura_sdeapply(data : AuraData) -> void:
+	for i in range(aura_stat_attribute_get_count()):
+		data.owner.stat_mod(aura_stat_attribute_get_stat(id), -aura_stat_attribute_get_base_mod(i), -aura_stat_attribute_get_bonus_mod(i), -aura_stat_attribute_get_percent_mod(i))
+
+	if aura_states_add != 0:
+		for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
+			var t : int = 1 << i
+
+			if aura_states_add & t != 0:
+				data.owner.removes_state_ref(i)
+				
+	deapply_mods(data)
+				
+func apply_mods(ad : AuraData):
+	pass
+	
+func deapply_mods(ad : AuraData):
+	pass
+	
+func _con_aura_added(data : AuraData) -> void:
+	if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
+		return
+	
+	var bse : SpellEffectVisualBasic = aura_visual_spell_effects as SpellEffectVisualBasic
+		
+	if bse != null:
+		if bse.root_aura_effect != null:
+			if bse.root_aura_effect_time < 0.00001:
+				data.owner.get_character_skeleton().root_attach_point.add_effect(bse.root_aura_effect)
+			else:
+				data.owner.get_character_skeleton().root_attach_point.add_effect_timed(bse.root_aura_effect, bse.root_aura_effect_time)
+
+		if bse.torso_aura_effect != null:
+			if bse.torso_aura_effect_time < 0.00001:
+				data.owner.get_character_skeleton().torso_attach_point.add_effect(bse.torso_aura_effect)
+			else:
+				data.owner.get_character_skeleton().torso_attach_point.add_effect_timed(bse.torso_aura_effect, bse.torso_aura_effect_time)
+
+func _con_aura_removed(data : AuraData) -> void:
+	var bse : SpellEffectVisualBasic = aura_visual_spell_effects as SpellEffectVisualBasic
+		
+	if bse != null:
+		if bse.root_aura_effect != null and bse.root_aura_effect_time < 0.00001:
+			data.owner.get_character_skeleton().root_attach_point.remove_effect(bse.root_aura_effect)
+			
+		if bse.torso_aura_effect != null and bse.torso_aura_effect_time < 0.00001:
+			data.owner.get_character_skeleton().torso_attach_point.remove_effect(bse.torso_aura_effect)
+