Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

var/datum/splat/vampire/kindred/kindred_splat = iskindred(src)
if(kindred_splat)
var/hunger_threshold = 7 - (kindred_splat.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL))
var/hunger_threshold = 7 - (is_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL))
var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)
var/will_be_hungry = (clamp(bloodpool + amount, 0, maxbloodpool) < hunger_threshold)

Expand Down
3 changes: 1 addition & 2 deletions modular_darkpack/modules/blood_drinking/code/vamp_bite.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
if(!skipface)
if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD))
var/datum/splat/vampire/kindred/kindred_species = iskindred(src)
var/stat_to_roll = kindred_species.enlightenment ? STAT_INSTINCT : STAT_SELF_CONTROL
var/stat_to_roll = is_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL
var/datum/storyteller_roll/frezy_roll = new()
frezy_roll.applicable_stats = list(stat_to_roll)
var/frenzy_result = frezy_roll.st_roll(src, bit_living)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
if(!kindred_owner)
return FALSE
// Humanity 10 vamps are immume to the light. atleast for the amount of time our day lasts.
if(CONFIG_GET(flag/humanity_sunlight_resistance) && !kindred_owner.enlightenment && (owner.st_get_stat(STAT_MORALITY) >= 10))
if(CONFIG_GET(flag/humanity_sunlight_resistance) && !owner.is_enlightenment() && (owner.st_get_stat(STAT_MORALITY) >= 10))
return FALSE

to_chat(owner, span_danger("THE SUN SEARS YOUR FLESH"))
Expand Down
3 changes: 1 addition & 2 deletions modular_darkpack/modules/economy/code/selling/lombard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@
// Morality loss warning for bulk sales
if(selling_comp.humanity_loss && ishuman(user))
var/mob/living/carbon/human/H = user
var/datum/splat/vampire/kindred/vampirism = iskindred(H)
if(!iskindred(H) || !vampirism.enlightenment)
if(!iskindred(H) || !H.is_enlightenment())
var/humanity_loss_modifier = HAS_TRAIT(H, TRAIT_SENSITIVE_HUMANITY) ? 2 : 1
var/total_humanity_risk = length(items_to_sell) * humanity_loss_modifier * selling_comp.humanity_loss

Expand Down
3 changes: 1 addition & 2 deletions modular_darkpack/modules/economy/code/selling/selling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@

// If we found a seller and they're on Enlightenment path, no warning
if(seller && iskindred(seller))
var/datum/splat/vampire/kindred/vampirism = iskindred(seller)
if(vampirism.enlightenment)
if(seller.is_enlightenment())
return span_notice("You've sold [parent]!")

// Default warning for Humanity path or non-vampires
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ pools for a turn or two after the manifestation.
/datum/discipline_power/dementation/the_haunting/pre_activation_checks(mob/living/carbon/human/target)
var/resistence_stat = target.st_get_stat(STAT_SELF_CONTROL)
if(iskindred(target))
var/datum/splat/vampire/kindred/target_species = iskindred(target)
resistence_stat = target.st_get_stat(target_species.enlightenment ? STAT_CONVICTION : STAT_SELF_CONTROL)
resistence_stat = target.st_get_stat(owner.is_enlightenment() ? STAT_CONVICTION : STAT_SELF_CONTROL)
var/theirpower = target.st_get_stat(STAT_PERCEPTION) + resistence_stat
mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_SUBTERFUGE), theirpower, owner, numerical = TRUE)
if(mypower <= 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
min_score = 0
max_score = 10
points = 0
//freebie_point_cost = FREEBIE_COST_HUMANITY
// freebie_point_cost = FREEBIE_COST_HUMANITY

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SIGNAL_HANDLER

// "Enlightenment" is essentially the Path of Pure Evil. Inverts Humanity changes and limits.
var/is_enlightenment = enlightenment
var/is_enlightenment = owner.is_enlightenment()
var/path = is_enlightenment ? "Enlightenment" : "Humanity"
if (is_enlightenment && !forced)
value = -value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@

stat_morality.morality_path = new value(target)

/mob/living/proc/is_enlightenment()
var/datum/st_stat/morality_path/morality/stat_morality = storyteller_stats["[STAT_MORALITY]"]
if(!stat_morality?.morality_path)
return FALSE

if(stat_morality.morality_path.alignment == MORALITY_ENLIGHTENMENT)
var/datum/splat/vampire/kindred/kindred_splat = iskindred(target)
if(istype(kindred_splat))
kindred_splat.enlightenment = TRUE
return TRUE
return FALSE
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,15 @@
var/vitae_spending_rate
/// Which vampiric bloodline or Clan they fall into. Determines natural Disciplines. Singleton reference, never modify
var/datum/subsplat/vampire_clan/clan
/// Which morality they follow, Humanity if false and Enlightenment if true
var/enlightenment
/// The Kindred who created this Kindred, null unless Embraced in-round
var/mob/living/sire

/// Timer tracking how long before the Kindred can wake up from torpor
COOLDOWN_DECLARE(torpor_timer)

/datum/splat/vampire/kindred/New(generation, clan, enlightenment = FALSE, mob/living/sire)
/datum/splat/vampire/kindred/New(generation, clan, mob/living/sire)
src.generation = generation
src.clan = clan
src.enlightenment = enlightenment
src.sire = sire

/datum/splat/vampire/kindred/on_gain()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/**
* Makes the mob a Kindred with the given Generation, Clan, morality, and sire.
*/
/mob/living/proc/make_kindred(generation = DEFAULT_GENERATION, datum/subsplat/vampire_clan/clan, enlightenment, mob/living/sire)
/mob/living/proc/make_kindred(generation = DEFAULT_GENERATION, datum/subsplat/vampire_clan/clan, mob/living/sire)
RETURN_TYPE(/datum/splat/vampire/kindred)

return add_splat(/datum/splat/vampire/kindred, generation, clan, enlightenment, sire)
return add_splat(/datum/splat/vampire/kindred, generation, clan, sire)

/**
* Makes the mob a Kindred as if Embraced by another Kindred.
Expand All @@ -26,7 +26,7 @@
if (!always_same_clan && prob(5))
childe_clan = GLOB.vampire_clans[/datum/subsplat/vampire_clan/caitiff]

return make_kindred(sire_splat.generation + 1, childe_clan, FALSE, sire)
return make_kindred(sire_splat.generation + 1, childe_clan, sire)

/mob/living/carbon/human/splat/kindred
auto_splats = list(/datum/splat/vampire/kindred)
1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\area_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\_dwelling_gvars_defines.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\quirks\code\quirks.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\bloodpack_adulteration.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\old\gifts.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\gifts\tribes\tribes.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\weather\code\weather.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\computer.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app_types.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -7568,7 +7568,6 @@
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_attribute.dm"
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_freebie.dm"
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_morality.dm"
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_path.dm"
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_pooled.dm"
#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_virtue.dm"
#include "modular_darkpack\modules\strings\global_strings.dm"
Expand Down
Loading