cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13398 from timothyteakettle/wound-config

Browse Source 
wound config values, wound bonus for how damaged a limb is
This commit is contained in:
silicons
2020-10-01 03:02:35 -07:00
committed by GitHub
parent 71a07e68be 3db878484d
commit b7650f3dea
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/wounds.dm
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

12
code/controllers/configuration/entries/game_options.dm
View File

@@ -535,3 +535,15 @@
/datum/config_entry/number/max_shuttle_size /datum/config_entry/number/max_shuttle_size
config_entry_value = 500 config_entry_value = 500
//wound config stuff (increases the max injury roll, making injuries more likely)
/datum/config_entry/number/wound_exponent
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
integer = FALSE

2
code/modules/surgery/bodyparts/_bodyparts.dm
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 ** WOUND_DAMAGE_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]

7
config/wounds.txt Normal file
View File

@@ -0,0 +1,7 @@
## WOUNDS ##
## wound damage exponent
WOUND_EXPONENT 1.2
## wound damage multiplier (injury rolls get limb damage multiplied by this, added)
WOUND_DAMAGE_MULTIPLIER 0.333