-
Notifications
You must be signed in to change notification settings - Fork 4.4k
[Xedra Evolved ] Boann Quest Ending Screen #83247
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Maleclypse
wants to merge
25
commits into
CleverRaven:master
Choose a base branch
from
Maleclypse:Boann-Ending-screen
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+85
−5
Open
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
fcc0290
Update monster_drops.json
Maleclypse 3caee0f
Merge branch 'master' of https://github.com/Maleclypse/Cataclysm-DDA
Maleclypse 6aebb20
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse d581f04
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse fae339b
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse 89eeb59
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse d21c703
Quick and dirty craft failure explosions
Maleclypse 1d8df85
Update crafting.cpp
Maleclypse 80c50be
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse 46c095a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse a4dd5e8
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse 94f7f3c
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse ea49103
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
Maleclypse ae39de1
Boann Quest Ending Screen
Maleclypse c76fab8
Update data/mods/Xedra_Evolved/xe_end_screen.json
Maleclypse c75d191
Update data/mods/Xedra_Evolved/xe_end_screen.json
Maleclypse b9a3b67
Vampire Death Screen
Maleclypse 7280827
Update data/mods/Xedra_Evolved/xe_graveyard.json
Maleclypse 489b317
Fix
Maleclypse 235c7a9
Remove bad explosive addittions
Maleclypse 92db32f
Fixes
Maleclypse 43063b3
Revert "Fixes"
Maleclypse d9d3a3a
Ending text fixed
Maleclypse a9029ff
Update boann.json
Maleclypse 57be962
Update data/mods/Xedra_Evolved/npc/boann.json
Maleclypse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,30 @@ | ||
| [ | ||
| { | ||
| "type": "end_screen", | ||
| "id": "boann_court_win", | ||
| "priority": 200, | ||
| "picture_id": "ascii_portal_storm_win", | ||
| "condition": { "and": [ { "not": "u_is_alive" }, { "u_has_effect": "a_winner_is_u" }, { "u_has_effect": "march_baron" } ] }, | ||
| "added_info": [ | ||
| [ [ 6, 6 ], "You <color_light_green>escaped</color>" ], | ||
| [ [ 8, 7 ], "<u_name> has trod the path to Arcadia." ], | ||
| [ [ 4, 10 ], "...<u_name>, were they ever heard from again?" ], | ||
| [ [ 15, 11 ], "A story for another day." ], | ||
| [ [ 9, 15 ], "<color_blue>Stories</color> are all thats <color_orange>left</color>." ], | ||
| [ [ 4, 21 ], "Mortal striving lasted for: <time_survived>" ] | ||
| ] | ||
| }, | ||
| { | ||
| "type": "end_screen", | ||
| "id": "vampire_death", | ||
| "priority": 100, | ||
| "picture_id": "ascii_rip_vampire", | ||
| "condition": { "and": [ { "not": "u_is_alive" }, { "u_has_trait": "VAMPIRE" } ] }, | ||
| "added_info": [ | ||
| [ [ 25, 3 ], "The night is over for you: <color_light_red><u_name></color>" ], | ||
| [ [ 26, 4 ], "Survived: <time_survived>" ], | ||
| [ [ 27, 5 ], "Kills: <total_kills>" ] | ||
| ], | ||
| "last_words_label": "Last Words:" | ||
| } | ||
| ] |
This file contains hidden or 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,30 @@ | ||
| [ | ||
| { | ||
| "type": "ascii_art", | ||
| "id": "ascii_rip_vampire", | ||
| "picture": [ | ||
| "________ __ ", | ||
| "\\_____ \\ __ ___/ |_", | ||
| " / | \\| | \\ __\\", | ||
| "/ | \\ | /| | ", | ||
| "\\_______ /____/ |__| ", | ||
| " \/ ", | ||
| "________ ", | ||
| "\\______ \\ _____ _____ ____ ", | ||
| " | | \\\\__ \\ / \\ / \\ ", | ||
| " | ` \\/ __ \\| Y Y \\ | \\", | ||
| "/_______ (____ /__|_| /___| /", | ||
| " \\/ \\/ \\/ \\/ ", | ||
| " _________ __ ", | ||
| "/ _____/_____ _____/ |_ ", | ||
| "\\_____ \\\\____ \\ / _ \\ __\\|", | ||
| " / \\ |_> > <_> ) | ", | ||
| "/_______ / __/ \\____/|__| ", | ||
| " \\/|__| ", | ||
| " ", | ||
| " ", | ||
| " ", | ||
| " " | ||
| ] | ||
| } | ||
| ] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.