diff --git a/ConversationElement.gd b/ConversationElement.gd new file mode 100644 index 0000000..c658aaf --- /dev/null +++ b/ConversationElement.gd @@ -0,0 +1,5 @@ +extends Resource +class_name ConversationElement + +@export_node_path("Entity") var entity:NodePath +@export_multiline var label: String \ No newline at end of file diff --git a/ConversationElement.gd.uid b/ConversationElement.gd.uid new file mode 100644 index 0000000..bd6bbc4 --- /dev/null +++ b/ConversationElement.gd.uid @@ -0,0 +1 @@ +uid://b40rstjkpompc diff --git a/singleton/Overworld.gd b/overworld/Overworld.gd similarity index 99% rename from singleton/Overworld.gd rename to overworld/Overworld.gd index 04774e5..ef722a7 100644 --- a/singleton/Overworld.gd +++ b/overworld/Overworld.gd @@ -2,7 +2,6 @@ class_name OverworldSingleton extends Node signal mapChanged(map:PackedScene, playerDestinationNodeName:String) - var newMapPath:String var hasFadedOut:bool = false var playerDestinationNodeName:String diff --git a/singleton/Overworld.gd.uid b/overworld/Overworld.gd.uid similarity index 100% rename from singleton/Overworld.gd.uid rename to overworld/Overworld.gd.uid diff --git a/overworld/entity/Entity.gd b/overworld/entity/Entity.gd index 425c715..e7b9206 100644 --- a/overworld/entity/Entity.gd +++ b/overworld/entity/Entity.gd @@ -1,4 +1,5 @@ class_name Entity extends CharacterBody3D +const ConversationElement = preload("res://ConversationElement.gd") enum MovementType { NONE, @@ -8,11 +9,15 @@ enum MovementType { enum InteractType { NONE, + CONVERSATION, }; # Movement settings +@export_category("Movement") @export var movementType:MovementType = MovementType.NONE # Interaction settings -@export var interactType:InteractType = InteractType.NONE \ No newline at end of file +@export_category("Interactions") +@export var interactType:InteractType = InteractType.NONE +@export var conversation:Array[ConversationElement] = [] diff --git a/overworld/entity/EntityConversationElement.gd.uid b/overworld/entity/EntityConversationElement.gd.uid new file mode 100644 index 0000000..d00b5e2 --- /dev/null +++ b/overworld/entity/EntityConversationElement.gd.uid @@ -0,0 +1 @@ +uid://55jotw6snoi diff --git a/overworld/entity/EntityInteractableArea.gd b/overworld/entity/EntityInteractableArea.gd index 5233eb4..e3e8bbf 100644 --- a/overworld/entity/EntityInteractableArea.gd +++ b/overworld/entity/EntityInteractableArea.gd @@ -4,13 +4,29 @@ const Entity = preload("res://overworld/entity/Entity.gd") @export var entity:Entity func isInteractable() -> bool: - return entity && entity.interactType != Entity.InteractType.NONE - -func onInteract() -> void: - if !isInteractable(): - return + if !entity: + return false if entity.interactType == Entity.InteractType.NONE: - return + return false - print("Entity Interacted") \ No newline at end of file + if entity.interactType == Entity.InteractType.CONVERSATION: + if entity.conversation.size() == 0: + return false + + return true + +func _onConversationInteract(_other:Entity) -> void: + print("Starting conversation with ", entity.name) + pass + +func onInteract(other:Entity) -> void: + if entity.interactType == Entity.InteractType.NONE: + return + + match entity.interactType: + Entity.InteractType.CONVERSATION: + _onConversationInteract(other) + return + _: + pass \ No newline at end of file diff --git a/overworld/entity/EntityInteractingArea.gd b/overworld/entity/EntityInteractingArea.gd index ccecf91..ac56e93 100644 --- a/overworld/entity/EntityInteractingArea.gd +++ b/overworld/entity/EntityInteractingArea.gd @@ -5,11 +5,15 @@ var interactableAreas:Array[EntityInteractableArea] = [] @export var entity:Entity func hasInteraction() -> bool: - return true + return interactableAreas.size() > 0 func interact() -> void: for area in interactableAreas: - area.onInteract() + if !area.isInteractable(): + continue + + area.onInteract(self.entity) + break func _enter_tree() -> void: self.area_entered.connect(_onAreaEntered) @@ -23,11 +27,7 @@ func _onAreaEntered(area:Area3D) -> void: if area is EntityInteractableArea: if area.entity == entity: return - if !area.isInteractable(): - return - print("EntityInteractingArea: Area Entered") interactableAreas.append(area) func _onAreaExited(area:Area3D) -> void: - print("EntityInteractingArea: Area Exited") interactableAreas.erase(area) \ No newline at end of file diff --git a/overworld/entity/EntityMovement.gd b/overworld/entity/EntityMovement.gd index 78be5be..9850658 100644 --- a/overworld/entity/EntityMovement.gd +++ b/overworld/entity/EntityMovement.gd @@ -1,5 +1,6 @@ class_name EntityMovement extends Node +const GRAVITY = Vector3.DOWN * 100 const FRICTION = 0.01 const WALK_SPEED_DEFAULT = 8 const RUN_SPEED_DEFAULT = 12 @@ -18,7 +19,7 @@ const RUN_SPEED_DEFAULT = 12 # func _applyGravity() -> void: if !entity.is_on_floor(): - entity.velocity += PHYSICS.GRAVITY * get_process_delta_time() + entity.velocity += GRAVITY * get_process_delta_time() func _applyPlayerMovement(_delta:float): if Input.is_action_just_pressed("interact") && interactingArea && interactingArea.hasInteraction(): diff --git a/overworld/map/TestMap.tscn b/overworld/map/TestMap.tscn index b1275e5..f6bec24 100644 --- a/overworld/map/TestMap.tscn +++ b/overworld/map/TestMap.tscn @@ -1,14 +1,23 @@ -[gd_scene load_steps=4 format=3 uid="uid://d0ywgijpuqy0r"] +[gd_scene load_steps=6 format=3 uid="uid://d0ywgijpuqy0r"] [ext_resource type="Script" uid="uid://xe6pcuq741xi" path="res://overworld/map/TestMap.gd" id="1_6ms5s"] [ext_resource type="PackedScene" uid="uid://cluuhtfjeodwb" path="res://overworld/map/TestMapBase.tscn" id="1_ox0si"] [ext_resource type="PackedScene" uid="uid://by4a0r2hp0w6s" path="res://overworld/entity/Entity.tscn" id="2_jmygs"] +[ext_resource type="Script" uid="uid://b40rstjkpompc" path="res://ConversationElement.gd" id="3_p7git"] + +[sub_resource type="Resource" id="Resource_p7git"] +script = ExtResource("3_p7git") +entity = NodePath(".") +label = "Hello!" +metadata/_custom_type_script = "uid://b40rstjkpompc" [node name="TestMap" type="Node3D"] script = ExtResource("1_6ms5s") [node name="NotPlayer" parent="." instance=ExtResource("2_jmygs")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00883961, 1.11219, 0.0142021) +interactType = 1 +conversation = Array[ExtResource("3_p7git")]([SubResource("Resource_p7git")]) [node name="TestMapBase" parent="." instance=ExtResource("1_ox0si")] diff --git a/project.godot b/project.godot index f870435..dfe3ae1 100644 --- a/project.godot +++ b/project.godot @@ -17,13 +17,12 @@ config/icon="res://icon.svg" [autoload] -PHYSICS="*res://singleton/GamePhysics.gd" PAUSE="*res://singleton/Pause.gd" TRANSITION="*res://singleton/Transition.tscn" -UI="*res://singleton/UI.tscn" -QUEST="*res://singleton/Quest.tscn" -OVERWORLD="*res://singleton/Overworld.gd" -SCENE="*res://singleton/Scene.gd" +UI="*res://ui/UI.tscn" +QUEST="*res://quest/Quest.tscn" +OVERWORLD="*res://overworld/Overworld.gd" +SCENE="*res://scene/Scene.gd" ControllerIcons="*res://addons/controller_icons/ControllerIcons.gd" [debug] diff --git a/singleton/Quest.gd b/quest/Quest.gd similarity index 100% rename from singleton/Quest.gd rename to quest/Quest.gd diff --git a/singleton/Quest.gd.uid b/quest/Quest.gd.uid similarity index 100% rename from singleton/Quest.gd.uid rename to quest/Quest.gd.uid diff --git a/singleton/Quest.tscn b/quest/Quest.tscn similarity index 87% rename from singleton/Quest.tscn rename to quest/Quest.tscn index 5cc2117..d6ba528 100644 --- a/singleton/Quest.tscn +++ b/quest/Quest.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dodd3jx81w40c"] -[ext_resource type="Script" uid="uid://cd4lf5sm2aquv" path="res://singleton/Quest.gd" id="1_u2r0s"] +[ext_resource type="Script" uid="uid://cd4lf5sm2aquv" path="res://quest/Quest.gd" id="1_u2r0s"] [node name="Quest" type="Node"] script = ExtResource("1_u2r0s") diff --git a/meta/InitialScene.tscn b/scene/InitialScene.tscn similarity index 100% rename from meta/InitialScene.tscn rename to scene/InitialScene.tscn diff --git a/meta/OverworldScene.gd b/scene/OverworldScene.gd similarity index 100% rename from meta/OverworldScene.gd rename to scene/OverworldScene.gd diff --git a/meta/OverworldScene.gd.uid b/scene/OverworldScene.gd.uid similarity index 100% rename from meta/OverworldScene.gd.uid rename to scene/OverworldScene.gd.uid diff --git a/meta/OverworldScene.tscn b/scene/OverworldScene.tscn similarity index 88% rename from meta/OverworldScene.tscn rename to scene/OverworldScene.tscn index 74309fe..9e6ed9e 100644 --- a/meta/OverworldScene.tscn +++ b/scene/OverworldScene.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c0k1t3tyiaojl"] -[ext_resource type="Script" uid="uid://dpvccegdmn7s6" path="res://meta/OverworldScene.gd" id="1_fa54r"] +[ext_resource type="Script" uid="uid://dpvccegdmn7s6" path="res://scene/OverworldScene.gd" id="1_fa54r"] [node name="OverworldScene" type="Node3D" node_paths=PackedStringArray("map")] script = ExtResource("1_fa54r") diff --git a/meta/RootScene.gd b/scene/RootScene.gd similarity index 100% rename from meta/RootScene.gd rename to scene/RootScene.gd diff --git a/meta/RootScene.gd.uid b/scene/RootScene.gd.uid similarity index 100% rename from meta/RootScene.gd.uid rename to scene/RootScene.gd.uid diff --git a/meta/RootScene.tscn b/scene/RootScene.tscn similarity index 83% rename from meta/RootScene.tscn rename to scene/RootScene.tscn index ffb05a1..e0dd927 100644 --- a/meta/RootScene.tscn +++ b/scene/RootScene.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://ckkewlcugc8ro"] -[ext_resource type="Script" uid="uid://ml70iui7qpo4" path="res://meta/RootScene.gd" id="1_nky1x"] -[ext_resource type="PackedScene" uid="uid://bs41nqi3ocih3" path="res://meta/InitialScene.tscn" id="2_hkmoa"] -[ext_resource type="PackedScene" uid="uid://c0k1t3tyiaojl" path="res://meta/OverworldScene.tscn" id="2_o1wvd"] +[ext_resource type="Script" uid="uid://ml70iui7qpo4" path="res://scene/RootScene.gd" id="1_nky1x"] +[ext_resource type="PackedScene" uid="uid://bs41nqi3ocih3" path="res://scene/InitialScene.tscn" id="2_hkmoa"] +[ext_resource type="PackedScene" uid="uid://c0k1t3tyiaojl" path="res://scene/OverworldScene.tscn" id="2_o1wvd"] [node name="RootScene" type="Node3D" node_paths=PackedStringArray("overworld", "initial")] script = ExtResource("1_nky1x") diff --git a/singleton/Scene.gd b/scene/Scene.gd similarity index 91% rename from singleton/Scene.gd rename to scene/Scene.gd index 260b89d..17b14a8 100644 --- a/singleton/Scene.gd +++ b/scene/Scene.gd @@ -16,4 +16,4 @@ func setScene(newScene:SceneType) -> void: if currentScene == newScene: return currentScene = newScene - sceneChanged.emit(currentScene) \ No newline at end of file + sceneChanged.emit(currentScene) diff --git a/singleton/Scene.gd.uid b/scene/Scene.gd.uid similarity index 100% rename from singleton/Scene.gd.uid rename to scene/Scene.gd.uid diff --git a/singleton/GamePhysics.gd b/singleton/GamePhysics.gd deleted file mode 100644 index ad920f9..0000000 --- a/singleton/GamePhysics.gd +++ /dev/null @@ -1,3 +0,0 @@ -class_name GamePhysicsSingleton extends Node - -const GRAVITY = Vector3.DOWN * 100 diff --git a/singleton/GamePhysics.gd.uid b/singleton/GamePhysics.gd.uid deleted file mode 100644 index b31ca2b..0000000 --- a/singleton/GamePhysics.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bj8jxbaikqrhf diff --git a/singleton/UI.gd b/ui/UI.gd similarity index 100% rename from singleton/UI.gd rename to ui/UI.gd diff --git a/singleton/UI.gd.uid b/ui/UI.gd.uid similarity index 100% rename from singleton/UI.gd.uid rename to ui/UI.gd.uid diff --git a/singleton/UI.tscn b/ui/UI.tscn similarity index 96% rename from singleton/UI.tscn rename to ui/UI.tscn index c4669ab..c3696d4 100644 --- a/singleton/UI.tscn +++ b/ui/UI.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://baos0arpiskbp"] [ext_resource type="PackedScene" uid="uid://bkx3l0kckf4a8" path="res://ui/component/VNTextbox.tscn" id="1_1mtk3"] -[ext_resource type="Script" uid="uid://dq3qyyayugt5l" path="res://singleton/UI.gd" id="1_son71"] +[ext_resource type="Script" uid="uid://dq3qyyayugt5l" path="res://ui/UI.gd" id="1_son71"] [ext_resource type="PackedScene" uid="uid://c0i5e2dj11d8c" path="res://ui/pause/PauseMenu.tscn" id="2_atyu8"] [node name="UI" type="Control" node_paths=PackedStringArray("TEXTBOX", "PAUSE")] diff --git a/fonts/IllusionBook/IllusionBook-Regular.otf b/ui/fonts/IllusionBook/IllusionBook-Regular.otf similarity index 100% rename from fonts/IllusionBook/IllusionBook-Regular.otf rename to ui/fonts/IllusionBook/IllusionBook-Regular.otf diff --git a/fonts/IllusionBook/IllusionBook-Regular.otf.import b/ui/fonts/IllusionBook/IllusionBook-Regular.otf.import similarity index 69% rename from fonts/IllusionBook/IllusionBook-Regular.otf.import rename to ui/fonts/IllusionBook/IllusionBook-Regular.otf.import index 83c6ec4..5db99f3 100644 --- a/fonts/IllusionBook/IllusionBook-Regular.otf.import +++ b/ui/fonts/IllusionBook/IllusionBook-Regular.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bnodbj3rhtd8v" -path="res://.godot/imported/IllusionBook-Regular.otf-a48250df46ace3f831871b997ec2974c.fontdata" +path="res://.godot/imported/IllusionBook-Regular.otf-4e37b6d8b8e633c2c137ff4f64dc2865.fontdata" [deps] -source_file="res://fonts/IllusionBook/IllusionBook-Regular.otf" -dest_files=["res://.godot/imported/IllusionBook-Regular.otf-a48250df46ace3f831871b997ec2974c.fontdata"] +source_file="res://ui/fonts/IllusionBook/IllusionBook-Regular.otf" +dest_files=["res://.godot/imported/IllusionBook-Regular.otf-4e37b6d8b8e633c2c137ff4f64dc2865.fontdata"] [params] diff --git a/fonts/IllusionBook/LICENSE.md b/ui/fonts/IllusionBook/LICENSE.md similarity index 100% rename from fonts/IllusionBook/LICENSE.md rename to ui/fonts/IllusionBook/LICENSE.md diff --git a/fonts/IllusionBook/README.md b/ui/fonts/IllusionBook/README.md similarity index 100% rename from fonts/IllusionBook/README.md rename to ui/fonts/IllusionBook/README.md diff --git a/fonts/ark-pixel-font/10px/monospaced/OFL.txt b/ui/fonts/ark-pixel-font/10px/monospaced/OFL.txt similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/OFL.txt rename to ui/fonts/ark-pixel-font/10px/monospaced/OFL.txt diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import similarity index 70% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import index e761fb4..9a38878 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bgmgoufsglbsi" -path="res://.godot/imported/ark-pixel-10px-monospaced-ja.otf-38ba4666a3e1990287b02155293b9445.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-ja.otf-99ae7328f3c4e7aabdea2463a0407d28.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-ja.otf-38ba4666a3e1990287b02155293b9445.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ja.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-ja.otf-99ae7328f3c4e7aabdea2463a0407d28.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import similarity index 70% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import index 969d665..f9bfb9d 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://58epv4f0dajy" -path="res://.godot/imported/ark-pixel-10px-monospaced-ko.otf-8341a65ffaff79c5f8b69a457b6b9819.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-ko.otf-07aa893f10acd24fc76958bf5d87853b.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-ko.otf-8341a65ffaff79c5f8b69a457b6b9819.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-ko.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-ko.otf-07aa893f10acd24fc76958bf5d87853b.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import similarity index 83% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import index 37efa44..de04a11 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://37b5j0x5hkfw" -path="res://.godot/imported/ark-pixel-10px-monospaced-latin.otf-9c9dff89c11fd86fe704be6e11ed4ec5.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-latin.otf-830e367b2047379b2ab45987472976bf.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-latin.otf-9c9dff89c11fd86fe704be6e11ed4ec5.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-latin.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-latin.otf-830e367b2047379b2ab45987472976bf.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import similarity index 77% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import index e87567b..ac73b25 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://ctflok6kaqmmr" -path="res://.godot/imported/ark-pixel-10px-monospaced-zh_cn.otf-27baa59740a2826e03022b066005666c.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-zh_cn.otf-1b2d5f435ab9fc2dbdb8cc4da179e90f.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_cn.otf-27baa59740a2826e03022b066005666c.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_cn.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_cn.otf-1b2d5f435ab9fc2dbdb8cc4da179e90f.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import similarity index 77% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import index 4af8096..66f570e 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bqxsxe2db2cse" -path="res://.godot/imported/ark-pixel-10px-monospaced-zh_hk.otf-bc34ed3d5ef13f516e1e9f634f6c40f9.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-zh_hk.otf-b560e6a7c560c23831b7d7e514396f6f.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_hk.otf-bc34ed3d5ef13f516e1e9f634f6c40f9.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_hk.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_hk.otf-b560e6a7c560c23831b7d7e514396f6f.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import similarity index 77% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import index 1beb472..43bf873 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://b84su101onshd" -path="res://.godot/imported/ark-pixel-10px-monospaced-zh_tr.otf-70b638161ad4133cb5afc42af4d32b4e.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-zh_tr.otf-2fb7bdb96127596e3b077485518866b8.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_tr.otf-70b638161ad4133cb5afc42af4d32b4e.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tr.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_tr.otf-2fb7bdb96127596e3b077485518866b8.fontdata"] [params] diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf similarity index 100% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf diff --git a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import similarity index 77% rename from fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import rename to ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import index 875bcde..ed94468 100644 --- a/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import +++ b/ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://be77yaondpu24" -path="res://.godot/imported/ark-pixel-10px-monospaced-zh_tw.otf-8ff41aa3f7b844697a8e2fa357d158c0.fontdata" +path="res://.godot/imported/ark-pixel-10px-monospaced-zh_tw.otf-89a0b80ffd53e9723518701b8c2c7e6b.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf" -dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_tw.otf-8ff41aa3f7b844697a8e2fa357d158c0.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/10px/monospaced/ark-pixel-10px-monospaced-zh_tw.otf" +dest_files=["res://.godot/imported/ark-pixel-10px-monospaced-zh_tw.otf-89a0b80ffd53e9723518701b8c2c7e6b.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/OFL.txt b/ui/fonts/ark-pixel-font/12px/monospaced/OFL.txt similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/OFL.txt rename to ui/fonts/ark-pixel-font/12px/monospaced/OFL.txt diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import similarity index 70% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import index cc98725..a065f9b 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bh385kaiy3gju" -path="res://.godot/imported/ark-pixel-12px-monospaced-ja.otf-04d55f6dd91df9f963dc22d5cb3e011e.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-ja.otf-3d9cd72ea3bb06c5b0dfcd78ab3a5b1c.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-ja.otf-04d55f6dd91df9f963dc22d5cb3e011e.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ja.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-ja.otf-3d9cd72ea3bb06c5b0dfcd78ab3a5b1c.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import similarity index 70% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import index 5c7a9a1..86a40aa 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://c8cc3xaq3fkpb" -path="res://.godot/imported/ark-pixel-12px-monospaced-ko.otf-b1318c2eff65e7d693111f676a62222a.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-ko.otf-8c62206e895b40b4d06f67b2d735ecaf.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-ko.otf-b1318c2eff65e7d693111f676a62222a.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-ko.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-ko.otf-8c62206e895b40b4d06f67b2d735ecaf.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import similarity index 83% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import index 83b7452..76bbc51 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://ck4rsg0nvvxtq" -path="res://.godot/imported/ark-pixel-12px-monospaced-latin.otf-252d3af5082843874088eb2a25b164b0.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-latin.otf-42f68d985e893bfd95218622eaf3b160.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-latin.otf-252d3af5082843874088eb2a25b164b0.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-latin.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-latin.otf-42f68d985e893bfd95218622eaf3b160.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import similarity index 77% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import index 265ddb1..b8e79e3 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bdrf0h5ee0d8h" -path="res://.godot/imported/ark-pixel-12px-monospaced-zh_cn.otf-68b621c1e7601219a85b563834031d13.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-zh_cn.otf-917e23c2ab0ca66bf0894f3bad2cdae4.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_cn.otf-68b621c1e7601219a85b563834031d13.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_cn.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_cn.otf-917e23c2ab0ca66bf0894f3bad2cdae4.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import similarity index 77% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import index 711049b..78801ba 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://87qflu7rgg4l" -path="res://.godot/imported/ark-pixel-12px-monospaced-zh_hk.otf-529004a90ae5661e0d8ee5aa35fa2591.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-zh_hk.otf-9a2cbd8e74c01e3e7e6309684fe87271.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_hk.otf-529004a90ae5661e0d8ee5aa35fa2591.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_hk.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_hk.otf-9a2cbd8e74c01e3e7e6309684fe87271.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import similarity index 77% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import index ee8c6fa..a3f1182 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://detvyvcqc6y1n" -path="res://.godot/imported/ark-pixel-12px-monospaced-zh_tr.otf-a037d4b14237e45c066bf079220cf7ac.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-zh_tr.otf-81d56ce5ad8d6a349efc87b0a7f296b3.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_tr.otf-a037d4b14237e45c066bf079220cf7ac.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tr.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_tr.otf-81d56ce5ad8d6a349efc87b0a7f296b3.fontdata"] [params] diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf similarity index 100% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf diff --git a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import similarity index 77% rename from fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import rename to ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import index 720305a..293171c 100644 --- a/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import +++ b/ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf.import @@ -3,12 +3,12 @@ importer="font_data_dynamic" type="FontFile" uid="uid://bt0devpfk1mt2" -path="res://.godot/imported/ark-pixel-12px-monospaced-zh_tw.otf-027d9d78140dcdd6a0d64a2f7912eaa4.fontdata" +path="res://.godot/imported/ark-pixel-12px-monospaced-zh_tw.otf-33fbe616ea58daa0f8a2a737331425ab.fontdata" [deps] -source_file="res://fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf" -dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_tw.otf-027d9d78140dcdd6a0d64a2f7912eaa4.fontdata"] +source_file="res://ui/fonts/ark-pixel-font/12px/monospaced/ark-pixel-12px-monospaced-zh_tw.otf" +dest_files=["res://.godot/imported/ark-pixel-12px-monospaced-zh_tw.otf-33fbe616ea58daa0f8a2a737331425ab.fontdata"] [params]