diff --git a/modular_darkpack/modules/vitae/code/embracing.dm b/modular_darkpack/modules/vitae/code/embracing.dm
index 28452f65ff07..b0fa3c7cd8cb 100644
--- a/modular_darkpack/modules/vitae/code/embracing.dm
+++ b/modular_darkpack/modules/vitae/code/embracing.dm
@@ -21,7 +21,7 @@
childe.make_kindred_from_sire(src)
- /* // DARKPACK TODO - Commenting this out until preferences are properly finished.
+ /* // DARKPACK TODO - DISCIPLINE PREFERENCES
//Gives the Childe the src's first three Disciplines
var/list/disciplines_to_give = list()
var/discipline_number = 0
@@ -30,12 +30,20 @@
for (var/i in 1 to discipline_number)
disciplines_to_give += client?.prefs.discipline_types[i]
childe.create_disciplines(FALSE, disciplines_to_give)
- childe.calculate_max_bloodpool()
- childe.morality_path = morality_path
- childe.clan.is_enlightened = clan.is_enlightened
*/
- //addtimer(CALLBACK(childe, PROC_REF(embrace_persistence_confirmation)), 1 SECONDS)
+ var/datum/st_stat/morality_path/morality/stat_morality = storyteller_stats["[STAT_MORALITY]"]
+ var/datum/st_stat/morality_path/morality/stat_morality_childe = childe.storyteller_stats["[STAT_MORALITY]"]
+
+ if(stat_morality?.morality_path && stat_morality_childe)
+ stat_morality_childe.morality_path = new stat_morality.morality_path.type(childe)
+
+ if(stat_morality_childe.morality_path.alignment == MORALITY_ENLIGHTENMENT)
+ var/datum/splat/vampire/kindred/kindred_splat = iskindred(childe)
+ if(istype(kindred_splat))
+ kindred_splat.enlightenment = TRUE
+
+ addtimer(CALLBACK(childe, PROC_REF(prompt_permanent_embrace)), 1 SECONDS)
/* // DARKPACK TODO - WEREWOLF
/mob/living/carbon/human/proc/attempt_abomination_embrace(mob/living/carbon/human/childe, second_party_embrace)
@@ -67,20 +75,23 @@
return
*/
-/* // DARKPACK TODO - PREFERENCES
-/mob/living/carbon/human/proc/embrace_persistence_confirmation()
- var/response_v = tgui_input_list(src, "Do you wish to keep being a vampire on your save slot? (Yes will be a permanent choice and you can't go back!)", "Embrace", list("Yes", "No"), "No")
+
+/mob/living/carbon/human/proc/prompt_permanent_embrace()
+ var/response = tgui_alert(src, "Do you wish to keep being a vampire on your save slot? This is a permanent choice, and you can't go back!", "Embrace", list("Yes", "No"))
//Verify if they accepted to save being a vampire
- if(response_v != "Yes" || !client)
+ if(response != "Yes" || !client)
return
- var/datum/preferences/childe_prefs_v = client.prefs
- childe_prefs_v.pref_species.id = "kindred"
- childe_prefs_v.pref_species.name = "Vampire"
- childe_prefs_v.clan = clan
+ write_preference_midround(/datum/preference/choiced/splats, SPLAT_KINDRED)
+ write_preference_midround(/datum/preference/choiced/subsplat/vampire_clan, get_clan()?.name) // clan should already be changed by the embracing itself...
- childe_prefs_v.skin_tone = get_vamp_skin_color(skin_tone)
- childe_prefs_v.clan.is_enlightened = clan.is_enlightened
+ // ...same with your morality path. unfortunately, this is a bit of a clusterfuck to get
+ var/datum/st_stat/morality_path/morality/stat_morality = storyteller_stats["[STAT_MORALITY]"]
+ if(stat_morality?.morality_path)
+ write_preference_midround(/datum/preference/choiced/vtm_morality, stat_morality.morality_path.name)
+
+ /* // DARKPACK TODO - PREFERENCES
+ var/datum/preferences/childe_prefs_v = client.prefs
//Rarely the new mid round vampires get the 3 brujah skil(it is default)
//This will remove if it happens
@@ -97,6 +108,7 @@
for (var/i in 1 to 3)
childe_prefs_v.discipline_types += childe_prefs_v.clan.clan_disciplines[i]
childe_prefs_v.discipline_levels += 1
+ */
+
+ to_chat(src, span_danger("You have chosen to permanently become a vampire! No regrets, kindred..."))
- childe_prefs_v.save_character()
-*/
diff --git a/modular_darkpack/modules/vitae/code/ghouling.dm b/modular_darkpack/modules/vitae/code/ghouling.dm
index 60db83b701f4..fec17a8770bd 100644
--- a/modular_darkpack/modules/vitae/code/ghouling.dm
+++ b/modular_darkpack/modules/vitae/code/ghouling.dm
@@ -1,7 +1,8 @@
-/* // DARKPACK TODO - PREFERENCES
-/mob/living/carbon/human/proc/prompt_permenant_ghouling()
- var/response_g = tgui_input_list(src, "Do you wish to keep being a ghoul on your save slot?(Yes will be a permanent choice and you can't go back)", "Ghouling", list("Yes", "No"), "No")
- if(response_g == "Yes")
+/mob/living/carbon/human/proc/prompt_permanent_ghouling()
+ var/response = tgui_alert(src, "Do you wish to keep being a ghoul on your save slot? This is a permanent choice, and you can't go back!", "Ghouling", list("Yes", "No"))
+ if(response == "Yes")
+ /*
+ // DARKPACK TODO - DISCIPLINE PREFERENCES
var/datum/preferences/thrall_prefs_g = client.prefs
if(thrall_prefs_g.discipline_types.len == 3)
for (var/i in 1 to 3)
@@ -10,10 +11,10 @@
var/index = thrall_prefs_g.discipline_types.Find(removing_discipline)
thrall_prefs_g.discipline_types.Cut(index, index + 1)
thrall_prefs_g.discipline_levels.Cut(index, index + 1)
- thrall_prefs_g.pref_species.name = "Ghoul"
- thrall_prefs_g.pref_species.id = "ghoul"
- thrall_prefs_g.save_character()
-*/
+ */
+ write_preference_midround(/datum/preference/choiced/splats, SPLAT_GHOUL)
+ to_chat(src, span_danger("You have chosen to permanently become a ghoul! No regrets..."))
+
/mob/living/carbon/human/proc/ghoulificate(mob/living/carbon/human/owner)
make_ghoul(owner)
@@ -29,7 +30,7 @@
if(master != owner)
mind.enslave_mind_to_creator(owner)
apply_status_effect(/datum/status_effect/blood_bond, owner)
- to_chat(src, span_userdanger("From the first sip from the first night, you shall idolize or hate from whom you've drank deep. From the second sip upon the second night, you shall likewise hold onto their words and seek to curry their favor. Upon the third night and third drink, you are utterly theirs. Acts of defiant will are possible, but they are fleeting."))
+ to_chat(src, span_userdanger("From the first sip from the first night, you shall idolize or hate from whom you've drank deep. From the second sip upon the second night, you shall likewise hold onto their words and seek to curry their favor. Upon the third night and third drink, you are utterly theirs. Acts of defiant will are possible, but they are fleeting."))
return TRUE
diff --git a/modular_darkpack/modules/vitae/code/vitae.dm b/modular_darkpack/modules/vitae/code/vitae.dm
index 6dbfc41182d8..a1484b6c64f6 100644
--- a/modular_darkpack/modules/vitae/code/vitae.dm
+++ b/modular_darkpack/modules/vitae/code/vitae.dm
@@ -34,7 +34,7 @@
victim.send_ghoul_vitae_consumption_message(embracer)
else
victim.ghoulificate(embracer)
- //victim.prompt_permenant_ghouling()
+ victim.prompt_permanent_ghouling()
return
if(iskindred(victim)) //Are we a kindred species?