alysbrooks-public/games/isometric-park-fna Commit - r429:63185be3ab12

alysbrooks-public » games » isometric-park-fna

Commit `r429:63185be3ab12` public

parent | child

Description:

Fix dialog bugs.

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

r429:63185be3ab12 - Sat, 23 Oct 2021 04:06:42

isometric-park-fna/Content/dialog.ink ¶ +6 -8

              Governor: Welcome to your new park, director!
                  * [Okay]
                  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!
                  * * [And I need to keep the forest healthy, too, right?]
                  ~ GovernorOpinion = GovernorOpinion - 1
                      Governor: Ummm, yeah
                      * * * [\...]
                          -> END
                  * * [Sounds good!]
                  ~ GovernorOpinion = GovernorOpinion + 1
                      Governor:  I'll check in soon.
              \#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.
+                    \#assistantName\#: 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.
                          * * [Got it, thanks.]
-                         \#assistantName\#: Bye
+                             \#assistantName\#: Bye
                              -> END
                          * * [How are you?]
-                         \#assistantName\#: \#howdoing\#
-                         -> END
+                             \#assistantName\#: \#howdoing\#
+                             -> END
              === BadNewsReact ===
              === MassVandalism ===
              \#assistantName\#: Bad news, director.
                  + [Oh?]
                      \#assistantName\#: A number of trees have been seriously damaged overnight.
                          + + [How bad are they?]

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}],"alter":[{"temp=":"k"},{"temp=":"x"},"ev",{"VAR?":"x"},{"VAR?":"k"},"+","/ev",{"temp=":"x","re":true},{"#f":1}],"inc":[{"temp=":"x"},"ev",{"VAR?":"x"},1,"+","/ev",{"temp=":"x","re":true},{"#f":1}],"dec":[{"temp=":"x"},"ev",{"VAR?":"x"},1,"-","/ev",{"temp=":"x","re":true},{"#f":1}],"Once":[["^Once upon a time...","\n",["ev",{"^->":"Once.0.2.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":2},{"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":2},{"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":4},"ev","str","^Fuck.","/str","/ev",{"":".^.c-1","flg":4},"ev","str","^Shoot.","/str","/ev",{"":".^.c-2","flg":4},"ev","str","^Sigh. Fine.","/str","/ev",{"":".^.c-3","flg":4},"ev","str","^Who cares?","/str","/ev",{"":".^.c-4","flg":4},{"c-0":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-1":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-2":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-3":["\n","ev","void","/ev","->->",{"#f":5}],"c-4":["\n","ev","void","/ev","->->",{"#f":5}]}],{"#f":1}],"AssistantAcknowlege":[["ev","str","^Thanks.","/str","/ev",{"":".^.c-0","flg":4},"ev","str","^Mmmm hmm.","/str","/ev",{"":".^.c-1","flg":4},"ev","str","^Get to it.","/str","/ev",{"":".^.c-2","flg":4},"ev","str","^I really appreciate it, #assistantName#","/str","/ev",{"":".^.c-3","flg":4},{"c-0":["\n","ev","void","/ev","->->",{"#f":5}],"c-1":["\n","ev","void","/ev","->->",{"#f":5}],"c-2":["^ ","ev",{"^var":"playerRude","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-3":["\n",{"->":".^.^.^.Appreciate"},{"#f":5}]}],{"Appreciate":["^#assistantName#: ","ev",{"VAR?":"assistantTraits"},{"VAR?":"shy"},"?","/ev",[{"->":".^.b","c":true},{"b":["^...",{"->":".^.^.^.8"},null]}],[{"->":".^.b"},{"b":[["ev","visit",3,"seq","/ev","ev","du",0,"==","/ev",{"->":".^.s0","c":true},"ev","du",1,"==","/ev",{"->":".^.s1","c":true},"ev","du",2,"==","/ev",{"->":".^.s2","c":true},"nop",{"s0":["pop","^No problem.",{"->":".^.^.23"},null],"s1":["pop","^Oh, you're welcome.",{"->":".^.^.23"},null],"s2":["pop","^My pleasure.",{"->":".^.^.23"},null],"#f":5}],{"->":".^.^.^.8"},null]}],"nop","\n","ev","void","/ev","->->",{"#f":1}],"#f":1}],"MassVandalism":[["^#assistantName#: Bad news, director.","\n","ev","str","^Oh?","/str","/ev",{"":".^.c-0","flg":4},{"c-0":["\n","^#assistantName#: A number of trees have been seriously damaged overnight.","\n",["ev","str","^How bad are they?","/str","/ev",{"":".^.c-0","flg":4},{"c-0":["\n","^#assistantName#: I'm no botanist, but they're not great. The gouges are pretty deep.","\n",{"->t->":"BadNewsReact"},"^#assistantName#: Yeah, it's ","ev",{"VAR?":"assistantTraits"},{"VAR?":"sweary"},"?","/ev",[{"->":".^.b","c":true},{"b":["^fucking",{"->":".^.^.^.11"},null]}],"nop","^ awful.","\n","^I'll see who's around and get to cleaning.","\n",{"->t->":"AssistantAcknowlege"},"end",{"#f":5}]}],{"#f":5}]}],{"#f":1}],"global decl":["ev",0,{"VAR=":"playerSwears"},0,{"VAR=":"playerRude"},0,{"VAR=":"GovernorOpinion"},{"list":{},"origins":["assistantTraits"]},{"VAR=":"assistantTraits"},"/ev","end",null],"#f":1}],"listDefs":{"assistantTraits":{"shy":1,"esoteric":2,"sweary":3}}} No newline at end of file
	1	{"inkVersion":20,"root":[[["done",{"#f":5,"#n":"g-0"}],null],"done",{"placeholder":["end",{"#f":1}],"alter":[{"temp=":"k"},{"temp=":"x"},"ev",{"VAR?":"x"},{"VAR?":"k"},"+","/ev",{"temp=":"x","re":true},{"#f":1}],"inc":[{"temp=":"x"},"ev",{"VAR?":"x"},1,"+","/ev",{"temp=":"x","re":true},{"#f":1}],"dec":[{"temp=":"x"},"ev",{"VAR?":"x"},1,"-","/ev",{"temp=":"x","re":true},{"#f":1}],"Once":[["^Once upon a time...","\n",["ev",{"^->":"Once.0.2.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"":".^.^.c-0","flg":2},{"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":2},{"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","^#assistantName#: 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":4},"ev","str","^Fuck.","/str","/ev",{"":".^.c-1","flg":4},"ev","str","^Shoot.","/str","/ev",{"":".^.c-2","flg":4},"ev","str","^Sigh. Fine.","/str","/ev",{"":".^.c-3","flg":4},"ev","str","^Who cares?","/str","/ev",{"":".^.c-4","flg":4},{"c-0":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-1":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-2":["^ ","ev",{"^var":"playerSwears","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-3":["\n","ev","void","/ev","->->",{"#f":5}],"c-4":["\n","ev","void","/ev","->->",{"#f":5}]}],{"#f":1}],"AssistantAcknowlege":[["ev","str","^Thanks.","/str","/ev",{"":".^.c-0","flg":4},"ev","str","^Mmmm hmm.","/str","/ev",{"":".^.c-1","flg":4},"ev","str","^Get to it.","/str","/ev",{"":".^.c-2","flg":4},"ev","str","^I really appreciate it, #assistantName#","/str","/ev",{"":".^.c-3","flg":4},{"c-0":["\n","ev","void","/ev","->->",{"#f":5}],"c-1":["\n","ev","void","/ev","->->",{"#f":5}],"c-2":["^ ","ev",{"^var":"playerRude","ci":-1},{"f()":"inc"},"out","/ev","\n","ev","void","/ev","->->",{"#f":5}],"c-3":["\n",{"->":".^.^.^.Appreciate"},{"#f":5}]}],{"Appreciate":["^#assistantName#: ","ev",{"VAR?":"assistantTraits"},{"VAR?":"shy"},"?","/ev",[{"->":".^.b","c":true},{"b":["^...",{"->":".^.^.^.8"},null]}],[{"->":".^.b"},{"b":[["ev","visit",3,"seq","/ev","ev","du",0,"==","/ev",{"->":".^.s0","c":true},"ev","du",1,"==","/ev",{"->":".^.s1","c":true},"ev","du",2,"==","/ev",{"->":".^.s2","c":true},"nop",{"s0":["pop","^No problem.",{"->":".^.^.23"},null],"s1":["pop","^Oh, you're welcome.",{"->":".^.^.23"},null],"s2":["pop","^My pleasure.",{"->":".^.^.23"},null],"#f":5}],{"->":".^.^.^.8"},null]}],"nop","\n","ev","void","/ev","->->",{"#f":1}],"#f":1}],"MassVandalism":[["^#assistantName#: Bad news, director.","\n","ev","str","^Oh?","/str","/ev",{"":".^.c-0","flg":4},{"c-0":["\n","^#assistantName#: A number of trees have been seriously damaged overnight.","\n",["ev","str","^How bad are they?","/str","/ev",{"":".^.c-0","flg":4},{"c-0":["\n","^#assistantName#: I'm no botanist, but they're not great. The gouges are pretty deep.","\n",{"->t->":"BadNewsReact"},"^#assistantName#: Yeah, it's ","ev",{"VAR?":"assistantTraits"},{"VAR?":"sweary"},"?","/ev",[{"->":".^.b","c":true},{"b":["^fucking",{"->":".^.^.^.11"},null]}],"nop","^ awful.","\n","^I'll see who's around and get to cleaning.","\n",{"->t->":"AssistantAcknowlege"},"end",{"#f":5}]}],{"#f":5}]}],{"#f":1}],"global decl":["ev",0,{"VAR=":"playerSwears"},0,{"VAR=":"playerRude"},0,{"VAR=":"GovernorOpinion"},{"list":{},"origins":["assistantTraits"]},{"VAR=":"assistantTraits"},"/ev","end",null],"#f":1}],"listDefs":{"assistantTraits":{"shy":1,"esoteric":2,"sweary":3}}} No newline at end of file

isometric-park-fna/Content/dialog_runner.ink ¶ +1 -1

              ~ assistantTraits = (shy, sweary)
-             -> MassVandalism
+             -> IntroAssistant
              -> END
  No newline at end of file

isometric-park-fna/Engines/DialogEngine.cs ¶ +8 -15

                                  var parts = Regex.Split(continuation, ":", 0);
                                  var speaker = (parts.Length == 2) ? this.Grammar.Flatten(parts[0]) : "Dialog";
                                  var dialog = (parts.Length == 2) ? this.Grammar.Flatten(parts[1]) : continuation;
-                                 var index = 0;
                                  SetComponent(choiceMessage.Entity, new DialogComponent {
                                          CurrentDialog = dialog,
-                                         CurrentSpeaker = speaker,
+                                         CurrentSpeaker = speaker.Trim(),
                                          Options = this.Story.currentChoices
                                          .Select(option => BleepString(option.text,
                                                      profanity_setting ))
                                          .ToList()});
-                                 if (DialogSpawner.indexes.ContainsKey(this.Grammar.Flatten(speaker))) {
-                                     index = DialogSpawner.indexes[this.Grammar.Flatten(speaker)];
+                                 }
-                                 else {
-                                     do
+                                     {
-                                         index = Random.Next(0,7);
-                                     } while(DialogSpawner.indexes.ContainsValue(index));
+                                 var index = DialogSpawner.GetSpeakerImageIndex(this.Grammar, this.Random, speaker);
-                                     DialogSpawner.indexes[this.Grammar.Flatten(speaker)] = index;
+                                 }
                                  SetComponent(choiceMessage.Entity, new ImageComponent {
                                          ImageIndex = index});
                              }
                              else
                              {
                                  Logging.Debug(String.Format("Destroying Dialog (Entity ID {0}).", choiceMessage.Entity.ID));
                                      SetComponent(lowestEntity, new DialogComponent {
                                              Knot = Knot,
                                              CurrentDialog = dialog,
-                                             CurrentSpeaker = speaker,
+                                             CurrentSpeaker = speaker.Trim(),
                                              Options = this.Story.currentChoices
                                              .Select(option => option.text)
                                              .ToList()});
+                                    var index = DialogSpawner.GetSpeakerImageIndex(this.Grammar, this.Random, speaker);
+                                     SetComponent(lowestEntity, new ImageComponent {
+                                             ImageIndex = index});
                                  }
                              }
                          }

isometric-park-fna/Engines/Spawners/DialogSpawner.cs ¶ +22 -12

                          }
              		}
+                     public static int GetSpeakerImageIndex(Grammar grammar, Random random, String speakerRaw)
+                     {
+                         var index = 0;
+                         String speaker = grammar.Flatten(speakerRaw.Trim());
+                         if (DialogSpawner.indexes.ContainsKey(speaker)) {
+                             index = DialogSpawner.indexes[speaker];
+                         }
+                         else {
+                             Logging.Info(String.Format("Creating a new image for speaker {0}", speaker));
+                             do
+                             {
+                                 index = random.Next(0,7);
+                             } while(DialogSpawner.indexes.ContainsValue(index));
+                             DialogSpawner.indexes[speaker] = index;
+                         }
+                         return index;
+                     }
              		protected override void Spawn(in SpawnDialogMessage message)
              		{
                          Logging.Spy(this.Story.currentChoices.Count(), "Count");
                          AddComponent(newDialog, new DialogComponent {
                                  Knot = message.Path,
                                  CurrentDialog = this.Grammar.Flatten(dialog),
-                                 CurrentSpeaker = this.Grammar.Flatten(speaker),
+                                 CurrentSpeaker = this.Grammar.Flatten(speaker).Trim(),
                                  Options = this.Story.currentChoices
                                  .Select(option => option.text)
                                  .ToList()});
              			AddComponent(newDialog,
              					new VisibilityComponent{ visible = true});
-                         if (DialogSpawner.indexes.ContainsKey(this.Grammar.Flatten(speaker))) {
-                             index = DialogSpawner.indexes[this.Grammar.Flatten(speaker)];
+                         }
-                         else {
-                             do
+                             {
-                                 index = Random.Next(0,7);
-                             } while(DialogSpawner.indexes.ContainsValue(index));
-                             DialogSpawner.indexes[this.Grammar.Flatten(speaker)] = index;
+                         }
+                         index = GetSpeakerImageIndex(this.Grammar, this.Random, speaker);
                          AddComponent(newDialog, new ImageComponent {
                                  ImageIndex = index});

isometric-park-fna/FNAGame.cs ¶ +7 0

                      additionalInfo.Add("mouse ", String.Format("{0}, {1}", state.X, state.Y));
                      additionalInfo.Add("mouse delta", delta.ToString());
+                     string entries = "";
+                     foreach (var pair in DialogSpawner.indexes)
+                     {
+                         entries += String.Format("{0}={1}, ", pair.Key, pair.Value);
+                     }
                      additionalInfo.Add("Tracery Test", this.output);
                      additionalInfo.Add("Log Entry", string.Format("{0} {1}", Logging.entries[Logging.entries.Count-1].level, Logging.entries[Logging.entries.Count-1].message));
+                     additionalInfo.Add("Dialog entries", entries);
                      debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window);

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

              			    {
              				    //Could address this with a placeholder image, but
              				    //I think I prefer eliminating the possibility of a placeholder.
-             				    Logging.Warning(String.Format("Conversation (Entity ID {0}) without an image.", entity.ID));
+             				    // Logging.Warning(String.Format("Conversation (Entity ID {0}) without an image.", entity.ID));
              			    }
              			    var dialog = GetComponent<DialogComponent>(entity);

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

r429:63185be3ab12 - Sat, 23 Oct 2021 04:06:42

Sign in to your account

Commit r429:63185be3ab12 public

Author

r429:63185be3ab12 - Sat, 23 Oct 2021 04:06:42

Commit `r429:63185be3ab12` public