k4d3 commited on
Commit
4e03c08
1 Parent(s): dda7d52

dont ship with test dialog

Browse files
.cargo/config.toml ADDED
@@ -0,0 +1,10 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ [build]
2
+ target-dir = "target"
3
+
4
+ [target.x86_64-unknown-linux-gnu]
5
+ linker = "clang"
6
+ rustflags = ["-Zshare-generics=yes", "link-arg=-fuse-ld=lld"]
7
+
8
+ [target.x86_64-pc-windows-msvc]
9
+ linker = "rust-lld.exe"
10
+ rustflags = ["-Clinker=rust-lld.exe", "-Zshare-generics=n", "-Zthreads=0"]
Cargo.toml CHANGED
@@ -76,7 +76,7 @@ dev_features = [
76
  "bevy/trace",
77
  "bevy/file_watcher",
78
  "bevy/embedded_watcher",
79
- #"iyes_progress/debug",
80
  "bevy_rapier2d/debug-render-2d",
81
  #"big-brain/trace",
82
  #"sickle_ui/dev",
@@ -136,10 +136,12 @@ wgpu = { version = "0.20.1", default-features = false, features = [
136
  "naga",
137
  "naga-ir",
138
  ] }
139
- winit = { version = "0.30.3", default-features = false, features = ["rwh_06"] }
140
  image = { version = "0.25.1", default-features = false, features = ["png"] }
141
- rand = "0.8.5"
142
  unicode-segmentation = "1.11.0"
 
 
 
143
 
144
  [dependencies.bevy]
145
  version = "0.14.0"
 
76
  "bevy/trace",
77
  "bevy/file_watcher",
78
  "bevy/embedded_watcher",
79
+ "iyes_progress/debug",
80
  "bevy_rapier2d/debug-render-2d",
81
  #"big-brain/trace",
82
  #"sickle_ui/dev",
 
136
  "naga",
137
  "naga-ir",
138
  ] }
139
+ winit = { version = "0.30", default-features = false, features = ["rwh_06"] }
140
  image = { version = "0.25.1", default-features = false, features = ["png"] }
 
141
  unicode-segmentation = "1.11.0"
142
+ # I wish to one day see.. what would break, if I comment this..
143
+ # But alas.. that day is not today..
144
+ rand = "0.8.5"
145
 
146
  [dependencies.bevy]
147
  version = "0.14.0"
assets/dialogues/{test_dialog.yarn → kade_dialog.yarn} RENAMED
@@ -19,12 +19,12 @@ Kade: Well, too bad! My cauldron is broken! I mean.. its out of firewood! Bring
19
  <<jump Kade_Denied>>
20
  ===
21
  title: Kade_Excellent
22
- position: -473,-545
23
  ---
24
- Kade: Excellent, bro!
25
  ===
26
  title: Kade_First_Loop
27
- position: -633,-779
28
  ---
29
  <<if $firstQuestComplete >>
30
  Kade: Ah! You completed my first quest! I'll take you to the next dialogue loop!
@@ -41,7 +41,7 @@ position: -633,-779
41
  <<endif>>
42
  ===
43
  title: A_Critical_Moment
44
- position: 108,-925
45
  ---
46
  ???: We may soon face a critical moment!
47
  ???: Our life might hang on a split second decision, a hesitation would kill us all and those that were counting on us would surely die as well!
 
19
  <<jump Kade_Denied>>
20
  ===
21
  title: Kade_Excellent
22
+ position: -475,-559
23
  ---
24
+ Kade: Excellent, bro! Oh! Could you also bring some water? There should be some in the barrel behind the house.
25
  ===
26
  title: Kade_First_Loop
27
+ position: -631,-790
28
  ---
29
  <<if $firstQuestComplete >>
30
  Kade: Ah! You completed my first quest! I'll take you to the next dialogue loop!
 
41
  <<endif>>
42
  ===
43
  title: A_Critical_Moment
44
+ position: -125,-1146
45
  ---
46
  ???: We may soon face a critical moment!
47
  ???: Our life might hang on a split second decision, a hesitation would kill us all and those that were counting on us would surely die as well!
assets/dialogues/the_treachery.yarn CHANGED
@@ -17,3 +17,8 @@ position: 280,162
17
  Asd: It's nice to see you again, <Player>! I just wish it were under better circumstances!
18
  -> Indeed, this was not the right way for a reunion, but it is still a welcome one!
19
  ===
 
 
 
 
 
 
17
  Asd: It's nice to see you again, <Player>! I just wish it were under better circumstances!
18
  -> Indeed, this was not the right way for a reunion, but it is still a welcome one!
19
  ===
20
+ title: Node1
21
+ position: 543,161
22
+ ---
23
+
24
+ ===
src/plugins/dialogueview/mod.rs CHANGED
@@ -69,7 +69,7 @@ struct Assets {
69
  impl<T: States + FreelyMutableState> Plugin for YarnSpinnerDialogueViewPlugin<T> {
70
  fn build(&self, app: &mut App) {
71
  app.add_plugins(
72
- YarnSpinnerPlugin::with_yarn_source(YarnFileSource::file("dialogues/test_dialog.yarn"))
73
  )
74
  .configure_loading_state(
75
  LoadingStateConfig::new(self.loading_state.clone()).load_collection::<Assets>()
 
69
  impl<T: States + FreelyMutableState> Plugin for YarnSpinnerDialogueViewPlugin<T> {
70
  fn build(&self, app: &mut App) {
71
  app.add_plugins(
72
+ YarnSpinnerPlugin::with_yarn_source(YarnFileSource::file("dialogues/kade_dialog.yarn"))
73
  )
74
  .configure_loading_state(
75
  LoadingStateConfig::new(self.loading_state.clone()).load_collection::<Assets>()