Update HEADS, and fix errors.

HEADS

@@ -1 +1 @@
-{"engine": "40d1486cb317a60dc0e982cbc7ff3e6645cd5280", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "e0d733eb5499f6e83ffa6110af9d8f5415a457bf", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "367b2318da45726710c27fd3ac1d23e8a5a8f1f7"}
+{"engine": "2845e6a21a9a1b7c8bf64dc49575213141a68832", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "7f3b1eecdda1e04dd85b2f89cfa5e4cfa1a43a6a", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "a7549c6feacfc52d3b35d16d020c51789c88c487"}

game/data/models/armature_model_orig_v2.tscn

@@ -209,14 +209,17 @@ viss = [ ExtResource( 6 ) ]
 [node name="armature" parent="." instance=ExtResource( 5 )]
 
 [node name="Skeleton" parent="armature/Armature" index="0"]
+bones/1/bound_children = [ NodePath("RootAttachment") ]
 bones/4/rest = Transform( 1, 6.46674e-07, 6.45602e-07, -6.48981e-07, 0.999994, 0.00358023, -6.43283e-07, -0.00358023, 0.999994, 0, 4.65661e-10, -0.147629 )
 bones/5/rest = Transform( 1, -2.68318e-05, -0.000279704, 0.000117096, 0.944671, 0.328021, 0.000255427, -0.328021, 0.94467, -1.16415e-10, 4.88944e-08, -0.189165 )
 bones/6/rest = Transform( 1, 0.000377033, 0.000350316, -0.000245136, 0.947438, -0.31994, -0.00045253, 0.319939, 0.947438, 1.16415e-10, 0, -0.0579902 )
+bones/6/bound_children = [ NodePath("NeckAttachment") ]
 bones/7/rest = Transform( 0.00701095, 0.0774391, -0.996973, 0.996989, -0.0775305, 0.000988811, -0.0772191, -0.993978, -0.0777495, 0.0321484, -0.00817799, -0.142039 )
 bones/8/rest = Transform( 0.998087, 0.0364489, -0.0499443, -0.0372952, 0.999174, -0.016119, 0.0493155, 0.0179508, 0.998622, -1.49012e-08, -1.19209e-07, -0.123344 )
 bones/9/rest = Transform( 0.997892, 0.0111941, 0.063919, -0.00935398, 0.999535, -0.0290152, -0.0642141, 0.0283562, 0.997533, 7.45058e-09, 1.19209e-07, -0.252095 )
 bones/10/rest = Transform( -0.986881, -0.160856, -0.0138398, 0.160936, -0.973276, -0.163808, 0.0128795, -0.163886, 0.986395, -3.72529e-09, -1.19209e-07, -0.240671 )
 bones/11/rest = Transform( -0.858768, 0.133704, 0.494612, -0.183369, -0.981613, -0.0530235, 0.478429, -0.136232, 0.867495, -0.0617973, 0.000467658, -0.0759538 )
+bones/11/bound_children = [ NodePath("LeftHandAttachment") ]
 bones/12/rest = Transform( 0.879725, 0.00470716, 0.47546, -0.00342996, 0.999988, -0.00355378, -0.475471, 0.00149554, 0.87973, 0, 0, -0.0346539 )
 bones/13/rest = Transform( -0.990866, 0.133748, 0.0172254, -0.134848, -0.981619, -0.13506, -0.00115522, -0.136149, 0.990688, 0, 0, -0.109284 )
 bones/14/rest = Transform( 0.999816, 0.00095504, -0.0191504, -0.000973632, 0.999999, -0.000961549, 0.0191495, 0.000980017, 0.999816, 1.39698e-09, 0, -0.039715 )
@@ -225,6 +228,7 @@ bones/16/rest = Transform( 0.998936, -0.00708907, 0.0455772, 0.00908724, 0.999,
 bones/17/rest = Transform( 0.997956, -0.0120584, -0.0627536, 0.0127437, 0.999863, 0.0105315, 0.062618, -0.0113097, 0.997973, 7.45058e-09, 0, -0.251481 )
 bones/18/rest = Transform( 0.989714, -0.142888, 0.00706463, 0.142388, 0.979061, -0.145484, 0.0138712, 0.144993, 0.989335, 1.49012e-08, -1.19209e-07, -0.240761 )
 bones/19/rest = Transform( 0.848529, 0.124654, 0.514256, -0.17645, 0.982887, 0.0528969, -0.498861, -0.135625, 0.856004, -0.0617307, -0.00216746, -0.0760976 )
+bones/19/bound_children = [ NodePath("RightHandAttachment") ]
 bones/20/rest = Transform( 0.870568, 0.0151711, -0.491814, -0.0140032, 0.999884, 0.00605627, 0.491849, 0.00161457, 0.870679, 1.49012e-08, 0, -0.0345328 )
 bones/21/rest = Transform( 0.994898, 0.0954731, 0.0326043, -0.0981578, 0.990701, 0.0942105, -0.0233065, -0.0969302, 0.995018, -1.49012e-08, -1.19209e-07, -0.109269 )
 bones/22/rest = Transform( 0.999771, 0.0194525, -0.00896364, -0.019275, 0.999624, 0.019487, 0.00933935, -0.0193098, 0.99977, -9.77889e-09, 0, -0.039749 )
@@ -237,7 +241,7 @@ mesh = SubResource( 2 )
 material/0 = null
 
 [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
-transform = Transform( 0.103304, -0.98795, -0.115123, 0.0568848, -0.109662, 0.992302, -0.993019, -0.10906, 0.0448706, 0.244155, 0.765347, -0.00956605 )
+transform = Transform( 0.867753, -0.122335, -0.481698, -0.0760567, 0.925067, -0.37193, 0.491141, 0.359458, 0.793468, 0.0663019, 1.53039, -0.467791 )
 bone_name = "left_hand"
 
 [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@@ -245,7 +249,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 )
 script = ExtResource( 4 )
 
 [node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
-transform = Transform( -0.04134, -0.998543, 0.0341369, -0.126483, 0.0391075, 0.991149, -0.991117, 0.0366649, -0.12792, -0.246154, 0.764094, -0.00730105 )
+transform = Transform( 0.827146, -0.0141611, 0.561829, -0.180941, 0.939671, 0.29006, -0.532089, -0.341542, 0.774744, -0.0105463, 1.50037, -0.459212 )
 bone_name = "right_hand"
 
 [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@@ -261,7 +265,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0
 script = ExtResource( 4 )
 
 [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
-transform = Transform( 0.999971, -0.00242181, 0.00719139, 0.00758594, 0.316417, -0.94853, 2.16843e-05, 0.948612, 0.316445, 0.00106155, 1.31794, 0.00218411 )
+transform = Transform( 0.999708, -0.0240038, 0.00278186, 0.00319565, 0.0174128, -0.999793, 0.023952, 0.99955, 0.0174223, 0.00357899, 1.21486, -0.0242463 )
 bone_name = "neck"
 
 [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]

game/project.godot

@@ -139,11 +139,6 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://scripts/spells/gd_spell_script.gd"
 }, {
-"base": "SpellProjectile",
-"class": "SpellProjectileGD",
-"language": "GDScript",
-"path": "res://scripts/projectiles/SpellProjectileGD.gd"
-}, {
 "base": "VoxelChunk",
 "class": "TVGUVoxelChunk",
 "language": "GDScript",
@@ -178,6 +173,11 @@ _global_script_classes=[ {
 "class": "TestVoxelMesher",
 "language": "GDScript",
 "path": "res://voxelman/transvoxel_mesher/TestVoxelMesher.gd"
+}, {
+"base": "WorldSpell",
+"class": "WorldSpellGD",
+"language": "GDScript",
+"path": "res://scripts/projectiles/WorldSpellGD.gd"
 } ]
 _global_script_class_icons={
 "AuraGD": "",
@@ -206,14 +206,14 @@ _global_script_class_icons={
 "PropToolScene": "",
 "SpellEffectVisualBasic": "",
 "SpellGD": "",
-"SpellProjectileGD": "",
 "TVGUVoxelChunk": "",
 "TVGUVoxelMesher": "",
 "TVNUVoxelChunk": "",
 "TVNUVoxelMesher": "",
 "TVVoxelChunk": "",
 "TVVoxelMesher": "",
-"TestVoxelMesher": ""
+"TestVoxelMesher": "",
+"WorldSpellGD": ""
 }
 Node="input/actionbar_5_11"
 

game/scripts/projectiles/WorldSpellGD.gd

@@ -1,5 +1,5 @@
-extends SpellProjectile
+extends WorldSpell
-class_name SpellProjectileGD
+class_name WorldSpellGD
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

game/scripts/spells/gd_spell_script.gd

@@ -53,7 +53,7 @@ func _son_cast_player_moved(info):
 
 func fire_projectile(info : SpellCastInfo):
 	if projectile_type == SPELL_PROJECTILE_TYPE_FOLLOW:
-		var sp : SpellProjectileGD = SpellProjectileGD.new()
+		var sp : WorldSpellGD = WorldSpellGD.new()
 		
 		info.get_caster().get_parent().add_child(sp)
 		sp.owner = info.get_caster().get_parent()