diff --git a/game/data/core/materials/1_standard_material.tres b/game/data/core/materials/1_standard_material.tres index 937a6132..1ff5717c 100644 --- a/game/data/core/materials/1_standard_material.tres +++ b/game/data/core/materials/1_standard_material.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=4 format=2] -[ext_resource path="res://data/shaders/1_standard_shader.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/1_standard_shader.tres" type="Shader" id=1] + [sub_resource type="Image" id=1] data = { diff --git a/game/data/core/materials/2_simple_particle_billboard.tres b/game/data/core/materials/2_simple_particle_billboard.tres index cce74f1f..8a8d2550 100644 --- a/game/data/core/materials/2_simple_particle_billboard.tres +++ b/game/data/core/materials/2_simple_particle_billboard.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] + [resource] shader = ExtResource( 1 ) diff --git a/game/data/core/materials/3_standard_character_material.tres b/game/data/core/materials/3_standard_character_material.tres index 1758f770..de5ecd18 100644 --- a/game/data/core/materials/3_standard_character_material.tres +++ b/game/data/core/materials/3_standard_character_material.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://data/shaders/4_standard_character_shader.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/4_standard_character_shader.tres" type="Shader" id=1] + [resource] shader = ExtResource( 1 ) diff --git a/game/data/core/materials/4_standard_material_prop.tres b/game/data/core/materials/4_standard_material_prop.tres index 50cd0846..a258a3cf 100644 --- a/game/data/core/materials/4_standard_material_prop.tres +++ b/game/data/core/materials/4_standard_material_prop.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=4 format=2] -[ext_resource path="res://data/shaders/1_standard_shader.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/1_standard_shader.tres" type="Shader" id=1] + [sub_resource type="Image" id=1] data = { diff --git a/game/data/core/materials/5_standard_material_nouv2.tres b/game/data/core/materials/5_standard_material_nouv2.tres index 59ccda61..e4c291bf 100644 --- a/game/data/core/materials/5_standard_material_nouv2.tres +++ b/game/data/core/materials/5_standard_material_nouv2.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=4 format=2] -[ext_resource path="res://data/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1] + [sub_resource type="Image" id=1] data = { diff --git a/game/data/core/materials/6_standard_material_prop_nouv2.tres b/game/data/core/materials/6_standard_material_prop_nouv2.tres index b100dd74..45f3631c 100644 --- a/game/data/core/materials/6_standard_material_prop_nouv2.tres +++ b/game/data/core/materials/6_standard_material_prop_nouv2.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=4 format=2] -[ext_resource path="res://data/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1] + [sub_resource type="Image" id=1] data = { diff --git a/game/data/core/materials/7_standard_material_notex.tres b/game/data/core/materials/7_standard_material_notex.tres index 4cf0ee30..d419161a 100644 --- a/game/data/core/materials/7_standard_material_notex.tres +++ b/game/data/core/materials/7_standard_material_notex.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://data/shaders/6_standard_shader_notex.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1] + [resource] shader = ExtResource( 1 ) diff --git a/game/data/core/materials/8_standard_material_prop_notex.tres b/game/data/core/materials/8_standard_material_prop_notex.tres index 4cf0ee30..d419161a 100644 --- a/game/data/core/materials/8_standard_material_prop_notex.tres +++ b/game/data/core/materials/8_standard_material_prop_notex.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://data/shaders/6_standard_shader_notex.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1] + [resource] shader = ExtResource( 1 ) diff --git a/game/data/core/materials/9_standard_character_material_notex.tres b/game/data/core/materials/9_standard_character_material_notex.tres index d9572745..4457c389 100644 --- a/game/data/core/materials/9_standard_character_material_notex.tres +++ b/game/data/core/materials/9_standard_character_material_notex.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://data/shaders/7_standard_character_shader_notex.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/7_standard_character_shader_notex.tres" type="Shader" id=1] + [resource] shader = ExtResource( 1 ) diff --git a/game/data/core/materials/world_material.tres b/game/data/core/materials/world_material.tres index bcc62c18..6a3b41cc 100644 --- a/game/data/core/materials/world_material.tres +++ b/game/data/core/materials/world_material.tres @@ -1,6 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=4 format=2] -[ext_resource path="res://data/shaders/1_standard_shader.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/1_standard_shader.tres" type="Shader" id=1] + [sub_resource type="Image" id=1] data = { diff --git a/game/data/shaders/1_standard_shader.tres b/game/data/core/shaders/1_standard_shader.tres similarity index 100% rename from game/data/shaders/1_standard_shader.tres rename to game/data/core/shaders/1_standard_shader.tres diff --git a/game/data/shaders/2_simple_particle_billboard_shader.shader b/game/data/core/shaders/2_simple_particle_billboard_shader.shader similarity index 100% rename from game/data/shaders/2_simple_particle_billboard_shader.shader rename to game/data/core/shaders/2_simple_particle_billboard_shader.shader diff --git a/game/data/shaders/3_simple_y_billboard.shader b/game/data/core/shaders/3_simple_y_billboard.shader similarity index 100% rename from game/data/shaders/3_simple_y_billboard.shader rename to game/data/core/shaders/3_simple_y_billboard.shader diff --git a/game/data/shaders/4_standard_character_shader.tres b/game/data/core/shaders/4_standard_character_shader.tres similarity index 100% rename from game/data/shaders/4_standard_character_shader.tres rename to game/data/core/shaders/4_standard_character_shader.tres diff --git a/game/data/shaders/5_standard_shader_nouv2.tres b/game/data/core/shaders/5_standard_shader_nouv2.tres similarity index 100% rename from game/data/shaders/5_standard_shader_nouv2.tres rename to game/data/core/shaders/5_standard_shader_nouv2.tres diff --git a/game/data/shaders/6_standard_shader_notex.tres b/game/data/core/shaders/6_standard_shader_notex.tres similarity index 100% rename from game/data/shaders/6_standard_shader_notex.tres rename to game/data/core/shaders/6_standard_shader_notex.tres diff --git a/game/data/shaders/7_standard_character_shader_notex.tres b/game/data/core/shaders/7_standard_character_shader_notex.tres similarity index 100% rename from game/data/shaders/7_standard_character_shader_notex.tres rename to game/data/core/shaders/7_standard_character_shader_notex.tres diff --git a/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn index 9d46ba7a..0e7ca8e3 100644 --- a/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://data/core/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( 1 ) shader_param/albedo = Color( 1, 1, 1, 1 ) diff --git a/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn index 1a4e4525..67d0364a 100644 --- a/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://data/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://data/core/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( 1 ) shader_param/albedo = Color( 0.0627451, 0.741176, 0.619608, 1 ) diff --git a/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn index 8758385b..1bbd7eaf 100644 --- a/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=9 format=2] -[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/core/shaders/3_simple_y_billboard.shader" type="Shader" id=1] +[ext_resource path="res://data/core/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( 2 ) shader_param/albedo = Color( 1, 1, 1, 1 ) diff --git a/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn b/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn index afb2c829..964c81bc 100644 --- a/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn +++ b/game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn @@ -1,10 +1,11 @@ [gd_scene load_steps=8 format=2] [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/core/shaders/3_simple_y_billboard.shader" type="Shader" id=2] [ext_resource path="res://data/core/materials/2_simple_particle_billboard.tres" type="Material" id=3] + [sub_resource type="QuadMesh" id=1] material = ExtResource( 3 ) size = Vector2( 0.02, 0.02 ) diff --git a/game/data/spell_effects/enchanter/Arrow.tscn b/game/data/spell_effects/enchanter/Arrow.tscn index e21fb19d..d50cabe0 100644 --- a/game/data/spell_effects/enchanter/Arrow.tscn +++ b/game/data/spell_effects/enchanter/Arrow.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://data/shaders/1_standard_shader.tres" type="Shader" id=1] +[ext_resource path="res://data/core/shaders/1_standard_shader.tres" type="Shader" id=1] + [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 )