This commit is contained in:
timothyteakettle
2020-09-15 23:50:26 +01:00
parent 7be15afb32
commit c3bea5f77b
3 changed files with 9 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
#define WOUND_DAMAGE_EXPONENT 1.225 #define WOUND_DAMAGE_EXPONENT 1.2
/// an attack must do this much damage after armor in order to roll for being a wound (incremental pressure damage need not apply) /// an attack must do this much damage after armor in order to roll for being a wound (incremental pressure damage need not apply)
#define WOUND_MINIMUM_DAMAGE 5 #define WOUND_MINIMUM_DAMAGE 5

View File

@@ -538,6 +538,12 @@
//wound config stuff (increases the max injury roll, making injuries more likely) //wound config stuff (increases the max injury roll, making injuries more likely)
/datum/config_entry/number/wound_exponent /datum/config_entry/number/wound_exponent
config_entry_value = 1.225 config_entry_value = WOUND_DAMAGE_EXPONENT
min_val = 0
integer = FALSE
//adds a set amount to any injury rolls on a limb using get_damage() multiplied by this number
/datum/config_entry/number/wound_damage_multiplier
config_entry_value = 0.333
min_val = 0 min_val = 0
integer = FALSE integer = FALSE

View File

@@ -355,7 +355,7 @@
else else
damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE) damage = min(damage, WOUND_MAX_CONSIDERED_DAMAGE)
var/base_roll = rand(max(damage/1.5,25), round(damage ** CONFIG_GET(number/wound_exponent))) var/base_roll = rand(max(damage/1.5,25), round(damage ** CONFIG_GET(number/wound_exponent))) + (get_damage()*CONFIG_GET(number/wound_damage_multiplier))
var/injury_roll = base_roll var/injury_roll = base_roll
injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus) injury_roll += check_woundings_mods(woundtype, damage, wound_bonus, bare_wound_bonus)
var/list/wounds_checking = GLOB.global_wound_types[woundtype] var/list/wounds_checking = GLOB.global_wound_types[woundtype]