diff --git a/isometric-park-fna/Content/grammar.json b/isometric-park-fna/Content/grammar.json --- a/isometric-park-fna/Content/grammar.json +++ b/isometric-park-fna/Content/grammar.json @@ -27,7 +27,9 @@ "Grey" ], "surname": ["Walker", "Wright", "Phillips", "Alvarez", "Smith", "Washington", "Perry", "Wong", "Stephens", - "Richards", "Albertson", "Klein", "Studebaker", "Dopp"], + "Richards", "Albertson", "Klein", "Studebaker", "Dopp", "Applebaum", + "Thomas", "MacDonald", "Loeffler", "Petry", "Augustin", "Russo", "Adorno", +"Milton", "Coltrane", "Kim", "Lindgren", "Kerry", "Harris"], "greeting": [ "Hi", "Hello", "Greetings" ], "addressGreeting": "#greeting#, #name#", "howdoing": [ "I'm good.", "Fine", "Alright, I guess." ], @@ -1342,10 +1344,12 @@ "large_number": ["billions", "millions", "tens of millions", "hundreds of millions"], "secrets_etc": ["mysteries", "secrets", "enigmas"], "many": ["#large_number# of", "many", "numerous"], + "establish_year": ["1893", "1901", "1788", "1822"], "company_ending": ["LLC", "Inc.", "Corporation"], - "company": ["#surname# Brothers", "#surname# and Sons", "#surname# and Progeny", "#surname# Siblings"], - "logging_company": ["#company#", "#company#", "#surname# Logging", - "#town_name_adjectives# #town_name_endings# Logging #company_ending#"], + "family_company": ["#surname# Brothers", "#surname# and Sons", "#surname# and Progeny", "#surname# Siblings"], + "logging_company": ["#family_company#", "#family_company#", "#surname# Logging", "#town_name_adjectives# #town_name_endings# #company_ending#", + "#tree_species_common# forestry #company_ending#", "the #tree_species_common# forestry company "], + "company_description": ["Family loggers since #establish_year#", "Loggers since #establish_year#", "Dedicated to our community, workers, and environment."], "vars": "assistantName = #assistantName# \n whatever = #whatever#", "test": "test", "empty": "" diff --git a/isometric-park-fna/Engines/SimulationBridgeEngine.cs b/isometric-park-fna/Engines/SimulationBridgeEngine.cs --- a/isometric-park-fna/Engines/SimulationBridgeEngine.cs +++ b/isometric-park-fna/Engines/SimulationBridgeEngine.cs @@ -89,7 +89,7 @@ SendMessage(new TickMessage{}); //For now: SendMessage(new SpawnContractMessage{ max_squares = 100, - name = string.Format("#company# {0}", this.simulation.DateTime.ToShortDateString()) }); + name = string.Format("#logging_company.capitalizeAll# {0}", this.simulation.DateTime.ToShortDateString()) }); foreach (ref readonly var entity in ReadEntities()) diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -259,7 +259,7 @@ { WorldBuilder.SendMessage(new SpawnOrganizationtMessage { offersContracts = true, - description = "Expert loggers since 1893." }); + description = "#company_description#" }); } WorldBuilder.SendMessage(new SpawnContractMessage { diff --git a/isometric-park-fna/UI/ContractWindow.cs b/isometric-park-fna/UI/ContractWindow.cs --- a/isometric-park-fna/UI/ContractWindow.cs +++ b/isometric-park-fna/UI/ContractWindow.cs @@ -52,7 +52,7 @@ ImGui.Image(_imGuiTexture, new Num.Vector2(250, 200), map.GetSourceUVStart(imageIndex), map.GetSourceUVEnd(imageIndex), Num.Vector4.One, Num.Vector4.Zero); // Here, the previously loaded texture is used ImGui.PushFont(italicFont); - ImGui.Text(description); + ImGui.TextWrapped(description); ImGui.PopFont(); ImGui.Separator(); diff --git a/isometric-park-fna/UI/DebugWindow.cs b/isometric-park-fna/UI/DebugWindow.cs --- a/isometric-park-fna/UI/DebugWindow.cs +++ b/isometric-park-fna/UI/DebugWindow.cs @@ -52,7 +52,6 @@ #endif this.monoFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 15); - this.italicFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmediumitalic.ttf", 15); unsafe //god this sucks { ImFontConfigPtr config = ImGuiNative.ImFontConfig_ImFontConfig(); @@ -65,6 +64,7 @@ } + this.italicFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmediumitalic.ttf", 15); _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering