Skip to content
Open
Show file tree
Hide file tree
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 Jan 15, 2025
3caee0f
Merge branch 'master' of https://github.com/Maleclypse/Cataclysm-DDA
Maleclypse Jan 18, 2025
6aebb20
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Feb 1, 2025
d581f04
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Feb 5, 2025
fae339b
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Mar 21, 2025
89eeb59
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse May 16, 2025
d21c703
Quick and dirty craft failure explosions
Maleclypse Jun 7, 2025
1d8df85
Update crafting.cpp
Maleclypse Jun 7, 2025
80c50be
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Jul 19, 2025
46c095a
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Sep 3, 2025
a4dd5e8
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Oct 19, 2025
94f7f3c
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Maleclypse Oct 19, 2025
ea49103
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
Maleclypse Nov 1, 2025
ae39de1
Boann Quest Ending Screen
Maleclypse Oct 10, 2025
c76fab8
Update data/mods/Xedra_Evolved/xe_end_screen.json
Maleclypse Oct 10, 2025
c75d191
Update data/mods/Xedra_Evolved/xe_end_screen.json
Maleclypse Oct 10, 2025
b9a3b67
Vampire Death Screen
Maleclypse Oct 10, 2025
7280827
Update data/mods/Xedra_Evolved/xe_graveyard.json
Maleclypse Oct 10, 2025
489b317
Fix
Maleclypse Oct 12, 2025
235c7a9
Remove bad explosive addittions
Maleclypse Nov 1, 2025
92db32f
Fixes
Maleclypse Nov 5, 2025
43063b3
Revert "Fixes"
Maleclypse Nov 5, 2025
d9d3a3a
Ending text fixed
Maleclypse Nov 10, 2025
a9029ff
Update boann.json
Maleclypse Nov 22, 2025
57be962
Update data/mods/Xedra_Evolved/npc/boann.json
Maleclypse Nov 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions data/mods/Xedra_Evolved/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -4211,5 +4211,11 @@
"id": "effect_xe_werewolf_summon_shadow_pack_limiter",
"name": [ "Summoned the Shadow Pack" ],
"desc": [ "You called on the aid of ancestral werewolves and must wait before seeking their aid again." ]
},
{
"type": "effect_type",
"id": "march_baron",
"name": [ "March Baron" ],
"//": "Used to target a slightly different winning screen upon exiting the mortal realms as a Lord in Boann's court."
}
]
24 changes: 19 additions & 5 deletions data/mods/Xedra_Evolved/npc/boann.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,16 @@
"topic": "TALK_QUEST_LIST",
"condition": { "math": [ "Boann_Quests_Completed < 10" ] }
},
{
"text": "I've completed all your quests and am ready to join your court.",
"topic": "TALK_JOIN_COURT_SUCCESS",
"condition": { "math": [ "Boann_Quests_Completed >= 10" ] },
"effect": { "u_add_effect": "march_baron", "duration": "PERMANENT" },
},
{
"text": "I am ready to leave this world for yours.",
"topic": "TALK_OUTWORLD_CONFIRM",
"condition": { "math": [ "Boann_Quests_Completed >= 10" ] }
"condition": { "u_has_effect": "march_baron" }
},
{
"text": "I'd like some advice about the Jabberwock.",
Expand Down Expand Up @@ -1011,13 +1017,21 @@
{ "text": "Thank you.", "topic": "TALK_DONE" }
]
},
{
"id": [ "TALK_JOIN_COURT_SUCCESS" ],
"type": "talk_topic",
"dynamic_line": "You are now officially a member of my court and can leave this place for the summer lands. You will be assigned a territory to guard in my name in the Marches and troops to help you hold it. But only when you leave here and there is no return from there to here so anyone you wish to take must come with you when you leave.",
"responses": [
{ "text": "Thank you my liege. I will let you know when I am ready to make the journey.", "topic": "TALK_DONE" },
{ "text": "I wish to leave now. (This will end the game)", "topic": "TALK_OUTWORLD_CONFIRM" }
]
},
{
"id": [ "TALK_OUTWORLD_CONFIRM" ],
"type": "talk_topic",
"//": "TODO: add custom tombstone as the player don't actually die",
"dynamic_line": "Are you certain? Leaving this world is a one-way trip. There is still a very long time before it becomes urgent to do so and many things to gain from staying here a little longer.",
"responses": [
{ "text": "I changed my mind. I'll stay for now", "topic": "TALK_DONE" },
{ "text": "I changed my mind. I'll stay for now.", "topic": "TALK_DONE" },
{ "text": "I am sure. Bring me out of here. (This will end the game)", "topic": "TALK_LEAVE_THIS_WORLD" },
{
"text": "I am sure. Bring me and my followers out of here. (This will end the game)",
Expand All @@ -1032,8 +1046,8 @@
"id": "TALK_LEAVE_THIS_WORLD",
"dynamic_line": {
"compare_string": [ "yes", { "u_val": "u_has_followers" } ],
"yes": "(Boann lead you and your followers to a hidden ritual circle) This is the exit point. After the ritual, you will all go through the decontamination process before you are allowed to claim your own barony, as fit for a member of my court. Your followers will then claim a small part of it for their homes.",
"no": "(Boann lead you to a hidden ritual circle) This is the exit point. After the ritual, you'll go through the decontamination process before being allowed to claim your own barony, as fit for a member of my court."
"yes": "(Boann leads you and your followers to a hidden ritual circle) This is the exit point. After the ritual, you will all go through the decontamination process before you are allowed to claim your own barony, as fit for a member of my court. Your followers will then claim a small part of it for their homes.",
"no": "(Boann leads you to a hidden ritual circle) This is the exit point. After the ritual, you'll go through the decontamination process before being allowed to claim your own barony, as fit for a member of my court."
},
"responses": [
{
Expand Down
30 changes: 30 additions & 0 deletions data/mods/Xedra_Evolved/xe_end_screen.json
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:"
}
]
30 changes: 30 additions & 0 deletions data/mods/Xedra_Evolved/xe_graveyard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[
{
"type": "ascii_art",
"id": "ascii_rip_vampire",
"picture": [
"________ __ ",
"\\_____ \\ __ ___/ |_",
" / | \\| | \\ __\\",
"/ | \\ | /| | ",
"\\_______ /____/ |__| ",
" \/ ",
"________ ",
"\\______ \\ _____ _____ ____ ",
" | | \\\\__ \\ / \\ / \\ ",
" | ` \\/ __ \\| Y Y \\ | \\",
"/_______ (____ /__|_| /___| /",
" \\/ \\/ \\/ \\/ ",
" _________ __ ",
"/ _____/_____ _____/ |_ ",
"\\_____ \\\\____ \\ / _ \\ __\\|",
" / \\ |_> > <_> ) | ",
"/_______ / __/ \\____/|__| ",
" \\/|__| ",
" ",
" ",
" ",
" "
]
}
]
Loading