From 73e37907e6f59338e49e21dd2de0107565110ace Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 12 Feb 2022 18:46:03 +0100 Subject: [PATCH] Moved the materials to a new folder. --- .../materials/10_standard_vman_mdr_material.tres | 0 .../{modules/core => }/materials/1_standard_material.tres | 0 .../core => }/materials/2_simple_particle_billboard.tres | 0 .../materials/3_standard_character_material.tres | 0 .../core => }/materials/4_standard_material_prop.tres | 0 .../core => }/materials/5_standard_material_nouv2.tres | 0 .../materials/6_standard_material_prop_nouv2.tres | 0 .../core => }/materials/7_standard_material_notex.tres | 0 .../materials/8_standard_material_prop_notex.tres | 2 -- .../materials/9_standard_character_material_notex.tres | 0 game/{modules/core => }/materials/character_mat..tres | 0 game/{modules/core => }/materials/character_mat.tres_off | 0 .../core => }/materials/spatial_voxelman_mat.tres | 0 game/{modules/core => }/materials/voxelman.tres | 0 game/{modules/core => }/materials/voxelman.tres_off | 0 game/{modules/core => }/materials/voxelman2.tres | 0 .../{modules/core => }/materials/voxelman_shader.tres_off | 0 game/{modules/core => }/materials/world_material.tres | 0 .../model_visual_scenes/TestOnehander.tscn | 4 ++-- .../model_visual_scenes/TestOnehander2.tscn | 4 ++-- .../model_visual_scenes/TestShield.tscn | 4 ++-- .../naturalist/spell_effects/nature/NautreSwiftness.tscn | 2 +- game/project.godot | 4 ++-- game/tw/new_terramanlibrarymerger.tres | 4 ++-- game/tw/new_terramanlibrarymergerpcm.tres | 8 ++++---- 25 files changed, 15 insertions(+), 17 deletions(-) rename game/{modules/core => }/materials/10_standard_vman_mdr_material.tres (100%) rename game/{modules/core => }/materials/1_standard_material.tres (100%) rename game/{modules/core => }/materials/2_simple_particle_billboard.tres (100%) rename game/{modules/core => }/materials/3_standard_character_material.tres (100%) rename game/{modules/core => }/materials/4_standard_material_prop.tres (100%) rename game/{modules/core => }/materials/5_standard_material_nouv2.tres (100%) rename game/{modules/core => }/materials/6_standard_material_prop_nouv2.tres (100%) rename game/{modules/core => }/materials/7_standard_material_notex.tres (100%) rename game/{modules/core => }/materials/8_standard_material_prop_notex.tres (99%) rename game/{modules/core => }/materials/9_standard_character_material_notex.tres (100%) rename game/{modules/core => }/materials/character_mat..tres (100%) rename game/{modules/core => }/materials/character_mat.tres_off (100%) rename game/{modules/core => }/materials/spatial_voxelman_mat.tres (100%) rename game/{modules/core => }/materials/voxelman.tres (100%) rename game/{modules/core => }/materials/voxelman.tres_off (100%) rename game/{modules/core => }/materials/voxelman2.tres (100%) rename game/{modules/core => }/materials/voxelman_shader.tres_off (100%) rename game/{modules/core => }/materials/world_material.tres (100%) diff --git a/game/modules/core/materials/10_standard_vman_mdr_material.tres b/game/materials/10_standard_vman_mdr_material.tres similarity index 100% rename from game/modules/core/materials/10_standard_vman_mdr_material.tres rename to game/materials/10_standard_vman_mdr_material.tres diff --git a/game/modules/core/materials/1_standard_material.tres b/game/materials/1_standard_material.tres similarity index 100% rename from game/modules/core/materials/1_standard_material.tres rename to game/materials/1_standard_material.tres diff --git a/game/modules/core/materials/2_simple_particle_billboard.tres b/game/materials/2_simple_particle_billboard.tres similarity index 100% rename from game/modules/core/materials/2_simple_particle_billboard.tres rename to game/materials/2_simple_particle_billboard.tres diff --git a/game/modules/core/materials/3_standard_character_material.tres b/game/materials/3_standard_character_material.tres similarity index 100% rename from game/modules/core/materials/3_standard_character_material.tres rename to game/materials/3_standard_character_material.tres diff --git a/game/modules/core/materials/4_standard_material_prop.tres b/game/materials/4_standard_material_prop.tres similarity index 100% rename from game/modules/core/materials/4_standard_material_prop.tres rename to game/materials/4_standard_material_prop.tres diff --git a/game/modules/core/materials/5_standard_material_nouv2.tres b/game/materials/5_standard_material_nouv2.tres similarity index 100% rename from game/modules/core/materials/5_standard_material_nouv2.tres rename to game/materials/5_standard_material_nouv2.tres diff --git a/game/modules/core/materials/6_standard_material_prop_nouv2.tres b/game/materials/6_standard_material_prop_nouv2.tres similarity index 100% rename from game/modules/core/materials/6_standard_material_prop_nouv2.tres rename to game/materials/6_standard_material_prop_nouv2.tres diff --git a/game/modules/core/materials/7_standard_material_notex.tres b/game/materials/7_standard_material_notex.tres similarity index 100% rename from game/modules/core/materials/7_standard_material_notex.tres rename to game/materials/7_standard_material_notex.tres diff --git a/game/modules/core/materials/8_standard_material_prop_notex.tres b/game/materials/8_standard_material_prop_notex.tres similarity index 99% rename from game/modules/core/materials/8_standard_material_prop_notex.tres rename to game/materials/8_standard_material_prop_notex.tres index d3c02d46..3d69f582 100644 --- a/game/modules/core/materials/8_standard_material_prop_notex.tres +++ b/game/materials/8_standard_material_prop_notex.tres @@ -2,8 +2,6 @@ [ext_resource path="res://modules/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1] - - [resource] shader = ExtResource( 1 ) shader_param/albedo = Color( 1, 1, 1, 1 ) diff --git a/game/modules/core/materials/9_standard_character_material_notex.tres b/game/materials/9_standard_character_material_notex.tres similarity index 100% rename from game/modules/core/materials/9_standard_character_material_notex.tres rename to game/materials/9_standard_character_material_notex.tres diff --git a/game/modules/core/materials/character_mat..tres b/game/materials/character_mat..tres similarity index 100% rename from game/modules/core/materials/character_mat..tres rename to game/materials/character_mat..tres diff --git a/game/modules/core/materials/character_mat.tres_off b/game/materials/character_mat.tres_off similarity index 100% rename from game/modules/core/materials/character_mat.tres_off rename to game/materials/character_mat.tres_off diff --git a/game/modules/core/materials/spatial_voxelman_mat.tres b/game/materials/spatial_voxelman_mat.tres similarity index 100% rename from game/modules/core/materials/spatial_voxelman_mat.tres rename to game/materials/spatial_voxelman_mat.tres diff --git a/game/modules/core/materials/voxelman.tres b/game/materials/voxelman.tres similarity index 100% rename from game/modules/core/materials/voxelman.tres rename to game/materials/voxelman.tres diff --git a/game/modules/core/materials/voxelman.tres_off b/game/materials/voxelman.tres_off similarity index 100% rename from game/modules/core/materials/voxelman.tres_off rename to game/materials/voxelman.tres_off diff --git a/game/modules/core/materials/voxelman2.tres b/game/materials/voxelman2.tres similarity index 100% rename from game/modules/core/materials/voxelman2.tres rename to game/materials/voxelman2.tres diff --git a/game/modules/core/materials/voxelman_shader.tres_off b/game/materials/voxelman_shader.tres_off similarity index 100% rename from game/modules/core/materials/voxelman_shader.tres_off rename to game/materials/voxelman_shader.tres_off diff --git a/game/modules/core/materials/world_material.tres b/game/materials/world_material.tres similarity index 100% rename from game/modules/core/materials/world_material.tres rename to game/materials/world_material.tres diff --git a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander.tscn b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander.tscn index 79b92d10..a1f53564 100644 --- a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander.tscn +++ b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://models/weapons/cethiels_weapons_3d/props/TestOnehander.tres" type="PropData" id=1] -[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2] -[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] +[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2] +[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] [node name="PropInstanceMerger" type="PropInstanceMerger"] transform = Transform( 0.0566189, -0.496784, 0, 0.386499, 0.0440496, 0.314131, -0.31211, -0.0355715, 0.389001, 0, 0, 0 ) diff --git a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander2.tscn b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander2.tscn index 42c55ebf..4a8bcc9a 100644 --- a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander2.tscn +++ b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestOnehander2.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://models/weapons/cethiels_weapons_3d/props/TestOnehander2.tres" type="PropData" id=1] -[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2] -[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] +[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2] +[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] [node name="PropInstanceMerger" type="PropInstanceMerger"] transform = Transform( 0.0566189, -0.496784, 0, 0.386499, 0.0440496, 0.314131, -0.31211, -0.0355715, 0.389001, 0, 0, 0 ) diff --git a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestShield.tscn b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestShield.tscn index 66150b9a..62e5e94b 100644 --- a/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestShield.tscn +++ b/game/models/weapons/cethiels_weapons_3d/model_visual_scenes/TestShield.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://models/weapons/cethiels_weapons_3d/props/test_shield.tres" type="PropData" id=1] -[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2] -[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] +[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2] +[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3] [node name="PropInstanceMerger" type="PropInstanceMerger"] transform = Transform( -0.430642, 0.00290663, 0.130534, -0.130445, 0.00984939, -0.430566, -0.00563817, -0.449883, -0.00858312, 0, 0, 0 ) diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn index 08d1dc30..29183365 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn +++ b/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://modules/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://materials/2_simple_particle_billboard.tres" type="Material" id=3] diff --git a/game/project.godot b/game/project.godot index 205dc810..4da31e60 100644 --- a/game/project.godot +++ b/game/project.godot @@ -369,7 +369,7 @@ enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,ne enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" ) xp/character_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ) material_cache/texture_flags=1 -material_cache/material_paths=PoolStringArray( "res://modules/core/materials/3_standard_character_material.tres", "res://modules/core/materials/3_standard_character_material.tres", "res://modules/core/materials/9_standard_character_material_notex.tres" ) +material_cache/material_paths=PoolStringArray( "res://materials/3_standard_character_material.tres", "res://materials/3_standard_character_material.tres", "res://materials/9_standard_character_material_notex.tres" ) profiles/automatic_save=true data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres" level/max_character_level=60 @@ -824,7 +824,7 @@ limits/message_queue/max_size_kb=2048 [props] texture_flags=1 -material_paths=PoolStringArray( "res://modules/core/materials/6_standard_material_prop_nouv2.tres", "res://modules/core/materials/6_standard_material_prop_nouv2.tres", "res://modules/core/materials/8_standard_material_prop_notex.tres" ) +material_paths=PoolStringArray( "res://materials/6_standard_material_prop_nouv2.tres", "res://materials/6_standard_material_prop_nouv2.tres", "res://materials/8_standard_material_prop_notex.tres" ) [rendering] diff --git a/game/tw/new_terramanlibrarymerger.tres b/game/tw/new_terramanlibrarymerger.tres index 4421e663..5f31302f 100644 --- a/game/tw/new_terramanlibrarymerger.tres +++ b/game/tw/new_terramanlibrarymerger.tres @@ -3,8 +3,8 @@ [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] -[ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=4] -[ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=5] +[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] +[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] [sub_resource type="TerrainSurfaceMerger" id=1] texture_top = ExtResource( 1 ) diff --git a/game/tw/new_terramanlibrarymergerpcm.tres b/game/tw/new_terramanlibrarymergerpcm.tres index e9361e75..841ee09d 100644 --- a/game/tw/new_terramanlibrarymergerpcm.tres +++ b/game/tw/new_terramanlibrarymergerpcm.tres @@ -3,10 +3,10 @@ [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] -[ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=4] -[ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=5] -[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=6] -[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=7] +[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] +[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] +[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=6] +[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=7] [sub_resource type="TerrainSurfaceMerger" id=1] texture_top = ExtResource( 1 )