Compare commits
No commits in common. "008e2d55bcf7017f0b19e369874dec0236384ed9" and "bf5b5f2156723ef30026b8e334a2eeb2781674c7" have entirely different histories.
008e2d55bc
...
bf5b5f2156
|
@ -458,9 +458,6 @@ pub fn apply_input_to_player(
|
||||||
key_input: Res<ButtonInput<KeyCode>>,
|
key_input: Res<ButtonInput<KeyCode>>,
|
||||||
q_windows: Query<&Window, With<PrimaryWindow>>,
|
q_windows: Query<&Window, With<PrimaryWindow>>,
|
||||||
) {
|
) {
|
||||||
if settings.map_active || !settings.in_control() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let player = q_player.get_single_mut();
|
let player = q_player.get_single_mut();
|
||||||
if player.is_err() {
|
if player.is_err() {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -883,22 +883,12 @@
|
||||||
- Oh, hello!
|
- Oh, hello!
|
||||||
- Look, I'm very busy right now constructing this place.
|
- Look, I'm very busy right now constructing this place.
|
||||||
- We can talk more once this is done.
|
- We can talk more once this is done.
|
||||||
- label: entrypoint
|
|
||||||
- Can you spare some oxygen?:
|
- Can you spare some oxygen?:
|
||||||
- Oh, sure thing!
|
- Oh, sure thing!
|
||||||
- script: refilloxygen 1
|
- script: refilloxygen 1
|
||||||
- Can I ask you some general questions?:
|
|
||||||
- Of course.
|
|
||||||
- goto: generic_questions
|
|
||||||
- Bye!:
|
- Bye!:
|
||||||
- See you around!
|
- See you around!
|
||||||
- goto: EXIT
|
|
||||||
- goto: entrypoint
|
|
||||||
|
|
||||||
- label: generic_questions
|
|
||||||
- include: generic_questions_serenity
|
|
||||||
- Anything else?
|
|
||||||
- goto: entrypoint
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -906,22 +896,11 @@
|
||||||
- chat: River
|
- chat: River
|
||||||
- Welcome to our little oasis!
|
- Welcome to our little oasis!
|
||||||
- This will be great once it's finished.
|
- This will be great once it's finished.
|
||||||
- label: entrypoint
|
|
||||||
- Can you spare some oxygen?:
|
- Can you spare some oxygen?:
|
||||||
- Oh, sure thing!
|
- Oh, sure thing!
|
||||||
- script: refilloxygen 1
|
- script: refilloxygen 1
|
||||||
- Can I ask you some general questions?:
|
|
||||||
- Of course.
|
|
||||||
- goto: generic_questions
|
|
||||||
- Bye!:
|
- Bye!:
|
||||||
- See you around!
|
- See you around!
|
||||||
- goto: EXIT
|
|
||||||
- goto: entrypoint
|
|
||||||
|
|
||||||
- label: generic_questions
|
|
||||||
- include: generic_questions_serenity
|
|
||||||
- Anything else?
|
|
||||||
- goto: entrypoint
|
|
||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
Loading…
Reference in a new issue