Initial weapon sheathing support. ALso updated ESS to get a few new constants.

HEADS

@@ -1 +1 @@
-{"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"}}
+{"engine": {"3.2": "1cf8652945edd8c25084fed95b68bb015d77c4fb", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "2acdb0f6d72fcc3e05fb412d8708f584cfd3ea26"}, "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"}}

game/modules/species/Human/models/armature_huf.tscn

@@ -134,6 +134,11 @@ attach_point_paths/3_root = NodePath("armature/Armature/Skeleton/RootAttachment/
 attach_point_paths/4_right_hip = NodePath("armature/Armature/Skeleton/RightHipAttachment/Spatial")
 attach_point_paths/5_left_hip = NodePath("")
 attach_point_paths/6_spine_2 = NodePath("armature/Armature/Skeleton/BoneAttachment/Spine2AP")
+attach_point_paths/7_weapon_left = NodePath("armature/Armature/Skeleton/LeftWeapon")
+attach_point_paths/8_weapon_right = NodePath("armature/Armature/Skeleton/RightWeapon")
+attach_point_paths/9_weapon_left_back = NodePath("armature/Armature/Skeleton/LeftWeaponBack")
+attach_point_paths/10_weapon_right_back = NodePath("armature/Armature/Skeleton/RightWeaponBack")
+attach_point_paths/11_weapon_shield_left = NodePath("armature/Armature/Skeleton/Shield")
 script = ExtResource( 8 )
 automatic_build = true
 mesh_instance_path = NodePath("armature/Armature/Skeleton/MeshInstance")
@@ -144,33 +149,42 @@ viss = [ ExtResource( 1 ) ]
 [node name="armature" parent="." instance=ExtResource( 6 )]
 
 [node name="Skeleton" parent="armature/Armature" index="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 )
+transform = Transform( 1, -6.84064e-18, 1.54087e-25, 6.84064e-18, 1, 1.05378e-42, -1.54087e-25, 0, 1, 0, 0, 0 )
 bones/0/bound_children = [ NodePath("RootAttachment") ]
-bones/1/bound_children = [ NodePath("RightHipAttachment") ]
+bones/1/bound_children = [ NodePath("RightHipAttachment"), NodePath("LeftHipAttachment") ]
-bones/10/bound_children = [ NodePath("BoneAttachment") ]
+bones/10/bound_children = [ NodePath("RightBackAttachment"), NodePath("LeftBackAttachment") ]
+bones/13/bound_children = [ NodePath("ShieldAttachment") ]
 bones/14/bound_children = [ NodePath("LeftHandAttachment") ]
 bones/19/bound_children = [ NodePath("NeckAttachment") ]
 bones/24/bound_children = [ NodePath("RightHandAttachment") ]
 
 [node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"]
+visible = false
 
 [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"]
-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 )
+transform = Transform( 0.102742, 0.121361, -0.987264, 0.0573268, -0.991557, -0.115914, -0.99305, -0.0446887, -0.108835, 0.228346, 0.771445, -0.0102045 )
 bone_name = "left_hand"
 
 [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 )
+transform = Transform( -0.0646502, 0.683772, 0.726832, -0.148514, -0.726783, 0.670508, 0.986758, -0.0646467, 0.148575, -0.0226043, 0.107657, 0.0283146 )
 script = ExtResource( 2 )
 
-[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
+[node name="ShieldAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
-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 )
+transform = Transform( 0.0460429, 0.0993847, 0.993971, -0.0443354, -0.99381, 0.101413, 0.997951, -0.0487388, -0.0413565, 0.204427, 1.01063, 0.00152545 )
+bone_name = "left_forearm"
+
+[node name="LeftHandShield" type="Spatial" parent="armature/Armature/Skeleton/ShieldAttachment"]
+transform = Transform( 0.122585, 0.992132, -0.0242311, 0.987746, -0.124342, -0.0941345, -0.0964273, -0.0123912, -0.995239, 0.0157415, 0.108918, 0.0213161 )
+
+[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
+transform = Transform( -0.0400954, -0.0242101, -0.998884, -0.127471, -0.991364, 0.0291305, -0.991041, 0.128501, 0.0366712, -0.226341, 0.768569, -0.00640216 )
 bone_name = "right_hand"
 
 [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 )
+transform = Transform( 0.0789363, 0.493983, 0.86583, -0.0571054, -0.864836, 0.498656, 0.995268, -0.0888088, -0.0400836, -0.0131918, 0.0790432, -0.0425565 )
 script = ExtResource( 2 )
 
-[node name="RootAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
+[node name="RootAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.23883e-05, 0, 0.000216131 )
 bone_name = "root"
 
@@ -178,39 +192,79 @@ bone_name = "root"
 transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0 )
 script = ExtResource( 2 )
 
-[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"]
+[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
-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 )
+transform = Transform( 0.99998, -0.00629028, -0.000312272, 0.00629784, 0.997246, 0.0731527, -0.000148758, -0.0731576, 0.99732, 0.00103962, 1.31823, 5.39592e-05 )
 bone_name = "neck"
 
 [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 )
 script = ExtResource( 2 )
 
-[node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
+[node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"]
-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 )
+transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 )
 bone_name = "pelvis"
 
 [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"]
-transform = Transform( 0.999874, 9.23108e-09, -0.0158884, -9.23082e-09, 1, 8.90736e-11, 0.0158884, 5.76676e-11, 0.999874, -0.121211, 2.41562e-09, -0.00380749 )
+transform = Transform( 0.993372, -0.0110498, 0.114411, 0.0109836, 0.999939, 0.00120905, -0.114417, 5.56017e-05, 0.993433, -0.141825, 0.176866, 0.16621 )
 
-[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton/RightHipAttachment/Spatial"]
+[node name="LeftHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="7"]
-transform = Transform( 0.0405167, -0.299003, 0.00405361, 0.388314, 0.020471, 0.313125, -0.312362, -0.0133353, 0.389789, -0.0185653, 0.0297996, -0.00511713 )
+transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 )
+bone_name = "pelvis"
+
+[node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/LeftHipAttachment"]
+transform = Transform( 0.99343, -0.00240871, -0.114417, 0.00240855, 0.999997, -0.000139626, 0.114417, -0.00013687, 0.993433, 0.144429, 0.18077, 0.165634 )
+
+[node name="RightBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="8"]
+transform = Transform( 0.999978, -0.00656778, 0.000273144, 0.00656962, 0.999923, -0.00103998, -0.000266317, 0.0010415, 0.999999, 0.00227172, 1.13064, -0.000141409 )
+bone_name = "spine_2"
+
+[node name="RightBackAP" type="Spatial" parent="armature/Armature/Skeleton/RightBackAttachment"]
+transform = Transform( 0.999997, -0.00244424, -0.000479204, 0.00243884, 0.999966, -3.47705e-05, 0.000479292, 3.44458e-05, 1, 0.000560207, -0.00363708, -0.120332 )
+
+[node name="LeftBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="9"]
+transform = Transform( 0.999978, -0.00656778, 0.000273144, 0.00656962, 0.999923, -0.00103998, -0.000266317, 0.0010415, 0.999999, 0.00227172, 1.13064, -0.000141409 )
+bone_name = "spine_2"
+
+[node name="LeftBackAP" type="Spatial" parent="armature/Armature/Skeleton/LeftBackAttachment"]
+transform = Transform( 1, -0.000811443, -0.00015917, 0.000809707, 0.999989, -1.11629e-05, 0.000159176, 1.13178e-05, 1, 0.000184765, -0.00126779, -0.097997 )
+
+[node name="LeftWeapon" type="Spatial" parent="armature/Armature/Skeleton" index="10"]
+script = ExtResource( 2 )
+positions = [ NodePath("../LeftHipAttachment/Spatial"), NodePath("../LeftHandAttachment/LeftHandAP") ]
+
+[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton/LeftWeapon"]
+transform = Transform( 0.0566188, -0.29807, 0, 0.386498, 0.0264298, 0.31413, -0.31211, -0.0213429, 0.389, 0, 0, 0 )
 mesh = ExtResource( 5 )
 material/0 = null
 material/1 = null
 
-[node name="BoneAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"]
+[node name="RightWeapon" type="Spatial" parent="armature/Armature/Skeleton" index="11"]
-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 )
+script = ExtResource( 2 )
-bone_name = "spine_2"
+positions = [ NodePath("../RightHipAttachment/Spatial"), NodePath("../RightHandAttachment/RightHandAP") ]
 
-[node name="Spine2AP" type="Spatial" parent="armature/Armature/Skeleton/BoneAttachment"]
+[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton/RightWeapon"]
-transform = Transform( -0.430811, -0.000122875, 0.129993, 8.54071e-05, -0.45, -0.000142502, 0.130026, -0.000112184, 0.430809, 0.000957399, -0.0715881, -0.0057677 )
+transform = Transform( 0.0387335, -0.299098, 0, 0.388688, 0.0181208, 0.313063, -0.312123, -0.0145513, 0.38986, 0, 0, 0 )
+mesh = ExtResource( 5 )
+material/0 = null
+material/1 = null
 
-[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton/BoneAttachment/Spine2AP"]
+[node name="LeftWeaponBack" type="Spatial" parent="armature/Armature/Skeleton" index="12"]
-transform = Transform( 0.914344, -0.295324, -0.277032, 0.283891, -0.0205529, 0.958773, -0.288935, -0.954992, 0.065061, -0.0775848, 0.00327253, -0.254833 )
+script = ExtResource( 2 )
+positions = [ NodePath("../LeftBackAttachment/LeftBackAP"), NodePath("../LeftHandAttachment/LeftHandAP") ]
+
+[node name="Shield" type="Spatial" parent="armature/Armature/Skeleton" index="13"]
+script = ExtResource( 2 )
+positions = [ NodePath("../LeftBackAttachment/LeftBackAP"), NodePath("../ShieldAttachment/LeftHandShield") ]
+
+[node name="MeshInstance2" type="MeshInstance" parent="armature/Armature/Skeleton/Shield"]
+transform = Transform( -0.430658, 0.00290468, 0.130517, -0.130451, 0.00984704, -0.4306, -0.00563716, -0.449808, -0.00858344, 0, 0, 0 )
 mesh = ExtResource( 4 )
 material/0 = null
 
+[node name="RightWeaponBack" type="Spatial" parent="armature/Armature/Skeleton" index="14"]
+script = ExtResource( 2 )
+positions = [ NodePath("../RightBackAttachment/RightBackAP"), NodePath("../RightHandAttachment/RightHandAP") ]
+
 [node name="AnimationPlayer" parent="armature" index="1"]
 autoplay = "rest"
 anims/cast-end = ExtResource( 11 )

game/player/CharacterSkeletonAttachPoint.gd

@@ -27,6 +27,13 @@ class_name CharacterSkeketonAttachPoint
 var effects : Dictionary
 var timed_effects : Dictionary
 
+export(Array, NodePath) var positions : Array
+var position_nodes : Array 
+
+func load_positions():
+	for p in positions:
+		position_nodes.append(get_node(p))
+
 func add(effect : PackedScene) -> void:
 	if effects.has(effect):
 		effects[effect][0] = effects[effect][0] + 1
@@ -73,3 +80,10 @@ func _process(delta : float) -> void:
 			data[1].queue_free()
 			
 			timed_effects.erase(k)
+
+func set_node_position(index : int) -> void:
+	if positions.size() != position_nodes.size():
+		load_positions()
+	
+	get_parent().remove_child(self)
+	position_nodes[index].add_child(self)

game/player/CharacterSkeletonGD.gd

@@ -90,6 +90,7 @@ var _textures : Array
 var _texture : Texture
 
 var _editor_built : bool = false
+var sheathed : bool = true
 
 func _enter_tree():
 	_mesh_job = job_script.new()
@@ -113,12 +114,19 @@ func _enter_tree():
 	for iv in viss:
 		add_model_visual(iv as ModelVisual)
 
-#func _exit_tree():
-#	_mesh_job.
-	
 	if automatic_build:
 		build_model()
 	
+	if not Engine.editor_hint:
+		sheath(sheathed)
+		
+
+func _process(delta):
+	if not Engine.editor_hint:
+		if Input.is_action_just_pressed("sheath"):
+			sheathed = not sheathed
+			sheath(sheathed)
+		
 
 func _build_model():
 	if _generating:
@@ -244,6 +252,14 @@ func _common_attach_point_index_get(point):
 		return 6
 	elif point == EntityEnums.COMMON_SKELETON_POINT_RIGHT_HIP:
 		return 4
+	elif point == EntityEnums.COMMON_SKELETON_POINT_WEAPON_LEFT:
+		return 7
+	elif point == EntityEnums.COMMON_SKELETON_POINT_WEAPON_LEFT_BACK:
+		return 8
+	elif point == EntityEnums.COMMON_SKELETON_POINT_WEAPON_RIGHT:
+		return 9
+	elif point == EntityEnums.COMMON_SKELETON_POINT_WEAPON_RIGHT_BACK:
+		return 10
 		
 	return 3
 	
@@ -263,3 +279,15 @@ func set_lod_level(level : int) -> void:
 	_current_lod_level = level
 	
 	mesh_instance.mesh = meshes[_current_lod_level]
+	
+func sheath(on : bool) -> void:
+	var pos = 0
+	
+	if not on:
+		pos = 1
+	
+	attach_point_node_get(7).set_node_position(pos)
+	attach_point_node_get(8).set_node_position(pos)
+	attach_point_node_get(9).set_node_position(pos)
+	attach_point_node_get(10).set_node_position(pos)
+	attach_point_node_get(11).set_node_position(pos)

game/project.godot

@@ -378,7 +378,7 @@ data/ess_resource_db_path="res://data/resource_db.tres"
 data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
 enums/stats="Agility,Strength,Stamina,Intellect,Spirit,Health,Mana,Speed,Global Cooldown,Haste,Haste Rating,Resilience,Armor,Attack Power,Spell Power,Melee Crit,Melee Crit bonus,Spell Crit,Spell Crit Bonus,Block,Parry,Damage Reduction,Melee Damage Reduction,Spell Damage Reduction,Damage Taken,Heal Taken,Melee Damage,Spell Damage,Holy Resist,Shadow Resist,Nature Resist,Fire Resist,Frost Resist,Lightning Resist,Chaos Resist,Silence Resist,Fear Resist,Stun Resist,Energy,Rage,XP Rate"
 enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,neck,head,left_clavicle,left_upper_arm,left_forearm,left_hand,left_thumb_base,left_thumb_end,left_fingers_base,left_fingers_end,right_clavicle,right_upper_arm,right_forearm,right_hand,right_thumb_base,right_thumb_end,right_fingers_base,right_fingers_end,left_thigh,left_calf,left_foot,right_thigh,right_calf,right_foot" )
-enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2" )
+enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" )
 profiles/automatic_save=true
 
 [importer_defaults]
@@ -489,6 +489,11 @@ actionbar_1_12={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":39,"unicode":0,"echo":false,"script":null)
  ]
 }
+sheath={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [layer_names]