Overworld Work, NPC Shaded, Unused Files Placed in New Folder
This commit is contained in:
@@ -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")
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@@ -1,34 +0,0 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bavr1xnqn384k"
|
||||
path="res://.godot/imported/CLALO.png-b8f3bb9e0cbf40c9512d845631147680.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://src/npc/Clalo/CLALO.png"
|
||||
dest_files=["res://.godot/imported/CLALO.png-b8f3bb9e0cbf40c9512d845631147680.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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 21 KiB |
@@ -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=""
|
||||
|
||||
Reference in New Issue
Block a user