diff --git a/Zennysoft.Game.Ma/project.godot b/Zennysoft.Game.Ma/project.godot index 7aaa7c11..34ab7633 100644 --- a/Zennysoft.Game.Ma/project.godot +++ b/Zennysoft.Game.Ma/project.godot @@ -253,5 +253,6 @@ textures/default_filters/anisotropic_filtering_level=0 environment/ssao/quality=0 environment/ssil/quality=0 environment/screen_space_reflection/roughness_quality=2 +mesh_lod/lod_change/threshold_pixels=0.0 2d/snap/snap_2d_transforms_to_pixel=true 2d/snap/snap_2d_vertices_to_pixel=true diff --git a/Zennysoft.Game.Ma/src/map/overworld/HubWorld.tscn b/Zennysoft.Game.Ma/src/Unused and Old/HubWorld.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/overworld/HubWorld.tscn rename to Zennysoft.Game.Ma/src/Unused and Old/HubWorld.tscn diff --git a/Zennysoft.Game.Ma/src/map/overworld/OverworldMap.tscn b/Zennysoft.Game.Ma/src/Unused and Old/Old Overworld Test.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/overworld/OverworldMap.tscn rename to Zennysoft.Game.Ma/src/Unused and Old/Old Overworld Test.tscn diff --git a/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png b/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png deleted file mode 100644 index 5aea5031..00000000 Binary files a/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png.import b/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png.import deleted file mode 100644 index 0030a5b3..00000000 --- a/Zennysoft.Game.Ma/src/map/map shaders/CYM 1.0•32•512x512.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://5ww66cp88vy7" -path="res://.godot/imported/CYM 1.0•32•512x512.png-62e148a8020202817d050af2cf279443.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://src/map/map shaders/CYM 1.0•32•512x512.png" -dest_files=["res://.godot/imported/CYM 1.0•32•512x512.png-62e148a8020202817d050af2cf279443.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader b/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader new file mode 100644 index 00000000..d96ec45e --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader @@ -0,0 +1,14 @@ +shader_type spatial; + +void vertex() { + // Called for every vertex the material is visible on. +} + +void fragment() { + // Called for every pixel the material is visible on. +} + +//void light() { +// // Called for every pixel for every light affecting the material. +// // Uncomment to replace the default light processing function with this one. +//} diff --git a/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader.uid b/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader.uid new file mode 100644 index 00000000..60ab01d3 --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/map shaders/Overworld God Rays.gdshader.uid @@ -0,0 +1 @@ +uid://dj3ut2w0lnwq2 diff --git a/Zennysoft.Game.Ma/src/map/overworld/Overworld Water.gdshader b/Zennysoft.Game.Ma/src/map/map shaders/Overworld Water.gdshader similarity index 100% rename from Zennysoft.Game.Ma/src/map/overworld/Overworld Water.gdshader rename to Zennysoft.Game.Ma/src/map/map shaders/Overworld Water.gdshader diff --git a/Zennysoft.Game.Ma/src/map/overworld/Overworld Water.gdshader.uid b/Zennysoft.Game.Ma/src/map/map shaders/Overworld Water.gdshader.uid similarity index 100% rename from Zennysoft.Game.Ma/src/map/overworld/Overworld Water.gdshader.uid rename to Zennysoft.Game.Ma/src/map/map shaders/Overworld Water.gdshader.uid diff --git a/Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg b/Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg new file mode 100644 index 00000000..4ebcc4e9 Binary files /dev/null and b/Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg differ diff --git a/Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png.import b/Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg.import similarity index 68% rename from Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png.import rename to Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg.import index 57111d92..1a3b3514 100644 --- a/Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png.import +++ b/Zennysoft.Game.Ma/src/map/map shaders/reflejo1.jpg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bavr1xnqn384k" -path="res://.godot/imported/CLALO.png-b8f3bb9e0cbf40c9512d845631147680.ctex" +uid="uid://b4odn0hf8hgbj" +path="res://.godot/imported/reflejo1.jpg-b96b0a438a286cb6e4de4e3e18fac404.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://src/npc/Clalo/CLALO.png" -dest_files=["res://.godot/imported/CLALO.png-b8f3bb9e0cbf40c9512d845631147680.ctex"] +source_file="res://src/map/map shaders/reflejo1.jpg" +dest_files=["res://.godot/imported/reflejo1.jpg-b96b0a438a286cb6e4de4e3e18fac404.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn b/Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn index d5d327d8..94a388a5 100644 --- a/Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn +++ b/Zennysoft.Game.Ma/src/map/overworld/Overworld.tscn @@ -17,7 +17,7 @@ [ext_resource type="Texture2D" uid="uid://dicwnhepupj5a" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_OUTTER_33.png" id="15_8isf0"] [ext_resource type="Texture2D" uid="uid://bs8a3hyubf521" path="res://src/map/overworld/Models/Overworld_makeshift_skybox_Cloudscape 3.png" id="16_8nnl3"] [ext_resource type="Shader" uid="uid://blrcjqdo7emhs" path="res://src/map/overworld/Models/water.gdshader" id="17_b53dq"] -[ext_resource type="Shader" uid="uid://yagva4an6w2" path="res://src/map/overworld/Overworld Water.gdshader" id="17_q2pi3"] +[ext_resource type="Shader" uid="uid://yagva4an6w2" path="res://src/map/map shaders/Overworld Water.gdshader" id="17_q2pi3"] [ext_resource type="Texture2D" uid="uid://cchqagfhsko0r" path="res://src/map/overworld/Models/Overworld_optimized_Pass 1_A1_eyeblock.png" id="18_r86sn"] [ext_resource type="Texture2D" uid="uid://bkly85kkv2gjs" path="res://src/map/overworld/Models/Overworld_optimized_Pass 1_concrete_0025_color_1k.jpg" id="19_0u0mt"] [ext_resource type="Texture2D" uid="uid://cgx3b275abnwg" path="res://src/map/overworld/Models/Overworld_optimized_Pass 1_OW_Worked-Stone-Outside.png" id="20_4rcfa"] diff --git a/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader b/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader deleted file mode 100644 index 1db27287..00000000 --- a/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader +++ /dev/null @@ -1,86 +0,0 @@ -shader_type spatial; -render_mode unshaded, depth_draw_never, cull_disabled; - -uniform float noise_scale = 11.24; -uniform float speed = 0.16; -uniform float darkness_amount = 9.155; -uniform float detail = 0.23; -uniform float concentration = 0.0; -uniform float amount = 0.12; -uniform float bloom = 2.0; -uniform float alpha = 8.0; -uniform vec3 cloud_tint : source_color = vec3(1.0, 1.0, 1.0); -uniform float edge_fade = -0.035; - -uniform mat2 rotation_matrix = mat2(vec2(1.6, 1.2), vec2(-1.2, 1.6)); - -// --- Noise Functions --- -vec2 hash(vec2 p) { - p = vec2(dot(p, vec2(127.1, 311.7)), dot(p, vec2(269.5, 183.3))); - return -1.0 + 2.0 * fract(sin(p) * 43758.5453123); -} - -float noise(vec2 p) { - const float K1 = 0.366025404; - const float K2 = 0.211324865; - vec2 i = floor(p + (p.x + p.y) * K1); - vec2 a = p - i + (i.x + i.y) * K2; - vec2 o = (a.x > a.y) ? vec2(1.0, 0.0) : vec2(0.0, 1.0); - vec2 b = a - o + K2; - vec2 c = a - 1.0 + 2.0 * K2; - vec3 h = max(0.5 - vec3(dot(a,a), dot(b,b), dot(c,c)), 0.0); - vec3 n = h * h * h * h * vec3(dot(a, hash(i + 0.0)), dot(b, hash(i + o)), dot(c, hash(i + 1.0))); - return dot(n, vec3(70.0)); -} - -float fbm(vec2 n) { - float total = 0.0; - float amplitude = 0.1; - for (int i = 0; i < 7; i++) { - total += noise(n) * amplitude; - n = rotation_matrix * n; - amplitude *= 0.4; - } - return total; -} - -// --- Main Fragment --- -void fragment() { - vec2 uv = UV; - - // Animate clouds - float time = TIME * (speed / 10.0); - float q = fbm(uv * noise_scale * 0.5); - - float r = 0.0; - vec2 tuv = uv * noise_scale + q - time; - float weight = 0.8; - for (int i = 0; i < 8; i++) { - r += abs(weight * noise(tuv)); - tuv = rotation_matrix * tuv + time; - weight *= 0.7; - } - - float f = 0.0; - tuv = uv * noise_scale + q - time; - weight = 0.7; - for (int i = 0; i < 8; i++) { - f += weight * noise(tuv); - tuv = rotation_matrix * tuv + time; - weight *= 0.6; - } - - f *= r + f; - - vec3 cloud_color = clamp(cloud_tint * (darkness_amount * detail * f), 0.0, 1.0) * bloom; - - float cloud_strength = amount + alpha * f * r; - cloud_strength = clamp(cloud_strength, 0.0, 1.0); - - // --- Edge fade --- - float edge_dist = distance(uv, vec2(0.5)); - float fade = smoothstep(edge_fade, 0.5, edge_dist); - - ALBEDO = cloud_color; - ALPHA = cloud_strength * (1.0 - fade) + concentration; -} diff --git a/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader.uid b/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader.uid deleted file mode 100644 index 1ad9c82e..00000000 --- a/Zennysoft.Game.Ma/src/map/overworld/Skybox.gdshader.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b7cri8j6ev4bi diff --git a/Zennysoft.Game.Ma/src/map/overworld/block.blend b/Zennysoft.Game.Ma/src/map/overworld/block.blend deleted file mode 100644 index e34751d3..00000000 Binary files a/Zennysoft.Game.Ma/src/map/overworld/block.blend and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/map/overworld/block.blend.import b/Zennysoft.Game.Ma/src/map/overworld/block.blend.import deleted file mode 100644 index 06ca3956..00000000 --- a/Zennysoft.Game.Ma/src/map/overworld/block.blend.import +++ /dev/null @@ -1,60 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://cvyi6iyeg5bmm" -path="res://.godot/imported/block.blend-1f5384908d93f77089fae16111405003.scn" - -[deps] - -source_file="res://src/map/overworld/block.blend" -dest_files=["res://.godot/imported/block.blend-1f5384908d93f77089fae16111405003.scn"] - -[params] - -nodes/root_type="" -nodes/root_name="" -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -nodes/use_node_type_suffixes=true -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -_subresources={ -"materials": { -"Material": { -"use_external/enabled": true, -"use_external/path": "res://src/map/overworld/Textures/ruins2.tres" -} -} -} -blender/nodes/visible=0 -blender/nodes/active_collection_only=false -blender/nodes/punctual_lights=true -blender/nodes/cameras=true -blender/nodes/custom_properties=true -blender/nodes/modifiers=1 -blender/meshes/colors=false -blender/meshes/uvs=true -blender/meshes/normals=true -blender/meshes/export_geometry_nodes_instances=false -blender/meshes/tangents=true -blender/meshes/skins=2 -blender/meshes/export_bones_deforming_mesh_only=false -blender/materials/unpack_enabled=true -blender/materials/export_materials=1 -blender/animation/limit_playback=true -blender/animation/always_sample=true -blender/animation/group_tracks=true diff --git a/Zennysoft.Game.Ma/src/npc/Caretaker/Caretaker.tscn b/Zennysoft.Game.Ma/src/npc/Caretaker/Caretaker.tscn index be273607..2ba5a1f1 100644 --- a/Zennysoft.Game.Ma/src/npc/Caretaker/Caretaker.tscn +++ b/Zennysoft.Game.Ma/src/npc/Caretaker/Caretaker.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0) gi_mode = 0 billboard = 2 +shaded = true texture_filter = 0 texture = ExtResource("3_85c36") diff --git a/Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png b/Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png deleted file mode 100644 index 9b94aa7d..00000000 Binary files a/Zennysoft.Game.Ma/src/npc/Clalo/CLALO.png and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/npc/Clalo/Clalo.tscn b/Zennysoft.Game.Ma/src/npc/Clalo/Clalo.tscn index cef70339..144625af 100644 --- a/Zennysoft.Game.Ma/src/npc/Clalo/Clalo.tscn +++ b/Zennysoft.Game.Ma/src/npc/Clalo/Clalo.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=7 format=3 uid="uid://ccwn5dfst7o4d"] [ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_38loe"] -[ext_resource type="Texture2D" uid="uid://bavr1xnqn384k" path="res://src/npc/Clalo/CLALO.png" id="2_rop5q"] [ext_resource type="Resource" uid="uid://lao0opxww3ib" path="res://src/dialog/Dialogue.dialogue" id="2_x0dcb"] +[ext_resource type="Texture2D" uid="uid://loeqa6twpa3q" path="res://src/npc/Clalo/CLALO_ver.2.png" id="3_rop5q"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"] radius = 3.0 @@ -21,11 +21,12 @@ Dialogue = ExtResource("2_x0dcb") [node name="Sprite" type="Sprite3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0) +transform = Transform3D(0.895, 0, 0, 0, 0.895, 0, 0, 0, 0.895, 0, 0.1, 0) gi_mode = 0 billboard = 2 +shaded = true texture_filter = 0 -texture = ExtResource("2_rop5q") +texture = ExtResource("3_rop5q") [node name="DialogueZone" type="Area3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii.tscn b/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii.tscn index e91d54e2..7e7e7757 100644 --- a/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii.tscn +++ b/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true gi_mode = 0 pixel_size = 0.008 billboard = 2 +shaded = true double_sided = false alpha_cut = 2 texture_filter = 0 diff --git a/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii2.tscn b/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii2.tscn index d488d34d..6fe53611 100644 --- a/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii2.tscn +++ b/Zennysoft.Game.Ma/src/npc/Gesthesemii/Gesthemii2.tscn @@ -25,6 +25,7 @@ gi_mode = 0 offset = Vector2(-100, 0) pixel_size = 0.008 billboard = 2 +shaded = true double_sided = false alpha_cut = 2 texture_filter = 0 diff --git a/Zennysoft.Game.Ma/src/npc/Goddess of Guidance/GoddessOfGuidance.tscn b/Zennysoft.Game.Ma/src/npc/Goddess of Guidance/GoddessOfGuidance.tscn index b119bbed..f79e9ec2 100644 --- a/Zennysoft.Game.Ma/src/npc/Goddess of Guidance/GoddessOfGuidance.tscn +++ b/Zennysoft.Game.Ma/src/npc/Goddess of Guidance/GoddessOfGuidance.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true gi_mode = 0 pixel_size = 0.008 billboard = 2 +shaded = true double_sided = false alpha_cut = 2 texture_filter = 0 diff --git a/Zennysoft.Game.Ma/src/npc/Npc.cs b/Zennysoft.Game.Ma/src/npc/Npc.cs index 6c87eb35..e6bb90c4 100644 --- a/Zennysoft.Game.Ma/src/npc/Npc.cs +++ b/Zennysoft.Game.Ma/src/npc/Npc.cs @@ -20,53 +20,53 @@ public partial class Npc : Node3D public void OnReady() { - SetPhysicsProcess(true); - DialogueZone.BodyEntered += DialogueZone_BodyEntered; - DialogueZone.BodyExited += DialogueZone_BodyExited; - Hitbox.AreaEntered += Hitbox_AreaEntered; + SetPhysicsProcess(true); + DialogueZone.BodyEntered += DialogueZone_BodyEntered; + DialogueZone.BodyExited += DialogueZone_BodyExited; + Hitbox.AreaEntered += Hitbox_AreaEntered; } private void Hitbox_AreaEntered(Area3D area) { - if (area.GetOwner() is ThrownItem thrownItem) - { - DialogueController.ShowDialogue(Dialogue, "get_item"); - thrownItem.QueueFree(); - } - else - { - DialogueController.ShowDialogue(Dialogue, "hit"); - } + if (area.GetOwner() is ThrownItem thrownItem) + { + DialogueController.ShowDialogue(Dialogue, "get_item"); + thrownItem.QueueFree(); + } + else + { + DialogueController.ShowDialogue(Dialogue, "hit"); + } } private void Hitbox_BodyEntered(Node body) { - DialogueController.ShowDialogue(Dialogue, "hit"); + DialogueController.ShowDialogue(Dialogue, "hit"); } private void DialogueZone_BodyExited(Node3D body) { - _isInDialogueZone = false; - DialogueController.Interrupt(); + _isInDialogueZone = false; + DialogueController.Interrupt(); } private void DialogueZone_BodyEntered(Node3D body) { - _isInDialogueZone = true; + _isInDialogueZone = true; } public override void _UnhandledInput(InputEvent @event) { - if (@event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone) - { - if (_isIntroductionComplete) - DialogueController.ShowDialogue(Dialogue, "general"); - else - { - DialogueController.ShowDialogue(Dialogue, "introduction"); - _isIntroductionComplete = true; - } - } + if (@event.IsActionPressed(GameInputs.Interact) && _isInDialogueZone) + { + if (_isIntroductionComplete) + DialogueController.ShowDialogue(Dialogue, "general"); + else + { + DialogueController.ShowDialogue(Dialogue, "introduction"); + _isIntroductionComplete = true; + } + } } } diff --git a/Zennysoft.Game.Ma/src/npc/Proscenium/Proscenium.tscn b/Zennysoft.Game.Ma/src/npc/Proscenium/Proscenium.tscn index 088251ed..7cf6e20e 100644 --- a/Zennysoft.Game.Ma/src/npc/Proscenium/Proscenium.tscn +++ b/Zennysoft.Game.Ma/src/npc/Proscenium/Proscenium.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true gi_mode = 0 offset = Vector2(-40, 50) billboard = 2 +shaded = true alpha_cut = 2 texture_filter = 0 texture = ExtResource("2_rqskb") diff --git a/Zennysoft.Game.Ma/src/npc/Puer/Puer.tscn b/Zennysoft.Game.Ma/src/npc/Puer/Puer.tscn index 3ccdf72a..02913c55 100644 --- a/Zennysoft.Game.Ma/src/npc/Puer/Puer.tscn +++ b/Zennysoft.Game.Ma/src/npc/Puer/Puer.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true gi_mode = 0 offset = Vector2(0, 10) billboard = 2 +shaded = true alpha_cut = 2 texture_filter = 0 texture = ExtResource("2_3ad4x") diff --git a/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn b/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn index 5624163c..a44e5743 100644 --- a/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn +++ b/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn @@ -24,6 +24,7 @@ unique_name_in_owner = true gi_mode = 0 offset = Vector2(0, 50) billboard = 2 +shaded = true texture_filter = 0 texture = ExtResource("3_m5rda") diff --git a/Zennysoft.Game.Ma/src/npc/Seshat/Seshat.tscn b/Zennysoft.Game.Ma/src/npc/Seshat/Seshat.tscn index 196cc99d..68a767cf 100644 --- a/Zennysoft.Game.Ma/src/npc/Seshat/Seshat.tscn +++ b/Zennysoft.Game.Ma/src/npc/Seshat/Seshat.tscn @@ -24,7 +24,8 @@ unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0) gi_mode = 0 pixel_size = 0.008 -billboard = 2 +billboard = 1 +shaded = true double_sided = false alpha_cut = 2 texture_filter = 0 diff --git a/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png b/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png index b8fee553..8ada357e 100644 Binary files a/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png and b/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png differ diff --git a/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png.import b/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png.import index f6511160..f6704028 100644 --- a/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png.import +++ b/Zennysoft.Game.Ma/src/npc/Seshat/seshat.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bt1n54xtem20m" -path="res://.godot/imported/seshat.png-02a4b362f584ce2171e108b824412341.ctex" +path.s3tc="res://.godot/imported/seshat.png-02a4b362f584ce2171e108b824412341.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://src/npc/Seshat/seshat.png" -dest_files=["res://.godot/imported/seshat.png-02a4b362f584ce2171e108b824412341.ctex"] +dest_files=["res://.godot/imported/seshat.png-02a4b362f584ce2171e108b824412341.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zennysoft.Game.Ma/src/video/Sky Test.ogv b/Zennysoft.Game.Ma/src/video/Sky Test.ogv deleted file mode 100644 index 6060588e..00000000 Binary files a/Zennysoft.Game.Ma/src/video/Sky Test.ogv and /dev/null differ diff --git a/Zennysoft.Game.Ma/src/video/Sky Test.ogv.uid b/Zennysoft.Game.Ma/src/video/Sky Test.ogv.uid deleted file mode 100644 index d2a660a0..00000000 --- a/Zennysoft.Game.Ma/src/video/Sky Test.ogv.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b7mlxo845l5to