From 528f4e8ceffa75e60c2bb9c8a75df80268d1c507 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 20 Dec 2019 17:00:12 +0100 Subject: [PATCH] Fix broken depencencies. --- .../item_templates/3_chest_of_the_infinite_wisdom.tres | 2 -- game/data/spell_effects/spelleffect.tscn | 3 +++ game/data/spells/14_amplify_pain_rank_1.tres | 2 +- game/data/spells/31_overload.tres | 7 +++---- game/player/NetworkedPlayer.tscn | 6 +----- 5 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 game/data/spell_effects/spelleffect.tscn diff --git a/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres b/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres index 4f17dc3..b12cb9f 100644 --- a/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres +++ b/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres @@ -1,7 +1,6 @@ [gd_resource type="ItemTemplate" load_steps=4 format=2] [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1] -[ext_resource path="res://data/item_visuals/1_chest_of_the_infinite_wisdom.tres" type="ItemVisual" id=2] [ext_resource path="res://data/icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=3] [resource] @@ -12,7 +11,6 @@ item_type = 1 rarity = 6 armor_type = 1 equip_slot = 3 -item_visual = ExtResource( 2 ) icon = ExtResource( 3 ) item_stat_modifier_count = 2 Modifiers_0/stat_id = 8 diff --git a/game/data/spell_effects/spelleffect.tscn b/game/data/spell_effects/spelleffect.tscn new file mode 100644 index 0000000..b171e8d --- /dev/null +++ b/game/data/spell_effects/spelleffect.tscn @@ -0,0 +1,3 @@ +[gd_scene format=2] + +[node name="Node2D" type="Node2D"] diff --git a/game/data/spells/14_amplify_pain_rank_1.tres b/game/data/spells/14_amplify_pain_rank_1.tres index b5c1b53..7e11238 100644 --- a/game/data/spells/14_amplify_pain_rank_1.tres +++ b/game/data/spells/14_amplify_pain_rank_1.tres @@ -3,7 +3,7 @@ [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1] [ext_resource path="res://data/icons/naturalist/amplify_pain.tres" type="Texture" id=2] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=3] -[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] +[ext_resource path="res://data/spell_effects/spelleffect.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 3 ) diff --git a/game/data/spells/31_overload.tres b/game/data/spells/31_overload.tres index 5494a89..e000ed9 100644 --- a/game/data/spells/31_overload.tres +++ b/game/data/spells/31_overload.tres @@ -1,10 +1,9 @@ -[gd_resource type="Spell" load_steps=7 format=2] +[gd_resource type="Spell" load_steps=6 format=2] [ext_resource path="res://data/icons/naturalist/amplify_pain.tres" type="Texture" id=1] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=3] -[ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] +[ext_resource path="res://data/spell_effects/spelleffect.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) @@ -12,7 +11,7 @@ spell_cast_effect_left_hand = ExtResource( 5 ) spell_cast_effect_right_hand = ExtResource( 5 ) torso_aura_effect_time = 0.0 root_aura_effect_time = 0.0 -torso_spell_cast_finish_effect = ExtResource( 4 ) +torso_spell_cast_finish_effect = ExtResource( 5 ) torso_spell_cast_finish_effect_time = 0.4 root_spell_cast_finish_effect_time = 1.0 diff --git a/game/player/NetworkedPlayer.tscn b/game/player/NetworkedPlayer.tscn index 418d5f2..6602f28 100644 --- a/game/player/NetworkedPlayer.tscn +++ b/game/player/NetworkedPlayer.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://player/NetworkedPlayer.gd" type="Script" id=1] -[ext_resource path="res://data/models/armature_model_orig_v2.tscn" type="PackedScene" id=2] [ext_resource path="res://ui/nameplates/NamePlate.tscn" type="PackedScene" id=3] [sub_resource type="CapsuleShape" id=1] @@ -12,7 +11,6 @@ height = 0.927641 extents = Vector3( 0.216228, 0.0681041, 0.183397 ) [node name="NetworkedPlayer" type="Entity"] -input_ray_pickable = false collision_layer = 3 collision_mask = 3 character_skeleton_path = NodePath("Rotation_Helper/Model/character") @@ -32,6 +30,4 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.960532, 0 ) [node name="Model" type="Spatial" parent="Rotation_Helper"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.875205, 0 ) -[node name="character" parent="Rotation_Helper/Model" instance=ExtResource( 2 )] - [node name="NamePlate" parent="." instance=ExtResource( 3 )]