Description:
Further improve dialog.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -3,27 +3,34 | |||
|
3 | 3 | Source: Bain Collection, Via Library of Congress |
|
4 | 4 | URL: https://www.example.com |
|
5 | 5 | Filename: 51105041943_e5527c802e_o.jpg.converted4grey_medium_reorder.jpg |
|
6 | Subjects: 1 | |
|
6 | 7 | - Description: This is a person |
|
7 | 8 | Subject: Person |
|
8 | 9 | Source: Bain Collection, Via Library of Congress |
|
9 | 10 | Filename: 51346251445_ae7044d163_o.jpg.converted4grey_medium_reorder.jpg |
|
11 | Subjects: 1 | |
|
10 | 12 | - Description: This is a person |
|
11 | 13 | Subject: Person |
|
12 | 14 | Source: Bain Collection, Via Library of Congress |
|
13 | 15 | Filename: 51104913627_bf626a8a53_o.jpg.converted4grey_medium_reorder.png |
|
16 | Subjects: 1 | |
|
14 | 17 | - Description: Sun Fo |
|
15 | 18 | Subject: Person |
|
16 | 19 | Source: Bain Collection, Via Library of Congress |
|
17 | 20 | Filename: 9684139377_9f74e12129_o.jpg.converted4grey_medium_reorder.png |
|
21 | Subjects: 1 | |
|
18 | 22 | - Description: M-4 tank crews of the United States, Ft. Knox, Ky. |
|
19 | 23 | Subject: Person |
|
20 | 24 | Source: Bain Collection, Via Library of Congress |
|
21 | 25 | Filename: service-pnp-fsac-1a35000-1a35200-1a35210v.jpg.converted4grey_medium_reorder.png |
|
26 | Subjects: 4 | |
|
22 | 27 | - Description: Yuvaraja of Mysore |
|
23 | 28 | Subject: Person |
|
24 | 29 | Source: Bain Collection, Via Library of Congress |
|
25 | 30 | Filename: service-pnp-ggbain-20000-20016r.jpg.converted4grey_medium_reorder.png |
|
31 | Subjects: 1 | |
|
26 | 32 | - Description: Mrs. Marie L. Baldwin |
|
27 | 33 | Subject: Person |
|
28 | 34 | Source: Bain Collection, Via Library of Congress |
|
29 | 35 | Filename: 5926007035_9d728b1837_o.jpg.converted4grey_medium_reorder.png |
|
36 | Subjects: 1 |
@@ -105,7 +105,7 | |||
|
105 | 105 | CurrentDialog = dialog, |
|
106 | 106 | CurrentSpeaker = speaker.Trim(), |
|
107 | 107 | Options = this.Story.currentChoices |
|
108 | .Select(option => BleepString(option.text, | |
|
108 | .Select(option => BleepString(this.Grammar.Flatten(option.text), | |
|
109 | 109 | profanity_setting )) |
|
110 | 110 | .ToList()}); |
|
111 | 111 | |
@@ -155,7 +155,8 | |||
|
155 | 155 | CurrentDialog = dialog, |
|
156 | 156 | CurrentSpeaker = speaker.Trim(), |
|
157 | 157 | Options = this.Story.currentChoices |
|
158 | .Select(option => option.text) | |
|
158 | .Select(option => BleepString(this.Grammar.Flatten(option.text), | |
|
159 | profanity_setting )) | |
|
159 | 160 | .ToList()}); |
|
160 | 161 | |
|
161 | 162 | var index = DialogSpawner.GetSpeakerImageIndex(this.Grammar, this.Random, speaker); |
@@ -94,7 +94,7 | |||
|
94 | 94 | CurrentDialog = this.Grammar.Flatten(dialog), |
|
95 | 95 | CurrentSpeaker = this.Grammar.Flatten(speaker).Trim(), |
|
96 | 96 | Options = this.Story.currentChoices |
|
97 | .Select(option => option.text) | |
|
97 | .Select(option => this.Grammar.Flatten(option.text)) | |
|
98 | 98 | .ToList()}); |
|
99 | 99 | |
|
100 | 100 | AddComponent(newDialog, new WindowTypeComponent { |
@@ -102,7 +102,7 | |||
|
102 | 102 | AddComponent(newDialog, |
|
103 | 103 | new VisibilityComponent{ visible = true}); |
|
104 | 104 | |
|
105 | index = GetSpeakerImageIndex(this.Grammar, this.Random, speaker); | |
|
105 | index = GetSpeakerImageIndex(this.Grammar, this.Random, speaker, 1); | |
|
106 | 106 | |
|
107 | 107 | AddComponent(newDialog, new ImageComponent { |
|
108 | 108 | ImageIndex = index}); |
@@ -9,14 +9,24 | |||
|
9 | 9 | using Microsoft.Xna.Framework; |
|
10 | 10 | using Microsoft.Xna.Framework.Graphics; |
|
11 | 11 | |
|
12 | using isometricparkfna.Spawners; | |
|
13 | ||
|
12 | 14 | namespace isometricparkfna |
|
13 | 15 | { |
|
16 | // public enum Role { | |
|
17 | // Unspecified, | |
|
18 | // Assistant, | |
|
19 | // Governor | |
|
20 | // } | |
|
21 | ||
|
14 | 22 | public struct ImageMetadata { |
|
15 | 23 | public string Description; |
|
16 | 24 | public string Subject; |
|
17 | 25 | public string Source; |
|
18 | 26 | public string URL; |
|
19 | 27 | public string Filename; |
|
28 | public OrganizationType[] OrganizationType; | |
|
29 | public int Subjects; | |
|
20 | 30 | } |
|
21 | 31 | |
|
22 | 32 | public class ImageMap |
You need to be logged in to leave comments.
Login now