mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-12-21 13:16:49 +01:00
Comment out the code that was implementing spell scaling in Aura. Also update ESS so auras continue to deal damage/heal even if the original caster's node is not available anymore.
This commit is contained in:
parent
7b28a3e17d
commit
1c4c3a5d55
2
HEADS
2
HEADS
@ -1 +1 @@
|
|||||||
{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "9839cb49721f2d9a37670d6040a4f56ce26001fe"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "07b24de868457c0a190c88771e99ff09e5451c3b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}
|
{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "f6f125b92c05ad12fed573d5568b5384a548fea5"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}
|
||||||
@ -51,6 +51,7 @@ class Logfile:
|
|||||||
var base_dir = ppath.get_base_dir()
|
var base_dir = ppath.get_base_dir()
|
||||||
if not dir.dir_exists(base_dir):
|
if not dir.dir_exists(base_dir):
|
||||||
# TODO: Move directory creation to the function that will actually *write*
|
# TODO: Move directory creation to the function that will actually *write*
|
||||||
|
dir.open(base_dir)
|
||||||
var err = dir.make_dir_recursive(base_dir)
|
var err = dir.make_dir_recursive(base_dir)
|
||||||
if err:
|
if err:
|
||||||
print("[ERROR] [logger] Could not create the '%s' directory; exited with error %d." \
|
print("[ERROR] [logger] Could not create the '%s' directory; exited with error %d." \
|
||||||
|
|||||||
@ -21,7 +21,6 @@
|
|||||||
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
|
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
|
||||||
[ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20]
|
[ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20]
|
||||||
|
|
||||||
|
|
||||||
[sub_resource type="VoxelmanLevelGenerator" id=1]
|
[sub_resource type="VoxelmanLevelGenerator" id=1]
|
||||||
script = ExtResource( 18 )
|
script = ExtResource( 18 )
|
||||||
_force_planet = -1
|
_force_planet = -1
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -21,69 +21,69 @@ class_name AuraGD
|
|||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
|
#
|
||||||
func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) -> void:
|
#func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) -> void:
|
||||||
randomize()
|
# randomize()
|
||||||
|
#
|
||||||
if damage_info.dealer == null:
|
# if damage_info.dealer == null:
|
||||||
printerr("_handle_aura_damage: damage_info.dealer is null! ")
|
# printerr("_handle_aura_damage: damage_info.dealer is null! ")
|
||||||
return
|
# return
|
||||||
|
#
|
||||||
damage_info.damage = damage_min + (randi() % (damage_max - damage_min))
|
# damage_info.damage = damage_min + (randi() % (damage_max - damage_min))
|
||||||
|
#
|
||||||
if scale_with_level:
|
# if scale_with_level:
|
||||||
damage_info.damage *= int(float(damage_info.dealer.scharacter_level) / float(EntityEnums.MAX_CHARACTER_LEVEL))
|
# damage_info.damage *= int(float(damage_info.dealer.scharacter_level) / float(EntityEnums.MAX_CHARACTER_LEVEL))
|
||||||
|
#
|
||||||
damage_info.damage_source_type = aura_data.aura.damage_type
|
# damage_info.damage_source_type = aura_data.aura.damage_type
|
||||||
|
#
|
||||||
if (is_instance_valid(damage_info.dealer)):
|
# if (is_instance_valid(damage_info.dealer)):
|
||||||
damage_info.dealer.sdeal_damage_to(damage_info)
|
# damage_info.dealer.sdeal_damage_to(damage_info)
|
||||||
|
#
|
||||||
func _handle_aura_heal(aura_data : AuraData, shi : SpellHealInfo) -> void:
|
#func _handle_aura_heal(aura_data : AuraData, shi : SpellHealInfo) -> void:
|
||||||
randomize()
|
# randomize()
|
||||||
|
#
|
||||||
shi.heal = heal_min + (randi() % (heal_max - heal_min))
|
# shi.heal = heal_min + (randi() % (heal_max - heal_min))
|
||||||
shi.damage *= shi.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL)
|
# shi.damage *= shi.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL)
|
||||||
shi.heal_source_type = aura_data.aura.aura_type
|
# shi.heal_source_type = aura_data.aura.aura_type
|
||||||
|
#
|
||||||
shi.dealer.sdeal_heal_to(shi)
|
# shi.dealer.sdeal_heal_to(shi)
|
||||||
|
#
|
||||||
func _sapply(info : AuraApplyInfo) -> void:
|
#func _sapply(info : AuraApplyInfo) -> void:
|
||||||
# var add : bool = false
|
## var add : bool = false
|
||||||
var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
|
# var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
|
||||||
|
#
|
||||||
if ad == null:
|
# if ad == null:
|
||||||
# add = true
|
## add = true
|
||||||
ad = AuraData.new()
|
# ad = AuraData.new()
|
||||||
|
#
|
||||||
setup_aura_data(ad, info);
|
# setup_aura_data(ad, info);
|
||||||
|
#
|
||||||
for i in range(stat_attribute_get_count()):
|
# for i in range(stat_attribute_get_count()):
|
||||||
info.target.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
|
# info.target.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
|
||||||
|
#
|
||||||
if states_add != 0:
|
# if states_add != 0:
|
||||||
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
|
# for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
|
||||||
var t : int = 1 << i
|
# var t : int = 1 << i
|
||||||
|
#
|
||||||
if states_add & t != 0:
|
# if states_add & t != 0:
|
||||||
info.target.adds_state_ref(i)
|
# info.target.adds_state_ref(i)
|
||||||
|
#
|
||||||
|
#
|
||||||
info.target.aura_adds(ad);
|
# info.target.aura_adds(ad);
|
||||||
else:
|
# else:
|
||||||
ad.remaining_time = time
|
# ad.remaining_time = time
|
||||||
|
#
|
||||||
|
#
|
||||||
func _sdeapply(data : AuraData) -> void:
|
#func _sdeapply(data : AuraData) -> void:
|
||||||
for i in range(stat_attribute_get_count()):
|
# for i in range(stat_attribute_get_count()):
|
||||||
data.owner.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
|
# data.owner.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
|
||||||
|
#
|
||||||
if states_add != 0:
|
# if states_add != 0:
|
||||||
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
|
# for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
|
||||||
var t : int = 1 << i
|
# var t : int = 1 << i
|
||||||
|
#
|
||||||
if states_add & t != 0:
|
# if states_add & t != 0:
|
||||||
data.owner.removes_state_ref(i)
|
# data.owner.removes_state_ref(i)
|
||||||
|
|
||||||
func _con_aura_added(data : AuraData) -> void:
|
func _con_aura_added(data : AuraData) -> void:
|
||||||
if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
|
if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user