alysbrooks-public/games/isometric-park-fna Commit - r405:3308ea479431

alysbrooks-public » games » isometric-park-fna

Commit `r405:3308ea479431` public

parent | child

Description:

Refactor dialog into separate Engine. (grafted from 93578fea7b5a3227975305bcc32e2e2fb2f7f7bc)

Commit status:

[Not Reviewed]

References:

default

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r405:3308ea479431 - Sat, 14 Aug 2021 07:14:13

isometric-park-fna/Content/dialog.ink ¶ created 644 +55 0

@@ -0,0 +1,55
	1
	2	VAR GovernorOpinion = 0
	3
	4	//This is needed to make both including and for jumpting to dialog sections work:
	5	=== placeholder ===
	6
	7	-> END
	8
	9	=== Once ===
	10
	11	Once upon a time...
	12
	13	* There were two choices.
	14	* There were four lines of content.
	15
	16	- They lived happily ever after.
	17	-> END
	18
	19
	20	=== IntroGovernor ===
	21
	22	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.
	23
	24	* [Okay]
	25
	26	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!
	27
	28	* * [And I need to keep the forest healthy, too, right?]
	29	~ GovernorOpinion = GovernorOpinion - 1
	30
	31
	32	Governor: Ummm, yeah
	33	* * * [\...]
	34	-> END
	35	* * [Sounds good!]
	36	~ GovernorOpinion = GovernorOpinion + 1
	37
	38
	39	Governor: I'll check in soon.
	40
	41
	42	-> END
	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 ¶ created 644 +1 0

	@@ -0,0 +1,1
				1	{"inkVersion":20,"root":[[["done",{"#f":5,"#n":"g-0"}],null],"done",{"placeholder":["end",{"#f":1}],"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","str","^...","/str","/ev",{"":".^.c-0","flg":20},{"c-0":["\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/DialogEngine.cs ¶ created 644 +122 0

@@ -0,0 +1,122
	1	using System;
	2	using System.Text.RegularExpressions;
	3	using System.Linq;
	4
	5	using Encompass;
	6	using Ink.Runtime;
	7	using TraceryNet;
	8
	9	using isometricparkfna.Messages;
	10	using isometricparkfna.Components;
	11
	12	namespace isometricparkfna.Engines
	13	{
	14
	15	[Receives(typeof(SetDialogMessage),
	16	typeof(DialogChoiceMessage))]
	17	[Reads(typeof(DialogComponent)) ]
	18	[Writes( typeof(DialogComponent))]
	19	class DialogEngine : Engine
	20	{
	21	public Story Story;
	22	public Grammar Grammar;
	23
	24	public DialogEngine(Story story, Grammar grammar)
	25	{
	26	this.Story = story;
	27	this.Grammar = grammar;
	28	}
	29
	30	public override void Update(double dt)
	31	{
	32
	33	foreach (ref readonly var dialogMessage in ReadMessages<SetDialogMessage>())
	34	{
	35	if (dialogMessage.newOption != null)
	36	{
	37	// SetComponent(dialogMessage.Entity,
	38	// new DialogComponent {CurrentDialog = dialogMessage.newOption
	39	// });
	40	}
	41	else
	42	{
	43	Destroy(dialogMessage.Entity);
	44
	45	}
	46	}
	47
	48	foreach (ref readonly var choiceMessage in ReadMessages<DialogChoiceMessage>())
	49	{
	50
	51	if (Story.currentChoices.Count > 0)
	52	{
	53	//Advance the story
	54	Logging.Debug("Advancing story.");
	55	Story.ChooseChoiceIndex(choiceMessage.Choice);
	56
	57	//Update the dialog component with the new speaker, dialog, and options:
	58	var continuation = this.Grammar.Flatten(this.Story.ContinueMaximally());
	59	var parts = Regex.Split(continuation, ":", 0);
	60	var speaker = (parts.Length == 2) ? this.Grammar.Flatten(parts[0]) : "Dialog";
	61	var dialog = (parts.Length == 2) ? this.Grammar.Flatten(parts[1]) : continuation;
	62
	63	SetComponent(choiceMessage.Entity, new DialogComponent {
	64	CurrentDialog = dialog,
	65	CurrentSpeaker = speaker,
	66	Options = this.Story.currentChoices
	67	.Select(option => option.text)
	68	.ToList()});}
	69	else
	70	{
	71	Logging.Debug(String.Format("Destroying Dialog (Entity ID {0}).", choiceMessage.Entity.ID));
	72	Destroy(choiceMessage.Entity);
	73
	74	var lowestID = Int32.MaxValue;
	75	Entity lowestEntity = default;
	76
	77
	78	foreach(ref var entity in ReadEntities<DialogComponent>())
	79	{
	80	if ((entity.ID < lowestID)
	81	//Don't try to use entity we just destroyed:
	82	&& (entity.ID != choiceMessage.Entity.ID)
	83
	84	&& (!GetComponent<DialogComponent>(entity).Hydrated))
	85	{
	86	lowestID = entity.ID;
	87	lowestEntity = entity;
	88	Logging.Spy(lowestID, "ID");
	89	}
	90	}
	91
	92	if (lowestID != Int32.MaxValue
	93	&& EntityExists(lowestEntity))
	94	{
	95	Logging.Debug("Hydrating Dialog.");
	96
	97
	98	var Knot = GetComponent<DialogComponent>(lowestEntity).Knot;
	99
	100	Story.ChoosePathString(Knot);
	101	var continuation = this.Story.ContinueMaximally();
	102	var parts = Regex.Split(continuation, ":", 0);
	103	var speaker = (parts.Length == 2) ? this.Grammar.Flatten(parts[0]) : "Dialog";
	104	var dialog = (parts.Length == 2) ? this.Grammar.Flatten(parts[1]) : continuation;
	105	SetComponent(lowestEntity, new DialogComponent {
	106	Knot = Knot,
	107	CurrentDialog = dialog,
	108	CurrentSpeaker = speaker,
	109	Options = this.Story.currentChoices
	110	.Select(option => option.text)
	111	.ToList()});
	112
	113	}
	114	}
	115
	116
	117
	118
	119	}
	120	}
	121	}
	122	}

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

@@ -0,0 +1,85
	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	[Reads(typeof(DialogComponent))]
	23	[Receives(typeof(SpawnDialogMessage))]
	24	class DialogSpawner : Spawner<SpawnDialogMessage>
	25
	26	{
	27	Story Story;
	28	Grammar Grammar;
	29
	30	public DialogSpawner(Story story, Grammar grammar)
	31	{
	32	this.Story = story;
	33	this.Grammar = grammar;
	34	}
	35
	36	protected override void Spawn(in SpawnDialogMessage message)
	37	{
	38	Logging.Spy(this.Story.currentChoices.Count(), "Count");
	39	Logging.Spy(this.Story.canContinue, "CanContinue");
	40	//If there are no existing dialog:
	41	if(ReadEntities<DialogComponent>().Length == 0
	42	&& this.Story.currentChoices.Count() == 0
	43	&& !this.Story.canContinue)
	44	{
	45	Logging.Debug("Creating and hydrating new Dialog.");
	46	//Jump to the specified part of the story:
	47	Story.ChoosePathString(message.Path);
	48
	49	var newDialog = CreateEntity();
	50	var continuation = this.Story.ContinueMaximally();
	51
	52	var parts = Regex.Split(continuation, ":", 0);
	53	var speaker = (parts.Length == 2) ? parts[0] : "";
	54	var dialog = (parts.Length == 2) ? parts[1] : continuation;
	55
	56	AddComponent(newDialog, new DialogComponent {
	57	Knot = message.Path,
	58	CurrentDialog = this.Grammar.Flatten(dialog),
	59	CurrentSpeaker = this.Grammar.Flatten(speaker),
	60	Options = this.Story.currentChoices
	61	.Select(option => option.text)
	62	.ToList()});
	63
	64	AddComponent(newDialog, new WindowTypeComponent {
	65	type = Window.Dialog});
	66	AddComponent(newDialog,
	67	new VisibilityComponent{ visible = true});
	68
	69	Logging.Success("Spawned new dialog.");
	70	}
	71	else
	72	{
	73
	74	Logging.Debug("Creating new Dialog without hydrating.");
	75	var newDialog = CreateEntity();
	76	AddComponent(newDialog, new DialogComponent {
	77	Knot = message.Path});
	78	AddComponent(newDialog, new WindowTypeComponent {
	79	type = Window.Dialog});
	80	AddComponent(newDialog,
	81	new VisibilityComponent{ visible = true});
	82	}
	83	}
	84	}
	85	}

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 ¶ +9 -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 Knot;
+                    public string CurrentDialog;
+                    public string CurrentSpeaker;
+                    public List<string> Options;
+                    public bool Hydrated { get {
+                        return (this.CurrentDialog != null)
+                            && (this.CurrentSpeaker != null); }}
             	}
             }

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ +13 -2

             using System;
             using System.Collections.Generic;
+            using Encompass;
             using System.Linq;
             using Encompass;
             		typeof(SetTrespassingPolicyMessage),
             		typeof(SpawnGameMessage),
             		typeof(SetTextVariableMessage),
-            		typeof(SetDialogMessage))]
+            		typeof(SetDialogMessage),
+            		typeof(DialogChoiceMessage))]
             	[Reads(typeof(VisibilityComponent),
             		typeof(WindowTypeComponent),
             		typeof(TrespassingPolicyComponent),
             		typeof(ContractStatusComponent),
             		typeof(RelatedOrganizationComponent),
-            		typeof(NameAndDescriptionComponent))]
+            		typeof(NameAndDescriptionComponent)
+            	)]
+            	// [Writes(typeof(SelectedComponent))]
             	public class ImGuiWindowBridgeEngine : Engine
             	{
             		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>();
             			this.showContractIndicator = false;
             			{
             				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 ¶ +6 -30

@@ -17,10 +17,11
17	[Receives(typeof(SpawnGameMessage))]	17	[Receives(typeof(SpawnGameMessage))]
18	[Sends(typeof(SpawnContractMessage),	18	[Sends(typeof(SpawnContractMessage),
19	typeof(SpawnOrganizationtMessage),	19	typeof(SpawnOrganizationtMessage),
20	typeof(ToggleWindowMessage))]	20	typeof(ToggleWindowMessage),
		21	typeof(SpawnDialogMessage))]
21	[Writes(typeof(WindowTypeComponent)	22	[Writes(typeof(WindowTypeComponent)
22	//, typeof(DialogComponent)	23	//, typeof(DialogComponent)
23	)]	24	)]
24	class GameSpawner : Spawner<SpawnGameMessage>	25	class GameSpawner : Spawner<SpawnGameMessage>
25		26
26	{	27	{
@@ -111,34 +112,9
111	#endregion	112	#endregion
112	#region dialog	113	#region dialog
113		114
114	// this.game.enqueueDialog(DialogTrees.flatten(DialogTrees.testTree, this.grammar));	115	SendMessage(new SpawnDialogMessage { Path = "IntroGovernor"});
115	//	116	// SendMessage(new SpawnDialogMessage { Path = "Once"});
116		117	SendMessage(new SpawnDialogMessage { Path = "IntroAssistant"});
117	var dialogInitial = CreateEntity();
118	// SetComponent(dialogInitial, new VisibilityComponent { visible = true });
119	AddComponent(dialogInitial, new WindowTypeComponent { type = isometricparkfna.Messages.Window.Dialog });
120	AddComponent(dialogInitial,
121	new DialogComponent {Dialog = DialogTrees.introTree });
122	AddComponent(dialogInitial,
123	new VisibilityComponent{ visible = true});
124	// SendMessage(new SetWindowVisibilityMessage {
125	// Entity = dialogInitial,
126	// Visibility = true });
127
128
129	var dialogTest = CreateEntity();
130	// SetComponent(dialogTest, new VisibilityComponent { visible = true });
131	AddComponent(dialogTest, new WindowTypeComponent { type = isometricparkfna.Messages.Window.Dialog });
132	AddComponent(dialogTest,
133	new DialogComponent {Dialog = DialogTrees.flatten(DialogTrees.testTree, this.grammar)});
134	// SendMessage(new SetWindowVisibilityMessage {
135	// Entity = dialogTest,
136	// Visibility = true
137	// });
138	AddComponent(dialogTest,
139	new VisibilityComponent{ visible = true});
140
141
142	#endregion	118	#endregion
143	this.simulation.Subsidy = message.Difficulty switch {	119	this.simulation.Subsidy = message.Difficulty switch {
144	DifficultyLevel.Hard => 0M,	120	DifficultyLevel.Hard => 0M,

isometric-park-fna/Engines/UIEngine.cs ¶ +34 -20

+            using System;
+            using System.Text.RegularExpressions;
+            using System.Linq;
             using Microsoft.Xna.Framework.Input;
             using Encompass;
+            using Ink.Runtime;
+            using TraceryNet;
             using isometricparkfna.Messages;
             using isometricparkfna.Components;
             	    typeof(ToggleVisibilityMessage),
             	    typeof(SetWindowVisibilityMessage),
             	    typeof(SelectMessage),
-            	    typeof(SetDialogMessage))]
+            	    typeof(SetDialogMessage),
-                [Reads(typeof(WindowTypeComponent),
+            	    typeof(DialogChoiceMessage))]
+                [Reads(typeof(DialogComponent),
+            		    typeof(WindowTypeComponent),
             	    typeof(VisibilityComponent),
             	    typeof(SelectedComponent))]
                 [Writes(typeof(VisibilityComponent),
-            		    typeof(SelectedComponent),
+            		    typeof(SelectedComponent))]
-            		    typeof(DialogComponent))]
                 class UIEngine : Engine
                 {
+            	    public Story Story;
+            	    public UIEngine(Story story)
+            	    {
+            		    this.Story = story;
+            	    }
                     public override void Update(double dt)
                     {
                         foreach (var entity in ReadEntities<SelectedComponent>())
                         foreach (ref readonly var windowMessage in ReadMessages<SetWindowVisibilityMessage>())
                         {
+                            Logging.Spy(windowMessage, "message");
+                            Logging.Spy(windowMessage.Entity, "message.Entity");
+                            Logging.Spy(windowMessage.Entity.ID, "message.Entity.ID");
+                            Logging.Spy(windowMessage.Visibility, "message.Visibility");
                             foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
                             {
+            			Logging.Spy(entity.ID, "ID");
                                 if (EntityExists(windowMessage.Entity) && entity.ID == windowMessage.Entity.ID)
                                 {
-                                    SetComponent(entity, new VisibilityComponent { visible = windowMessage.Visibility });
+                                    AddComponent(entity, new VisibilityComponent { visible = windowMessage.Visibility });
             			Logging.Success("Set Visibility.");
                                 }
                             }
                         }
                         foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowMessage>())
                         {
+                            Logging.Spy(windowMessage, "message");
+                            Logging.Spy(windowMessage.Window, "message.Window");
+                            Logging.Spy(windowMessage.Entity, "message.Entity");
                             foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
                             {
                                 if (EntityExists(windowMessage.Entity) && entity.ID == windowMessage.Entity.ID)
                                 {
                                     var visibilityComponent = GetComponent<VisibilityComponent>(entity);
-                                    SetComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible });
+                                    AddComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible });
                                 }
                             }
                         }
                         foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowTypeMessage>())
                         {
+                            Logging.Spy(windowMessage, "message");
+                            Logging.Spy(windowMessage.Window, "message.Window");
                             foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
                             {
                                 var window_type = GetComponent<WindowTypeComponent>(entity).type;
                                 if (window_type == windowMessage.Window)
                                 {
                              new SelectedComponent { selected = true });
                         }
-            	    foreach (ref readonly var dialogMessage in ReadMessages<SetDialogMessage>())
-            		    if (dialogMessage.newOption != null)
-            			    SetComponent(dialogMessage.Entity,
-            				    new DialogComponent {Dialog = dialogMessage.newOption
-            	    });
-            		    else
-            			    Destroy(dialogMessage.Entity);
             	}
                 }
             }

isometric-park-fna/FNAGame.cs ¶ +13 -2

             using System.Collections.Generic;
             using System.Linq;
             using SpriteFontPlus;
             using isometricparkfna;
             using static isometricparkfna.CellMap;
             using isometricparkfna.Utils;
             using isometricparkfna.UI;
             using ImGuiNET;
             using TraceryNet;
             using Encompass;
+            using Ink.Runtime;
             //Let's let core builds be deterministic
             #if NETCOREAPP
                 private bool showInitial;
                 int messageIndex;
+                public Story Story;
                 //buggy
                 private static bool enableCulling = false;
                 private ImGuiWindowBridgeEngine imGuiWindowBridgeEngine;
                 private static void Main(string[] args)
                 {
                     #if NETCOREAPP
                     //Has to happen after Grammar initialization.
                     NewGameWindow.Initialize(this.grammar);
+                    this.Story = new Story(File.ReadAllText(@"Content/dialog.json"));
+                    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));
+                    WorldBuilder.AddEngine(new DialogEngine(this.Story, this.grammar));
                     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.Hydrated)
             	    {
             		    var show = true;
             		    var paused = true;

isometric-park-fna/UI/Dialog.cs ¶ +19 -19

             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,
+                    public static void 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
+                                                    for(int i = 0; i < dialogComponent.Options.Count; i++)
-            					foreach ((Node<DialogOption> child, string choice) in currentNode.children.Select((child) => (child, child.data.choice)).Where( (pair, choice) => pair.choice != null))
             					{
-            						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 {
-                                                    Entity = entity,
-                                                    newOption = new_child });
-            			return new_child;
             		}
             	}
             }

isometric-park-fna/isometric-park-fna-core.csproj ¶ +1 0

               <!-- <Import Project="..\build\CopyFNALibs.targets"/> -->
               <ItemGroup>
                 <PackageReference Include="ImGui.NET" Version="1.78.0" />
+                <PackageReference Include="Ink.Engine.Runtime-Unofficial" Version="1.0.0-nightly-21061600" />
                 <PackageReference Include="Tracery.Net" Version="1.0.0" />
                 <PackageReference Include="YamlDotNet" Version="11.0.1" />
                 <PackageReference Include="JM.LinqFaster" Version="1.1.2" />

isometric-park-fna/isometric-park-fna.csproj ¶ +6 0

                 <None Include="Content\grammar.json">
                   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                 </None>
+                <None Include="Content\dialog.json">
+                  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                </None>
                 <None Include="Content\news_items.yaml">
                   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                 </None>
               <ItemGroup>
                 <Folder Include="Utils\" />
               </ItemGroup>
+              <ItemGroup>
+                <PackageReference Include="Ink.Engine.Runtime-Unofficial" Version="1.0.0-nightly-21061600" />
+              </ItemGroup>
               <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
               <Import Project="..\packages\ImGui.NET.1.78.0\build\net40\ImGui.NET.targets" Condition="Exists('..\packages\ImGui.NET.1.78.0\build\net40\ImGui.NET.targets')" />
             </Project>

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

r405:3308ea479431 - Sat, 14 Aug 2021 07:14:13

Sign in to your account

Commit r405:3308ea479431 public

Author

r405:3308ea479431 - Sat, 14 Aug 2021 07:14:13

Commit `r405:3308ea479431` public