alysbrooks-public/games/isometric-park-fna Commit - r375:bc494fb11207

alysbrooks-public » games » isometric-park-fna

Commit `r375:bc494fb11207` public

parent | child

Description:

Add random park names.

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

r375:bc494fb11207 - Mon, 02 Aug 2021 08:06:46

SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

             	  "Bend", "Rock", "Spring", "Whitting"],
               "town_name_adjectives": ["Little", "Big", "Royal", "Green", "Windy",
             	  "Rocky", "Red", "Violet", "Wild"],
+              "park_name_adjectives": ["Little", "Big", "Green", "Windy", "Rolling",
+            	  "Meandering", "Red", "Violet", "Wild", "Emerald", "Whispering"],
+              "park_name_nouns": ["Hill", "Mound", "Wood", "Morraine", "Ridge", "Creek", "Meadow", "Willow",
+            	  "Peak", "Valley"],
+              "park_name_number": ["1000", "100", "20", "7", "10,000"],
+              "park_name": ["#park_name_adjectives# #park_name_nouns# State Park",
+            	  "#park_name_adjectives# #park_name_nouns.s# State Park",
+            	  "#park_name_number# #park_name_nouns.s# State Park",
+            	  "#park_name_adjectives# #park_name_nouns# Park",
+            	  "#park_name_adjectives# #park_name_nouns# State Forest"],
               "occupation": ["shift supervisor", "towtruck operator",
                 "truck driver", "truck driver", "truck driver",
                 "server", "server", "server", "telemarketer",
                 "librarian", "professor", "marketer", "fishmonger",
                 "programmer", "union organizer", "filmmaker", "medium",
                 "drag performer", "lineman for the county", "steelworker",
-                "caddy", "sex worker", "baker", "line cook"],
+                "caddy", "sex worker", "baker", "line cook", "nurse", "nurse", "welder",
-                "book_descriptor": ["history", "travelogue", "story", "saga", "tale", "reminiscings"],
+                "bookbinder"],
+                "book_descriptor": ["history", "anthology", "travelogue", "story", "saga", "tale", "reminiscings"],
                 "noun": [
                 "Armour", "Barrymore", "Cabot", "Catholicism", "Chihuahua",
                 "Christianity", "Easter", "Frenchman", "Lowry", "Mayer",

isometric-park-fna/Engines/TraceryBridgeEngine.cs ¶ +10 -10

                 [Receives(typeof(SetTextVariableMessage))]
                 public class TraceryBridgeEngine : Engine
                 {
-            	    public Grammar grammar;
+                    public Grammar grammar;
                     public TraceryBridgeEngine(Grammar grammar)
                     {
-            		this.grammar = grammar;
+                        this.grammar = grammar;
                     }
                     public override void Update(double dt)
                     {
-            		foreach (ref readonly var message in ReadMessages<SetTextVariableMessage>())
+                        foreach (ref readonly var message in ReadMessages<SetTextVariableMessage>())
+                        {
-            			string variableString  = "#";
+                            string variableString  = "#";
-                                variableString += String.Format("[{0}:{1}]", message.variable, message.value);
+                            variableString += String.Format("[{0}:{1}]", message.variable, message.value);
-            		    variableString += "vars# ";
+                            variableString += "vars# ";
-            		    Logging.Spy(new {var_string = variableString});
+                            Logging.Spy(new {var_string = variableString});
-            		    var result = grammar.Flatten(variableString);
+                            var result = grammar.Flatten(variableString);
+                        }
                     }
                 }

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

                     Logging.Success("Initialized Quad texture.");
                     ContractWindow.LoadContent(this._imGuiRenderer, this.imageMap);
                     OptionsWindow.Initialize(new Vector2(FNAGame.width, FNAGame.height), gdm.IsFullScreen);
-                    NewGameWindow.Initialize();
                     //Must be done before SetFontMessage is sent
                     var bakedMono = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),
                     this.grammar = new TraceryNet.Grammar(json2);
+                    //Has to happen after Grammar initialization.
+                    NewGameWindow.Initialize(this.grammar);
                     WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
                     WorldBuilder.AddEngine(new UIEngine());

isometric-park-fna/UI/NewGameWindow.cs ¶ +18 -7

             using System;
-            using ImGuiNET;
+            using System.Text;
             using Num = System.Numerics;
+            using Microsoft.Xna.Framework;
-            using Microsoft.Xna.Framework;
+            using ImGuiNET;
+            using TraceryNet;
             using isometricparkfna.Engines;
             using isometricparkfna.Messages;
                 public static class NewGameWindow
                 {
+            	    private static Grammar grammar;
                     public static bool had_focus = false;
             	public const int BUFFER_SIZE = 32;
-            	public static void Initialize()
+            	public static void Initialize(Grammar grammar)
             	{
+            		NewGameWindow.grammar = grammar;
+            		showModal = true;
             		NewGameWindow.Reset();
-            		showModal = true;
             	}
             	public static void Reset() {
-            		parkNameBuffer =  new byte[BUFFER_SIZE];
+            		// parkNameBuffer =  new byte[BUFFER_SIZE];
+            		parkNameBuffer = Encoding.UTF8.GetBytes(NewGameWindow.grammar.Flatten("#park_name#"));
             		pos = 0;
             		playerNameBuffer = new byte[BUFFER_SIZE];
             		}
             		NewGameWindow.pos = newPos;
+            		ImGui.SameLine();
+            		if (ImGui.Button("Random"))
+            		{
+            			parkNameBuffer = Encoding.UTF8.GetBytes(NewGameWindow.grammar.Flatten("#park_name#"));
+            		}
             		ImGui.Text("Formal Name: ");
             		ImGui.SameLine();
             		//God this sucks:
             		unsafe {
-            			ImGui.InputTextWithHint("##playerName2", "Leave blank to use full name", ref playerName2Buffer, 32, ImGuiInputTextFlags.AutoSelectAll, null, (IntPtr)(&newPlayerName2Pos));
+            			ImGui.InputTextWithHint("##playerName2", "Leave blank to use full name", /*ref*/ playerName2Buffer, 32, ImGuiInputTextFlags.AutoSelectAll, null, (IntPtr)(&newPlayerName2Pos));
             		}
             		NewGameWindow.playerName2Pos = newPlayerName2Pos;

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

r375:bc494fb11207 - Mon, 02 Aug 2021 08:06:46

Sign in to your account

Commit r375:bc494fb11207 public

Author

r375:bc494fb11207 - Mon, 02 Aug 2021 08:06:46

Commit `r375:bc494fb11207` public