From 53b6b34dd0e72ba7134aea247da297bb242138b4 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 12:30:42 +0200 Subject: [PATCH] Also move the spell effects of naturalist into it's folder. --- .../effect_data/aspect_of_scorpions.tres | 5 +++-- .../effect_data/natures_swiftness.tres | 3 ++- .../spell_effects/nature/AOSCastFinish.tscn | 8 +++---- .../spell_effects/nature/AmplifyPain.tscn | 8 +++---- .../spell_effects/nature/NatureCast.tscn | 20 +++++++++--------- .../spell_effects/nature/NautreSwiftness.tscn | 10 ++++----- .../spell_effects/textures/arrows.png | Bin .../spell_effects/textures/arrows.png.import | 6 +++--- .../spell_effects/textures/big_glow.png | Bin .../textures/big_glow.png.import | 6 +++--- .../spell_effects/textures/main_texture.png | Bin .../textures/main_texture.png.import | 6 +++--- .../spell_effects/textures/small_star.png | Bin .../textures/small_star.png.import | 6 +++--- .../spell_effects/textures/star.png | Bin .../spell_effects/textures/star.png.import | 6 +++--- .../spells/14_amplify_pain_rank_1.tres | 5 +++-- game/data/spells/31_overload.tres | 5 +++-- game/data/spells/35_strike.tres | 5 +++-- 19 files changed, 52 insertions(+), 47 deletions(-) rename game/data/{ => entity_classes/naturalist}/spell_effects/nature/AOSCastFinish.tscn (74%) rename game/data/{ => entity_classes/naturalist}/spell_effects/nature/AmplifyPain.tscn (83%) rename game/data/{ => entity_classes/naturalist}/spell_effects/nature/NatureCast.tscn (71%) rename game/data/{ => entity_classes/naturalist}/spell_effects/nature/NautreSwiftness.tscn (91%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/arrows.png (100%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/arrows.png.import (67%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/big_glow.png (100%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/big_glow.png.import (66%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/main_texture.png (100%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/main_texture.png.import (64%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/small_star.png (100%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/small_star.png.import (65%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/star.png (100%) rename game/data/{ => entity_classes/naturalist}/spell_effects/textures/star.png.import (67%) diff --git a/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres b/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres index d09cfd8e..2cb4cc49 100644 --- a/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres +++ b/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres @@ -1,8 +1,9 @@ [gd_resource type="SpellEffectVisual" load_steps=4 format=2] -[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] -[ext_resource path="res://data/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3] + [resource] script = ExtResource( 2 ) diff --git a/game/data/entity_classes/naturalist/effect_data/natures_swiftness.tres b/game/data/entity_classes/naturalist/effect_data/natures_swiftness.tres index fcbc832e..7a4e49f6 100644 --- a/game/data/entity_classes/naturalist/effect_data/natures_swiftness.tres +++ b/game/data/entity_classes/naturalist/effect_data/natures_swiftness.tres @@ -1,7 +1,8 @@ [gd_resource type="SpellEffectVisual" load_steps=3 format=2] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] -[ext_resource path="res://data/spell_effects/nature/NautreSwiftness.tscn" type="PackedScene" id=2] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn" type="PackedScene" id=2] + [resource] script = ExtResource( 1 ) diff --git a/game/data/spell_effects/nature/AOSCastFinish.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn similarity index 74% rename from game/data/spell_effects/nature/AOSCastFinish.tscn rename to game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn index 5e60f8e3..9d46ba7a 100644 --- a/game/data/spell_effects/nature/AOSCastFinish.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://data/spell_effects/textures/small_star.png" type="Texture" id=1] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=2] +[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/textures/small_star.png" type="Texture" id=2] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 2 ) +shader = ExtResource( 1 ) shader_param/albedo = Color( 1, 1, 1, 1 ) -shader_param/texture_albedo = ExtResource( 1 ) +shader_param/texture_albedo = ExtResource( 2 ) [sub_resource type="QuadMesh" id=2] material = SubResource( 1 ) diff --git a/game/data/spell_effects/nature/AmplifyPain.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn similarity index 83% rename from game/data/spell_effects/nature/AmplifyPain.tscn rename to game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn index 720f2599..1a4e4525 100644 --- a/game/data/spell_effects/nature/AmplifyPain.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://data/spell_effects/textures/star.png" type="Texture" id=1] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=2] +[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/textures/star.png" type="Texture" id=2] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 2 ) +shader = ExtResource( 1 ) shader_param/albedo = Color( 0.0627451, 0.741176, 0.619608, 1 ) -shader_param/texture_albedo = ExtResource( 1 ) +shader_param/texture_albedo = ExtResource( 2 ) [sub_resource type="QuadMesh" id=2] material = SubResource( 1 ) diff --git a/game/data/spell_effects/nature/NatureCast.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn similarity index 71% rename from game/data/spell_effects/nature/NatureCast.tscn rename to game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn index d90597a2..8758385b 100644 --- a/game/data/spell_effects/nature/NatureCast.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn @@ -1,26 +1,26 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://data/spell_effects/textures/main_texture.png" type="Texture" id=1] -[ext_resource path="res://data/spell_effects/textures/big_glow.png" type="Texture" id=2] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=3] -[ext_resource path="res://data/shaders/3_simple_y_billboard.shader" type="Shader" id=4] +[ext_resource path="res://data/shaders/3_simple_y_billboard.shader" type="Shader" id=1] +[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=2] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/textures/big_glow.png" type="Texture" id=3] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/textures/main_texture.png" type="Texture" id=4] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 3 ) +shader = ExtResource( 2 ) shader_param/albedo = Color( 1, 1, 1, 1 ) -shader_param/texture_albedo = ExtResource( 1 ) +shader_param/texture_albedo = ExtResource( 4 ) [sub_resource type="QuadMesh" id=2] material = SubResource( 1 ) size = Vector2( 0.1, 0.1 ) -[sub_resource type="ShaderMaterial" id=5] -shader = ExtResource( 4 ) +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 1 ) shader_param/albedo = Color( 0.027451, 0.537255, 0.317647, 1 ) -shader_param/texture_albedo = ExtResource( 2 ) +shader_param/texture_albedo = ExtResource( 3 ) [sub_resource type="QuadMesh" id=4] -material = SubResource( 5 ) +material = SubResource( 3 ) size = Vector2( 0.3, 0.3 ) [node name="NatureCast" type="Spatial"] diff --git a/game/data/spell_effects/nature/NautreSwiftness.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn similarity index 91% rename from game/data/spell_effects/nature/NautreSwiftness.tscn rename to game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn index 212d28fd..4ba08c22 100644 --- a/game/data/spell_effects/nature/NautreSwiftness.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://data/spell_effects/textures/arrows.png" type="Texture" id=1] -[ext_resource path="res://data/materials/2_simple_particle_billboard.tres" type="Material" id=2] -[ext_resource path="res://data/shaders/3_simple_y_billboard.shader" type="Shader" id=3] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/textures/arrows.png" type="Texture" id=1] +[ext_resource path="res://data/shaders/3_simple_y_billboard.shader" type="Shader" id=2] +[ext_resource path="res://data/materials/2_simple_particle_billboard.tres" type="Material" id=3] [sub_resource type="QuadMesh" id=1] -material = ExtResource( 2 ) +material = ExtResource( 3 ) size = Vector2( 0.02, 0.02 ) [sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 3 ) +shader = ExtResource( 2 ) shader_param/albedo = Color( 0.0470588, 0.898039, 0.380392, 0.435294 ) shader_param/texture_albedo = ExtResource( 1 ) diff --git a/game/data/spell_effects/textures/arrows.png b/game/data/entity_classes/naturalist/spell_effects/textures/arrows.png similarity index 100% rename from game/data/spell_effects/textures/arrows.png rename to game/data/entity_classes/naturalist/spell_effects/textures/arrows.png diff --git a/game/data/spell_effects/textures/arrows.png.import b/game/data/entity_classes/naturalist/spell_effects/textures/arrows.png.import similarity index 67% rename from game/data/spell_effects/textures/arrows.png.import rename to game/data/entity_classes/naturalist/spell_effects/textures/arrows.png.import index ba3b7ea9..c8948018 100644 --- a/game/data/spell_effects/textures/arrows.png.import +++ b/game/data/entity_classes/naturalist/spell_effects/textures/arrows.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrows.png-e04cf4aa970f723402f40b1f4c1c0b3b.stex" +path="res://.import/arrows.png-ccd1d947e8119c25045f2d11c787ac90.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/spell_effects/textures/arrows.png" -dest_files=[ "res://.import/arrows.png-e04cf4aa970f723402f40b1f4c1c0b3b.stex" ] +source_file="res://data/entity_classes/naturalist/spell_effects/textures/arrows.png" +dest_files=[ "res://.import/arrows.png-ccd1d947e8119c25045f2d11c787ac90.stex" ] [params] diff --git a/game/data/spell_effects/textures/big_glow.png b/game/data/entity_classes/naturalist/spell_effects/textures/big_glow.png similarity index 100% rename from game/data/spell_effects/textures/big_glow.png rename to game/data/entity_classes/naturalist/spell_effects/textures/big_glow.png diff --git a/game/data/spell_effects/textures/big_glow.png.import b/game/data/entity_classes/naturalist/spell_effects/textures/big_glow.png.import similarity index 66% rename from game/data/spell_effects/textures/big_glow.png.import rename to game/data/entity_classes/naturalist/spell_effects/textures/big_glow.png.import index ad06fe9a..d6b56afa 100644 --- a/game/data/spell_effects/textures/big_glow.png.import +++ b/game/data/entity_classes/naturalist/spell_effects/textures/big_glow.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/big_glow.png-d3eda1d6185d63bdc430c646a22bb62f.stex" +path="res://.import/big_glow.png-0a9a2baf785319f331dd5eb065a1f77e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/spell_effects/textures/big_glow.png" -dest_files=[ "res://.import/big_glow.png-d3eda1d6185d63bdc430c646a22bb62f.stex" ] +source_file="res://data/entity_classes/naturalist/spell_effects/textures/big_glow.png" +dest_files=[ "res://.import/big_glow.png-0a9a2baf785319f331dd5eb065a1f77e.stex" ] [params] diff --git a/game/data/spell_effects/textures/main_texture.png b/game/data/entity_classes/naturalist/spell_effects/textures/main_texture.png similarity index 100% rename from game/data/spell_effects/textures/main_texture.png rename to game/data/entity_classes/naturalist/spell_effects/textures/main_texture.png diff --git a/game/data/spell_effects/textures/main_texture.png.import b/game/data/entity_classes/naturalist/spell_effects/textures/main_texture.png.import similarity index 64% rename from game/data/spell_effects/textures/main_texture.png.import rename to game/data/entity_classes/naturalist/spell_effects/textures/main_texture.png.import index 0a404802..95733028 100644 --- a/game/data/spell_effects/textures/main_texture.png.import +++ b/game/data/entity_classes/naturalist/spell_effects/textures/main_texture.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/main_texture.png-f00e0ab4ed97ff1475835686a7454874.stex" +path="res://.import/main_texture.png-accc253a039401582df33486651b8c33.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/spell_effects/textures/main_texture.png" -dest_files=[ "res://.import/main_texture.png-f00e0ab4ed97ff1475835686a7454874.stex" ] +source_file="res://data/entity_classes/naturalist/spell_effects/textures/main_texture.png" +dest_files=[ "res://.import/main_texture.png-accc253a039401582df33486651b8c33.stex" ] [params] diff --git a/game/data/spell_effects/textures/small_star.png b/game/data/entity_classes/naturalist/spell_effects/textures/small_star.png similarity index 100% rename from game/data/spell_effects/textures/small_star.png rename to game/data/entity_classes/naturalist/spell_effects/textures/small_star.png diff --git a/game/data/spell_effects/textures/small_star.png.import b/game/data/entity_classes/naturalist/spell_effects/textures/small_star.png.import similarity index 65% rename from game/data/spell_effects/textures/small_star.png.import rename to game/data/entity_classes/naturalist/spell_effects/textures/small_star.png.import index b453d452..e66a47e1 100644 --- a/game/data/spell_effects/textures/small_star.png.import +++ b/game/data/entity_classes/naturalist/spell_effects/textures/small_star.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/small_star.png-df42addd723ec8255619446fbe11ce1a.stex" +path="res://.import/small_star.png-01c454c8056e70dd863fc8f53538a44c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/spell_effects/textures/small_star.png" -dest_files=[ "res://.import/small_star.png-df42addd723ec8255619446fbe11ce1a.stex" ] +source_file="res://data/entity_classes/naturalist/spell_effects/textures/small_star.png" +dest_files=[ "res://.import/small_star.png-01c454c8056e70dd863fc8f53538a44c.stex" ] [params] diff --git a/game/data/spell_effects/textures/star.png b/game/data/entity_classes/naturalist/spell_effects/textures/star.png similarity index 100% rename from game/data/spell_effects/textures/star.png rename to game/data/entity_classes/naturalist/spell_effects/textures/star.png diff --git a/game/data/spell_effects/textures/star.png.import b/game/data/entity_classes/naturalist/spell_effects/textures/star.png.import similarity index 67% rename from game/data/spell_effects/textures/star.png.import rename to game/data/entity_classes/naturalist/spell_effects/textures/star.png.import index abac45d7..8450f7ec 100644 --- a/game/data/spell_effects/textures/star.png.import +++ b/game/data/entity_classes/naturalist/spell_effects/textures/star.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/star.png-d57669aa5fea5b6090428296488efa8d.stex" +path="res://.import/star.png-03497afedfd2143cd77b3ec2b1e184a2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/spell_effects/textures/star.png" -dest_files=[ "res://.import/star.png-d57669aa5fea5b6090428296488efa8d.stex" ] +source_file="res://data/entity_classes/naturalist/spell_effects/textures/star.png" +dest_files=[ "res://.import/star.png-03497afedfd2143cd77b3ec2b1e184a2.stex" ] [params] diff --git a/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres b/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres index 4e425720..5d66d5ac 100644 --- a/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres +++ b/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres @@ -1,10 +1,11 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" 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/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] -[ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] + [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) diff --git a/game/data/spells/31_overload.tres b/game/data/spells/31_overload.tres index 407b6966..6e10fe7d 100644 --- a/game/data/spells/31_overload.tres +++ b/game/data/spells/31_overload.tres @@ -3,8 +3,9 @@ [ext_resource path="res://data/entity_classes/naturalist/icons/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/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] + [sub_resource type="SpellEffectVisual" id=1] diff --git a/game/data/spells/35_strike.tres b/game/data/spells/35_strike.tres index a7ffc839..d5f69e38 100644 --- a/game/data/spells/35_strike.tres +++ b/game/data/spells/35_strike.tres @@ -3,8 +3,9 @@ [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1] [ext_resource path="res://data/entity_classes/naturalist/icons/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/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/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] + [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 3 )