alysbrooks-public/games/isometric-park-fna Commit - r384:23e132ba3fe0

alysbrooks-public » games » isometric-park-fna

Commit `r384:23e132ba3fe0` public

parent | child

Description:

Actually render dialog from Ink.

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

r384:23e132ba3fe0 - Wed, 04 Aug 2021 19:59:26

isometric-park-fna/Engines/Spawners/DialogSpawner.cs ¶ created 644 +62 0

@@ -0,0 +1,62
	1
	2
	3	using System;
	4	using System.Collections.Generic;
	5	using System.Text.RegularExpressions;
	6	using System.Linq;
	7
	8	using Microsoft.Xna.Framework;
	9
	10	using isometricparkfna.Messages;
	11	using isometricparkfna.Components;
	12	using static isometricparkfna.CellMap;
	13	using isometricparkfna.UI;
	14
	15	using Encompass;
	16	using TraceryNet;
	17	using Ink.Runtime;
	18
	19
	20	namespace isometricparkfna.Spawners {
	21
	22	[Receives(typeof(SpawnDialogMessage))]
	23	class DialogSpawner : Spawner<SpawnDialogMessage>
	24
	25	{
	26	Story Story;
	27	Grammar Grammar;
	28
	29	public DialogSpawner(Story story, Grammar grammar)
	30	{
	31	this.Story = story;
	32	this.Grammar = grammar;
	33	}
	34
	35	protected override void Spawn(in SpawnDialogMessage message)
	36	{
	37	//Jump to the specified part of the story:
	38	Story.ChoosePathString(message.Path);
	39
	40	var newDialog = CreateEntity();
	41	var continuation = this.Story.ContinueMaximally();
	42
	43	var parts = Regex.Split(continuation, ":", 0);
	44	var speaker = (parts.Length == 2) ? parts[0] : "";
	45	var dialog = (parts.Length == 2) ? parts[1] : continuation;
	46
	47	AddComponent(newDialog, new DialogComponent {
	48	CurrentDialog = dialog,
	49	CurrentSpeaker = speaker,
	50	Options = this.Story.currentChoices
	51	.Select(option => option.text)
	52	.ToList()});
	53
	54	AddComponent(newDialog, new WindowTypeComponent {
	55	type = Window.Dialog});
	56	AddComponent(newDialog,
	57	new VisibilityComponent{ visible = true});
	58
	59	Logging.Success("Spawned new dialog.");
	60	}
	61	}
	62	}

isometric-park-fna/Messages/DialogChoiceMessage.cs ¶ created 644 +17 0

@@ -0,0 +1,17
	1
	2	using Encompass;
	3
	4	using isometricparkfna.Utils;
	5	using isometricparkfna.UI;
	6
	7	namespace isometricparkfna.Messages
	8	{
	9
	10	//You must specify both or you get 0 for a window, which is the default window :(
	11	public struct DialogChoiceMessage : IMessage, IHasEntity
	12	{
	13
	14	public Entity Entity { set; get; }
	15	public int Choice;
	16	}
	17	}

isometric-park-fna/Messages/SpawnDialog.cs ¶ created 644 +15 0

@@ -0,0 +1,15
	1
	2
	3	using Microsoft.Xna.Framework;
	4	using Encompass;
	5
	6	using isometricparkfna.Spawners;
	7
	8	#nullable enable
	9
	10	namespace isometricparkfna.Messages {
	11	public struct SpawnDialogMessage : IMessage
	12	{
	13	public string Path;
	14	}
	15	}

SpriteFontPlus.FNA.Core.csproj ¶ +4 0

               <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
                 <PackageReference Include="LinqFaster" Version="1.0.0" />
               </ItemGroup>
+              <ItemGroup>
+                <PackageReference Include="Ink.Engine.Runtime-Unofficial" Version="1.0.0-nightly-21061600" />
+              </ItemGroup>
             </Project>

isometric-park-fna/Components/Dialog.cs ¶ +6 -2

+            using System.Collections.Generic;
             using Microsoft.Xna.Framework;
             namespace isometricparkfna.Components {
-            	public struct DialogComponent : IComponent {
+            	public struct DialogComponent : IComponent/*, IHasEntity*/ {
                     public Node<DialogOption> Dialog;
+                    public string CurrentDialog;
+                    // public Entity Entity {get; set;}
+                    public string CurrentSpeaker;
+                    public List<string> Options;
             	}
             }

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

	@@ -1,1 +1,1
	1	{"inkVersion":20,"root":[[{"->":"IntroGovernor"},["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","^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":[[{"->":"IntroGovernor"},["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

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ +9 -1

             		typeof(SetTrespassingPolicyMessage),
             		typeof(SpawnGameMessage),
             		typeof(SetTextVariableMessage),
-            		typeof(SetDialogMessage))]
+            		typeof(SetDialogMessage),
+            		typeof(DialogChoiceMessage))]
             	[Reads(typeof(VisibilityComponent),
             		typeof(WindowTypeComponent),
             		typeof(TrespassingPolicyComponent)
             		public List<SpawnGameMessage> spawnGameMessages;
             		public List<SetTextVariableMessage> setTextVariableMessages;
             		public List<SetDialogMessage> setDialogMessages;
+            		public List<DialogChoiceMessage> dialogChoiceMessages;
             		bool showBudget {get;}
             		bool showForest {get;}
             			this.spawnGameMessages = new List<SpawnGameMessage>();
             			this.setTextVariableMessages = new List<SetTextVariableMessage>();
             			this.setDialogMessages = new List<SetDialogMessage>();
+            			this.dialogChoiceMessages = new List<DialogChoiceMessage>();
             			this.windowStatuses = new Dictionary<Window, bool>();
             			{
             				SendMessage(message);
             			}
+            			foreach (var message in this.dialogChoiceMessages)
+            			{
+            				SendMessage(message);
+            			}
             			this.spawnGameMessages.Clear();
             			this.setTextVariableMessages.Clear();
             			this.setDialogMessages.Clear();
+            			this.dialogChoiceMessages.Clear();
             		}
             	}
             }

isometric-park-fna/Engines/Spawners/GameSpawner.cs ¶ +7 -4

             	[Receives(typeof(SpawnGameMessage))]
             	[Sends(typeof(SpawnContractMessage),
             			typeof(SpawnOrganizationtMessage),
-            			typeof(ToggleWindowMessage))]
+            			typeof(ToggleWindowMessage),
-            	[Writes(typeof(WindowTypeComponent)
+            			typeof(SpawnDialogMessage))]
-            			//, typeof(DialogComponent)
+            	[Writes(typeof(WindowTypeComponent))]
-            			)]
             	class GameSpawner : Spawner<SpawnGameMessage>
             	{
             					type = OrganizationType.Cooperative });
             #endregion
             #region dialog
+            			/*
             			// this.game.enqueueDialog(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
             			//
             					new VisibilityComponent{ visible = true});
+            */
+            			SendMessage(new SpawnDialogMessage { Path = "IntroGovernor"});
+            			// SendMessage(new SpawnDialogMessage { Path = "Once"});
             #endregion
             			this.simulation.Subsidy = message.Difficulty switch {
             				DifficultyLevel.Hard => 0M,

isometric-park-fna/Engines/UIEngine.cs ¶ +40 -1

@@ -1,6 +1,10
		1	using System.Text.RegularExpressions;
		2	using System.Linq;
		3
1	using Microsoft.Xna.Framework.Input;	4	using Microsoft.Xna.Framework.Input;
2		5
3	using Encompass;	6	using Encompass;
		7	using Ink.Runtime;
4		8
5	using isometricparkfna.Messages;	9	using isometricparkfna.Messages;
6	using isometricparkfna.Components;	10	using isometricparkfna.Components;
@@ -13,7 +17,8
13	typeof(ToggleVisibilityMessage),	17	typeof(ToggleVisibilityMessage),
14	typeof(SetWindowVisibilityMessage),	18	typeof(SetWindowVisibilityMessage),
15	typeof(SelectMessage),	19	typeof(SelectMessage),
16	typeof(SetDialogMessage))]	20	typeof(SetDialogMessage),
		21	typeof(DialogChoiceMessage))]
17	[Reads(typeof(WindowTypeComponent),	22	[Reads(typeof(WindowTypeComponent),
18	typeof(VisibilityComponent),	23	typeof(VisibilityComponent),
19	typeof(SelectedComponent))]	24	typeof(SelectedComponent))]
@@ -22,6 +27,12
22	typeof(DialogComponent))]	27	typeof(DialogComponent))]
23	class UIEngine : Engine	28	class UIEngine : Engine
24	{	29	{
		30	public Story Story;
		31
		32	public UIEngine(Story story)
		33	{
		34	this.Story = story;
		35	}
25		36
26	public override void Update(double dt)	37	public override void Update(double dt)
27	{	38	{
@@ -99,6 +110,34
99		110
100	}	111	}
101	}	112	}
		113
		114	foreach (ref readonly var choiceMessage in ReadMessages<DialogChoiceMessage>())
		115	{
		116
		117	if (Story.currentChoices.Count > 0)
		118	{
		119	//Advance the story
		120	Story.ChooseChoiceIndex(choiceMessage.Choice);
		121
		122	//Update the dialog component with the new speaker, dialog, and options:
		123	var continuation = this.Story.ContinueMaximally();
		124	var parts = Regex.Split(continuation, ":", 0);
		125	var speaker = (parts.Length == 2) ? parts[0] : "";
		126	var dialog = (parts.Length == 2) ? parts[1] : continuation;
		127
		128	SetComponent(choiceMessage.Entity, new DialogComponent {
		129	CurrentDialog = dialog,
		130	CurrentSpeaker = speaker,
		131	Options = this.Story.currentChoices
		132	.Select(option => option.text)
		133	.ToList()});
		134	}
		135	else
		136	{
		137	Destroy(choiceMessage.Entity);
		138	}
		139
		140	}
102	}	141	}
103	}	142	}
104	}	143	}

isometric-park-fna/FNAGame.cs ¶ +6 -3

                 private bool showInitial;
                 int messageIndex;
+                public Story Story;
                 //buggy
                 private static bool enableCulling = false;
                     //Has to happen after Grammar initialization.
                     NewGameWindow.Initialize(this.grammar);
-                    var _inkStory = new Story(File.ReadAllText(@"Content/dialog.json"));
+                    this.Story = new Story(File.ReadAllText(@"Content/dialog.json"));
-                    Logging.Debug(_inkStory.ContinueMaximally());
+                    // Logging.Debug(this.Story.ContinueMaximally());
                     WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
-                    WorldBuilder.AddEngine(new UIEngine());
+                    WorldBuilder.AddEngine(new UIEngine(this.Story));
                     var gameBridgeEngine = new GameBridgeEngine(this);
                     WorldBuilder.AddEngine(new ContractSpawner(simulation.map.MapWidth, simulation.map.MapHeight, this.simulation, this.grammar));
                     WorldBuilder.AddEngine(new GameSpawner(this.simulation, this, this.grammar));
                     WorldBuilder.AddEngine(new OrganizationSpawner(this.simulation, this.grammar));
+                    WorldBuilder.AddEngine(new DialogSpawner(this.Story, this.grammar));
                     WorldBuilder.AddEngine(new PolicyEngine());
                     WorldBuilder.AddEngine(new TraceryBridgeEngine(this.grammar));

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +3 -3

                         var width = gdm.PreferredBackBufferWidth;
             	    Entity dialogEntity = default;
-            	    Node<DialogOption> dialogNode = default;
+            	    DialogComponent dialogNode = default;
             			    break;
             			case Window.Dialog:
-            			    var dialog = GetComponent<DialogComponent>(entity).Dialog;
+            			    var dialog = GetComponent<DialogComponent>(entity);
             			    if ((dialogEntity == null)
             					    || (dialogEntity.ID == 0)
                             }
                         }
-            	    if (dialogNode != null)
+            	    if (dialogNode.CurrentDialog != null)
             	    {
             		    var show = true;
             		    var paused = true;

isometric-park-fna/UI/Dialog.cs ¶ +24 -17

             using Encompass;
             using isometricparkfna.Engines;
+            using isometricparkfna.Components;
             using isometricparkfna.Messages;
             #nullable enable
             	public static bool hadFocus = false;
                     public static Node<DialogOption> RenderDialog(Entity entity,
-                                    ImGuiWindowBridgeEngine bridgeEngine, ref bool show, ref bool paused, ImFontPtr font, Node<DialogOption> currentNode)
+                                    ImGuiWindowBridgeEngine bridgeEngine, ref bool show, ref bool paused, ImFontPtr font, DialogComponent dialogComponent)
                     {
-            			Node<DialogOption> new_child = currentNode;
+            			Node<DialogOption> new_child = default;
             			if (show)
             			{
             				ImGui.PushFont(font);
                                             {
                                                     ImGui.PushStyleColor(ImGuiCol.Text, StyleSets.white);
                                             }
-            				ImGui.Begin(currentNode.data.speaker, ref show, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoSavedSettings);
+            				ImGui.Begin(dialogComponent.CurrentSpeaker, ref show, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoSavedSettings);
                                             if (DialogInterface.hadFocus)
                                             {
                                                     ImGui.PopStyleColor();
                                             DialogInterface.hadFocus = ImGui.IsWindowFocused();
-            				if (currentNode.data.response != null)
+            				if (dialogComponent.CurrentDialog != null)
                             {
-            					string messageText = currentNode.data.response;
+            					string messageText = dialogComponent.CurrentDialog;
             					ImGui.TextWrapped(messageText);
             				}
-            				if ((currentNode.children != null) && currentNode.children.Length > 0)
+            				if ((dialogComponent.Options != null) && dialogComponent.Options.Count > 0)
             				{
-            					//Filter out nulls
+            					// foreach (var choice in dialogComponent.Options)
-            					foreach ((Node<DialogOption> child, string choice) in currentNode.children.Select((child) => (child, child.data.choice)).Where( (pair, choice) => pair.choice != null))
+                                                    for(int i = 0; i < dialogComponent.Options.Count; i++)
             					{
-            						string buttonText = choice;
+            						string buttonText = dialogComponent.Options[i];
             						if (ImGui.Button(buttonText))
             						{
-            							new_child = child;
+                                                            bridgeEngine.dialogChoiceMessages.Add(new DialogChoiceMessage {
+                                                                            Entity = entity,
+                                                                            Choice = i });
             						}
             					}
             				}
             					{
             						show = false;
             						paused = false;
-                                                            bridgeEngine.setDialogMessages.Add(new SetDialogMessage {
+                                                            bridgeEngine.dialogChoiceMessages.Add(new DialogChoiceMessage {
                                                                             Entity = entity,
-                                                                            newOption = null });
+                                                                            Choice = -1 });
                                                     }
             				}
-            				if (currentNode.data.response == null)
+            				if (dialogComponent.CurrentDialog == null)
             				{
             					show = false;
             					paused = false;
                                             StyleSets.defaultSet.pop();
             				ImGui.PopFont();
             			}
-                                    bridgeEngine.setDialogMessages.Add(new SetDialogMessage {
+                                    // bridgeEngine.setDialogMessages.Add(new SetDialogMessage {
+                                    //
-                                                    Entity = entity,
+                                    //                 Entity = entity,
-                                                    newOption = new_child });
+                                    //                 newOption = new_child });
             			return new_child;
             		}
             	}

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

r384:23e132ba3fe0 - Wed, 04 Aug 2021 19:59:26

Sign in to your account

Commit r384:23e132ba3fe0 public

Author

r384:23e132ba3fe0 - Wed, 04 Aug 2021 19:59:26

Commit `r384:23e132ba3fe0` public