-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dialog and NPCs' Behaviors Update: Merge branch 'feature-dialog' into…
… develop * feature-dialog: (24 commits) Target Type Detection Chase Behavior hello clippy calculate "closeness" when the FollowBehavior is attribute close dialog automatically Global Refactor NPC, Behavior, Collisions normalize npc interaction add Follow behavior rearrange button choice add `fight_arena` dialog bump version to v0.3.9 and update the `README add preview and badges add the stairs down ramp in the secret room fix overlapping secret room stones (cause of stairs' fake perspective) add castle theme game start, title flex keep the mountain at the bottom (and the title in the screen) add new changes Scaling art with window's resolution (keep the 16/9) add smoke anim (random time) ...
- Loading branch information
Showing
33 changed files
with
4,068 additions
and
727 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,35 @@ | ||
| [package] | ||
| name = "fabien-et-la-trahison-de-olf" | ||
| version = "0.3.8" | ||
| version = "0.3.9" | ||
| authors = ["Morgan Van Amerongen <[email protected]>", "Olf EPAIN <[email protected]>", "Grassouille la Fripouille", "Sombre Roi René"] | ||
| repository = "https://github.com/Fabinistere/fabien-et-la-trahison-de-olf" | ||
| license = "MIT OR Apache-2.0" | ||
| edition = "2021" | ||
|
|
||
| [workspace] | ||
| resolver = "2" | ||
|
|
||
| [target.'cfg(not(target_arch = "wasm32"))'.dependencies] | ||
| bevy = { version = "0.11", features = ["dynamic_linking"] } | ||
| bevy_ecs = "0.11" | ||
| bevy_reflect = "0.11" | ||
|
|
||
| [target.'cfg(target_arch = "wasm32")'.dependencies] | ||
| bevy = "0.11" | ||
| bevy_ecs = "0.11" | ||
| bevy_reflect = "0.11" | ||
| # wasm-bindgen = "0.2" | ||
|
|
||
|
|
||
| [dependencies] | ||
| # ----------- Common ---------- | ||
| bevy = "0.11" | ||
| # bevy = "0.11" | ||
| bevy_tweening = "0.8" | ||
|
|
||
| # ---------- Dialog ----------- | ||
| yml_dialog = "0.2" | ||
| serde_yaml = "0.9" | ||
|
|
||
| # ----- Hitbox - Velocity ----- | ||
| bevy_rapier2d = { version = "0.22", features = ["simd-stable", "debug-render-2d"] } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| 1: | ||
| source: Fabien | ||
| content: | ||
| text: | ||
| - Hello | ||
| - <3 | ||
| exit_state: 2 | ||
| 2: | ||
| source: Player | ||
| content: | ||
| - text: Hey | ||
| condition: null | ||
| exit_state: 3 | ||
| - text: No Hello | ||
| condition: null | ||
| exit_state: 4 | ||
| - text: Want to share a flat ? | ||
| condition: null | ||
| exit_state: 5 | ||
| 3: | ||
| source: Fabien | ||
| content: | ||
| text: | ||
| - :) | ||
| exit_state: 6 | ||
| 4: | ||
| source: Fabien | ||
| content: | ||
| text: | ||
| - :O | ||
| exit_state: 6 | ||
| 5: | ||
| source: Fabien | ||
| content: | ||
| text: | ||
| - Sure | ||
| exit_state: 6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| 1: | ||
| source: Hugo | ||
| content: | ||
| text: | ||
| - Hello fellow friend | ||
| exit_state: 2 | ||
| 2: | ||
| source: Player | ||
| content: | ||
| - text: Just Follow me for a sec. | ||
| condition: null | ||
| exit_state: 3 | ||
| - text: Who are you again ? | ||
| condition: null | ||
| exit_state: 4 | ||
| 3: | ||
| source: Hugo | ||
| content: | ||
| text: | ||
| - :) | ||
| exit_state: 6 | ||
| trigger_event: | ||
| - FollowPlayer | ||
| 4: | ||
| source: Hugo | ||
| content: | ||
| text: | ||
| - :O | ||
| exit_state: 5 | ||
| 5: | ||
| source: Hugo | ||
| content: | ||
| text: | ||
| - Still shocked. | ||
| exit_state: 2 | ||
| trigger_event: | ||
| - EndDialog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| 1: | ||
| source: Olf | ||
| content: | ||
| text: | ||
| - Il faut absolument sauver les Fabien du Chien Geant | ||
| exit_state: 2 | ||
| 2: | ||
| source: Player | ||
| content: | ||
| - text: ... | ||
| condition: null | ||
| exit_state: 3 | ||
| 3: | ||
| source: Olf | ||
| content: | ||
| text: | ||
| - Il me faut donc obtenir le trone | ||
| exit_state: 4 | ||
| 4: | ||
| source: Player | ||
| content: | ||
| - text: ... | ||
| condition: null | ||
| exit_state: 5 | ||
| - text: et de l'$ | ||
| condition: null | ||
| exit_state: 6 | ||
| 5: | ||
| source: Olf | ||
| content: | ||
| text: | ||
| - Et de l'$ | ||
| exit_state: 6 | ||
| 6: | ||
| source: Olf | ||
| content: | ||
| text: | ||
| - C'est essentiel | ||
| exit_state: 7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| 1: | ||
| source: Player | ||
| content: | ||
| text: | ||
| - Bonjour Flo. | ||
| - Comment vas-tu ? | ||
| - J'ai faim. | ||
| exit_state: 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| 1: | ||
| source: Player | ||
| content: | ||
| - text: Can you Follow Me ? | ||
| condition: null | ||
| exit_state: 2 | ||
| - text: No Nothing | ||
| condition: null | ||
| exit_state: 3 | ||
| 2: | ||
| source: Dieu Suprème | ||
| content: | ||
| text: | ||
| - Sure | ||
| exit_state: 4 | ||
| trigger_event: | ||
| - FollowPlayer | ||
| 3: | ||
| source: Dieu Suprème | ||
| content: | ||
| text: | ||
| - :O | ||
| exit_state: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.