alysbrooks-public/games/isometric-park-fna Commit - r403:f678f0973392

alysbrooks-public » games » isometric-park-fna

Commit `r403:f678f0973392` public

parent | child

Description:

Add Tracery support.

Commit status:

[Not Reviewed]

References:

proto-add-ink

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r403:f678f0973392 - Sat, 14 Aug 2021 06:48:09

isometric-park-fna/Content/dialog.ink ¶ +13 -1

@@ -2,7 +2,8
2	VAR GovernorOpinion = 0	2	VAR GovernorOpinion = 0
3		3
4	//-> IntroGovernor	4	//-> IntroGovernor
5	This is a test.	5	//-> IntroAssistant
		6	//This is a test.
6	-> END	7	-> END
7		8
8	=== Once ===	9	=== Once ===
@@ -41,3 +42,14
41	-> END	42	-> END
42		43
43		44
		45	=== IntroAssistant ===
		46
		47	\#assistantName\#: \#whatever\#
		48	* Hi
		49
		50	\#assistantName\#: Bye
		51	-> END
		52	* How are you?
		53
		54	\#assistantName\#: \#howdoing\#
		55	-> END No newline at end of file

isometric-park-fna/Content/dialog.json ¶ +1 -1

	@@ -1,1 +1,1
	1	{"inkVersion":20,"root":[[~~"^This is a test."~~,~~"\n"~~,"end",["done",{"#f":5,"#n":"g-0"}],null],"done",{"Once":[["^Once upon a time...","\n",["ev",{"^->":"Once.0.2.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":18},{"s":["^There were two choices.",{"->":"$r","var":true},null]}],["ev",{"^->":"Once.0.3.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-1","flg":18},{"s":["^There were four lines of content.",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"Once.0.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.2.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":5}],"c-1":["ev",{"^->":"Once.0.c-1.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.3.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":5}],"g-0":["^They lived happily ever after.","\n","end",{"#f":5}]}],{"#f":1}],"IntroGovernor":[["^Governor: Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out. B opens the budget and F lets you adjust Forest Policy.","\n","ev","str","^Okay","/str","/ev",{"":".^.c-0","flg":20},{"c-0":["\n","^Governor: Make sure that you keep visitors happy and the budget in the black! You're currently getting an annual grant out of my budget—it'd sure be nice if you park were self-sufficient so we could drop that expense!","\n",["ev","str","^And I need to keep the forest healthy, too, right?","/str","/ev",{"":".^.c-0","flg":20},"ev","str","^Sounds good!","/str","/ev",{"":".^.c-1","flg":20},{"c-0":["^ ","\n","ev",{"VAR?":"GovernorOpinion"},1,"-","/ev",{"VAR=":"GovernorOpinion","re":true},"^Governor: Ummm, yeah","\n",[["ev",{"^->":"IntroGovernor.0.c-0.3.c-0.10.0.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":18},{"s":["^...",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"IntroGovernor.0.c-0.3.c-0.10.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.0.s"},[{"#n":"$r2"}],"\n","end",{"#f":5}]}],{"#f":5}],"c-1":["\n","ev",{"VAR?":"GovernorOpinion"},1,"+","/ev",{"VAR=":"GovernorOpinion","re":true},"^Governor: I'll check in soon.","\n","end",{"#f":5}]}],{"#f":5}]}],{"#f":1}],"global decl":["ev",0,{"VAR=":"GovernorOpinion"},"/ev","end",null],"#f":1}],"listDefs":{}} No newline at end of file		1	{"inkVersion":20,"root":[["end",["done",{"#f":5,"#n":"g-0"}],null],"done",{"Once":[["^Once upon a time...","\n",["ev",{"^->":"Once.0.2.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":18},{"s":["^There were two choices.",{"->":"$r","var":true},null]}],["ev",{"^->":"Once.0.3.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-1","flg":18},{"s":["^There were four lines of content.",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"Once.0.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.2.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":5}],"c-1":["ev",{"^->":"Once.0.c-1.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.3.s"},[{"#n":"$r2"}],"\n",{"->":".^.^.g-0"},{"#f":5}],"g-0":["^They lived happily ever after.","\n","end",{"#f":5}]}],{"#f":1}],"IntroGovernor":[["^Governor: Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out. B opens the budget and F lets you adjust Forest Policy.","\n","ev","str","^Okay","/str","/ev",{"":".^.c-0","flg":20},{"c-0":["\n","^Governor: Make sure that you keep visitors happy and the budget in the black! You're currently getting an annual grant out of my budget—it'd sure be nice if you park were self-sufficient so we could drop that expense!","\n",["ev","str","^And I need to keep the forest healthy, too, right?","/str","/ev",{"":".^.c-0","flg":20},"ev","str","^Sounds good!","/str","/ev",{"":".^.c-1","flg":20},{"c-0":["^ ","\n","ev",{"VAR?":"GovernorOpinion"},1,"-","/ev",{"VAR=":"GovernorOpinion","re":true},"^Governor: Ummm, yeah","\n",[["ev",{"^->":"IntroGovernor.0.c-0.3.c-0.10.0.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":18},{"s":["^...",{"->":"$r","var":true},null]}],{"c-0":["ev",{"^->":"IntroGovernor.0.c-0.3.c-0.10.c-0.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.0.s"},[{"#n":"$r2"}],"\n","end",{"#f":5}]}],{"#f":5}],"c-1":["\n","ev",{"VAR?":"GovernorOpinion"},1,"+","/ev",{"VAR=":"GovernorOpinion","re":true},"^Governor: I'll check in soon.","\n","end",{"#f":5}]}],{"#f":5}]}],{"#f":1}],"IntroAssistant":[["^#assistantName#: #whatever#","\n","ev","str","^Hi","/str","/ev",{"":".^.c-0","flg":20},"ev","str","^How are you?","/str","/ev",{"":".^.c-1","flg":20},{"c-0":["\n","^#assistantName#: Bye","\n","end",{"#f":5}],"c-1":["\n","^#assistantName#: #howdoing#","\n","end",{"#f":5}]}],{"#f":1}],"global decl":["ev",0,{"VAR=":"GovernorOpinion"},"/ev","end",null],"#f":1}],"listDefs":{}} No newline at end of file

isometric-park-fna/Engines/Spawners/DialogSpawner.cs ¶ +2 -2

                         AddComponent(newDialog, new DialogComponent {
                                 Knot = message.Path,
-                                CurrentDialog = dialog,
+                                CurrentDialog = this.Grammar.Flatten(dialog),
-                                CurrentSpeaker = speaker,
+                                CurrentSpeaker = this.Grammar.Flatten(speaker),
                                 Options = this.Story.currentChoices
                                 .Select(option => option.text)
                                 .ToList()});

isometric-park-fna/Engines/Spawners/GameSpawner.cs ¶ +2 -1

             #region dialog
             			SendMessage(new SpawnDialogMessage { Path = "IntroGovernor"});
-            			SendMessage(new SpawnDialogMessage { Path = "Once"});
+            			// SendMessage(new SpawnDialogMessage { Path = "Once"});
+            			SendMessage(new SpawnDialogMessage { Path = "IntroAssistant"});
             #endregion
             			this.simulation.Subsidy = message.Difficulty switch {
             				DifficultyLevel.Hard => 0M,

isometric-park-fna/Engines/UIEngine.cs ¶ +13 -11

             using Encompass;
             using Ink.Runtime;
+            using TraceryNet;
             using isometricparkfna.Messages;
             using isometricparkfna.Components;
                 class UIEngine : Engine
                 {
             	    public Story Story;
+            	    public Grammar grammar;
-            	    public UIEngine(Story story)
+            	    public UIEngine(Story story, Grammar grammar)
             	    {
             		    this.Story = story;
+            		    this.grammar = grammar;
             	    }
                     public override void Update(double dt)
             		    //Update the dialog component with the new speaker, dialog, and options:
             		    var continuation = this.Story.ContinueMaximally();
             		    var parts = Regex.Split(continuation, ":", 0);
-            		    var speaker = (parts.Length == 2) ? parts[0] : "";
+            		    var speaker = (parts.Length == 2) ? this.grammar.Flatten(parts[0]) : "Dialog";
-            		    var dialog = (parts.Length == 2) ? parts[1] : continuation;
+            		    var dialog = (parts.Length == 2) ? this.grammar.Flatten(parts[1]) : continuation;
             		    SetComponent(choiceMessage.Entity, new DialogComponent {
-                                CurrentDialog = dialog,
+            				    CurrentDialog = dialog,
-                                CurrentSpeaker = speaker,
+            				    CurrentSpeaker = speaker,
-                                Options = this.Story.currentChoices
+            				    Options = this.Story.currentChoices
-                                .Select(option => option.text)
+            				    .Select(option => option.text)
-                                .ToList()});
+            				    .ToList()});}
             		    else
             		    {
             			    Logging.Debug(String.Format("Destroying Dialog (Entity ID {0}).", choiceMessage.Entity.ID));
             			    Story.ChoosePathString(Knot);
             			    var continuation = this.Story.ContinueMaximally();
             			    var parts = Regex.Split(continuation, ":", 0);
-            			    var speaker = (parts.Length == 2) ? parts[0] : "";
+            			    var speaker = (parts.Length == 2) ? this.grammar.Flatten(parts[0]) : "Dialog";
-            			    var dialog = (parts.Length == 2) ? parts[1] : continuation;
+            			    var dialog = (parts.Length == 2) ? this.grammar.Flatten(parts[1]) : continuation;
             			    SetComponent(lowestEntity, new DialogComponent {
             				    Knot = Knot,
             					    CurrentDialog = dialog,

isometric-park-fna/FNAGame.cs ¶ +1 -1

                     Logging.Debug(this.Story.ContinueMaximally());
                     WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
-                    WorldBuilder.AddEngine(new UIEngine(this.Story));
+                    WorldBuilder.AddEngine(new UIEngine(this.Story, this.grammar));
                     var gameBridgeEngine = new GameBridgeEngine(this);

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r403:f678f0973392 - Sat, 14 Aug 2021 06:48:09

Sign in to your account

Commit r403:f678f0973392 public

Author

r403:f678f0973392 - Sat, 14 Aug 2021 06:48:09

Commit `r403:f678f0973392` public