YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Dominic Masters
2025-05-05 10:55:45 -05:00
parent 65a3d49f55
commit 7106469bd1
8 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scenes/Entities/Rosa.tscn
View File

@@ -13,6 +13,7 @@ height = 0.804274
[sub_resource type="ShaderMaterial" id="ShaderMaterial_fegux"]
render_priority = 0
shader = ExtResource("3_j5vis")
shader_parameter/color = Color(0.931725, 0.000206962, 0.803019, 1)
shader_parameter/frame = 0
shader_parameter/direction = 1

1
scenes/Entities/TestNPC.tscn
View File

@@ -13,6 +13,7 @@ height = 0.804274
[sub_resource type="ShaderMaterial" id="ShaderMaterial_l4utx"]
render_priority = 0
shader = ExtResource("1_xgcv1")
shader_parameter/color = Color(0, 0.563816, 0, 1)
shader_parameter/frame = 0
shader_parameter/direction = 1

4
scenes/Maps/SomeMap.tscn
View File

@@ -53,12 +53,16 @@ shadow_normal_bias = 0.9
omni_range = 281.646
[node name="Map" type="Node3D" parent="."]
metadata/_edit_lock_ = true
[node name="Ground" type="StaticBody3D" parent="Map"]
metadata/_edit_lock_ = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="Map/Ground"]
mesh = SubResource("BoxMesh_s8iqe")
surface_material_override/0 = SubResource("ShaderMaterial_s8iqe")
metadata/_edit_lock_ = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="Map/Ground"]
shape = SubResource("BoxShape3D_s8iqe")
metadata/_edit_lock_ = true

2
scripts/Cutscene/TestCutscene.gd
View File

@@ -5,6 +5,6 @@ func _init(speaker:OverworldEntity, interacted:OverworldEntity ) -> void:
speaker,
interacted,
[
"Hello"
"Hello, my name is GREEN and I am an NPC."
]
);

4
scripts/Entities/OverworldEntity.gd
View File

@@ -148,8 +148,8 @@ func _process(delta:float) -> void:
# Handle entity leaving map bounds
if !withinMapBounds:
if !withinBoundsLastFrame:
print("Entity ", self.name, " was out of map bounds for two frames");
# if !withinBoundsLastFrame:
# print("Entity ", self.name, " was out of map bounds for two frames");
withinBoundsLastFrame = false;
else:
withinBoundsLastFrame = true;

1
scripts/player.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://bemw1wubl22hp

3
shaders/NPC Shader.gdshader
View File

@@ -2,6 +2,7 @@ shader_type spatial;
render_mode cull_disabled;
uniform sampler2D npcTexture : filter_nearest;
uniform vec4 color : source_color;
uniform int frame;
uniform int direction;
@@ -35,5 +36,5 @@ void fragment() {
if(npcColor.r == 0.00392156862745 && npcColor.g == 1.0 && npcColor.b == 0.0)
discard;
ALBEDO.rgb = npcColor.rgb;
ALBEDO.rgb = npcColor.rgb * color.rgb;
}

5
ui/UI Theme.tres
View File

@@ -1,9 +1,6 @@
[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dm7ee4aqjr2dl"]
[ext_resource type="Texture2D" uid="uid://63qoqwcwjrdr" path="res://textures/ui/ui_frame.png" id="1_wss1l"]
[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dm7ee4aqjr2dl"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_linbi"]
texture = ExtResource("1_wss1l")
texture_margin_left = 14.0
texture_margin_top = 14.0
texture_margin_right = 14.0