Skip to content

Commit 23b8473

Browse files
DominaeDevDominaeDev
committed
Bug fix: Radio choice parameter didn't update correctly.
Bug fix: Linebreaks in generated recipes. Bug fix: Backyard AI validation was dependent on column order.
1 parent 7baa158 commit 23b8473

17 files changed

+75
-83
lines changed

‎source/Content/en/Internal/global_recipe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<!-- Relationship block -->
6565
<Node path="persona/relationship" style="block" order="800" rule="not less-detail">
66-
[multi-character?[char's] relationship to [user]|Relationship to [user]]:
66+
[char's] relationship to [user]:
6767
{inner}
6868
</Node>
6969
<Node path="persona/relationship" style="block" order="800" rule="less-detail"/>

‎source/Content/en/Recipes/Story/relationship-family.recipe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<Rule id="first-order">not (cousin or second-cousin or grandparent or grandchild)</Rule>
113113

114-
<Node path="persona/relationship/academic" rule="first-order">[char] and [user] are family.</Node>
114+
<Node path="persona/relationship/kin" rule="first-order">[char] and [user] are family.</Node>
115115
<Node path="persona/relationship/kin" rule="not family-member">[char] is a close relative to [user].</Node>
116116

117117
<Node path="persona/relationship/kin" rule="parent">[char] is [user's] [@parent] and loves [#them] dearly.</Node>

‎source/Resources/Templates/recipe_template_base.txt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
65
<Category>%%CATEGORY%%</Category>
76
<Requires>not base</Requires>
87
<Flags>base</Flags>
9-
<Description>
10-
<!-- Recipe information here -->
11-
</Description>
12-
13-
<!-- Parameters? -->
8+
<Description></Description>
9+
<Author>%%AUTHOR%%</Author>
1410

1511
<!-- Output -->
16-
17-
<System>
18-
<!-- Model instructions here -->
12+
<System>
13+
Text transcript of a never-ending conversation between [user] and [char].
14+
In the transcript, gestures and other non-verbal actions are written between asterisks (for example, *waves hello* or *moves closer*).
1915
</System>
2016

2117
</Ginger>

‎source/Resources/Templates/recipe_template_card.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
65
<Category>%%CATEGORY%%</Category>
76
<Flags>%%FLAGS%%</Flags>
8-
<Description>
9-
<!-- Recipe information here -->
10-
</Description>
11-
12-
<!-- Parameters? -->
7+
<Description></Description>
8+
<Author>%%AUTHOR%%</Author>
139

1410
<!-- Output -->
1511
%%NODES%%%%ATTRIBUTES%%%%SYSTEM%%%%POSTHISTORY%%%%PERSONA%%%%USER%%%%SCENARIO%%%%GREETING%%%%GROUPGREETING%%%%EXAMPLE%%%%GRAMMAR%%%%LORE%%</Ginger>

‎source/Resources/Templates/recipe_template_empty.txt‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Ginger version="1.0">
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
4-
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
64
<Category>%%CATEGORY%%</Category>
7-
<Description>
8-
<!-- Recipe details here -->
9-
</Description>
5+
<Description></Description>
6+
<Author>%%AUTHOR%%</Author>
107

118
<!-- Output -->
12-
<Persona>
13-
<!-- Character description here -->
9+
<Persona>
10+
1411
</Persona>
1512
</Ginger>

‎source/Resources/Templates/recipe_template_personality.txt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
65
<Category>%%CATEGORY%%</Category>
7-
<Description>
8-
<!-- Recipe information here -->
9-
</Description>
6+
<Description></Description>
7+
<Author>%%AUTHOR%%</Author>
108

119
<!-- Output -->
12-
1310
<Attribute>
1411
<Name>Personality</Name>
15-
<Value><!-- Personality traits, separated by commas --></Value>
12+
<Value></Value>
1613
</Attribute>
1714

1815
<Attribute>
1916
<Name>Likes</Name>
20-
<Value><!-- Likes, separated by commas --></Value>
17+
<Value></Value>
2118
</Attribute>
2219

2320
<Attribute>
2421
<Name>Dislikes</Name>
25-
<Value><!-- Dislikes, separated by commas --></Value>
22+
<Value></Value>
2623
</Attribute>
2724

2825
<Persona>
29-
<!-- Personality description here -->
26+
3027
</Persona>
31-
3228
</Ginger>

‎source/Resources/Templates/recipe_template_sample_1.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
65
<Category>%%CATEGORY%%</Category>
7-
<Description>
8-
Sample recipe of a character trait
9-
</Description>
10-
11-
<!-- Output -->
6+
<Description>Sample recipe of a character trait.</Description>
7+
<Author>%%AUTHOR%%</Author>
128

9+
<!-- Output -->
1310
<Persona>
1411
Two large horns, like those of a ram, protrude from [char's] forehead, curling up and around her head.
1512
</Persona>

‎source/Resources/Templates/recipe_template_sample_2.txt‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,31 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
5+
<Description>Sample recipe with parameters.</Description>
66
<Category>%%CATEGORY%%</Category>
7-
<Description>
8-
Sample recipe with parameters.
9-
</Description>
7+
<Author>%%AUTHOR%%</Author>
108

11-
<!-- Parameters -->
12-
13-
<!-- A drop-down list -->
9+
<!-- Input -->
1410
<Choice id="my-choice">
1511
<Label>A choice</Label>
1612
<Option id="choice-1">Choice #1</Option>
1713
<Option id="choice-2">Choice #2</Option>
1814
<Option id="choice-3">Choice #3</Option>
1915
</Choice>
2016

21-
<!-- A text field -->
2217
<Text id="my-text">
2318
<Label>A text field</Label>
2419
<Placeholder>Please enter some text</Placeholder>
2520
</Text>
2621

27-
<!-- A checkbox -->
2822
<Toggle id="my-toggle">
2923
<Label>A toggle</Label>
3024
<Default>No</Default>
3125
</Toggle>
3226

33-
<!-- A hint label -->
3427
<Hint rule="my-toggle">Hello there!</Hint>
3528

3629
<!-- Output -->
37-
3830
<Persona rule="not my-choice">
3931
No choice has been made.
4032
</Persona>

‎source/Resources/Templates/recipe_template_sample_3.txt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22
<!-- Preamble -->
33
<Name>%%NAME%%</Name>
44
<Title>%%TITLE%%</Title>
5-
<Author>%%AUTHOR%%</Author>
5+
<Description>Sample recipe with lore book entries.</Description>
66
<Category>%%CATEGORY%%</Category>
7-
<Description>
8-
Sample recipe with lore book entries.
9-
</Description>
7+
<Author>%%AUTHOR%%</Author>
108

11-
<!-- Parameters -->
12-
9+
<!-- Input -->
1310
<Choice id="lore-kind" mandatory="true">
1411
<Label>Lore kind</Label>
1512
<Option id="fruits">Fruits</Option>
1613
<Option id="vegetables">Vegetables</Option>
1714
</Choice>
1815

1916
<!-- Output -->
20-
2117
<Lore rule="fruits">
2218
<Name>Apple</Name>
2319
<Value>An apple is a sweet, edible fruit produced by an apple tree (Malus domestica). It is one of the most widely cultivated tree fruits.</Value>

‎source/src/Interface/Controls/SidePanel.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)