change import process for .yarnproject files to not need a separate .…

…tres file in the project. the .yarnproject will appear as the C# YarnProject resource in the inspector.
YarnSpinnerTool · Nov 24, 2023 · 6e15e03 · 6e15e03
1 parent 877afa6
commit 6e15e03
Show file tree

Hide file tree

Showing 38 changed files with 167 additions and 370 deletions.
diff --git a/Samples/MarkupPalette/Palette-dialogue.yarn b/Samples/MarkupPalette/Palette-dialogue.yarn
@@ -4,6 +4,7 @@ Alice: this is a [calm]quick[/calm] demonstration of using the [hype]new[/hype]
 Bob: [calm]oh[/calm], cool, [hype]colours[/hype]!
 Alice: yes indeed, [turbohype]colours[/turbohype].
 
+
 Bob: so [calm]how does[/calm] one use this [turbohype]fabulous[/turbohype] [hype]new[/hype] feature?
 Alice: well [calm]first[/calm] you make a [hype]new[/hype] MarkupPalette resource
 Bob: uh huh

diff --git a/Samples/MarkupPalette/Palette-dialogue.yarn.import b/Samples/MarkupPalette/Palette-dialogue.yarn.import
@@ -1,7 +1,7 @@
 [remap]
 
 importer="yarnscript"
-type="Script"
+type="Resource"
 uid="uid://dwascvkaa7nmf"
 path="res://.godot/imported/Palette-dialogue.yarn-caa39b62f3fe47a6c11e168523b4ecdb.tres"
 

diff --git a/Samples/MarkupPalette/Palette.yarnproject.import b/Samples/MarkupPalette/Palette.yarnproject.import
@@ -2,7 +2,7 @@
 
 importer="yarnproject"
 type="Resource"
-uid="uid://7y2xm4f22ep5"
+uid="uid://374uxyocig3s"
 path="res://.godot/imported/Palette.yarnproject-2c1612daef56a2c0f2be9d1a92c0c8b9.tres"
 
 [deps]

diff --git a/Samples/MarkupPalette/PaletteProj.tres b/Samples/MarkupPalette/PaletteProj.tres
diff --git a/Samples/MarkupPalette/PaletteSample.tscn b/Samples/MarkupPalette/PaletteSample.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://uxc1jm6ayoar"]
 
 [ext_resource type="PackedScene" uid="uid://bv42g323prh5f" path="res://addons/YarnSpinner-Godot/Scenes/DefaultDialogueSystem.tscn" id="1_luv5t"]
-[ext_resource type="Resource" uid="uid://65vclh8qnnlk" path="res://Samples/MarkupPalette/PaletteProj.tres" id="2_yfv6n"]
+[ext_resource type="Resource" uid="uid://7y2xm4f22ep5" path="res://Samples/MarkupPalette/Palette.yarnproject" id="2_yfv6n"]
 [ext_resource type="Resource" uid="uid://c631us202ijmk" path="res://Samples/MarkupPalette/example_markup_palette.tres" id="3_1wwmk"]
 [ext_resource type="Script" path="res://Samples/ReturnOnComplete.cs" id="4_q6j15"]
 

diff --git a/Samples/PausingTypewriter/PauseDialogue.yarn.import b/Samples/PausingTypewriter/PauseDialogue.yarn.import
@@ -1,7 +1,7 @@
 [remap]
 
 importer="yarnscript"
-type="Script"
+type="Resource"
 uid="uid://dgw4ojltf2hn6"
 path="res://.godot/imported/PauseDialogue.yarn-926959666337d027238a2c8dd345367d.tres"
 

diff --git a/Samples/PausingTypewriter/PauseProj.tres b/Samples/PausingTypewriter/PauseProj.tres
diff --git a/Samples/PausingTypewriter/PauseProj.yarnproject.import b/Samples/PausingTypewriter/PauseProj.yarnproject.import
@@ -2,7 +2,7 @@
 
 importer="yarnproject"
 type="Resource"
-uid="uid://cgk3obf527mhm"
+uid="uid://btil08na83k0p"
 path="res://.godot/imported/PauseProj.yarnproject-744c25107925e6d1f7a2789f0626afa3.tres"
 
 [deps]

diff --git a/Samples/PausingTypewriter/PauseSample.tscn b/Samples/PausingTypewriter/PauseSample.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://ckp616grs7xrs"]
 
 [ext_resource type="PackedScene" uid="uid://bv42g323prh5f" path="res://addons/YarnSpinner-Godot/Scenes/DefaultDialogueSystem.tscn" id="1_m0dlq"]
-[ext_resource type="Resource" uid="uid://d2ucrvm44r0vh" path="res://Samples/PausingTypewriter/PauseProj.tres" id="2_j3415"]
+[ext_resource type="Resource" uid="uid://cgk3obf527mhm" path="res://Samples/PausingTypewriter/PauseProj.yarnproject" id="2_j3415"]
 [ext_resource type="Texture2D" uid="uid://crtrls05kcbu5" path="res://Samples/PausingTypewriter/sprites/talking.png" id="2_njmvd"]
 [ext_resource type="Script" path="res://Samples/PausingTypewriter/PauseResponder.cs" id="3_uqanb"]
 [ext_resource type="Texture2D" uid="uid://dk84dy4vqquds" path="res://Samples/PausingTypewriter/sprites/thinking.png" id="4_1i87u"]
@@ -39,7 +39,7 @@ offset_bottom = 1542.0
 scale = Vector2(0.3, 0.3)
 texture = ExtResource("2_njmvd")
 
-[node name="PauseResponder" type="Control" parent="." node_paths=PackedStringArray("face", "lineView", "dialogueRunner")]
+[node name="PauseResponder" type="Control" parent="." node_paths=PackedStringArray("face", "lineView")]
 anchors_preset = 0
 offset_right = 40.0
 offset_bottom = 40.0
@@ -48,7 +48,6 @@ face = NodePath("../Face")
 thinkingFace = ExtResource("4_1i87u")
 talkingFace = ExtResource("2_njmvd")
 lineView = NodePath("../YarnSpinnerCanvasLayer/LineView")
-dialogueRunner = NodePath("../YarnSpinnerCanvasLayer/DialogueRunner")
 
 [node name="ReturnOnComplete" type="Node2D" parent="." node_paths=PackedStringArray("dialogueRunner")]
 script = ExtResource("6_otpsy")

diff --git a/Samples/RoundedViews/Rounded.yarnproject.import b/Samples/RoundedViews/Rounded.yarnproject.import
@@ -2,7 +2,7 @@
 
 importer="yarnproject"
 type="Resource"
-uid="uid://byyyntobab06n"
+uid="uid://crbfo1tue0g06"
 path="res://.godot/imported/Rounded.yarnproject-f4f7cd79583437b6fbb15d97bcf58422.tres"
 
 [deps]

diff --git a/Samples/RoundedViews/RoundedDialogue.yarn.import b/Samples/RoundedViews/RoundedDialogue.yarn.import
@@ -1,7 +1,7 @@
 [remap]
 
 importer="yarnscript"
-type="Script"
+type="Resource"
 uid="uid://7ukn607q8q87"
 path="res://.godot/imported/RoundedDialogue.yarn-782e62627649fc50f7a31dbc32e16966.tres"