mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-30 08:38:13 +01:00
between() -> clamp() & swaps args 1 and 2 in uses
This commit is contained in:
@@ -518,7 +518,7 @@
|
||||
var/damage_calc = LERP(brain.max_damage, H.getBrainLoss(), brain_death_scale)
|
||||
|
||||
// A bit of sanity.
|
||||
var/brain_damage = between(H.getBrainLoss(), damage_calc, brain.max_damage)
|
||||
var/brain_damage = clamp(damage_calc, H.getBrainLoss(), brain.max_damage)
|
||||
|
||||
H.setBrainLoss(brain_damage)
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ var/global/list/active_radio_jammers = list()
|
||||
|
||||
var/overlay_percent = 0
|
||||
if(power_source)
|
||||
overlay_percent = between(0, round( power_source.percent() , 25), 100)
|
||||
overlay_percent = clamp(round(power_source.percent(), 25), 0, 100)
|
||||
else
|
||||
overlay_percent = 0
|
||||
|
||||
@@ -115,4 +115,3 @@ var/global/list/active_radio_jammers = list()
|
||||
cut_overlays()
|
||||
add_overlay("jammer_overlay_[overlay_percent]")
|
||||
last_overlay_percent = overlay_percent
|
||||
|
||||
|
||||
@@ -182,7 +182,7 @@ Protectiveness | Armor %
|
||||
|
||||
// Makes sure the numbers stay capped.
|
||||
for(var/number in list(melee_armor, bullet_armor, laser_armor, energy_armor, bomb_armor))
|
||||
number = between(0, number, 100)
|
||||
number = clamp(number, 0, 100)
|
||||
|
||||
armor["melee"] = melee_armor
|
||||
armor["bullet"] = bullet_armor
|
||||
@@ -191,9 +191,9 @@ Protectiveness | Armor %
|
||||
armor["bomb"] = bomb_armor
|
||||
|
||||
if(!isnull(material.conductivity))
|
||||
siemens_coefficient = between(0, material.conductivity / 10, 10)
|
||||
siemens_coefficient = clamp(material.conductivity / 10, 0, 10)
|
||||
|
||||
var/slowdownModified = between(0, round(material.weight / 10, 0.1), 6)
|
||||
var/slowdownModified = clamp(round(material.weight / 10, 0.1), 0, 6)
|
||||
|
||||
var/slowdownUncapped = (material_slowdown_multiplier * slowdownModified) - material_slowdown_modifier
|
||||
|
||||
|
||||
@@ -311,7 +311,7 @@
|
||||
if(!istype(user))
|
||||
return 1
|
||||
var/safety = user.eyecheck()
|
||||
safety = between(-1, safety + eye_safety_modifier, 2)
|
||||
safety = clamp(safety + eye_safety_modifier, -1, 2)
|
||||
if(istype(user, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = user
|
||||
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
|
||||
|
||||
Reference in New Issue
Block a user