alysbrooks-public/games/isometric-park-fna Commit - r365:6205f6d5b5e9

alysbrooks-public » games » isometric-park-fna

Commit `r365:6205f6d5b5e9` public

parent | child

Description:

Update variables based on game settings.

Commit status:

[Not Reviewed]

References:

m4-beginning

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r365:6205f6d5b5e9 - Fri, 30 Jul 2021 20:48:30

TODO.taskpaper ¶ +1 -1

             	- Add a create park dialog @milestone(4: Beginning)
             		- Procgen park names (that player can override)
             			- Button to generate new name?
-            		- Allow player to choose title @maybe
+            		- Allow player to choose title @maybe @done(2021-07-29)
             			Some possibilities: Mr., Ms., Mx., Director, Dr., Professor, Miss, Col., Herr Dr. Dr. nothing, custom
             			Might be fun to have tiny acknowledgement of choice — probably dialog only, no mechanical change. (E.g., a researcher might allude to you having a PhD. or an enby character might say something comiserating.)
             		- Allow player to choose difficulty

isometric-park-fna/Content/grammar.json ¶ +2 0

             "Milton", "Coltrane", "Kim", "Lindgren", "Kerry", "Harris"],
               "greeting": [ "Hi", "Hello", "Greetings" ],
               "addressGreeting": "#greeting#, #name#",
+              "addressGreetingFormal": "#greeting#, #playerTitle# #playerFormal#",
+              "addressGreetingCasual": "#greeting#, #playerCasual#",
               "howdoing": [ "I'm good.", "Fine", "Alright, I guess." ],
               "city": ["Milwaukee", "Chicago", "Washington", "Minneapolis", "Dallas",
             	  "Oklahoma City", "Boston", "Los Angeles", "Portland", "Santa Fe",

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

             		typeof(SetResolutionMessage),
             		typeof(SetFontMessage),
             		typeof(SetTrespassingPolicyMessage),
-            		typeof(SpawnGameMessage))]
+            		typeof(SpawnGameMessage),
+            		typeof(SetTextVariableMessage))]
             	[Reads(typeof(VisibilityComponent),
             		typeof(WindowTypeComponent),
             		typeof(TrespassingPolicyComponent)
             		public List<SetFontMessage> fontMessages;
             		public List<SetTrespassingPolicyMessage> trespassingPolicyMessages;
             		public List<SpawnGameMessage> spawnGameMessages;
+            		public List<SetTextVariableMessage> setTextVariableMessages;
             		bool showBudget {get;}
             		bool showForest {get;}
             			this.fontMessages = new List<SetFontMessage>();
             			this.trespassingPolicyMessages = new List<SetTrespassingPolicyMessage>();
             			this.spawnGameMessages = new List<SpawnGameMessage>();
+            			this.setTextVariableMessages = new List<SetTextVariableMessage>();
             			this.windowStatuses = new Dictionary<Window, bool>();
             			{
             				SendMessage(message);
             			}
+            			//This may need to be moved up.
+            			foreach (var message in this.setTextVariableMessages)
+            			{
+            				SendMessage(message);
+            			}
             			this.fontMessages.Clear();
             			this.trespassingPolicyMessages.Clear();
             			this.spawnGameMessages.Clear();
+            			this.setTextVariableMessages.Clear();
             		}
             	}
             }

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

             using Microsoft.Xna.Framework;
+            using isometricparkfna.Messages;
+            using static isometricparkfna.CellMap;
+            using isometricparkfna.UI;
             using Encompass;
+            using TraceryNet;
-            using isometricparkfna.Messages;
-            using static isometricparkfna.CellMap;
             namespace isometricparkfna.Spawners {
             	{
             		private Simulation simulation;
             		Random random_generator;
+            		FNAGame game;
+            		Grammar grammar;
-            		public GameSpawner(Simulation simulation)
+            		public GameSpawner(Simulation simulation, FNAGame game, Grammar grammar)
             		{
             			this.simulation = simulation;
             			this.random_generator = new Random();
+            			this.game = game;
+            			this.grammar = grammar;
             		}
             		protected override void Spawn(in SpawnGameMessage message)
             					description = "#coop_company_description#",
             					type = OrganizationType.Cooperative });
             #endregion
+            #region dialog
+                    this.game.enqueueDialog(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
+            #endregion
             			Logging.Success("Spawned new game.");
             		}

isometric-park-fna/FNAGame.cs ¶ +10 -4

                     WorldBuilder.AddEngine(new ContractStatusEngine(this.simulation));
                     WorldBuilder.AddEngine(new ContractSpawner(simulation.map.MapWidth, simulation.map.MapHeight, this.simulation, this.grammar));
-                    WorldBuilder.AddEngine(new GameSpawner(this.simulation));
+                    WorldBuilder.AddEngine(new GameSpawner(this.simulation, this, this.grammar));
                     WorldBuilder.AddEngine(new OrganizationSpawner(this.simulation, this.grammar));
                     WorldBuilder.AddEngine(new PolicyEngine());
+                    WorldBuilder.AddEngine(new TraceryBridgeEngine(this.grammar));
                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, debugWindow.monoFont, debugWindow.italicFont, this.imGuiWindowBridgeEngine, this.gdm) , 2);
                     this.remainingDialog = new Queue<Node<DialogOption>>();
-            #if DEBUG
+            // #if DEBUG
-                    this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
+            //         this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
-            #endif
+            // #endif
                     this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
                     this.gdm.IsFullScreen = fullscreen;
                     this.gdm.ApplyChanges();
                 }
+                public void enqueueDialog(Node<DialogOption> tree)
+                {
+                    this.remainingDialog.Enqueue(tree);
+                }
             }

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

             		public static Node<DialogOption> testTree = new Node<DialogOption>(
             			new DialogOption
             			{
-            				response = "#[name:player]addressGreeting#",
+            				response = "#addressGreetingFormal#",
             				speaker = "#assistantName#"
             			},
             			new Node<DialogOption>[]{
+            				new Node<DialogOption>(new DialogOption {choice="Call me #playerCasual#", response="Sure",
+            				speaker = "#assistantName#" }),
             				new Node<DialogOption>(new DialogOption {choice="Hi.", response="Bye!",
             				speaker = "#assistantName#" }),
             				new Node<DialogOption>(new DialogOption {choice="How are you?", response="#howdoing#",
             			}
             		}
             	}

isometric-park-fna/UI/NewGameWindow.cs ¶ +11 -5

             		Hard
             	}
                 public static class NewGameWindow
                 {
             	public static bool showModal;
+            	public const int BUFFER_SIZE = 32;
             	public static void Initialize()
             	{
-            		parkNameBuffer =  new byte[32];
+            		parkNameBuffer =  new byte[BUFFER_SIZE];
             		pos = 0;
-            		playerNameBuffer = new byte[32];
+            		playerNameBuffer = new byte[BUFFER_SIZE];
             		playerNamePos = 0;
             		selectedTitle = "";
             		playerName2Buffer = "";
             		playerName2Pos = 0;
-            		customTitleBuffer = new byte[32];
+            		customTitleBuffer = new byte[BUFFER_SIZE];
             		customTitlePos = 0;
             		showModal = true;
             		//God this sucks:
             		unsafe {
-            			ImGui.InputTextWithHint("##playerName2", "Leave blank to use full name", playerName2Buffer, 32, ImGuiInputTextFlags.AutoSelectAll, null, (IntPtr)(&newPlayerNamePos));
+            			ImGui.InputTextWithHint("##playerName2", "Leave blank to use full name", ref playerName2Buffer, 32, ImGuiInputTextFlags.AutoSelectAll, null, (IntPtr)(&newPlayerName2Pos));
             		}
             		NewGameWindow.playerName2Pos = newPlayerName2Pos;
             		if (ImGui.Button("Okay"))
             		{
+            			bridgeEngine.setTextVariableMessages.Add(new SetTextVariableMessage { variable = "playerFormal", value = System.Text.Encoding.UTF8.GetString(playerNameBuffer) });
+            			bridgeEngine.setTextVariableMessages.Add(new SetTextVariableMessage { variable = "playerCasual", value = playerName2Buffer });
+            			bridgeEngine.setTextVariableMessages.Add(new SetTextVariableMessage { variable = "playerTitle", value = selectedTitle});
             			bridgeEngine.spawnGameMessages.Add(new SpawnGameMessage{});
             			bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage {Window = Window.NewGame});
             			bridgeEngine.gameStateMessages.Add(new GameStateMessage { isPlaying = true});

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

r365:6205f6d5b5e9 - Fri, 30 Jul 2021 20:48:30

Sign in to your account

Commit r365:6205f6d5b5e9 public

Author

r365:6205f6d5b5e9 - Fri, 30 Jul 2021 20:48:30

Commit `r365:6205f6d5b5e9` public