Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-12-21 13:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ESS to get the Attachment ModelVisualEntry implementation/changes.

Browse Source
This commit is contained in:
Relintai 2020-06-16 15:55:01 +02:00
parent 2e1f1a1e84
commit 7e7dc3b43e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "893cf84278b0354af44849aae58e06c576ed36ab", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "3bafbe596ee76979ee7629e5744ffbbe331762ea"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "cdc918a5b89a226bad0510f270ddc0d06097f07e"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "fb01ca303dd733217fa59cbee391cbde439db35b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}} {"engine": {"3.2": "893cf84278b0354af44849aae58e06c576ed36ab", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "c3ac4bf02a4dc6b110538667ba2d80107e8e522e"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "cdc918a5b89a226bad0510f270ddc0d06097f07e"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "fb01ca303dd733217fa59cbee391cbde439db35b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

12
game/modules/species/Human/models/armature_huf.tscn
View File

@ -144,7 +144,7 @@ viss = [ ExtResource( 1 ) ]
[node name="armature" parent="." instance=ExtResource( 6 )] [node name="armature" parent="." instance=ExtResource( 6 )]
[node name="Skeleton" parent="armature/Armature" index="0"] [node name="Skeleton" parent="armature/Armature" index="0"]
transform = Transform( 1, -6.70125e-18, 1.50051e-25, 6.70125e-18, 1, 1.02995e-42, -1.50051e-25, -2.38221e-44, 1, 0, -2.25061e-17, 0 ) transform = Transform( 1, -5.78001e-18, 1.2338e-25, 5.78001e-18, 1, 8.66002e-43, -1.2338e-25, -1.54143e-43, 1, 0, -1.71245e-16, 0 )
bones/0/bound_children = [ NodePath("RootAttachment") ] bones/0/bound_children = [ NodePath("RootAttachment") ]
bones/1/bound_children = [ NodePath("RightHipAttachment") ] bones/1/bound_children = [ NodePath("RightHipAttachment") ]
bones/10/bound_children = [ NodePath("BoneAttachment") ] bones/10/bound_children = [ NodePath("BoneAttachment") ]
@ -155,7 +155,7 @@ bones/24/bound_children = [ NodePath("RightHandAttachment") ]
[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"] [node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"]
[node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"] [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"]
transform = Transform( 0.102751, 0.121251, -0.987277, 0.0573114, -0.99157, -0.115804, -0.99305, -0.0446844, -0.108838, 0.228388, 0.771368, -0.0101909 ) transform = Transform( 0.102812, 0.120527, -0.987357, 0.0572098, -0.991657, -0.115083, -0.99305, -0.0446561, -0.108853, 0.228664, 0.770859, -0.0101007 )
bone_name = "left_hand" bone_name = "left_hand"
[node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"] [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@ -163,7 +163,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"] [node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
transform = Transform( -0.0401201, -0.0244025, -0.998879, -0.127455, -0.99136, 0.0293239, -0.991043, 0.128493, 0.0366715, -0.226465, 0.768581, -0.00641895 ) transform = Transform( -0.0402821, -0.0256737, -0.998839, -0.127349, -0.991331, 0.0306021, -0.99105, 0.128439, 0.0366723, -0.227281, 0.76866, -0.00652948 )
bone_name = "right_hand" bone_name = "right_hand"
[node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"] [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@ -179,7 +179,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"] [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"]
transform = Transform( 0.99998, -0.00634746, -0.000327975, 0.0063559, 0.997245, 0.0731518, -0.000137274, -0.0731568, 0.99732, 0.00104182, 1.31814, 5.46634e-05 ) transform = Transform( 0.999977, -0.00672529, -0.000431739, 0.00673955, 0.997238, 0.0731456, -6.13874e-05, -0.0731515, 0.997321, 0.00105643, 1.31759, 5.93207e-05 )
bone_name = "neck" bone_name = "neck"
[node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"] [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]
@ -187,7 +187,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"] [node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
transform = Transform( 0.999512, 0.0312334, 1.48147e-08, -0.0312334, 0.999512, 4.71623e-07, -7.70601e-11, -4.71856e-07, 1, 9.77133e-05, 0.776641, 0 ) transform = Transform( 0.999562, 0.0296045, 1.40421e-08, -0.0296045, 0.999562, 4.71647e-07, -7.30456e-11, -4.71856e-07, 1, 0.000743483, 0.776087, 0 )
bone_name = "pelvis" bone_name = "pelvis"
[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"] [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"]
@ -200,7 +200,7 @@ material/0 = null
material/1 = null material/1 = null
[node name="BoneAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"] [node name="BoneAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"]
transform = Transform( 0.999978, -0.00662597, 0.000261727, 0.00662768, 0.999922, -0.00104081, -0.000254833, 0.0010423, 1, 0.00228484, 1.13056, -0.000140854 ) transform = Transform( 0.999975, -0.00701046, 0.000186282, 0.00701133, 0.999914, -0.00104639, -0.000178945, 0.00104757, 0.999999, 0.00237157, 1.13001, -0.000137186 )
bone_name = "spine_2" bone_name = "spine_2"
[node name="Spine2AP" type="Spatial" parent="armature/Armature/Skeleton/BoneAttachment"] [node name="Spine2AP" type="Spatial" parent="armature/Armature/Skeleton/BoneAttachment"]

6
game/player/CharacterSkeletonAttachPoint.gd
View File

@ -27,7 +27,7 @@ class_name CharacterSkeketonAttachPoint
var effects : Dictionary var effects : Dictionary
var timed_effects : Dictionary var timed_effects : Dictionary
func add_effect(effect : PackedScene) -> void: func add(effect : PackedScene) -> void:
if effects.has(effect): if effects.has(effect):
effects[effect][0] = effects[effect][0] + 1 effects[effect][0] = effects[effect][0] + 1
else: else:
@ -39,7 +39,7 @@ func add_effect(effect : PackedScene) -> void:
var data : Array = [ 1, eff ] var data : Array = [ 1, eff ]
effects[effect] = data effects[effect] = data
func add_effect_timed(effect : PackedScene, time : float) -> void: func add_timed(effect : PackedScene, time : float) -> void:
if timed_effects.has(effect): if timed_effects.has(effect):
timed_effects[effect][0] = timed_effects[effect][0] + 1 timed_effects[effect][0] = timed_effects[effect][0] + 1
else: else:
@ -51,7 +51,7 @@ func add_effect_timed(effect : PackedScene, time : float) -> void:
var data : Array = [ 1, eff, time ] var data : Array = [ 1, eff, time ]
timed_effects[effect] = data timed_effects[effect] = data
func remove_effect(effect : PackedScene) -> void: func remove(effect : PackedScene) -> void:
if effects.has(effect): if effects.has(effect):
var data : Array = effects[effect] var data : Array = effects[effect]

12
game/scripts/spells/gd_spell_script.gd
View File

@ -215,20 +215,20 @@ func add_spell_cast_effect(info : SpellCastInfo) -> void:
if basic_spell_effect != null: if basic_spell_effect != null:
if basic_spell_effect.spell_cast_effect_left_hand != null: if basic_spell_effect.spell_cast_effect_left_hand != null:
info.caster.get_character_skeleton().common_attach_point_add_effect(EntityEnums.COMMON_SKELETON_POINT_LEFT_HAND, basic_spell_effect.spell_cast_effect_left_hand) info.caster.get_character_skeleton().common_attach_point_add(EntityEnums.COMMON_SKELETON_POINT_LEFT_HAND, basic_spell_effect.spell_cast_effect_left_hand)
if basic_spell_effect.spell_cast_effect_right_hand != null: if basic_spell_effect.spell_cast_effect_right_hand != null:
info.caster.get_character_skeleton().common_attach_point_add_effect(EntityEnums.COMMON_SKELETON_POINT_RIGHT_HAND, basic_spell_effect.spell_cast_effect_right_hand) info.caster.get_character_skeleton().common_attach_point_add(EntityEnums.COMMON_SKELETON_POINT_RIGHT_HAND, basic_spell_effect.spell_cast_effect_right_hand)
func remove_spell_cast_effect(info : SpellCastInfo) -> void: func remove_spell_cast_effect(info : SpellCastInfo) -> void:
var basic_spell_effect : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic var basic_spell_effect : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic
if basic_spell_effect != null: if basic_spell_effect != null:
if basic_spell_effect.spell_cast_effect_left_hand != null: if basic_spell_effect.spell_cast_effect_left_hand != null:
info.caster.get_character_skeleton().common_attach_point_remove_effect(EntityEnums.COMMON_SKELETON_POINT_LEFT_HAND, basic_spell_effect.spell_cast_effect_left_hand) info.caster.get_character_skeleton().common_attach_point_remove(EntityEnums.COMMON_SKELETON_POINT_LEFT_HAND, basic_spell_effect.spell_cast_effect_left_hand)
if basic_spell_effect.spell_cast_effect_right_hand != null: if basic_spell_effect.spell_cast_effect_right_hand != null:
info.caster.get_character_skeleton().common_attach_point_remove_effect(EntityEnums.COMMON_SKELETON_POINT_RIGHT_HAND, basic_spell_effect.spell_cast_effect_right_hand) info.caster.get_character_skeleton().common_attach_point_remove(EntityEnums.COMMON_SKELETON_POINT_RIGHT_HAND, basic_spell_effect.spell_cast_effect_right_hand)
func _notification_ccast(what, info): func _notification_ccast(what, info):
if what == SpellEnums.NOTIFICATION_CAST_STARTED: if what == SpellEnums.NOTIFICATION_CAST_STARTED:
@ -249,10 +249,10 @@ func _notification_ccast(what, info):
if bse != null: if bse != null:
if bse.torso_spell_cast_finish_effect != null: if bse.torso_spell_cast_finish_effect != null:
info.target.get_character_skeleton().common_attach_point_add_effect_timed(EntityEnums.COMMON_SKELETON_POINT_TORSO, bse.torso_spell_cast_finish_effect_time) info.target.get_character_skeleton().common_attach_point_add_timed(EntityEnums.COMMON_SKELETON_POINT_TORSO, bse.torso_spell_cast_finish_effect_time)
if bse.root_spell_cast_finish_effect != null: if bse.root_spell_cast_finish_effect != null:
info.target.get_character_skeleton().common_attach_point_add_effect_timed(EntityEnums.COMMON_SKELETON_POINT_ROOT, bse.root_spell_cast_finish_effect_time) info.target.get_character_skeleton().common_attach_point_add_timed(EntityEnums.COMMON_SKELETON_POINT_ROOT, bse.root_spell_cast_finish_effect_time)
func _son_spell_hit(info): func _son_spell_hit(info):