alysbrooks-public/games/isometric-park-fna Commit - r417:ab75bb171839

alysbrooks-public » games » isometric-park-fna

Commit `r417:ab75bb171839` public

parent | child

Description:

Add profanity settings.

Commit status:

[Not Reviewed]

References:

m5-events

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r417:ab75bb171839 - Sat, 28 Aug 2021 10:13:40

isometric-park-fna/Components/OptionsComponent.cs ¶ created 644 +9 0

@@ -0,0 +1,9
	1	using Encompass;
	2
	3	namespace isometricparkfna.Components {
	4
	5	public struct OptionsComponent : IComponent {
	6	public ProfanityLevel ProfanitySetting;
	7
	8	}
	9	}

isometric-park-fna/Messages/SetOptionMessage.cs ¶ created 644 +10 0

@@ -0,0 +1,10
	1	using Microsoft.Xna.Framework;
	2	using Encompass;
	3
	4	namespace isometricparkfna.Messages
	5	{
	6	public struct SetOptionMessage : IMessage
	7	{
	8	public ProfanityLevel NewProfanitySetting;
	9	}
	10	}

isometric-park-fna/Content/dialog.ink ¶ +2 0

             \#assistantName\#: Hello. I'm \#assistantName\#.
                 * [Nice to meet you.]
                    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.
+                    -> BadNewsReact ->
                         * * [Got it, thanks.]

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

	@@ -1,1 +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!","\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#: Hello. I'm #assistantName#.","\n","ev","str","^Nice to meet you.","/str","/ev",{"":".^.c-0","flg":20},{"c-0":["\n","^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","^Got it, thanks.","/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":5}]}],{"#f":1}],"BadNewsReact":[["ev","str","^Damn.","/str","/ev",{"":".^.c-0","flg":20},"ev","str","^Fuck.","/str","/ev",{"":".^.c-1","flg":20},"ev","str","^Shoot.","/str","/ev",{"":".^.c-2","flg":20},{"c-0":["\n","ev","void","/ev","->->",{"#f":5}],"c-1":["\n","ev","void","/ev","->->",{"#f":5}],"c-2":["\n","ev","void","/ev","->->",{"#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":[[["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!","\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#: Hello. I'm #assistantName#.","\n","ev","str","^Nice to meet you.","/str","/ev",{"":".^.c-0","flg":20},{"c-0":["\n","^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",{"->t->":"BadNewsReact"},["ev","str","^Got it, thanks.","/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":5}]}],{"#f":1}],"BadNewsReact":[["ev","str","^Damn.","/str","/ev",{"":".^.c-0","flg":20},"ev","str","^Fuck.","/str","/ev",{"":".^.c-1","flg":20},"ev","str","^Shoot.","/str","/ev",{"":".^.c-2","flg":20},{"c-0":["\n","ev","void","/ev","->->",{"#f":5}],"c-1":["\n","ev","void","/ev","->->",{"#f":5}],"c-2":["\n","ev","void","/ev","->->",{"#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 ¶ +41 -2

             using System;
             using System.Text.RegularExpressions;
             using System.Linq;
+            using System.Collections.Generic;
             using Encompass;
             using Ink.Runtime;
                 [Receives(typeof(SetDialogMessage),
                         typeof(DialogChoiceMessage))]
-                [Reads(typeof(DialogComponent)) ]
+                [Reads(typeof(DialogComponent),
+                        typeof(OptionsComponent)) ]
                 [Writes( typeof(DialogComponent))]
                 class DialogEngine : Engine
                 {
+                    public static Dictionary<string, string> replacements = new Dictionary<string,string>{{"Damn", "Drat"},
+                        {"Fuck", "Fork"}, //Ty michael shur
+                        {"Motherfucker", "Motherforker"},
+                        {"Shit", "Shitake mushrooms"},
+                        {"Hell", "Heck"},
+                        {"Oh my God", "Oh my Glob"}, //Ty Pendleton Ward
+                        {"Bastard", "Bollocks"}};
                     public Story Story;
                     public Grammar Grammar;
                         this.Grammar = grammar;
                     }
+                    public string BleepString(string s,  ProfanityLevel setting)
+                    {
+                        switch (setting)
+                        {
+                            case ProfanityLevel.Uncensored:
+                                return s;
+                                break;
+                            case ProfanityLevel.Minced:
+                                foreach (var item in replacements)
+                                {
+                                    s = s.Replace(item.Key, item.Value);
+                                }
+                                return s;
+                                break;
+                            case ProfanityLevel.Removed:
+                                return Regex.Replace(s, "(?i)((?<=d)amn|(?<=f)uck|(?<=D)amn|(?<=F)uck)", "------");
+                        }
+                        return s;
+                    }
                     public override void Update(double dt)
                     {
+                        ProfanityLevel profanity_setting = default;
+                        foreach (ref readonly var entity in ReadEntities<OptionsComponent>())
+                        {
+                            var option_component = GetComponent<OptionsComponent>(entity);
+                            profanity_setting = option_component.ProfanitySetting;
+                        }
                         foreach (ref readonly var dialogMessage in ReadMessages<SetDialogMessage>())
                         {
                             if (dialogMessage.newOption != null)
                                         CurrentDialog = dialog,
                                         CurrentSpeaker = speaker,
                                         Options = this.Story.currentChoices
-                                        .Select(option => option.text)
+                                        .Select(option => BleepString(option.text,
+                                                    profanity_setting ))
                                         .ToList()});}
                             else
                             {

isometric-park-fna/Engines/GameBridgeEngine.cs ¶ +13 -3

                         typeof(SetResolutionMessage),
                         typeof(SetFontMessage))]
                 [Reads(typeof(AreaComponent),
-                        typeof(ContractStatusComponent))]
+                        typeof(ContractStatusComponent),
+            	    typeof(OptionsComponent))]
                 class GameBridgeEngine : Engine
                 {
                     public override void Update(double dt)
                     {
+            		ProfanityLevel profanity_setting = default;
                         foreach (ref readonly var windowMessage in ReadMessages<ToggleWindowTypeMessage>())
                         {
                             switch (windowMessage.Window)
                                     resolutionMessage.fullscreen);
                         }
+                        foreach (ref readonly var entity in ReadEntities<OptionsComponent>())
+            	    {
+            		    var component = GetComponent<OptionsComponent>(entity);
+            		    profanity_setting = component.ProfanitySetting;
+            	    }
                         foreach (ref readonly var fontMessage in ReadMessages<SetFontMessage>())
                         {
                             game.setFont(fontMessage.fontName, fontMessage.fontSize);
-                            Options.writeOptions(fontMessage.fontName, fontMessage.fontSize);
+                            Options.writeOptions(fontMessage.fontName, fontMessage.fontSize,
+            				profanity_setting);
                         }
                     }
                 }
-            }
  No newline at end of file

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ +21 -7

             		typeof(SpawnGameMessage),
             		typeof(SetTextVariableMessage),
             		typeof(SetDialogMessage),
-            		typeof(DialogChoiceMessage))]
+            		typeof(DialogChoiceMessage),
+            		typeof(SetOptionMessage))]
             	[Reads(typeof(VisibilityComponent),
             		typeof(WindowTypeComponent),
             		typeof(TrespassingPolicyComponent),
             		typeof(ContractStatusComponent),
             		typeof(RelatedOrganizationComponent),
-            		typeof(NameAndDescriptionComponent)
+            		typeof(NameAndDescriptionComponent),
-            	)]
+            		typeof(OptionsComponent))]
-            	// [Writes(typeof(SelectedComponent))]
+            	[Writes(typeof(OptionsComponent))]
             	public class ImGuiWindowBridgeEngine : Engine
             	{
             		public List<ToggleWindowMessage> messages;
             		public List<ToggleWindowTypeMessage> typeMessages;
             		public List<ChangeContractStatusMessage> contractStatusMessages;
             		public List<SetTextVariableMessage> setTextVariableMessages;
             		public List<SetDialogMessage> setDialogMessages;
             		public List<DialogChoiceMessage> dialogChoiceMessages;
+            		public List<SetOptionMessage> setOptionMessages;
             		bool showBudget {get;}
             		bool showForest {get;}
             			this.setTextVariableMessages = new List<SetTextVariableMessage>();
             			this.setDialogMessages = new List<SetDialogMessage>();
             			this.dialogChoiceMessages = new List<DialogChoiceMessage>();
+            			this.setOptionMessages = new List<SetOptionMessage>();
             			this.windowStatuses = new Dictionary<Window, bool>();
             			this.showContractIndicator = false;
             			{
             				SendMessage(message);
             			}
             			foreach (var message in this.spawnGameMessages)
             			{
             				SendMessage(message);
             			}
             			foreach (var message in this.setDialogMessages)
             			{
             				SendMessage(message);
             			}
+            			foreach(var message in this.setOptionMessages)
+            			{
+            				foreach(var entity in ReadEntities<OptionsComponent>())
+            				{
+            				SetComponent(entity, new OptionsComponent {
+            						ProfanitySetting = message.NewProfanitySetting});
+            				}
+            			}
             			this.setTextVariableMessages.Clear();
             			this.setDialogMessages.Clear();
             			this.dialogChoiceMessages.Clear();
+            			this.setOptionMessages.Clear();
             		}
             	}
             }

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

                     Quad.Initialize(GraphicsDevice, texture);
                     Logging.Success("Initialized Quad texture.");
                     ContractWindow.LoadContent(this._imGuiRenderer, this.imageMap);
-                    OptionsWindow.Initialize(new Vector2(FNAGame.width, FNAGame.height), gdm.IsFullScreen);
                     //Must be done before SetFontMessage is sent
                     var bakedMono = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),
                     this.imGuiWindowBridgeEngine.fontMessages.Add(new SetFontMessage{
                             fontSize = options.fontSize,
                             fontName = options.fontName});
+            			WorldBuilder.SetComponent(gameEntity, new OptionsComponent {ProfanitySetting = options.profanitySetting});
+                        OptionsWindow.Initialize(new Vector2(FNAGame.width, FNAGame.height), gdm.IsFullScreen, options.profanitySetting);
                     Logging.Success("Loaded options.");
                     }
                     catch (FileNotFoundException e)
                     {

isometric-park-fna/Options.cs ¶ +15 -3

             namespace isometricparkfna
             {
+                public enum ProfanityLevel
+                {
+                    Uncensored,
+                    Minced,
+                    Removed
+                }
                 public class Options
                 {
                     public string fontName;
                     public int fontSize;
+                    public ProfanityLevel profanitySetting;
-                    public Options(string fontName, int fontSize)
+                    public Options(string fontName, int fontSize, ProfanityLevel profanitySetting)
                     {
                         this.fontName = fontName;
                         this.fontSize = fontSize;
+                        this.profanitySetting = profanitySetting;
                     }
-                    public static void writeOptions(string fontName, int fontSize)
+                    public static void writeOptions(string fontName, int fontSize, ProfanityLevel profanitySetting)
             		{
-            			var options = new Options(fontName, fontSize);
+            			var options = new Options(fontName, fontSize, profanitySetting);
             			string json = JsonConvert.SerializeObject(options,
             					Formatting.Indented);

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +8 -1

             	    var area_size = GetComponent<AreaComponent>(entity).squares.Length;
                         if (HasComponent<RelatedOrganizationComponent>(entity))
                         {
                             var related_organization = GetComponent<RelatedOrganizationComponent>(entity).Entity;
             	    Entity dialogEntity = default;
             	    DialogComponent dialogNode = default;
+            	    ProfanityLevel profanityLevel = default;
+            	    foreach (ref readonly var entity in ReadEntities<OptionsComponent>())
+            	    {
+            	    profanityLevel = GetComponent<OptionsComponent>(entity).ProfanitySetting;
+            	    }
                         foreach (ref readonly var entity in ReadEntities<WindowTypeComponent>())
                                         InGameMenu.Render(this.BridgeEngine.font, this.BridgeEngine, width);
                                         break;
                                     case Window.Options:
-                                        OptionsWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine, width);
+                                        OptionsWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine, width, profanityLevel);
                                         break;
             			case Window.NewGame:
             			    NewGameWindow.Render(this.BridgeEngine.font, this.BridgeEngine.italicFont, this.BridgeEngine);

isometric-park-fna/UI/OptionsWindow.cs ¶ +32 -11

@@ -21,31 +21,27
21		21
22	private static string fontName = "Iosevka";	22	private static string fontName = "Iosevka";
23	private static int fontSize = 15;	23	private static int fontSize = 15;
		24	private static ProfanityLevel profanityLevel = default;
24		25
25	public static void Initialize(Vector2 resolution, bool fullscreen)	26	public static void Initialize(Vector2 resolution, bool fullscreen, ProfanityLevel profanityLevel)
26	{	27	{
27		28
28	newFullscreen = fullscreen;	29	OptionsWindow.newFullscreen = fullscreen;
29	newResolution = resolution;	30	OptionsWindow.newResolution = resolution;
		31	OptionsWindow.profanityLevel = profanityLevel;
30	}	32	}
31		33
32	public static void Render(ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine bridgeEngine, int width)	34	public static void Render(ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine bridgeEngine, int width, ProfanityLevel profanityLevel)
33	{	35	{
34		36
35	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;	37	ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.None;
36	bool newShow = true;	38	bool newShow = true;
37		39
38	// Num.Vector2 button_size = new Num.Vector2(120, 20);
39
40	StyleSets.defaultSet.push();	40	StyleSets.defaultSet.push();
41		41
42		42
43	// ImGui.SetNextWindowPos(new Num.Vector2(width/2, 200));	43	ImGui.PushFont(font);
44		44
45	ImGui.PushFont(font);
46	// ImGui.PushFont(smallFont);
47	//
48	// ImGui.SetNextWindowSize(new Num.Vector2(320, 320));
49	if(OptionsWindow.hadFocus)	45	if(OptionsWindow.hadFocus)
50	{	46	{
51	ImGui.PushStyleColor(ImGuiCol.Text, StyleSets.white);	47	ImGui.PushStyleColor(ImGuiCol.Text, StyleSets.white);
@@ -137,6 +133,31
137		133
138	ImGui.Separator();	134	ImGui.Separator();
139		135
		136	ImGui.PushFont(italicFont);
		137	ImGui.Text("Text:");
		138	ImGui.PopFont();
		139
		140	ImGui.Text("Profanity:");
		141	ImGui.SameLine();
		142	if (ImGui.BeginCombo("##Profanity", profanityLevel.ToString()))
		143	{
		144
		145	foreach(var level in Enum.GetValues(typeof(ProfanityLevel)))
		146	{
		147	if(ImGui.Selectable(level.ToString()))
		148	{
		149	bridgeEngine.setOptionMessages.Add(new SetOptionMessage{ NewProfanitySetting = (ProfanityLevel)level});
		150	OptionsWindow.profanityLevel = (ProfanityLevel)level;
		151	}
		152
		153	}
		154
		155	ImGui.EndCombo();
		156	}
		157
		158
		159
		160	ImGui.Separator();
140		161
141	if (ImGui.Button("Okay"))	162	if (ImGui.Button("Okay"))
142	{	163	{

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

r417:ab75bb171839 - Sat, 28 Aug 2021 10:13:40

Sign in to your account

Commit r417:ab75bb171839 public

Author

r417:ab75bb171839 - Sat, 28 Aug 2021 10:13:40

Commit `r417:ab75bb171839` public