Moved the core folder.

2024-11-21 13:17:17 +01:00 · 2022-02-27 01:34:59 +01:00 · 2022-02-27 01:34:59 +01:00 · 6a99199fad
commit 6a99199fad
parent af59b518d6
42 changed files with 47 additions and 47 deletions
--- a/game/modules/core/crafting/1_test_craft.tres
+++ b/game/modules/core/crafting/1_test_craft.tres
@ -1,7 +1,7 @@
 [gd_resource type="CraftRecipe" load_steps=8 format=2]

-[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
-[ext_resource path="res://modules/core/item_templates/1_gold.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://core/item_templates/1_gold.tres" type="ItemTemplate" id=2]

 [sub_resource type="CraftRecipeHelper" id=1]
 item = ExtResource( 2 )
--- a/game/modules/core/crafting/2_chest_of_the_infinite_wisdom.tres
+++ b/game/modules/core/crafting/2_chest_of_the_infinite_wisdom.tres
@ -1,7 +1,7 @@
 [gd_resource type="CraftRecipe" load_steps=5 format=2]

-[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
-[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]

 [sub_resource type="CraftRecipeHelper" id=1]
 item = ExtResource( 1 )
--- a/game/modules/core/entity_resources/1_mana_resource.tres
+++ b/game/modules/core/entity_resources/1_mana_resource.tres
--- a/game/modules/core/entity_skills/1_test.tres
+++ b/game/modules/core/entity_skills/1_test.tres
--- a/game/modules/core/game_module.tres
+++ b/game/modules/core/game_module.tres
@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]

 [ext_resource path="res://scripts/game_modules/GameModule.gd" type="Script" id=1]
-[ext_resource path="res://modules/core/resource_db.tres" type="ESSResourceDBStatic" id=2]
+[ext_resource path="res://core/resource_db.tres" type="ESSResourceDBStatic" id=2]

 [resource]
 script = ExtResource( 1 )
--- a/game/modules/core/item_templates/1_gold.tres
+++ b/game/modules/core/item_templates/1_gold.tres
--- a/game/modules/core/item_templates/2_test.tres
+++ b/game/modules/core/item_templates/2_test.tres
--- a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres
+++ b/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres
--- a/game/modules/core/materials/1_standard_material.tres
+++ b/game/modules/core/materials/1_standard_material.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=4 format=2]

-[ext_resource path="res://modules/core/shaders/1_standard_shader.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/1_standard_shader.tres" type="Shader" id=1]

 [sub_resource type="Image" id=3]
 data = {
--- a/game/core/materials/2_simple_particle_billboard.tres
+++ b/game/core/materials/2_simple_particle_billboard.tres
@ -0,0 +1,9 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=2]
+
+[ext_resource path="res://core/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1]
+
+
+
+[resource]
+shader = ExtResource( 1 )
+shader_param/albedo = Color( 1, 1, 1, 1 )
--- a/game/modules/core/materials/3_standard_character_material.tres
+++ b/game/modules/core/materials/3_standard_character_material.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=2]

-[ext_resource path="res://modules/core/shaders/4_standard_character_shader.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/4_standard_character_shader.tres" type="Shader" id=1]



--- a/game/modules/core/materials/4_standard_material_prop.tres
+++ b/game/modules/core/materials/4_standard_material_prop.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=4 format=2]

-[ext_resource path="res://modules/core/shaders/1_standard_shader.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/1_standard_shader.tres" type="Shader" id=1]

 [sub_resource type="Image" id=3]
 data = {
--- a/game/modules/core/materials/5_standard_material_nouv2.tres
+++ b/game/modules/core/materials/5_standard_material_nouv2.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=4 format=2]

-[ext_resource path="res://modules/core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]

 [sub_resource type="Image" id=1]
 data = {
--- a/game/modules/core/materials/6_standard_material_prop_nouv2.tres
+++ b/game/modules/core/materials/6_standard_material_prop_nouv2.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=4 format=2]

-[ext_resource path="res://modules/core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/5_standard_shader_nouv2.tres" type="Shader" id=1]

 [sub_resource type="Image" id=1]
 data = {
--- a/game/modules/core/materials/7_standard_material_notex.tres
+++ b/game/modules/core/materials/7_standard_material_notex.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=2]

-[ext_resource path="res://modules/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/6_standard_shader_notex.tres" type="Shader" id=1]

 [resource]
 shader = ExtResource( 1 )
--- a/game/modules/core/materials/8_standard_material_prop_notex.tres
+++ b/game/modules/core/materials/8_standard_material_prop_notex.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=2]

-[ext_resource path="res://modules/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/6_standard_shader_notex.tres" type="Shader" id=1]



--- a/game/modules/core/materials/9_standard_character_material_notex.tres
+++ b/game/modules/core/materials/9_standard_character_material_notex.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=2]

-[ext_resource path="res://modules/core/shaders/7_standard_character_shader_notex.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/7_standard_character_shader_notex.tres" type="Shader" id=1]



--- a/game/modules/core/materials/character_mat..tres
+++ b/game/modules/core/materials/character_mat..tres
--- a/game/modules/core/materials/character_mat.tres_off
+++ b/game/modules/core/materials/character_mat.tres_off
--- a/game/modules/core/materials/spatial_voxelman_mat.tres
+++ b/game/modules/core/materials/spatial_voxelman_mat.tres
--- a/game/modules/core/materials/voxelman.tres
+++ b/game/modules/core/materials/voxelman.tres
--- a/game/modules/core/materials/voxelman.tres_off
+++ b/game/modules/core/materials/voxelman.tres_off
--- a/game/modules/core/materials/voxelman2.tres
+++ b/game/modules/core/materials/voxelman2.tres
--- a/game/modules/core/materials/voxelman_shader.tres_off
+++ b/game/modules/core/materials/voxelman_shader.tres_off
--- a/game/modules/core/materials/world_material.tres
+++ b/game/modules/core/materials/world_material.tres
@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=4 format=2]

-[ext_resource path="res://modules/core/shaders/1_standard_shader.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/1_standard_shader.tres" type="Shader" id=1]



--- a/game/core/resource_db.tres
+++ b/game/core/resource_db.tres
@ -0,0 +1,15 @@
+[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2]
+
+[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=3]
+[ext_resource path="res://core/entity_skills/1_test.tres" type="EntitySkillData" id=4]
+[ext_resource path="res://core/item_templates/1_gold.tres" type="ItemTemplate" id=5]
+[ext_resource path="res://core/crafting/1_test_craft.tres" type="CraftRecipe" id=6]
+[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=7]
+
+[resource]
+entity_resources = [ ExtResource( 7 ) ]
+entity_skills = [ ExtResource( 4 ) ]
+craft_recipes = [ ExtResource( 6 ), ExtResource( 3 ) ]
+item_templates = [ ExtResource( 5 ), ExtResource( 1 ), ExtResource( 2 ) ]
--- a/game/modules/core/shaders/1_standard_shader.tres
+++ b/game/modules/core/shaders/1_standard_shader.tres
--- a/game/modules/core/shaders/2_simple_particle_billboard_shader.shader
+++ b/game/modules/core/shaders/2_simple_particle_billboard_shader.shader
--- a/game/modules/core/shaders/3_simple_y_billboard.shader
+++ b/game/modules/core/shaders/3_simple_y_billboard.shader
--- a/game/modules/core/shaders/4_standard_character_shader.tres
+++ b/game/modules/core/shaders/4_standard_character_shader.tres
--- a/game/modules/core/shaders/5_standard_shader_nouv2.tres
+++ b/game/modules/core/shaders/5_standard_shader_nouv2.tres
--- a/game/modules/core/shaders/6_standard_shader_notex.tres
+++ b/game/modules/core/shaders/6_standard_shader_notex.tres
--- a/game/modules/core/shaders/7_standard_character_shader_notex.tres
+++ b/game/modules/core/shaders/7_standard_character_shader_notex.tres
--- a/game/entity_classes/naturalist/1_naturalist.tres
+++ b/game/entity_classes/naturalist/1_naturalist.tres
@ -3,7 +3,7 @@
 [ext_resource path="res://entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1]
 [ext_resource path="res://entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2]
 [ext_resource path="res://entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=3]
-[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=4]
+[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=4]
 [ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
 [ext_resource path="res://entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=6]
 [ext_resource path="res://entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7]
--- a/game/entity_classes/naturalist/1_naturalist_vendor.tres
+++ b/game/entity_classes/naturalist/1_naturalist_vendor.tres
@ -1,7 +1,7 @@
 [gd_resource type="EntityClassData" load_steps=8 format=2]

-[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
-[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
 [ext_resource path="res://entity_classes/naturalist/stats/mob_statdata.tres" type="StatData" id=3]
 [ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13]

--- a/game/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn
+++ b/game/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn
@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]

-[ext_resource path="res://modules/core/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1]
+[ext_resource path="res://core/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1]
 [ext_resource path="res://entity_classes/naturalist/spell_effects/textures/small_star.png" type="Texture" id=2]

 [sub_resource type="ShaderMaterial" id=1]
--- a/game/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn
+++ b/game/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn
@ -1,8 +1,8 @@
 [gd_scene load_steps=8 format=2]

 [ext_resource path="res://entity_classes/naturalist/spell_effects/textures/arrows.png" type="Texture" id=1]
-[ext_resource path="res://modules/core/shaders/3_simple_y_billboard.shader" type="Shader" id=2]
-[ext_resource path="res://modules/core/materials/2_simple_particle_billboard.tres" type="Material" id=3]
+[ext_resource path="res://core/shaders/3_simple_y_billboard.shader" type="Shader" id=2]
+[ext_resource path="res://core/materials/2_simple_particle_billboard.tres" type="Material" id=3]

 [sub_resource type="QuadMesh" id=1]
 material = ExtResource( 3 )
--- a/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres
+++ b/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres
@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=7 format=2]

-[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
+[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
 [ext_resource path="res://entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4]
 [ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5]
--- a/game/entity_classes/naturalist/spells/36_regrow.tres
+++ b/game/entity_classes/naturalist/spells/36_regrow.tres
@ -1,6 +1,6 @@
 [gd_resource type="Spell" load_steps=5 format=2]

-[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
+[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://entity_classes/naturalist/icons/root.tres" type="Texture" id=3]

--- a/game/modules/core/materials/2_simple_particle_billboard.tres
+++ b/game/modules/core/materials/2_simple_particle_billboard.tres
@ -1,9 +0,0 @@
-[gd_resource type="ShaderMaterial" load_steps=2 format=2]
-
-[ext_resource path="res://modules/core/shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1]
-
-
-
-[resource]
-shader = ExtResource( 1 )
-shader_param/albedo = Color( 1, 1, 1, 1 )
--- a/game/modules/core/resource_db.tres
+++ b/game/modules/core/resource_db.tres
@ -1,15 +0,0 @@
-[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2]
-
-[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
-[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
-[ext_resource path="res://modules/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=3]
-[ext_resource path="res://modules/core/entity_skills/1_test.tres" type="EntitySkillData" id=4]
-[ext_resource path="res://modules/core/item_templates/1_gold.tres" type="ItemTemplate" id=5]
-[ext_resource path="res://modules/core/crafting/1_test_craft.tres" type="CraftRecipe" id=6]
-[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=7]
-
-[resource]
-entity_resources = [ ExtResource( 7 ) ]
-entity_skills = [ ExtResource( 4 ) ]
-craft_recipes = [ ExtResource( 6 ), ExtResource( 3 ) ]
-item_templates = [ ExtResource( 5 ), ExtResource( 1 ), ExtResource( 2 ) ]
--- a/game/spell_effects/enchanter/Arrow.tscn
+++ b/game/spell_effects/enchanter/Arrow.tscn
@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=2]

-[ext_resource path="res://modules/core/shaders/1_standard_shader.tres" type="Shader" id=1]
+[ext_resource path="res://core/shaders/1_standard_shader.tres" type="Shader" id=1]