kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

make characters and props in scenes fuzzymap

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-01-05 15:55:27 -07:00
parent c0878c8556
commit 56364b81b9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/hollywoo/src/hollywoo/Movie.kiss
View File

@@ -164,9 +164,9 @@
set set
(dictGet sets setKey) (dictGet sets setKey)
characters characters
(new Map) (new FuzzyMap<Character<StagePosition,StageFacing,Actor>>)
propsOnScreen propsOnScreen
(new Map) (new FuzzyMap<Prop>)
] ]
time time
perspective))) perspective)))
@@ -291,7 +291,7 @@
(showDialog actorName (VoiceOver (dictGet actors actorName)) wryly text cc)) (showDialog actorName (VoiceOver (dictGet actors actorName)) wryly text cc))
(hollywooMethod onPhoneSpeech true [actorName wryly text :Continuation cc] (hollywooMethod onPhoneSpeech true [actorName wryly text :Continuation cc]
(showDialog actorName (ifLet [charOnScreen (dictGet .characters (_currentScene) actorName)] (showDialog actorName (ifLet [charOnScreen (try (dictGet .characters (_currentScene) actorName) (catch [e] null))]
(OnScreen charOnScreen) (OnScreen charOnScreen)
(FromPhone (dictGet actors actorName))) wryly text cc)) (FromPhone (dictGet actors actorName))) wryly text cc))

6
projects/hollywoo/src/hollywoo/Scene.hx
View File

@@ -1,5 +1,7 @@
package hollywoo; package hollywoo;
import kiss.FuzzyMap;
enum SceneTime { enum SceneTime {
Morning; Morning;
Day; Day;
@@ -31,8 +33,8 @@ enum SpeechType<StagePosition, StageFacing, Actor> {
typedef Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop> = { typedef Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop> = {
set:Set, set:Set,
characters:Map<String, Character<StagePosition, StageFacing, Actor>>, characters:FuzzyMap<Character<StagePosition, StageFacing, Actor>>,
propsOnScreen:Map<String, Prop>, propsOnScreen:FuzzyMap<Prop>,
// TODO props on stage // TODO props on stage
time:SceneTime, time:SceneTime,
perspective:ScenePerspective perspective:ScenePerspective