From cf6c78985f6b07174300038c7b5e0d170bdbf68e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 28 Jul 2020 11:32:23 -0700 Subject: [PATCH 01/39] icons --- modular_citadel/icons/ui/screen_gen.dmi | Bin 5328 -> 5544 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_citadel/icons/ui/screen_gen.dmi b/modular_citadel/icons/ui/screen_gen.dmi index d006185a3c78ab430d1e3a40d2f904e13de9f07d..4b9f51591c2eac59d19aa78ef8941311be4a1b2a 100644 GIT binary patch literal 5544 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 NT%GnhKClnC^dI6Ti3tDz literal 5328 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 From 1fa691d5690a2466640c7ec5a2a3a5062c969c4c Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 28 Jul 2020 13:24:17 -0700 Subject: [PATCH 02/39] ok --- modular_citadel/icons/ui/screen_gen.dmi | Bin 5544 -> 6120 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_citadel/icons/ui/screen_gen.dmi b/modular_citadel/icons/ui/screen_gen.dmi index 4b9f51591c2eac59d19aa78ef8941311be4a1b2a..270f7c9ad90aef4de09aef9b7ec3ae5cb78aba6f 100644 GIT binary patch literal 6120 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 f(3w;*i82gLYZ%+k{JBf# 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 NT%GnhKClnC^dI6Ti3tDz From 42db990836984ef41b21bb9b8972d6679da7b2b2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:37:37 -0700 Subject: [PATCH 03/39] why am i doing this --- code/__DEFINES/combat.dm | 19 +++--------- code/__DEFINES/combat/stamina_combat.dm | 12 ++++++++ code/datums/martial/sleeping_carp.dm | 2 +- .../datums/weather/weather_types/ash_storm.dm | 4 +-- code/game/objects/items/electrostaff.dm | 7 ++--- code/game/objects/items/powerfist.dm | 7 ++--- code/game/objects/items/shields.dm | 6 ++-- code/modules/mob/living/carbon/carbon.dm | 29 ++++++++++++++----- .../mob/living/carbon/human/species.dm | 22 +++++++++----- code/modules/mob/living/living.dm | 2 +- .../modules/mob/living/living_active_block.dm | 6 ++-- code/modules/mob/living/living_defines.dm | 18 ++++++++++-- .../modules/mob/living/silicon/robot/robot.dm | 4 --- .../mob/living/silicon/stamina_buffer.dm | 2 ++ code/modules/mob/living/stamina_buffer.dm | 26 +++++++++++++++++ code/modules/projectiles/gun.dm | 4 +-- .../projectiles/guns/ballistic/shotgun.dm | 5 ++-- .../modules/mob/living/carbon/damage_procs.dm | 13 --------- .../code/modules/mob/living/damage_procs.dm | 2 -- .../code/modules/mob/living/living.dm | 25 ---------------- tgstation.dme | 6 +++- 21 files changed, 119 insertions(+), 102 deletions(-) create mode 100644 code/__DEFINES/combat/stamina_combat.dm create mode 100644 code/modules/mob/living/silicon/stamina_buffer.dm create mode 100644 code/modules/mob/living/stamina_buffer.dm delete mode 100644 modular_citadel/code/modules/mob/living/damage_procs.dm diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 1bf9b01403..b73f95f975 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -47,8 +47,8 @@ #define COMBAT_FLAG_RESISTING_REST (1<<4) /// Intentionally resting #define COMBAT_FLAG_INTENTIONALLY_RESTING (1<<5) -/// Currently stamcritted but not as violently -#define COMBAT_FLAG_SOFT_STAMCRIT (1<<6) +/// This mob requires stamina buffer to do things that require stamina buffer. Not having this exempts the mob from stamina combat. +#define COMBAT_FLAG_STAMINA_BUFFER (1<<6) /// Force sprint mode on at all times, overrides everything including sprint disable traits. #define COMBAT_FLAG_SPRINT_FORCED (1<<7) /// This mob is capable of using the active parrying system. @@ -64,26 +64,15 @@ // Helpers for getting someone's stamcrit state. Cast to living. #define NOT_STAMCRIT 0 -#define SOFT_STAMCRIT 1 -#define HARD_STAMCRIT 2 +#define HARD_STAMCRIT 1 // Stamcrit check helpers #define IS_STAMCRIT(mob) (CHECK_STAMCRIT(mob) != NOT_STAMCRIT) -#define CHECK_STAMCRIT(mob) ((mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)? HARD_STAMCRIT : ((mob.combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)? SOFT_STAMCRIT : NOT_STAMCRIT)) +#define CHECK_STAMCRIT(mob) (mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) //stamina stuff -///Threshold over which attacks start being hindered. -#define STAMINA_NEAR_SOFTCRIT 90 -///softcrit for stamina damage. prevents standing up, some actions that cost stamina, etc, but doesn't force a rest or stop movement -#define STAMINA_SOFTCRIT 100 -///sanity cap to prevent stamina actions (that are still performable) from sending you into crit. -#define STAMINA_NEAR_CRIT 130 ///crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit #define STAMINA_CRIT 140 -///same as STAMINA_SOFTCRIT except for the more traditional health calculations -#define STAMINA_SOFTCRIT_TRADITIONAL 0 -///ditto, but for STAMINA_CRIT -#define STAMINA_CRIT_TRADITIONAL -40 #define CRAWLUNDER_DELAY 30 //Delay for crawling under a standing mob diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm new file mode 100644 index 0000000000..7d1e9d75c0 --- /dev/null +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -0,0 +1,12 @@ +/// Stamina buffer amount +#define STAMINA_BUFFER_CAPACITY 50 + + + + + + + + + + diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 7d884344f1..81b7ea0628 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -130,7 +130,7 @@ playsound(get_turf(A), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) P.firer = A P.setAngle(rand(0, 360))//SHING - A.adjustStaminaLossBuffered (3) //Citadel change to stop infinite bullet sponging as you run away, but it is buffered! + A.adjustStaminaLoss(3) return BULLET_ACT_FORCE_PIERCE return BULLET_ACT_HIT diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 43190ef50c..3d98a82914 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -95,8 +95,8 @@ if(is_ash_immune(L)) return if(is_species(L, /datum/species/lizard/ashwalker)) - if(!IS_STAMCRIT(L)) - L.adjustStaminaLossBuffered(4) + if(L.getStaminaLoss() < (STAMINA_CRIT - 40)) + L.adjustStaminaLos(4) return L.adjustFireLoss(4) diff --git a/code/game/objects/items/electrostaff.dm b/code/game/objects/items/electrostaff.dm index 9750994c87..bc2c965b12 100644 --- a/code/game/objects/items/electrostaff.dm +++ b/code/game/objects/items/electrostaff.dm @@ -21,12 +21,11 @@ var/can_block_projectiles = FALSE //can't block guns var/lethal_cost = 400 //10000/400*20 = 500. decent enough? var/lethal_damage = 20 - var/lethal_stam_cost = 4 var/stun_cost = 333 //10000/333*25 = 750. stunbatons are at time of writing 10000/1000*49 = 490. var/stun_status_effect = STATUS_EFFECT_ELECTROSTAFF //a small slowdown effect var/stun_stamdmg = 40 var/stun_status_duration = 25 - var/stun_stam_cost = 3.5 + var/stam_cost = 3.5 var/wielded = FALSE // track wielded status on item // haha security desword time /s @@ -171,7 +170,7 @@ turn_off() /obj/item/electrostaff/attack(mob/living/target, mob/living/user) - if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit + if(IS_STAMCRIT(user) || !UseStaminaBuffer(stam_cost))//CIT CHANGE - makes it impossible to baton in stamina softcrit to_chat(user, "You're too exhausted to use [src] properly.")//CIT CHANGE - ditto return //CIT CHANGE - ditto if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) @@ -186,13 +185,11 @@ if(user.a_intent != INTENT_HARM) if(stun_act(target, user, null, return_list)) user.do_attack_animation(target) - user.adjustStaminaLossBuffered(stun_stam_cost) return else if(!harm_act(target, user, null, return_list)) return ..() //if you can't fry them just beat them with it else //we did harm act them user.do_attack_animation(target) - user.adjustStaminaLossBuffered(lethal_stam_cost) /obj/item/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE, list/block_return = list()) var/stunforce = block_calculate_resultant_damage(stun_stamdmg, block_return) diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 2834b3b758..349236fc2a 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -76,6 +76,9 @@ if(!tank) to_chat(user, "\The [src] can't operate without a source of gas!") return FALSE + var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) + if(!UseStaminaBuffer(weight, warn = TRUE)) + return FALSE var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting) var/turf/T = get_turf(src) if(!T) @@ -108,8 +111,4 @@ target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2)) log_combat(user, target, "power fisted", src) - - var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) - if(weight) - user.adjustStaminaLossBuffered(weight) return TRUE diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 992c173d3b..20dd4771a4 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -136,15 +136,17 @@ if(!(shield_flags & SHIELD_BASH_GROUND_SLAM)) to_chat(user, "You can't ground slam with [src]!") return FALSE + if(!user.UseStaminaBuffer(shieldbash_stamcost, warn = TRUE)) + return FALSE bash_target(user, target, NONE, harmful) user.do_attack_animation(target, used_item = src) playsound(src, harmful? "swing_hit" : 'sound/weapons/thudswoosh.ogg', 75, 1) last_shieldbash = world.time - user.adjustStaminaLossBuffered(shieldbash_stamcost) return TRUE // Directional sweep! last_shieldbash = world.time - user.adjustStaminaLossBuffered(shieldbash_stamcost) + if(!user.UseStaminaBuffer(shieldbash_stamcost, warn = TRUE)) + return FLASE // Since we are in combat mode, we can probably safely use the user's dir instead of getting their mouse pointing cardinal dir. var/bashdir = user.dir do_shieldbash_effect(user, bashdir, harmful) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 1e31655278..9d02e7f2f7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -602,14 +602,27 @@ remove_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit) /mob/living/carbon/update_stamina() - var/stam = getStaminaLoss() - if(stam > DAMAGE_PRECISION) - var/total_health = (maxHealth - stam) - if(total_health <= crit_threshold && !stat) - if(CHECK_MOBILITY(src, MOBILITY_STAND)) - to_chat(src, "You're too exhausted to keep going...") - KnockToFloor(TRUE) - update_health_hud() + var/total_health = getStaminaLoss() + if(total_health >= STAMINA_SOFTCRIT) + if(!(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)) + ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) + else + if(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT) + DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) + if(total_health) + if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health >= STAMINA_CRIT && !stat) + to_chat(src, "You're too exhausted to keep going...") + set_resting(TRUE, FALSE, FALSE) + SEND_SIGNAL(src, COMSIG_DISABLE_COMBAT_MODE) + ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) + filters += CIT_FILTER_STAMINACRIT + update_mobility() + if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_SOFTCRIT) + to_chat(src, "You don't feel nearly as exhausted anymore.") + DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT | COMBAT_FLAG_SOFT_STAMCRIT) + filters -= CIT_FILTER_STAMINACRIT + update_mobility() + update_health_hud() /mob/living/carbon/update_sight() if(!client) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 430227a39c..3984688303 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1462,9 +1462,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(!(attackchain_flags & ATTACK_IS_PARRY_COUNTERATTACK)) if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes punching cause staminaloss but funny martial artist types get a discount - user.adjustStaminaLossBuffered(1.5) - else - user.adjustStaminaLossBuffered(3.5) + if(!user.UseStaminaBuffer(1.5, warn = TRUE)) + return + else if(!user.UseStaminaBuffer(3.5, warn = TRUE)) + return if(attacker_style && attacker_style.harm_act(user,target)) return TRUE @@ -1592,6 +1593,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) return FALSE else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth)) + if(!UseStaminaBuffer(3, warn = TRUE)) + return playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) target.visible_message(\ @@ -1599,7 +1602,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) "[user] slaps you in the face! ",\ "You hear a slap.", target = user, target_message = "You slap [user == target ? "yourself" : "\the [target]"] in the face! ") user.do_attack_animation(target, ATTACK_EFFECT_FACE_SLAP) - user.adjustStaminaLossBuffered(3) if (!HAS_TRAIT(target, TRAIT_PERMABONER)) stop_wagging_tail(target) return FALSE @@ -1607,8 +1609,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(target.client?.prefs.cit_toggles & NO_ASS_SLAP) to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!") return FALSE + if(!user.UseStaminaBuffer(3, warn = TRUE)) + return FALSE user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP) - user.adjustStaminaLossBuffered(3) target.adjust_arousal(20,maso = TRUE) if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10)) target.mob_climax(forced_climax=TRUE) @@ -1626,9 +1629,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) user.do_attack_animation(target, ATTACK_EFFECT_DISARM) if(HAS_TRAIT(user, TRAIT_PUGILIST))//CITADEL CHANGE - makes disarmspam cause staminaloss, pugilists can do it almost effortlessly - user.adjustStaminaLossBuffered(1) + if(!user.UseStaminaBuffer(1, warn = TRUE)) + return else - user.adjustStaminaLossBuffered(3) + if(!user.UseStaminaBuffer(1, warn = TRUE)) + return if(attacker_style && attacker_style.disarm_act(user,target)) return TRUE @@ -1890,8 +1895,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) else if(user == target) return + if(!user.UseStaminaBuffer(4, warn = TRUE)) + return user.do_attack_animation(target, ATTACK_EFFECT_DISARM) - user.adjustStaminaLossBuffered(4) playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if(target.w_uniform) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b04f78f3ec..4c9416fe46 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1241,7 +1241,7 @@ SetUnconscious(clamp_unconscious_to) HealAllImmobilityUpTo(clamp_immobility_to) adjustStaminaLoss(min(0, -stamina_boost)) - adjustStaminaLossBuffered(min(0, -stamina_buffer_boost)) + RechargeStaminaBuffer(stamina_buffer_boost) if(scale_stamina_loss_recovery) adjustStaminaLoss(min(-((getStaminaLoss() - stamina_loss_recovery_bypass) * scale_stamina_loss_recovery), 0)) if(put_on_feet) diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm index 729e7d3d7a..25541c4a44 100644 --- a/code/modules/mob/living/living_active_block.dm +++ b/code/modules/mob/living/living_active_block.dm @@ -186,7 +186,7 @@ var/held_index = C.get_held_index_of_item(src) var/obj/item/bodypart/BP = C.hand_bodyparts[held_index] if(!BP?.body_zone) - return C.adjustStaminaLossBuffered(stamina_amount) //nah + return C.adjustStaminaLoss(stamina_amount) //nah var/zone = BP.body_zone var/stamina_to_zone = data.block_stamina_limb_ratio * stamina_amount var/stamina_to_chest = stamina_amount - stamina_to_zone @@ -194,9 +194,9 @@ stamina_to_chest -= stamina_buffered C.apply_damage(stamina_to_zone, STAMINA, zone) C.apply_damage(stamina_to_chest, STAMINA, BODY_ZONE_CHEST) - C.adjustStaminaLossBuffered(stamina_buffered) + C.adjustStaminaLoss(stamina_buffered) else - owner.adjustStaminaLossBuffered(stamina_amount) + owner.adjustStaminaLoss(stamina_amount) /obj/item/proc/on_active_block(mob/living/owner, atom/object, damage, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction) return diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 5495d37297..f6008cd7d6 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -53,6 +53,7 @@ var/hallucination = 0 //Directly affects how long a mob will hallucinate for + var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out. var/timeofdeath = 0 //Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects. @@ -148,9 +149,6 @@ var/combatmessagecooldown = 0 var/incomingstammult = 1 - var/bufferedstam = 0 - var/stambuffer = 20 - var/stambufferregentime //Sprint buffer--- var/sprint_buffer = 42 //Tiles @@ -159,3 +157,17 @@ var/sprint_buffer_regen_last = 0 //last world.time this was regen'd for math. var/sprint_stamina_cost = 0.70 //stamina loss per tile while insufficient sprint buffer. //---End + + // Stamina Buffer--- + /// Our maximum stamina buffer + var/stamina_buffer_max = STAMINA_BUFFER_CAPACITY + /// Our stamina buffer + var/stamina_buffer = STAMINA_BUFFER_CAPACITY + /// Stamina buffer regen modifier + var/stamina_buffer_regen_mod = 1 + /// Standard stamina buffer regen per second + var/stamina_buffer_regen = STAMINA_BUFFER_REGEN_PER_SECOND + /// Standard stamina buffer regen per second with combat mode + var/stamina_buffer_regen_combat = STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT + /// Last time stamina buffer regen was done + var/stamina_buffer_regen_last = 0 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4fcd6d1dbd..0565e0300c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1114,10 +1114,6 @@ bellyup = 1 update_icons() -/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_health = 1) - if(istype(cell)) - cell.charge -= amount*5 - /mob/living/silicon/robot/verb/viewmanifest() set category = "Robot Commands" set name = "View Crew Manifest" diff --git a/code/modules/mob/living/silicon/stamina_buffer.dm b/code/modules/mob/living/silicon/stamina_buffer.dm new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/code/modules/mob/living/silicon/stamina_buffer.dm @@ -0,0 +1,2 @@ + + diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm new file mode 100644 index 0000000000..7412c35dad --- /dev/null +++ b/code/modules/mob/living/stamina_buffer.dm @@ -0,0 +1,26 @@ +/** + * Attempts to use an amount of stamina from our stamina buffer. + * Does not use anything if we don't have enough. + * + * Returns TRUE or FALSE based on if we have it. + */ +/mob/living/proc/UseStaminaBuffer(amount, warn = FALSE) + if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER)) + return TRUE + if(stamina_buffer < amount) + if(warn) + to_chat(src, "You do not have enough action stamina to do that!") + return + return FALSE + stamina_buffer -= amount + return TRUE + +/** + * Updates our stamina buffer amount. + */ +/mob/living/proc/UpdateStaminaBuffer(updating_hud = TRUE) + var/time = world.time - stamina_buffer_regen_last + if(time <= 0) + return + stamina_buffer_regen_last = time + var/penalized diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4126c81367..a05f88eca1 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -153,8 +153,8 @@ shake_camera(user, recoil + 1, recoil) if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss - var/safe_cost = clamp(stam_cost, 0, STAMINA_NEAR_CRIT - user.getStaminaLoss())*(firing && burst_size >= 2 ? 1/burst_size : 1) - user.adjustStaminaLossBuffered(safe_cost) //CIT CHANGE - ditto + var/safe_cost = clamp(stam_cost, 0, user.stamina_buffer)*(firing && burst_size >= 2 ? 1/burst_size : 1) + user.UseStaminaBuffer(safe_cost) if(suppressed) playsound(user, fire_sound, 10, 1) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 873b129c8f..4d9a79bf92 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -44,10 +44,9 @@ if(HAS_TRAIT(user, TRAIT_FAST_PUMP)) recentpump = world.time + 2 else + if(!user.UseStaminaBuffer(2, warn = TRUE)) + return recentpump = world.time + 10 - if(istype(user))//CIT CHANGE - makes pumping shotguns cost a lil bit of stamina. - user.adjustStaminaLossBuffered(2) //CIT CHANGE - DITTO. make this scale inversely to the strength stat when stats/skills are added - return /obj/item/gun/ballistic/shotgun/blow_up(mob/user) . = 0 diff --git a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm index 17c3f17ad8..0457b853b7 100644 --- a/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm +++ b/modular_citadel/code/modules/mob/living/carbon/damage_procs.dm @@ -1,16 +1,3 @@ -/mob/living/carbon/adjustStaminaLossBuffered(amount, updating_health = 1) - if(status_flags & GODMODE) - return 0 - if(CONFIG_GET(flag/disable_stambuffer)) - return - var/directstamloss = (bufferedstam + amount) - stambuffer - if(directstamloss > 0) - adjustStaminaLoss(directstamloss) - bufferedstam = clamp(bufferedstam + amount, 0, stambuffer) - stambufferregentime = world.time + 10 - if(updating_health) - update_health_hud() - /mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST) if(!forced && (status_flags & GODMODE)) return FALSE diff --git a/modular_citadel/code/modules/mob/living/damage_procs.dm b/modular_citadel/code/modules/mob/living/damage_procs.dm deleted file mode 100644 index a399c17c71..0000000000 --- a/modular_citadel/code/modules/mob/living/damage_procs.dm +++ /dev/null @@ -1,2 +0,0 @@ -/mob/living/proc/adjustStaminaLossBuffered(amount, updating_health = TRUE, forced = FALSE) - return diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm index 01867e9dcc..b5be028607 100644 --- a/modular_citadel/code/modules/mob/living/living.dm +++ b/modular_citadel/code/modules/mob/living/living.dm @@ -1,5 +1,3 @@ -/mob/living - /atom var/pseudo_z_axis @@ -24,26 +22,3 @@ if(.) pseudo_z_axis = newloc.get_fake_z() pixel_z = pseudo_z_axis - -/mob/living/carbon/update_stamina() - var/total_health = getStaminaLoss() - if(total_health >= STAMINA_SOFTCRIT) - if(!(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)) - ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) - else - if(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT) - DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) - if(total_health) - if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health >= STAMINA_CRIT && !stat) - to_chat(src, "You're too exhausted to keep going...") - set_resting(TRUE, FALSE, FALSE) - SEND_SIGNAL(src, COMSIG_DISABLE_COMBAT_MODE) - ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) - filters += CIT_FILTER_STAMINACRIT - update_mobility() - if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_SOFTCRIT) - to_chat(src, "You don't feel nearly as exhausted anymore.") - DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT | COMBAT_FLAG_SOFT_STAMCRIT) - filters -= CIT_FILTER_STAMINACRIT - update_mobility() - update_health_hud() diff --git a/tgstation.dme b/tgstation.dme index b33277b4c0..7ea90680c7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -128,9 +128,11 @@ #include "code\__DEFINES\_flags\shields.dm" #include "code\__DEFINES\admin\keybindings.dm" #include "code\__DEFINES\chemistry\reactions.dm" +#include "code\__DEFINES\combat\aim_instability.dm" #include "code\__DEFINES\combat\attack_types.dm" #include "code\__DEFINES\combat\block.dm" #include "code\__DEFINES\combat\block_parry.dm" +#include "code\__DEFINES\combat\stamina_combat.dm" #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" @@ -2382,6 +2384,7 @@ #include "code\modules\mob\dead\observer\observer_movement.dm" #include "code\modules\mob\dead\observer\orbit.dm" #include "code\modules\mob\dead\observer\say.dm" +#include "code\modules\mob\living\aim_instability.dm" #include "code\modules\mob\living\blood.dm" #include "code\modules\mob\living\bloodcrawl.dm" #include "code\modules\mob\living\clickdelay.dm" @@ -2402,6 +2405,7 @@ #include "code\modules\mob\living\login.dm" #include "code\modules\mob\living\logout.dm" #include "code\modules\mob\living\say.dm" +#include "code\modules\mob\living\stamina_buffer.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\taste.dm" #include "code\modules\mob\living\update_icons.dm" @@ -2527,6 +2531,7 @@ #include "code\modules\mob\living\silicon\silicon.dm" #include "code\modules\mob\living\silicon\silicon_defense.dm" #include "code\modules\mob\living\silicon\silicon_movement.dm" +#include "code\modules\mob\living\silicon\stamina_buffer.dm" #include "code\modules\mob\living\silicon\ai\ai.dm" #include "code\modules\mob\living\silicon\ai\ai_defense.dm" #include "code\modules\mob\living\silicon\ai\death.dm" @@ -3491,7 +3496,6 @@ #include "modular_citadel\code\modules\mentor\mentorpm.dm" #include "modular_citadel\code\modules\mentor\mentorsay.dm" #include "modular_citadel\code\modules\mob\cit_emotes.dm" -#include "modular_citadel\code\modules\mob\living\damage_procs.dm" #include "modular_citadel\code\modules\mob\living\living.dm" #include "modular_citadel\code\modules\mob\living\carbon\carbon.dm" #include "modular_citadel\code\modules\mob\living\carbon\damage_procs.dm" From 0a36f9fbb57c12a4c861f80f1bea2377f9c6dae7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 4 Aug 2020 22:40:28 -0700 Subject: [PATCH 04/39] changes --- code/__DEFINES/_flags/item_flags.dm | 6 +-- code/__DEFINES/combat.dm | 30 ------------- code/__DEFINES/combat/stamina_combat.dm | 37 +++++++++++++++ code/__DEFINES/skills/defines.dm | 1 - code/_onclick/item_attack.dm | 45 +++++++------------ code/game/objects/items.dm | 4 +- code/game/objects/items/powerfist.dm | 2 +- code/game/objects/items/tools/screwdriver.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../mob/living/carbon/human/species.dm | 5 ++- code/modules/mob/living/carbon/life.dm | 6 --- code/modules/projectiles/gun.dm | 4 ++ tgstation.dme | 2 - 13 files changed, 66 insertions(+), 80 deletions(-) diff --git a/code/__DEFINES/_flags/item_flags.dm b/code/__DEFINES/_flags/item_flags.dm index 26e764c45b..7da71e22cb 100644 --- a/code/__DEFINES/_flags/item_flags.dm +++ b/code/__DEFINES/_flags/item_flags.dm @@ -22,12 +22,10 @@ #define SURGICAL_TOOL (1<<10) ///Can be worn on certain slots (currently belt and id) that would otherwise require an uniform. #define NO_UNIFORM_REQUIRED (1<<11) -///Damage when attacking people is not affected by combat mode. -#define NO_COMBAT_MODE_FORCE_MODIFIER (1<<12) /// This item can be used to parry. Only a basic check used to determine if we should proceed with parry chain at all. -#define ITEM_CAN_PARRY (1<<13) +#define ITEM_CAN_PARRY (1<<12) /// This item can be used in the directional blocking system. Only a basic check used to determine if we should proceed with directional block handling at all. -#define ITEM_CAN_BLOCK (1<<14) +#define ITEM_CAN_BLOCK (1<<13) // Flags for the clothing_flags var on /obj/item/clothing diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index b73f95f975..0679c7a3fc 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -243,36 +243,6 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( //We will round to this value in damage calculations. #define DAMAGE_PRECISION 0.01 -//items total mass, used to calculate their attacks' stamina costs. If not defined, the cost will be (w_class * 1.25) -#define TOTAL_MASS_TINY_ITEM 1.25 -#define TOTAL_MASS_SMALL_ITEM 2.5 -#define TOTAL_MASS_NORMAL_ITEM 3.75 -#define TOTAL_MASS_BULKY_ITEM 5 -#define TOTAL_MASS_HUGE_ITEM 6.25 -#define TOTAL_MASS_GIGANTIC_ITEM 7.5 - -#define TOTAL_MASS_HAND_REPLACEMENT 5 //standard punching stamina cost. most hand replacements are huge items anyway. -#define TOTAL_MASS_MEDIEVAL_WEAPON 3.6 //very, very generic average sword/warpick/etc. weight in pounds. -#define TOTAL_MASS_TOY_SWORD 1.5 - -//stamina cost defines. -#define STAM_COST_ATTACK_OBJ_MULT 1.2 -#define STAM_COST_ATTACK_MOB_MULT 1 -#define STAM_COST_BATON_MOB_MULT 1 -#define STAM_COST_NO_COMBAT_MULT 1.25 -#define STAM_COST_W_CLASS_MULT 1.25 -#define STAM_COST_THROW_MULT 2 -#define STAM_COST_THROW_MOB 2.5 //multiplied by (mob size + 1)^2. - -///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted. -#define STAM_CRIT_ITEM_ATTACK_PENALTY 0.66 -/// changeNext_move penalty multiplier of the above. -#define STAM_CRIT_ITEM_ATTACK_DELAY 1.75 -/// Damage penalty when fighting prone. -#define LYING_DAMAGE_PENALTY 0.7 -/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise. -#define STAM_CRIT_GUN_DELAY 2.75 - //stamina recovery defines. Blocked if combat mode is on. #define STAM_RECOVERY_STAM_CRIT -7.5 #define STAM_RECOVERY_RESTING -6 diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index 7d1e9d75c0..09dbc7253b 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -8,5 +8,42 @@ +// Standard amounts for stamina usage +// Multipliers +/// Base stamina cost for an item of a certain w_class without total_mass set. +#define STAM_COST_W_CLASS_MULT 1.25 +// Flat amounts +/// Usage for eyestabbing with a screwdriver +#define STAMINA_COST_ITEM_EYESTAB 7.5 +/// Usage for shoving yourself off the ground instantly +#define STAMINA_COST_SHOVE_UP 10 + +//items total mass, used to calculate their attacks' stamina costs. If not defined, the cost will be (w_class * 1.25) +#define TOTAL_MASS_TINY_ITEM 1.25 +#define TOTAL_MASS_SMALL_ITEM 2.5 +#define TOTAL_MASS_NORMAL_ITEM 3.75 +#define TOTAL_MASS_BULKY_ITEM 5 +#define TOTAL_MASS_HUGE_ITEM 6.25 +#define TOTAL_MASS_GIGANTIC_ITEM 7.5 + +#define TOTAL_MASS_HAND_REPLACEMENT 5 //standard punching stamina cost. most hand replacements are huge items anyway. +#define TOTAL_MASS_MEDIEVAL_WEAPON 3.6 //very, very generic average sword/warpick/etc. weight in pounds. +#define TOTAL_MASS_TOY_SWORD 1.5 + +//stamina cost defines. +#define STAM_COST_ATTACK_OBJ_MULT 1.2 +#define STAM_COST_ATTACK_MOB_MULT 1 +#define STAM_COST_BATON_MOB_MULT 1 +#define STAM_COST_THROW_MULT 2 +#define STAM_COST_THROW_MOB 2.5 //multiplied by (mob size + 1)^2. + +///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted. +#define STAM_CRIT_ITEM_ATTACK_PENALTY 0.66 +/// changeNext_move penalty multiplier of the above. +#define STAM_CRIT_ITEM_ATTACK_DELAY 1.75 +/// Damage penalty when fighting prone. +#define LYING_DAMAGE_PENALTY 0.7 +/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise. +#define STAM_CRIT_GUN_DELAY 2.75 diff --git a/code/__DEFINES/skills/defines.dm b/code/__DEFINES/skills/defines.dm index 47aaeeb1dc..a0b34895df 100644 --- a/code/__DEFINES/skills/defines.dm +++ b/code/__DEFINES/skills/defines.dm @@ -40,7 +40,6 @@ #define SKILL_TRAIN_ATTACK_OBJ "train_attack_obj" #define SKILL_STAMINA_COST "stamina_cost" //Influences the stamina cost from weapon usage. #define SKILL_THROW_STAM_COST "throw_stam_cost" -#define SKILL_COMBAT_MODE "combat_mode" //The user must have combat mode on. #define SKILL_SANITY "sanity" //Is the skill affected by (in)sanity. #define SKILL_INTELLIGENCE "intelligence" //Is the skill affected by brain damage? diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 6a26a6f116..307b476e2b 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -85,6 +85,9 @@ if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "You don't want to harm other living beings!") return + + if(!UseStaminaBufferStandard(user, STAM_COST_ATTACK_MOB_MULT, null, TRUE)) + return DISCARD_LAST_ACTION if(!force) playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) @@ -100,10 +103,6 @@ log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])") add_fingerprint(user) - var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) //CIT CHANGE - makes attacking things cause stamina loss - if(weight) - user.adjustStaminaLossBuffered(weight) - // CIT SCREENSHAKE if(force >= 15) shake_camera(user, ((force - 10) * 0.01 + 1), ((force - 10) * 0.01)) @@ -120,28 +119,23 @@ if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_NO_ATTACK_OBJ) return if(item_flags & NOBLUDGEON) - return + return DISCARD_LAST_ACTION + if(!UseStaminaBufferStandard(user, STAM_COST_ATTACK_OBJ_MULT, warn = TRUE)) + return DISCARD_LAST_ACTION user.do_attack_animation(O) O.attacked_by(src, user) - var/weight = getweight(user, STAM_COST_ATTACK_OBJ_MULT) - if(weight) - user.adjustStaminaLossBuffered(weight)//CIT CHANGE - makes attacking things cause stamina loss /atom/movable/proc/attacked_by() return /obj/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) var/totitemdamage = I.force * damage_multiplier - var/bad_trait var/stamloss = user.getStaminaLoss() if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do. var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY totitemdamage *= 1 - penalty - if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) - bad_trait = SKILL_COMBAT_MODE //blacklist combat skills. - if(I.used_skills && user.mind) if(totitemdamage) totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait) @@ -196,19 +190,10 @@ stam_mobility_mult = LYING_DAMAGE_PENALTY . *= stam_mobility_mult - var/bad_trait - if(!(I.item_flags & NO_COMBAT_MODE_FORCE_MODIFIER)) - if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) - bad_trait = SKILL_COMBAT_MODE //blacklist combat skills. - if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) - . *= 0.8 - else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) - . *= 1.2 - if(!user.mind || !I.used_skills) return if(.) - . = user.mind.item_action_skills_mod(I, ., I.skill_difficulty, SKILL_ATTACK_MOB, bad_trait) + . = user.mind.item_action_skills_mod(I, ., I.skill_difficulty, SKILL_ATTACK_MOB) for(var/skill in I.used_skills) if(!(SKILL_TRAIN_ATTACK_MOB in I.used_skills[skill])) continue @@ -264,14 +249,16 @@ . = (total_mass || w_class * STAM_COST_W_CLASS_MULT) * multiplier if(!user) return - var/bad_trait - if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) - . *= STAM_COST_NO_COMBAT_MULT - bad_trait = SKILL_COMBAT_MODE if(used_skills && user.mind) - . = user.mind.item_action_skills_mod(src, ., skill_difficulty, trait, bad_trait, FALSE) - var/total_health = user.getStaminaLoss() - . = clamp(., 0, STAMINA_NEAR_CRIT - total_health) + . = user.mind.item_action_skills_mod(src, ., skill_difficulty, trait, null, FALSE) + +/** + * Uses the amount of stamina required for a standard hit + */ +/obj/item/proc/UseStaminaBufferStandard(mob/living/user, multiplier = 1, trait = SKILL_STAMINA_COST, warn = TRUE) + ASSERT(user) + var/cost = getweight(user, multiplier, trait) + return user.UseStaminaBuffer(cost, warn) /// How long this staggers for. 0 and negatives supported. /obj/item/proc/melee_stagger_duration(force_override) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5870c8a780..2617ba2768 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -565,7 +565,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb to_chat(user, "You cannot locate any organic eyes on this brain!") return - if(IS_STAMCRIT(user))//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit + if(IS_STAMCRIT(user) || !user.UseStaminaBuffer(STAMINA_COST_ITEM_EYESTAB, warn = TRUR))//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto return //CIT CHANGE - ditto @@ -575,8 +575,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb user.do_attack_animation(M) - user.adjustStaminaLossBuffered(10)//CIT CHANGE - makes eyestabbing cost stamina - if(M != user) M.visible_message("[user] has stabbed [M] in the eye with [src]!", \ "[user] stabs you in the eye with [src]!") diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 349236fc2a..1e8668b6e2 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -6,7 +6,7 @@ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' flags_1 = CONDUCT_1 - item_flags = NEEDS_PERMIT | NO_COMBAT_MODE_FORCE_MODIFIER //To avoid ambushing and oneshotting healthy crewmembers on force setting 3. + item_flags = NEEDS_PERMIT attack_verb = list("whacked", "fisted", "power-punched") force = 20 throwforce = 10 diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index e9f517a9f1..523c5b951b 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -155,4 +155,4 @@ item_state = "screwdriver_nuke" usesound = 'sound/items/pshoom.ogg' toolspeed = 0.2 - random_color = FALSE \ No newline at end of file + random_color = FALSE diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 9d02e7f2f7..3638e50fdc 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -623,7 +623,7 @@ filters -= CIT_FILTER_STAMINACRIT update_mobility() update_health_hud() - + /mob/living/carbon/update_sight() if(!client) return diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 3984688303..ffa1aa989a 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1593,7 +1593,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) return FALSE else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth)) - if(!UseStaminaBuffer(3, warn = TRUE)) + if(!user.UseStaminaBuffer(3, warn = TRUE)) return playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) @@ -1874,9 +1874,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(CHECK_MOBILITY(user, MOBILITY_STAND)) to_chat(user, "You can only force yourself up if you're on the ground.") return + if(!user.UseStaminaBuffer(STAMINA_COST_SHOVE_UP, TRUE)) + return user.visible_message("[user] forces [p_them()]self up to [p_their()] feet!", "You force yourself up to your feet!") user.set_resting(FALSE, TRUE) - user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) /datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index e29c6b9ffe..925172df49 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -531,12 +531,6 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put incomingstammult = max(0.01, incomingstammult) incomingstammult = min(1, incomingstammult*2) - //CIT CHANGES START HERE. STAMINA BUFFER STUFF - if(bufferedstam && world.time > stambufferregentime) - var/drainrate = max((bufferedstam*(bufferedstam/(5)))*0.1,1) - bufferedstam = max(bufferedstam - drainrate, 0) - //END OF CIT CHANGES - var/restingpwr = 1 + 4 * !CHECK_MOBILITY(src, MOBILITY_STAND) //Dizziness diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index a05f88eca1..a176bf8149 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -594,6 +594,9 @@ update_icon() /obj/item/gun/proc/getinaccuracy(mob/living/user, bonus_spread, stamloss) + return 0 // Replacement TBD: Exponential curved aim instability system. + +/* if(inaccuracy_modifier == 0) return bonus_spread var/base_inaccuracy = weapon_weight * 25 * inaccuracy_modifier @@ -610,6 +613,7 @@ if(mult < 0) //accurate weapons should provide a proper bonus with negative inaccuracy. the opposite is true too. mult *= 1/inaccuracy_modifier return max(bonus_spread + (base_inaccuracy * mult), 0) //no negative spread. +*/ /obj/item/gun/proc/getstamcost(mob/living/carbon/user) . = recoil diff --git a/tgstation.dme b/tgstation.dme index 7ea90680c7..b51c21fe2d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -128,7 +128,6 @@ #include "code\__DEFINES\_flags\shields.dm" #include "code\__DEFINES\admin\keybindings.dm" #include "code\__DEFINES\chemistry\reactions.dm" -#include "code\__DEFINES\combat\aim_instability.dm" #include "code\__DEFINES\combat\attack_types.dm" #include "code\__DEFINES\combat\block.dm" #include "code\__DEFINES\combat\block_parry.dm" @@ -2384,7 +2383,6 @@ #include "code\modules\mob\dead\observer\observer_movement.dm" #include "code\modules\mob\dead\observer\orbit.dm" #include "code\modules\mob\dead\observer\say.dm" -#include "code\modules\mob\living\aim_instability.dm" #include "code\modules\mob\living\blood.dm" #include "code\modules\mob\living\bloodcrawl.dm" #include "code\modules\mob\living\clickdelay.dm" From de3227e3e0e4831b8c9efdfd9919a90bc7bf085e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 4 Aug 2020 22:55:33 -0700 Subject: [PATCH 05/39] fix --- code/__DEFINES/combat/stamina_combat.dm | 24 ++++++++----------- code/_onclick/item_attack.dm | 9 ------- code/game/objects/items.dm | 2 +- code/game/objects/items/melee/misc.dm | 3 ++- code/game/objects/items/mop.dm | 6 ++--- code/modules/mob/living/carbon/human/human.dm | 3 +-- 6 files changed, 16 insertions(+), 31 deletions(-) diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index 09dbc7253b..b35329d84d 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -1,12 +1,14 @@ +// Stamina Buffer /// Stamina buffer amount -#define STAMINA_BUFFER_CAPACITY 50 - - - - - - - +#define STAMINA_BUFFER_CAPACITY 35 +/// Stamina buffer regen per decisecond +#define STAMINA_BUFFER_REGEN_DS 0.1 +/// Stamina buffer regen multiplier while in combat mode +#define STAMINA_BUFFER_REGEN_COMBAT_MULT 3 +/// Linear scaling minimum for stamina buffer regen in percentage at stamcrit +#define STAMINA_BUFFER_STAMCRIT_PENALTY_REGEN 0.75 +/// Linear scaling minimum for stamina buffer capacity in percentage at stamcrit +#define STAMINA_BUFFER_STAMCRIT_PENALTY_CAPACITY 0.5 // Standard amounts for stamina usage @@ -39,11 +41,5 @@ #define STAM_COST_THROW_MULT 2 #define STAM_COST_THROW_MOB 2.5 //multiplied by (mob size + 1)^2. -///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted. -#define STAM_CRIT_ITEM_ATTACK_PENALTY 0.66 -/// changeNext_move penalty multiplier of the above. -#define STAM_CRIT_ITEM_ATTACK_DELAY 1.75 /// Damage penalty when fighting prone. #define LYING_DAMAGE_PENALTY 0.7 -/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise. -#define STAM_CRIT_GUN_DELAY 2.75 diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 307b476e2b..54cd4e1fd3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -131,11 +131,6 @@ /obj/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) var/totitemdamage = I.force * damage_multiplier - var/stamloss = user.getStaminaLoss() - if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do. - var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY - totitemdamage *= 1 - penalty - if(I.used_skills && user.mind) if(totitemdamage) totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait) @@ -181,11 +176,7 @@ if(!.) return - var/stamloss = user.getStaminaLoss() var/stam_mobility_mult = 1 - if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do. - var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY - stam_mobility_mult -= penalty if(stam_mobility_mult > LYING_DAMAGE_PENALTY && !CHECK_MOBILITY(user, MOBILITY_STAND)) //damage penalty for fighting prone, doesn't stack with the above. stam_mobility_mult = LYING_DAMAGE_PENALTY . *= stam_mobility_mult diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 2617ba2768..71aff1562c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -565,7 +565,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb to_chat(user, "You cannot locate any organic eyes on this brain!") return - if(IS_STAMCRIT(user) || !user.UseStaminaBuffer(STAMINA_COST_ITEM_EYESTAB, warn = TRUR))//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit + if(IS_STAMCRIT(user) || !user.UseStaminaBuffer(STAMINA_COST_ITEM_EYESTAB, warn = TRUE))//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto return //CIT CHANGE - ditto diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 9a7d455df6..f90f484513 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -349,6 +349,8 @@ return else if(cooldown_check < world.time) + if(!UseStaminaBufferStandard(user, STAM_COST_BATON_MOB_MULT, warn = TRUE)) + return DISCARD_LAST_ACTION if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) playsound(target, 'sound/weapons/genhit.ogg', 50, 1) return @@ -370,7 +372,6 @@ else target.LAssailant = WEAKREF(user) cooldown_check = world.time + cooldown - user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT)) else var/wait_desc = get_wait_description() if(wait_desc) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index b420bfc002..01ef96b7e8 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -56,22 +56,20 @@ return if(T) + if(!L.UseStaminaBuffer(stamusage, warn = TRUE)) + return user.visible_message("[user] cleans \the [T] with [src].", "You clean \the [T] with [src].") clean(T) user.DelayNextAction(CLICK_CD_MELEE) user.do_attack_animation(T, used_item = src) - if(istype(L)) - L.adjustStaminaLossBuffered(stamusage) playsound(T, "slosh", 50, 1) - /obj/effect/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap)) return else return ..() - /obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) if(insertable) J.put_in_cart(src, user) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 145db1be1e..b76f3139bd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1053,9 +1053,8 @@ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown) remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying) return - var/stambufferinfluence = (bufferedstam*(100/stambuffer))*0.2 //CIT CHANGE - makes stamina buffer influence movedelay if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN)) //if we want to ignore slowdown from damage, but not from equipment - var/health_deficiency = ((maxHealth + stambufferinfluence) - health + (getStaminaLoss()*0.75))//CIT CHANGE - reduces the impact of staminaloss and makes stamina buffer influence it + var/health_deficiency = ((maxHealth) - health + (getStaminaLoss()*0.75))//CIT CHANGE - reduces the impact of staminaloss and makes stamina buffer influence it if(health_deficiency >= 40) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown, TRUE, (health_deficiency-39) / 75) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying, TRUE, (health_deficiency-39) / 25) From 621f32adc36b39b3a0c6410675d40ccc34631069 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 17 Aug 2020 03:43:32 -0700 Subject: [PATCH 06/39] Update output.dm --- .../integrated_electronics/subtypes/output.dm | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index efd98c4d50..1fc08c9aaa 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -44,18 +44,18 @@ /obj/item/integrated_circuit/output/screen/large/do_work() ..() - if(isliving(assembly.loc))//this whole block just returns if the assembly is neither in a mobs hands or on the ground - var/mob/living/H = assembly.loc - if(H.get_active_held_item() != assembly && H.get_inactive_held_item() != assembly) - return - else - if(!isturf(assembly.loc)) - return - - var/atom/host = assembly || src var/list/mobs = list() - for(var/mob/M in range(0, get_turf(src))) - mobs += M + if(isliving(assembly.loc)) + mobs += assembly.loc + var/mob/living/L = assembly.loc + if(L.is_holding(src)) + for(var/mob/M in range(1, get_turf(src))) + mobs += M + else + for(var/mob/M in range(2, get_turf(src)) + mobs += M + + var/atom/host = assembly || src to_chat(mobs, "[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]") host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT) From e7220e842e367ea6b3259e2a625414851124df17 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 15 Sep 2020 15:29:34 -0700 Subject: [PATCH 07/39] things --- code/datums/weather/weather_types/ash_storm.dm | 2 +- code/game/objects/items/electrostaff.dm | 2 +- code/game/objects/items/powerfist.dm | 2 +- code/modules/mob/living/living_active_parry.dm | 5 +++-- code/modules/mob/living/living_blocking_parrying.dm | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 3d98a82914..6248be0de5 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -96,7 +96,7 @@ return if(is_species(L, /datum/species/lizard/ashwalker)) if(L.getStaminaLoss() < (STAMINA_CRIT - 40)) - L.adjustStaminaLos(4) + L.adjustStaminaLoss(4) return L.adjustFireLoss(4) diff --git a/code/game/objects/items/electrostaff.dm b/code/game/objects/items/electrostaff.dm index bc2c965b12..0ee58c6b16 100644 --- a/code/game/objects/items/electrostaff.dm +++ b/code/game/objects/items/electrostaff.dm @@ -170,7 +170,7 @@ turn_off() /obj/item/electrostaff/attack(mob/living/target, mob/living/user) - if(IS_STAMCRIT(user) || !UseStaminaBuffer(stam_cost))//CIT CHANGE - makes it impossible to baton in stamina softcrit + if(IS_STAMCRIT(user) || !user.UseStaminaBuffer(stam_cost))//CIT CHANGE - makes it impossible to baton in stamina softcrit to_chat(user, "You're too exhausted to use [src] properly.")//CIT CHANGE - ditto return //CIT CHANGE - ditto if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm index 1e8668b6e2..bd83404356 100644 --- a/code/game/objects/items/powerfist.dm +++ b/code/game/objects/items/powerfist.dm @@ -77,7 +77,7 @@ to_chat(user, "\The [src] can't operate without a source of gas!") return FALSE var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) - if(!UseStaminaBuffer(weight, warn = TRUE)) + if(!user.UseStaminaBuffer(weight, warn = TRUE)) return FALSE var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting) var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index 4a9c4e6311..e02bde2abc 100644 --- a/code/modules/mob/living/living_active_parry.dm +++ b/code/modules/mob/living/living_active_parry.dm @@ -68,12 +68,13 @@ // can always implement it later, whatever. if((data.parry_respect_clickdelay && !CheckActionCooldown()) || ((parry_end_time_last + data.parry_cooldown) > world.time)) to_chat(src, "You are not ready to parry (again)!") - return + return FALSE // Point of no return, make sure everything is set. parrying = method if(method == ITEM_PARRY) active_parry_item = using_item - adjustStaminaLossBuffered(data.parry_stamina_cost) + if(!UseStaminaBuffer(data.parry_stamina_cost, TRUE)) + return FALSE parry_start_time = world.time successful_parries = list() addtimer(CALLBACK(src, .proc/end_parry_sequence), full_parry_duration) diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 47dae8849d..3bc7943c67 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(block_parry_data) /mob/living/proc/handle_block_parry(seconds = 1) if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING) var/datum/block_parry_data/data = return_block_parry_datum(active_block_item.block_parry_data) - adjustStaminaLossBuffered(data.block_stamina_cost_per_second * seconds) + UseStaminaBuffer(data.block_stamina_cost_per_second * seconds) /mob/living/on_item_dropped(obj/item/I) if(I == active_block_item) From 97f373a199c7fa35a51243a0b1be6c132d2ea3f5 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 19 Sep 2020 16:17:26 -0700 Subject: [PATCH 08/39] whew --- code/game/objects/items/shields.dm | 2 +- code/game/objects/items/stunbaton.dm | 4 +++- code/modules/mob/living/carbon/carbon.dm | 11 +++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index df15195557..d1d57fe375 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -146,7 +146,7 @@ // Directional sweep! last_shieldbash = world.time if(!user.UseStaminaBuffer(shieldbash_stamcost, warn = TRUE)) - return FLASE + return FALSE // Since we are in combat mode, we can probably safely use the user's dir instead of getting their mouse pointing cardinal dir. var/bashdir = user.dir do_shieldbash_effect(user, bashdir, harmful) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 1a84b85a1a..8dbdc5ff20 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -166,7 +166,6 @@ if(turned_on) if(baton_stun(M, user, disarming)) user.do_attack_animation(M) - user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT)) else if(user.a_intent != INTENT_HARM) //they'll try to bash in the last proc. M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \ "[user] has prodded you with [src]. Luckily it was off") @@ -194,6 +193,9 @@ return FALSE stunpwr *= round(stuncharge/hitcost, 0.1) + if(!user.UseStaminaBuffer(getweight(user, STAM_COST_BATON_MOB_MULT), warn = TRUE)) + return FALSE + if(!disarming) if(knockdown) L.DefaultCombatKnockdown(50, override_stamdmg = 0) //knockdown diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 790dbfd9a6..a2a3c3af8e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -206,7 +206,8 @@ to_chat(src, "You set [I] down gently on the ground.") return - adjustStaminaLossBuffered(I.getweight(src, STAM_COST_THROW_MULT, SKILL_THROW_STAM_COST)) + if(!UseStaminaBuffer(I.getweight(src, STAM_COST_THROW_MULT, SKILL_THROW_STAM_COST), warn = TRUE)) + return if(thrown_thing) var/power_throw = 0 @@ -594,12 +595,6 @@ /mob/living/carbon/update_stamina() var/total_health = getStaminaLoss() - if(total_health >= STAMINA_SOFTCRIT) - if(!(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)) - ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) - else - if(combat_flags & COMBAT_FLAG_SOFT_STAMCRIT) - DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_SOFT_STAMCRIT) if(total_health) if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health >= STAMINA_CRIT && !stat) to_chat(src, "You're too exhausted to keep going...") @@ -610,7 +605,7 @@ update_mobility() if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_SOFTCRIT) to_chat(src, "You don't feel nearly as exhausted anymore.") - DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT | COMBAT_FLAG_SOFT_STAMCRIT) + DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) filters -= CIT_FILTER_STAMINACRIT update_mobility() update_health_hud() From 8ebe765d7041e6c427282d154b77654b529653ce Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:03:18 -0700 Subject: [PATCH 09/39] fixes --- code/__DEFINES/combat/stamina_combat.dm | 12 +++---- code/_globalvars/bitfields.dm | 1 - code/_onclick/hud/screen_objects/stamina.dm | 31 +++++++----------- code/game/objects/items/stunbaton.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 6 ++-- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/silicon/stamina_buffer.dm | 2 -- code/modules/mob/living/stamina_buffer.dm | 10 ++++-- modular_citadel/icons/ui/screen_gen.dmi | Bin 6120 -> 6123 bytes 9 files changed, 30 insertions(+), 36 deletions(-) delete mode 100644 code/modules/mob/living/silicon/stamina_buffer.dm diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index b35329d84d..0467b656c5 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -2,13 +2,13 @@ /// Stamina buffer amount #define STAMINA_BUFFER_CAPACITY 35 /// Stamina buffer regen per decisecond -#define STAMINA_BUFFER_REGEN_DS 0.1 +#define STAMINA_BUFFER_REGEN_PER_SECOND 1 /// Stamina buffer regen multiplier while in combat mode -#define STAMINA_BUFFER_REGEN_COMBAT_MULT 3 -/// Linear scaling minimum for stamina buffer regen in percentage at stamcrit -#define STAMINA_BUFFER_STAMCRIT_PENALTY_REGEN 0.75 -/// Linear scaling minimum for stamina buffer capacity in percentage at stamcrit -#define STAMINA_BUFFER_STAMCRIT_PENALTY_CAPACITY 0.5 +#define STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT 3 +/// percent of regen to take away at stamcrit +#define STAMINA_BUFFER_STAMCRIT_REGEN_PENALTY_PERCENT 0.5 +/// percent of capacity to take away at stamcrit +#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PENALTY_PERCENT 0.5 // Standard amounts for stamina usage diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 85f5e4fd9b..b2fa88a343 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -251,7 +251,6 @@ GLOBAL_LIST_INIT(bitfields, list( "COMBAT_FLAG_SPRINT_TOGGLED" = COMBAT_FLAG_SPRINT_TOGGLED, "COMBAT_FLAG_SPRINT_ACTIVE" = COMBAT_FLAG_SPRINT_ACTIVE, "COMBAT_FLAG_ATTEMPTING_CRAWL" = COMBAT_FLAG_ATTEMPTING_CRAWL, - "COMBAT_FLAG_HARD_STAMCRIT" = COMBAT_FLAG_HARD_STAMCRIT, "COMBAT_FLAG_SOFT_STAMCRIT" = COMBAT_FLAG_SOFT_STAMCRIT, "COMBAT_FLAG_INTENTIONALLY_RESTING" = COMBAT_FLAG_INTENTIONALLY_RESTING, "COMBAT_FLAG_RESISTING_REST" = COMBAT_FLAG_RESISTING_REST, diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index 5484014f8f..57152951db 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -38,24 +38,17 @@ if(!user) return if(user.stat == DEAD || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2)) - icon_state = "stambuffer7" - else if(user.hal_screwyhud == 5) icon_state = "stambuffer0" + else if(user.hal_screwyhud == 5) + icon_state = "stambuffer29" else - switch(user.bufferedstam / user.stambuffer) - if(0.95 to INFINITY) - icon_state = "stambuffer7" - if(0.9 to 0.95) - icon_state = "stambuffer6" - if(0.8 to 0.9) - icon_state = "stambuffer5" - if(0.6 to 0.8) - icon_state = "stambuffer4" - if(0.4 to 0.6) - icon_state = "stambuffer3" - if(0.2 to 0.4) - icon_state = "stambuffer2" - if(0.05 to 0.2) - icon_state = "stambuffer1" - else - icon_state = "stambuffer0" + icon_state = "stambuffer[FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1)]" + +/obj/screen/staminabuffer/update_overlays() + var/level = FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1) + if((user.stat == DEAD) || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2) || (level <= 5)) + . = list("stamina_alert3") + else if(level <= 8) + . = list("stamina_alert2") + else if(level <= 12) + . = list("stamina_alert1") diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 8dbdc5ff20..f71fd4db58 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -171,7 +171,7 @@ "[user] has prodded you with [src]. Luckily it was off") return disarming || (user.a_intent != INTENT_HARM) -/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE) +/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/living/user, disarming = FALSE) var/list/return_list = list() if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; check_shields() handles that playsound(L, 'sound/weapons/genhit.ogg', 50, 1) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a2a3c3af8e..a4b7a9cd8a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -191,8 +191,8 @@ if(HAS_TRAIT(src, TRAIT_PACIFISM)) to_chat(src, "You gently let go of [throwable_mob].") return - - adjustStaminaLossBuffered(STAM_COST_THROW_MOB * ((throwable_mob.mob_size+1)**2))// throwing an entire person shall be very tiring + if(!UseStaminaBuffer(STAM_COST_THROW_MOB * ((throwable_mob.mob_size+1)**2), TRUE)) + return var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors var/turf/end_T = get_turf(target) if(start_T && end_T) @@ -603,7 +603,7 @@ ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) filters += CIT_FILTER_STAMINACRIT update_mobility() - if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_SOFTCRIT) + if((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && total_health <= STAMINA_CRIT) to_chat(src, "You don't feel nearly as exhausted anymore.") DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) filters -= CIT_FILTER_STAMINACRIT diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b0c4e01359..a63b7a8f78 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -808,7 +808,7 @@ hud_used.healthdoll.icon_state = "healthdoll_DEAD" hud_used.staminas?.update_icon_state() - hud_used.staminabuffer?.update_icon_state() + hud_used.staminabuffer?.update_icon() /mob/living/carbon/human/fully_heal(admin_revive = FALSE) if(admin_revive) diff --git a/code/modules/mob/living/silicon/stamina_buffer.dm b/code/modules/mob/living/silicon/stamina_buffer.dm deleted file mode 100644 index 139597f9cb..0000000000 --- a/code/modules/mob/living/silicon/stamina_buffer.dm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 7412c35dad..85c33080d5 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -20,7 +20,11 @@ */ /mob/living/proc/UpdateStaminaBuffer(updating_hud = TRUE) var/time = world.time - stamina_buffer_regen_last - if(time <= 0) + var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT + var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) + if(stamina_buffer > stamina_buffer_max) + stamina_buffer = stamina_buffer_max return - stamina_buffer_regen_last = time - var/penalized + var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) + stamina_buffer += min((stamina_buffer_max - stamina_buffer), (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY)) * (time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod))) + hud_used?.staminabuffer?.update_icon() diff --git a/modular_citadel/icons/ui/screen_gen.dmi b/modular_citadel/icons/ui/screen_gen.dmi index 270f7c9ad90aef4de09aef9b7ec3ae5cb78aba6f..510d312f1c3b792cf4fe0d11f3528b75e7eecf89 100644 GIT binary patch delta 358 zcmV-s0h#{jFY7OmB!5qOR9JLGWpiV4X>fFDZ*Bkpc$}@1!D_=W5Jb<`S1ifZ6z|$j z(}OR?q4<#eLQreD7T9T#m6rZ}4=L2Ov?L2#xR^4CVK&{&Q|Mf+%_ z71J`!iE6o?#9Fjm8Dd(FcudP+jcOTyQSH4zyA^03BrHVWB;-(n4kheR0uLqhP=XI7 z{7?cAB?L)AkVOBUgdj->l7t{h2$F;#NeGgJAh873ushUH?;G_Eqj-2^ffFDZ*Bkpc$}@1L2AP=5JlJ4DTZVlif3%6 z=|Y?0P`pU45Y$?Z1$J6wrKPv;B87%ZQ)i%PW%%Sg5RZet!ZDsItzR(N3U&RMy(T ze1ZmCMTcS04J=}(adx^~m49#1orfV!iNiS)%zxfjMK`Y^472t6nnK?vo@Tz-^%6z2 zL=j;aiBe4YKbR_w*|3$02AiEJ{A0#eB;w0u!q7EhQP$CZ{_E4e^CH_z% z5G4jlVvt1tp2Q$Y43fkkNeq(2AW008#2~Q-m$2Q}Q12S`1tlYW*Z8V%d9!>0Zx(xH Br-1+f From 3505a5bc18a47a715d717854e83b86c5e3498e72 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:10:54 -0700 Subject: [PATCH 10/39] fixes --- code/__DEFINES/combat/stamina_combat.dm | 4 ++-- code/_globalvars/bitfields.dm | 2 +- code/_onclick/hud/screen_objects/stamina.dm | 20 ++++++++++++++------ tgstation.dme | 1 - 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index 0467b656c5..1926c35d40 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -6,9 +6,9 @@ /// Stamina buffer regen multiplier while in combat mode #define STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT 3 /// percent of regen to take away at stamcrit -#define STAMINA_BUFFER_STAMCRIT_REGEN_PENALTY_PERCENT 0.5 +#define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.5 /// percent of capacity to take away at stamcrit -#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PENALTY_PERCENT 0.5 +#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY 0.5 // Standard amounts for stamina usage diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index b2fa88a343..b558b28cf2 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(bitfields, list( "COMBAT_FLAG_SPRINT_TOGGLED" = COMBAT_FLAG_SPRINT_TOGGLED, "COMBAT_FLAG_SPRINT_ACTIVE" = COMBAT_FLAG_SPRINT_ACTIVE, "COMBAT_FLAG_ATTEMPTING_CRAWL" = COMBAT_FLAG_ATTEMPTING_CRAWL, - "COMBAT_FLAG_SOFT_STAMCRIT" = COMBAT_FLAG_SOFT_STAMCRIT, + "COMBAT_FLAG_HARD_STAMCRIT" = COMBAT_FLAG_HARD_STAMCRIT, "COMBAT_FLAG_INTENTIONALLY_RESTING" = COMBAT_FLAG_INTENTIONALLY_RESTING, "COMBAT_FLAG_RESISTING_REST" = COMBAT_FLAG_RESISTING_REST, "COMBAT_FLAG_SPRINT_FORCED" = COMBAT_FLAG_SPRINT_FORCED diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index 57152951db..c08f0dd2ce 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -11,7 +11,11 @@ /obj/screen/staminas/Click(location,control,params) if(isliving(usr)) var/mob/living/L = usr - to_chat(L, "You have [L.getStaminaLoss()] stamina loss.
Your stamina buffer can take [L.stambuffer] stamina loss, and recharges at no cost.
Your stamina buffer is [(L.stambuffer*(100/L.stambuffer))-(L.bufferedstam*(100/L.stambuffer))]% full.") + to_chat(L, "You have [L.getStaminaLoss()] stamina loss.
\ + Your stamina buffer is currently [L.stamina_buffer]/[L.stamina_buffer_max], and recharges at [L.stamina_buffer_regen] and [L.stamina_buffer_regen_combat] (combat mode on) per second.
\ + Your stamina buffer will have its capacity reduced by up to [STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY * 100] from stamina damage, up until stamcrit, and similarly will be impacted in regeneration by\ + [STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY]% from said damage.\ +
Your stamina buffer is [round((L.stamina_buffer / L.stamina_buffer_max) * 100, 0.1)]% full.") /obj/screen/staminas/update_icon_state() var/mob/living/carbon/user = hud?.mymob @@ -42,13 +46,17 @@ else if(user.hal_screwyhud == 5) icon_state = "stambuffer29" else - icon_state = "stambuffer[FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1)]" + icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]" /obj/screen/staminabuffer/update_overlays() - var/level = FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1) + . = ..() + var/mob/living/carbon/user = hud?.mymob + if(!user) + return + var/level = FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1) if((user.stat == DEAD) || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2) || (level <= 5)) - . = list("stamina_alert3") + . += list("stamina_alert3") else if(level <= 8) - . = list("stamina_alert2") + . += list("stamina_alert2") else if(level <= 12) - . = list("stamina_alert1") + . += list("stamina_alert1") diff --git a/tgstation.dme b/tgstation.dme index 294b31f6fb..36e37f6b48 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2577,7 +2577,6 @@ #include "code\modules\mob\living\silicon\silicon.dm" #include "code\modules\mob\living\silicon\silicon_defense.dm" #include "code\modules\mob\living\silicon\silicon_movement.dm" -#include "code\modules\mob\living\silicon\stamina_buffer.dm" #include "code\modules\mob\living\silicon\ai\ai.dm" #include "code\modules\mob\living\silicon\ai\ai_defense.dm" #include "code\modules\mob\living\silicon\ai\death.dm" From 102a452067579e4392cf2c04877007f7ad8667d1 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:14:41 -0700 Subject: [PATCH 11/39] fixes --- code/_onclick/item_attack.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 1 + code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/stamina_buffer.dm | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 827d67a701..622371e7c3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -133,7 +133,7 @@ if(I.used_skills && user.mind) if(totitemdamage) - totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait) + totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ) for(var/skill in I.used_skills) if(!(SKILL_TRAIN_ATTACK_OBJ in I.used_skills[skill])) continue diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a4b7a9cd8a..429eb47765 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -608,6 +608,7 @@ DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_HARD_STAMCRIT) filters -= CIT_FILTER_STAMINACRIT update_mobility() + UpdateStaminaBuffer() update_health_hud() /mob/living/carbon/update_sight() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 096b6362fd..c9c3bff6a2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1255,7 +1255,7 @@ SetUnconscious(clamp_unconscious_to) HealAllImmobilityUpTo(clamp_immobility_to) adjustStaminaLoss(min(0, -stamina_boost)) - RechargeStaminaBuffer(stamina_buffer_boost) + RechargeStaminaBuffer(stamina_buffer_boost) // this MUST GO AFTER ADJUSTSTAMINALOSS. if(scale_stamina_loss_recovery) adjustStaminaLoss(min(-((getStaminaLoss() - stamina_loss_recovery_bypass) * scale_stamina_loss_recovery), 0)) if(put_on_feet) diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 85c33080d5..9d38e50948 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -28,3 +28,10 @@ var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) stamina_buffer += min((stamina_buffer_max - stamina_buffer), (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY)) * (time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod))) hud_used?.staminabuffer?.update_icon() + +/** + * Boosts our stamina buffer by this much. + */ +/mob/living/proc/RechargeStaminaBuffer(amount) + var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) + stamina_buffer += min(amount, stamina_buffer_max - stamina_buffer) From f4acef3cf831bbd1aad0796830c13fd48d8c9ac7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:17:14 -0700 Subject: [PATCH 12/39] fixes --- code/modules/mob/living/stamina_buffer.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 9d38e50948..931a76d3cb 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -33,5 +33,6 @@ * Boosts our stamina buffer by this much. */ /mob/living/proc/RechargeStaminaBuffer(amount) + var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) stamina_buffer += min(amount, stamina_buffer_max - stamina_buffer) From c5403b5ef4e2571f280f8bbace43632cdc18ddd4 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:49:42 -0700 Subject: [PATCH 13/39] fixes --- .../configuration/entries/game_options.dm | 6 ++++ .../mob/living/carbon/human/human_movement.dm | 5 ---- code/modules/mob/living/living_mobility.dm | 2 ++ code/modules/mob/living/living_sprint.dm | 2 ++ code/modules/movespeed/_movespeed_modifier.dm | 18 +++++++++++- code/modules/movespeed/modifiers/items.dm | 5 ++-- code/modules/movespeed/modifiers/mobs.dm | 29 +++++++++++++++++++ 7 files changed, 59 insertions(+), 8 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 2e3cb1ea46..9f79353e77 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -280,6 +280,12 @@ /datum/config_entry/number/movedelay/sprint_speed_increase config_entry_value = 1 +/datum/config_entry/number/movedelay/sprint_max_tiles_increase + config_entry_value = 5 + +/datum/config_entry/number/movedelay/sprint_absolute_max_tiles + config_entry_value = 13 + /datum/config_entry/number/movedelay/sprint_buffer_max config_entry_value = 24 diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index bcb658eab8..45c558d0a6 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -11,11 +11,6 @@ /mob/living/carbon/human/movement_delay() . = ..() - if(CHECK_MOBILITY(src, MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE)) - var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI - if(!SSI) - SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase) - . -= SSI.config_entry_value if (m_intent == MOVE_INTENT_WALK && HAS_TRAIT(src, TRAIT_SPEEDY_STEP)) . -= 1.5 diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm index 654a979445..782da69248 100644 --- a/code/modules/mob/living/living_mobility.dm +++ b/code/modules/mob/living/living_mobility.dm @@ -173,4 +173,6 @@ else remove_movespeed_modifier(/datum/movespeed_modifier/limbless) + update_movespeed() + return mobility_flags diff --git a/code/modules/mob/living/living_sprint.dm b/code/modules/mob/living/living_sprint.dm index dc0f6d2767..3ef67c9edd 100644 --- a/code/modules/mob/living/living_sprint.dm +++ b/code/modules/mob/living/living_sprint.dm @@ -29,6 +29,7 @@ if(combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) return ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_SPRINT_ACTIVE) + add_movespeed_modifier(/datum/movespeed_modifier/sprinting) if(update_icon) update_sprint_icon() @@ -36,6 +37,7 @@ if(!(combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) || (combat_flags & COMBAT_FLAG_SPRINT_FORCED)) return DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_SPRINT_ACTIVE) + remove_movespeed_modifier(/datum/movespeed_modifier/sprinting) if(update_icon) update_sprint_icon() diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index 3bc4463531..cbd96b4c7b 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -38,6 +38,12 @@ Key procs /// Multiplicative slowdown var/multiplicative_slowdown = 0 + /// Next two variables depend on this: Should we do advanced calculations? + var/complex_calculation = FALSE + /// Absolute max tiles we can boost to + var/absolute_max_tiles_per_second + /// Max tiles per second we can boost + var/max_tiles_per_second_boost /// Movetypes this applies to var/movetypes = ALL @@ -53,6 +59,16 @@ Key procs if(!id) id = "[type]" //We turn the path into a string. +/** + * Returns new multiplicative movespeed after modification. + */ +/datum/movespeed_modifier/proc/apply_multiplicative(existing, mob/target) + if(!complex_calculation || (multiplicative_slowdown > 0)) // we aren't limiting how much things can slowdown.. yet. + return existing + multiplicative_slowdown + var/current_tiles = 10 / existing + var/minimum_speed = 10 / min(current_tiles + max_tiles_per_second_boost, max(current_tiles, absolute_max_tiles_per_second)) + return max(minimum_speed, existing + multiplicative_slowdown) + GLOBAL_LIST_EMPTY(movespeed_modification_cache) /// Grabs a STATIC MODIFIER datum from cache. YOU MUST NEVER EDIT THESE DATUMS, OR IT WILL AFFECT ANYTHING ELSE USING IT TOO! @@ -198,7 +214,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) conflict_tracker[conflict] = amt else continue - . += amt + . = M.apply_multiplicative(., src) var/old = cached_multiplicative_slowdown // CITAEDL EDIT - To make things a bit less jarring, when in situations where // your delay decreases, "give" the delay back to the client cached_multiplicative_slowdown = . diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm index 94dc2a1553..a8510ecd86 100644 --- a/code/modules/movespeed/modifiers/items.dm +++ b/code/modules/movespeed/modifiers/items.dm @@ -1,12 +1,13 @@ /datum/movespeed_modifier/jetpack conflicts_with = MOVE_CONFLICT_JETPACK movetypes = FLOATING + multiplicative_slowdown = -1 /datum/movespeed_modifier/jetpack/cybernetic - multiplicative_slowdown = -0.5 + multiplicative_slowdown = -1.25 /datum/movespeed_modifier/jetpack/fullspeed - multiplicative_slowdown = -2 + multiplicative_slowdown = -1.5 /datum/movespeed_modifier/die_of_fate multiplicative_slowdown = 1 diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index d17767bb1f..8daeca3acb 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -120,3 +120,32 @@ /datum/movespeed_modifier/active_block variable = TRUE flags = IGNORE_NOSLOW + +/datum/movespeed_modifier/sprinting + flags = IGNORE_NOSLOW + blacklisted_movetypes = FLOATING + required_mobility_flags = MOBILITY_STAND + priority = -100 + +/// for speed reasons this is sorta copypasty. +/datum/movespeed_modifier/sprinting/apply_multiplicative(existing, mob/target) + . = existing + if(target.m_intent != MOVE_INTENT_RUN) + return + if(isliving(target)) + var/mob/living/L = target + if(!(L.mobility_flags & MOBILITY_STAND)) + return + var/static/datum/config_entry/number/movedelay/sprint_max_tiles_increase/SSMTI + if(!SSMTI) + SSMTI = CONFIG_GET_ENTRY(number/movedelay/sprint_max_tiles_increase) + var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI + if(!SSI) + SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase) + var/static/datum/config_entry/number/movedelay/sprint_absolute_max_tiles/SAMT + if(!SAMT) + SAMT = CONFIG_GET_ENTRY(number/movedelay/sprint_absolute_max_tiles) + var/current_tiles = 10 / existing + var/minimum_speed = 10 / min(SAMT.config_entry_value, ((current_tiles) + SSMTI.config_entry_value)) + . = max(minimum_speed, (existing - SSI.config_entry_value)) + From 18f6bee9abec2bca82a463320d3369e02e0ff2eb Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 02:50:37 -0700 Subject: [PATCH 14/39] fixes --- code/modules/movespeed/modifiers/mobs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index 8daeca3acb..c9c3899650 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -124,7 +124,6 @@ /datum/movespeed_modifier/sprinting flags = IGNORE_NOSLOW blacklisted_movetypes = FLOATING - required_mobility_flags = MOBILITY_STAND priority = -100 /// for speed reasons this is sorta copypasty. From 8a54395f1a1da1f4ff1ca46831330baeba706d17 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 04:33:49 -0700 Subject: [PATCH 15/39] fixes --- code/__DEFINES/combat.dm | 2 + code/__DEFINES/combat/stamina_combat.dm | 4 ++ code/_onclick/hud/screen_objects/stamina.dm | 54 ++++++++++++------- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 2 +- code/modules/mob/living/stamina_buffer.dm | 10 +++- code/modules/movespeed/_movespeed_modifier.dm | 2 +- code/modules/movespeed/modifiers/mobs.dm | 15 +++--- 8 files changed, 60 insertions(+), 31 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 85c51ec26e..0439a5d7e5 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -34,6 +34,8 @@ #define COMBAT_FLAGS_DEFAULT (COMBAT_FLAG_PARRY_CAPABLE | COMBAT_FLAG_BLOCK_CAPABLE) /// Default combat flags for everyone else (so literally everyone but humans). #define COMBAT_FLAGS_SPRINT_EXEMPT (COMBAT_FLAG_SPRINT_ACTIVE | COMBAT_FLAG_SPRINT_TOGGLED | COMBAT_FLAG_SPRINT_FORCED | COMBAT_FLAG_PARRY_CAPABLE | COMBAT_FLAG_BLOCK_CAPABLE) +/// Default combat flags for those in stamina combat system +#define COMBAT_FLAGS_STAMINA_COMBAT (COMBAT_FLAG_PARRY_CAPABLE | COMBAT_FLAG_BLOCK_CAPABLE | COMBAT_FLAG_STAMINA_BUFFER) /// The user wants sprint mode on #define COMBAT_FLAG_SPRINT_TOGGLED (1<<0) diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index 1926c35d40..ee5b8a1af9 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -5,6 +5,10 @@ #define STAMINA_BUFFER_REGEN_PER_SECOND 1 /// Stamina buffer regen multiplier while in combat mode #define STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT 3 +/// Penalty time after an action (clickdelay counting action) ends for stamina buffer regeneration +#define STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME 8 +/// Penalty regen multiplier +#define STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR 0.5 /// percent of regen to take away at stamcrit #define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.5 /// percent of capacity to take away at stamcrit diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index c08f0dd2ce..faaf88ff30 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -13,8 +13,8 @@ var/mob/living/L = usr to_chat(L, "You have [L.getStaminaLoss()] stamina loss.
\ Your stamina buffer is currently [L.stamina_buffer]/[L.stamina_buffer_max], and recharges at [L.stamina_buffer_regen] and [L.stamina_buffer_regen_combat] (combat mode on) per second.
\ - Your stamina buffer will have its capacity reduced by up to [STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY * 100] from stamina damage, up until stamcrit, and similarly will be impacted in regeneration by\ - [STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY]% from said damage.\ + Your stamina buffer will have its capacity reduced by up to [STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY * 100]% from stamina damage, up until stamcrit, and similarly will be impacted in regeneration by \ + [STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY * 100]% from said damage.\
Your stamina buffer is [round((L.stamina_buffer / L.stamina_buffer_max) * 100, 0.1)]% full.") /obj/screen/staminas/update_icon_state() @@ -28,6 +28,18 @@ else icon_state = "stamina[clamp(FLOOR(user.getStaminaLoss() /20, 1), 0, 6)]" +/obj/screen/staminas/update_overlays() + var/mob/living/carbon/user = hud?.mymob + if(!user) + return + var/percent = user.getStaminaLoss() / STAMINA_CRIT + if((user.stat == DEAD) || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2)) + . += list("stamina_alert3") + else if(percent >= 0.85) + . += list("stamina_alert2") + else if(percent >= 0.7) + . += list("stamina_alert1") + //stam buffer /obj/screen/staminabuffer icon = 'modular_citadel/icons/ui/screen_gen.dmi' @@ -37,26 +49,32 @@ layer = ABOVE_HUD_LAYER + 0.1 mouse_opacity = 0 -/obj/screen/staminabuffer/update_icon_state() +/obj/screen/staminabuffer/proc/mark_dirty() + if(update_to_mob()) + START_PROCESSING(SShuds, src) + +/obj/screen/staminabuffer/process() + if(!update_to_mob()) + return PROCESS_KILL + +/obj/screen/staminabuffer/Destroy() + STOP_PROCESSING(SShuds, src) + return ..() + +/obj/screen/staminabuffer/proc/update_to_mob() var/mob/living/carbon/user = hud?.mymob - if(!user) - return + user.UpdateStaminaBuffer(FALSE) + if(!user?.client) + return FALSE if(user.stat == DEAD || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2)) icon_state = "stambuffer0" + return FALSE else if(user.hal_screwyhud == 5) icon_state = "stambuffer29" + return FALSE + else if(user.stamina_buffer >= user.stamina_buffer_max) + icon_state = "staminabuffer29" + return FALSE else icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]" - -/obj/screen/staminabuffer/update_overlays() - . = ..() - var/mob/living/carbon/user = hud?.mymob - if(!user) - return - var/level = FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1) - if((user.stat == DEAD) || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2) || (level <= 5)) - . += list("stamina_alert3") - else if(level <= 8) - . += list("stamina_alert2") - else if(level <= 12) - . += list("stamina_alert1") + return TRUE diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a63b7a8f78..22c4cfb04a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -808,7 +808,7 @@ hud_used.healthdoll.icon_state = "healthdoll_DEAD" hud_used.staminas?.update_icon_state() - hud_used.staminabuffer?.update_icon() + hud_used.staminabuffer?.mark_dirty() /mob/living/carbon/human/fully_heal(admin_revive = FALSE) if(admin_revive) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 13456ed61c..e9801f924b 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -7,7 +7,7 @@ buckle_lying = FALSE mob_biotypes = MOB_ORGANIC|MOB_HUMANOID /// Enable stamina combat - combat_flags = COMBAT_FLAGS_DEFAULT | COMBAT_FLAG_UNARMED_PARRY + combat_flags = COMBAT_FLAGS_STAMINA_COMBAT | COMBAT_FLAG_UNARMED_PARRY status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER has_field_of_vision = FALSE //Handled by species. diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 931a76d3cb..2062a526f5 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -13,6 +13,7 @@ return return FALSE stamina_buffer -= amount + UpdateStaminaBuffer() return TRUE /** @@ -22,12 +23,16 @@ var/time = world.time - stamina_buffer_regen_last var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) + stamina_buffer_regen_last = world.time if(stamina_buffer > stamina_buffer_max) stamina_buffer = stamina_buffer_max return var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) - stamina_buffer += min((stamina_buffer_max - stamina_buffer), (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY)) * (time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod))) - hud_used?.staminabuffer?.update_icon() + var/action_penalty = (((world.time - last_action) >= STAMINA_BUFFER_ACTION_PENALTY_TIME) && STAMINA_BUFFER_ACTION_PENALTY_FACTOR) || 1 + var/stamina_penalty = 1 - (missing_stamina_perent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY) + var/regen = (time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod) + stamina_buffer += min((stamina_buffer_max - stamina_buffer), action_penalty * stamina_penalty * regen)) + hud_used?.staminabuffer?.mark_dirty() /** * Boosts our stamina buffer by this much. @@ -36,3 +41,4 @@ var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) stamina_buffer += min(amount, stamina_buffer_max - stamina_buffer) + hud_used?.staminabuffer?.mark_dirty() diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index cbd96b4c7b..fc5f5696bd 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -65,7 +65,7 @@ Key procs /datum/movespeed_modifier/proc/apply_multiplicative(existing, mob/target) if(!complex_calculation || (multiplicative_slowdown > 0)) // we aren't limiting how much things can slowdown.. yet. return existing + multiplicative_slowdown - var/current_tiles = 10 / existing + var/current_tiles = 10 / max(existing, world.tick_lag) var/minimum_speed = 10 / min(current_tiles + max_tiles_per_second_boost, max(current_tiles, absolute_max_tiles_per_second)) return max(minimum_speed, existing + multiplicative_slowdown) diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index c9c3899650..49515313ea 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -124,7 +124,7 @@ /datum/movespeed_modifier/sprinting flags = IGNORE_NOSLOW blacklisted_movetypes = FLOATING - priority = -100 + priority = 100 /// for speed reasons this is sorta copypasty. /datum/movespeed_modifier/sprinting/apply_multiplicative(existing, mob/target) @@ -135,16 +135,15 @@ var/mob/living/L = target if(!(L.mobility_flags & MOBILITY_STAND)) return - var/static/datum/config_entry/number/movedelay/sprint_max_tiles_increase/SSMTI - if(!SSMTI) - SSMTI = CONFIG_GET_ENTRY(number/movedelay/sprint_max_tiles_increase) + var/static/datum/config_entry/number/movedelay/sprint_max_tiles_increase/SMTI + if(!SMTI) + SMTI = CONFIG_GET_ENTRY(number/movedelay/sprint_max_tiles_increase) var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI if(!SSI) SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase) var/static/datum/config_entry/number/movedelay/sprint_absolute_max_tiles/SAMT if(!SAMT) SAMT = CONFIG_GET_ENTRY(number/movedelay/sprint_absolute_max_tiles) - var/current_tiles = 10 / existing - var/minimum_speed = 10 / min(SAMT.config_entry_value, ((current_tiles) + SSMTI.config_entry_value)) - . = max(minimum_speed, (existing - SSI.config_entry_value)) - + var/current_tiles = 10 / max(existing, world.tick_lag) + var/minimum_speed = 10 / min(max(SAMT.config_entry_value, current_tiles), current_tiles + SMTI.config_entry_value) + . = min(., max(minimum_speed, existing - SSI.config_entry_value)) From fad91b1f79e37a90fb97e751b6754c6446984091 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 04:48:15 -0700 Subject: [PATCH 16/39] fixes --- code/modules/mob/living/stamina_buffer.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 2062a526f5..cfc40952ec 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -28,10 +28,10 @@ stamina_buffer = stamina_buffer_max return var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) - var/action_penalty = (((world.time - last_action) >= STAMINA_BUFFER_ACTION_PENALTY_TIME) && STAMINA_BUFFER_ACTION_PENALTY_FACTOR) || 1 - var/stamina_penalty = 1 - (missing_stamina_perent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY) - var/regen = (time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod) - stamina_buffer += min((stamina_buffer_max - stamina_buffer), action_penalty * stamina_penalty * regen)) + var/action_penalty = (((world.time - last_action) >= STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME) && STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR) || 1 + var/stamina_penalty = 1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY) + var/regen = time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod) + stamina_buffer += min((stamina_buffer_max - stamina_buffer), action_penalty * stamina_penalty * regen) hud_used?.staminabuffer?.mark_dirty() /** From 86ca2cb9055c38d7f95535dfd35e8478e44f506a Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 13:38:36 -0700 Subject: [PATCH 17/39] amends --- code/__DEFINES/combat/stamina_combat.dm | 8 ++++---- code/_onclick/hud/screen_objects/stamina.dm | 2 +- code/_onclick/item_attack.dm | 2 +- code/modules/mob/living/stamina_buffer.dm | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index ee5b8a1af9..374439f9eb 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -1,6 +1,6 @@ // Stamina Buffer /// Stamina buffer amount -#define STAMINA_BUFFER_CAPACITY 35 +#define STAMINA_BUFFER_CAPACITY 30 /// Stamina buffer regen per decisecond #define STAMINA_BUFFER_REGEN_PER_SECOND 1 /// Stamina buffer regen multiplier while in combat mode @@ -10,7 +10,7 @@ /// Penalty regen multiplier #define STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR 0.5 /// percent of regen to take away at stamcrit -#define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.5 +#define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.75 /// percent of capacity to take away at stamcrit #define STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY 0.5 @@ -39,9 +39,9 @@ #define TOTAL_MASS_TOY_SWORD 1.5 //stamina cost defines. -#define STAM_COST_ATTACK_OBJ_MULT 1.2 +#define STAM_COST_ATTACK_OBJ_MULT 0.75 #define STAM_COST_ATTACK_MOB_MULT 1 -#define STAM_COST_BATON_MOB_MULT 1 +#define STAM_COST_BATON_MOB_MULT 0.85 #define STAM_COST_THROW_MULT 2 #define STAM_COST_THROW_MOB 2.5 //multiplied by (mob size + 1)^2. diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index faaf88ff30..04ced9bf12 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -73,7 +73,7 @@ icon_state = "stambuffer29" return FALSE else if(user.stamina_buffer >= user.stamina_buffer_max) - icon_state = "staminabuffer29" + icon_state = "stambuffer29" return FALSE else icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 622371e7c3..cd1ee56848 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -255,7 +255,7 @@ if(!isnull(stagger_force)) return stagger_force /// totally not an untested, arbitrary equation. - return clamp((1.5 + (w_class/7.5)) * ((force_override || force) / 2), 0, 10 SECONDS) + return clamp((1.5 + (w_class/5)) * ((force_override || force) / 1.5), 0, 10 SECONDS) /obj/item/proc/do_stagger_action(mob/living/target, mob/living/user, force_override) if(!CHECK_BITFIELD(target.status_flags, CANSTAGGER)) diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index cfc40952ec..c2495eb633 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -28,11 +28,12 @@ stamina_buffer = stamina_buffer_max return var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) - var/action_penalty = (((world.time - last_action) >= STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME) && STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR) || 1 + var/action_penalty = (((world.time - last_action) <= STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME) && STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR) || 1 var/stamina_penalty = 1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY) var/regen = time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod) stamina_buffer += min((stamina_buffer_max - stamina_buffer), action_penalty * stamina_penalty * regen) - hud_used?.staminabuffer?.mark_dirty() + if(updating_hud) + hud_used?.staminabuffer?.mark_dirty() /** * Boosts our stamina buffer by this much. From d77fb0e17bb620311d71bcb658899598450fec15 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 13:53:43 -0700 Subject: [PATCH 18/39] amends --- code/_onclick/hud/screen_objects/stamina.dm | 1 + code/modules/mob/living/carbon/life.dm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index 04ced9bf12..bafe919045 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -29,6 +29,7 @@ icon_state = "stamina[clamp(FLOOR(user.getStaminaLoss() /20, 1), 0, 6)]" /obj/screen/staminas/update_overlays() + . = ..() var/mob/living/carbon/user = hud?.mymob if(!user) return diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 6f5520a36b..36a17ab82a 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -502,8 +502,9 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put //this updates all special effects: stun, sleeping, knockdown, druggy, stuttering, etc.. /mob/living/carbon/handle_status_effects() ..() - if(getStaminaLoss() && !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) //CIT CHANGE - prevents stamina regen while combat mode is active - adjustStaminaLoss(!CHECK_MOBILITY(src, MOBILITY_STAND) ? ((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) ? STAM_RECOVERY_STAM_CRIT : STAM_RECOVERY_RESTING) : STAM_RECOVERY_NORMAL) + var/combat_mode = SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE) + if(getStaminaLoss()) + adjustStaminaLoss((!CHECK_MOBILITY(src, MOBILITY_STAND) ? ((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) ? STAM_RECOVERY_STAM_CRIT : STAM_RECOVERY_RESTING) : STAM_RECOVERY_NORMAL) * (combat_mode? 0.25 : 1)) if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && incomingstammult != 1) incomingstammult = max(0.01, incomingstammult) From 527458c901804db8a03610ea486d2765e7644299 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 21:48:18 -0700 Subject: [PATCH 19/39] amends --- code/modules/mob/living/carbon/human/human_movement.dm | 6 +++++- code/modules/movespeed/_movespeed_modifier.dm | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 45c558d0a6..e2d98d6b28 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -56,7 +56,11 @@ HM.on_move(NewLoc) if(. && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && !(movement_type & FLYING) && CHECK_ALL_MOBILITY(src, MOBILITY_MOVE|MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && (!pulledby || (pulledby.pulledby == src))) if(!HAS_TRAIT(src, TRAIT_FREESPRINT)) - doSprintLossTiles(1) + var/datum/movespeed_modifier/equipment_speedmod/MM = get_movespeed_modifier_datum(/datum/movespeed_modifier/equipment_speedmod) + var/amount = 1 + if(MM) + amount *= (1 + (1 - (1 / MM.multiplicative_slowdown))) + doSprintLossTiles(amount) if((oldpseudoheight - pseudo_z_axis) >= 8) to_chat(src, "You trip off of the elevated surface!") for(var/obj/item/I in held_items) diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index fc5f5696bd..0cbb3d34f3 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -236,6 +236,13 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) var/datum/movespeed_modifier/M = movespeed_modification[id] . += M.multiplicative_slowdown +/** + * Gets the movespeed modifier datum of a modifier on a mob. Returns null if not found. + * DANGER: IT IS UP TO THE PERSON USING THIS TO MAKE SURE THE MODIFIER IS NOT MODIFIED IF IT HAPPENS TO BE GLOBAL/CACHED. + */ +/mob/proc/get_movespeed_modifier_datum(id) + return movespeed_modification[id] + /// Checks if a move speed modifier is valid and not missing any data /proc/movespeed_data_null_check(datum/movespeed_modifier/M) //Determines if a data list is not meaningful and should be discarded. . = TRUE From 0745f4ccd3e7df831b4bf3e77a1be97fbce438fd Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Sep 2020 23:12:19 -0700 Subject: [PATCH 20/39] done --- code/modules/mob/living/carbon/human/human_movement.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index e2d98d6b28..509633c0d5 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -58,8 +58,8 @@ if(!HAS_TRAIT(src, TRAIT_FREESPRINT)) var/datum/movespeed_modifier/equipment_speedmod/MM = get_movespeed_modifier_datum(/datum/movespeed_modifier/equipment_speedmod) var/amount = 1 - if(MM) - amount *= (1 + (1 - (1 / MM.multiplicative_slowdown))) + if(MM?.multiplicative_slowdown >= 1) + amount *= (1 + (6 - (3 / MM.multiplicative_slowdown))) doSprintLossTiles(amount) if((oldpseudoheight - pseudo_z_axis) >= 8) to_chat(src, "You trip off of the elevated surface!") From 7249fe058ffa86c0d9774f967aa636ba3d88fe5c Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 17:36:30 -0700 Subject: [PATCH 21/39] config based --- code/__DEFINES/combat/stamina_combat.dm | 14 ------- code/__DEFINES/configuration.dm | 2 + code/_onclick/hud/screen_objects/stamina.dm | 11 +++--- .../configuration/entries/stamina_combat.dm | 31 +++++++++++++++ code/modules/mob/living/living.dm | 2 + code/modules/mob/living/living_defines.dm | 8 +--- code/modules/mob/living/stamina_buffer.dm | 38 +++++++++++-------- tgstation.dme | 1 + 8 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 code/controllers/configuration/entries/stamina_combat.dm diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index 374439f9eb..c448e622f5 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -1,18 +1,4 @@ // Stamina Buffer -/// Stamina buffer amount -#define STAMINA_BUFFER_CAPACITY 30 -/// Stamina buffer regen per decisecond -#define STAMINA_BUFFER_REGEN_PER_SECOND 1 -/// Stamina buffer regen multiplier while in combat mode -#define STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT 3 -/// Penalty time after an action (clickdelay counting action) ends for stamina buffer regeneration -#define STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME 8 -/// Penalty regen multiplier -#define STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR 0.5 -/// percent of regen to take away at stamcrit -#define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.75 -/// percent of capacity to take away at stamcrit -#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY 0.5 // Standard amounts for stamina usage diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm index e9881677ba..0eeb3862f4 100644 --- a/code/__DEFINES/configuration.dm +++ b/code/__DEFINES/configuration.dm @@ -3,6 +3,8 @@ #define CONFIG_SET(X, Y) global.config.Set(/datum/config_entry/##X, ##Y) /// Gets the datum of the object, for when editing a const define. #define CONFIG_GET_ENTRY(X) global.config.GetEntryDatum(/datum/config_entry/##X) +/// Caches an entry in the proc +#define CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(X, varname) var/static/datum/config_entry/##X/entrycache_##varname;if(!entrycache_##varname){entrycache_##varname=CONFIG_GET_ENTRY(##X);};var/##varname=entrycache_##varname.config_entry_value #define CONFIG_MAPS_FILE "maps.txt" diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm index bafe919045..98a387d32d 100644 --- a/code/_onclick/hud/screen_objects/stamina.dm +++ b/code/_onclick/hud/screen_objects/stamina.dm @@ -11,11 +11,9 @@ /obj/screen/staminas/Click(location,control,params) if(isliving(usr)) var/mob/living/L = usr + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/buffer_max, buffer_max) to_chat(L, "You have [L.getStaminaLoss()] stamina loss.
\ - Your stamina buffer is currently [L.stamina_buffer]/[L.stamina_buffer_max], and recharges at [L.stamina_buffer_regen] and [L.stamina_buffer_regen_combat] (combat mode on) per second.
\ - Your stamina buffer will have its capacity reduced by up to [STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY * 100]% from stamina damage, up until stamcrit, and similarly will be impacted in regeneration by \ - [STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY * 100]% from said damage.\ -
Your stamina buffer is [round((L.stamina_buffer / L.stamina_buffer_max) * 100, 0.1)]% full.") +
Your stamina buffer is [round((L.stamina_buffer / buffer_max) * 100, 0.1)]% full.") /obj/screen/staminas/update_icon_state() var/mob/living/carbon/user = hud?.mymob @@ -65,6 +63,7 @@ /obj/screen/staminabuffer/proc/update_to_mob() var/mob/living/carbon/user = hud?.mymob user.UpdateStaminaBuffer(FALSE) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/buffer_max, buffer_max) if(!user?.client) return FALSE if(user.stat == DEAD || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2)) @@ -73,9 +72,9 @@ else if(user.hal_screwyhud == 5) icon_state = "stambuffer29" return FALSE - else if(user.stamina_buffer >= user.stamina_buffer_max) + else if(user.stamina_buffer >= buffer_max) icon_state = "stambuffer29" return FALSE else - icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]" + icon_state = "stambuffer[FLOOR((user.stamina_buffer / buffer_max) * 29, 1)]" return TRUE diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm new file mode 100644 index 0000000000..b519f7403e --- /dev/null +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -0,0 +1,31 @@ +/datum/config_entry/number/stamina_combat + integer = FALSE + abstract_type = /datum/config_entry/number/stamina_combat + +/// Maximum stamina buffer +/datum/config_entry/number/stamina_combat/buffer_max + config_entry_value = 75 + +/// Seconds until percent_regeneration_out_of_combat kicks in +/datum/config_entry/number/stamina_combat/out_of_combat_timer + config_entry_value = 5 + +/// Base regeneration per second +/datum/config_entry/number/stamina_combat/base_regeneration + config_entry_value = 1 + +/// Combat mode regeneration per second +/datum/config_entry/number/stamina_combat/combat_regeneration + config_entry_value = 5 + +/// After out_of_combat_timer elapses, additionally regenerate this percent of missing stamina per second. Unaffected by combat mode. +/datum/config_entry/number/stamina_combat/missing_percent_regeneration_out_of_combat + config_entry_value = 30 + +/// Seconds after an action for which your regeneration is penalized +/datum/config_entry/number/stamina_combat/post_action_penalty_delay + config_entry_value = 2 + +/// Factor to multiply by for penalizing post-action-stamina-regen +/datum/config_entry/number/stamina_combat/post_action_penalty_factor + config_entry_value = 0.25 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 36acdc77a8..d34073ea24 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -8,6 +8,8 @@ for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) diag_hud.add_to_hud(src) faction += "[REF(src)]" + stamina_buffer = INFINITY + UpdateStaminaBuffer() GLOB.mob_living_list += src /mob/living/prepare_huds() diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index f6008cd7d6..126672312a 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -159,15 +159,9 @@ //---End // Stamina Buffer--- - /// Our maximum stamina buffer - var/stamina_buffer_max = STAMINA_BUFFER_CAPACITY /// Our stamina buffer - var/stamina_buffer = STAMINA_BUFFER_CAPACITY + var/stamina_buffer /// Stamina buffer regen modifier var/stamina_buffer_regen_mod = 1 - /// Standard stamina buffer regen per second - var/stamina_buffer_regen = STAMINA_BUFFER_REGEN_PER_SECOND - /// Standard stamina buffer regen per second with combat mode - var/stamina_buffer_regen_combat = STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT /// Last time stamina buffer regen was done var/stamina_buffer_regen_last = 0 diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index c2495eb633..f7f450aa45 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -20,18 +20,28 @@ * Updates our stamina buffer amount. */ /mob/living/proc/UpdateStaminaBuffer(updating_hud = TRUE) - var/time = world.time - stamina_buffer_regen_last - var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT - var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) - stamina_buffer_regen_last = world.time - if(stamina_buffer > stamina_buffer_max) - stamina_buffer = stamina_buffer_max + if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER)) return - var/combat_mode = !SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) - var/action_penalty = (((world.time - last_action) <= STAMINA_BUFFER_REGEN_ACTION_PENALTY_TIME) && STAMINA_BUFFER_REGEN_ACTION_PENALTY_FACTOR) || 1 - var/stamina_penalty = 1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY) - var/regen = time * 0.1 * ((combat_mode? stamina_buffer_regen_combat : stamina_buffer_regen) * stamina_buffer_regen_mod) - stamina_buffer += min((stamina_buffer_max - stamina_buffer), action_penalty * stamina_penalty * regen) + var/time = world.time - stamina_buffer_regen_last + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/buffer_max, buffer_max) + stamina_buffer_regen_last = world.time + if(stamina_buffer >= buffer_max) + stamina_buffer = buffer_max + return + else if(!time) + return + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/out_of_combat_timer, out_of_combat_timer) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/base_regeneration, base_regeneration) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/combat_regeneration, combat_regeneration) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/missing_percent_regeneration_out_of_combat, missing_percent_regeneration_out_of_combat) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_delay, post_action_penalty_delay) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor) + var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration + var/time_since_last_action = world.time - last_action + var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 + var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? ((buffer_max - stamina_buffer) * (missing_percent_regeneration_out_of_combat * 0.01)) : 0 + var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod + stamina_buffer += min((buffer_max - stamina_buffer), regen) if(updating_hud) hud_used?.staminabuffer?.mark_dirty() @@ -39,7 +49,5 @@ * Boosts our stamina buffer by this much. */ /mob/living/proc/RechargeStaminaBuffer(amount) - var/missing_stamina_percent = getStaminaLoss() / STAMINA_CRIT - var/stamina_buffer_max = src.stamina_buffer_max * (1 - (missing_stamina_percent * STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY)) - stamina_buffer += min(amount, stamina_buffer_max - stamina_buffer) - hud_used?.staminabuffer?.mark_dirty() + stamina_buffer += abs(amount) + UpdateStaminaBuffer() diff --git a/tgstation.dme b/tgstation.dme index 5e92d0870a..db31db6000 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -291,6 +291,7 @@ #include "code\controllers\configuration\entries\plushies.dm" #include "code\controllers\configuration\entries\policy.dm" #include "code\controllers\configuration\entries\resources.dm" +#include "code\controllers\configuration\entries\stamina_combat.dm" #include "code\controllers\subsystem\acid.dm" #include "code\controllers\subsystem\adjacent_air.dm" #include "code\controllers\subsystem\air.dm" From ddc7f10de7c0ed0119ea722265cde3e36c6f4cac Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 18:35:42 -0700 Subject: [PATCH 22/39] fixes --- code/controllers/configuration/entries/stamina_combat.dm | 6 +++--- code/modules/mob/living/stamina_buffer.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index b519f7403e..c01673413c 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,7 +4,7 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 75 + config_entry_value = 45 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer @@ -18,8 +18,8 @@ /datum/config_entry/number/stamina_combat/combat_regeneration config_entry_value = 5 -/// After out_of_combat_timer elapses, additionally regenerate this percent of missing stamina per second. Unaffected by combat mode. -/datum/config_entry/number/stamina_combat/missing_percent_regeneration_out_of_combat +/// After out_of_combat_timer elapses, additionally regenerate this percent of total stamina per second. Unaffected by combat mode. +/datum/config_entry/number/stamina_combat/percent_regeneration_out_of_combat config_entry_value = 30 /// Seconds after an action for which your regeneration is penalized diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index f7f450aa45..f2037c1216 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -33,13 +33,13 @@ CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/out_of_combat_timer, out_of_combat_timer) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/base_regeneration, base_regeneration) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/combat_regeneration, combat_regeneration) - CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/missing_percent_regeneration_out_of_combat, missing_percent_regeneration_out_of_combat) + CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/percent_regeneration_out_of_combat, percent_regeneration_out_of_combat) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_delay, post_action_penalty_delay) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor) var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration var/time_since_last_action = world.time - last_action var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 - var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? ((buffer_max - stamina_buffer) * (missing_percent_regeneration_out_of_combat * 0.01)) : 0 + var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * missing_percent_regeneration_out_of_combat * 0.01)) var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod stamina_buffer += min((buffer_max - stamina_buffer), regen) if(updating_hud) From 2c4dc4d1a907caa4721d0516af93a651c42cbc25 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 19:08:21 -0700 Subject: [PATCH 23/39] ok --- code/controllers/configuration/entries/stamina_combat.dm | 4 ++-- code/modules/mob/living/stamina_buffer.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index c01673413c..5b179f7477 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,11 +4,11 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 45 + config_entry_value = 75 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer - config_entry_value = 5 + config_entry_value = 8 /// Base regeneration per second /datum/config_entry/number/stamina_combat/base_regeneration diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index f2037c1216..0670f97204 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -39,7 +39,7 @@ var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration var/time_since_last_action = world.time - last_action var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 - var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * missing_percent_regeneration_out_of_combat * 0.01)) + var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * percent_regeneration_out_of_combat * 0.01)) var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod stamina_buffer += min((buffer_max - stamina_buffer), regen) if(updating_hud) From 31791df2bda45648f355cfdbc86c32b8f769a184 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 20:38:43 -0700 Subject: [PATCH 24/39] fixes --- code/__DEFINES/combat.dm | 4 ++- code/__DEFINES/traits.dm | 4 +++ .../configuration/entries/stamina_combat.dm | 14 +++++++---- code/modules/mob/living/carbon/life.dm | 2 +- .../modules/mob/living/living_active_block.dm | 6 +++++ .../mob/living/living_blocking_parrying.dm | 6 ++++- code/modules/mob/living/living_defines.dm | 2 ++ code/modules/mob/living/stamina_buffer.dm | 25 +++++++++++-------- 8 files changed, 44 insertions(+), 19 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 0439a5d7e5..80170dccfa 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -73,8 +73,10 @@ #define CHECK_STAMCRIT(mob) (mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) //stamina stuff -///crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit +/// crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit #define STAMINA_CRIT 140 +/// Threshold under for which you are unable to draw from stamina health to replace stamina buffer +#define STAMINA_NO_OVERDRAW_THRESHOLD 100 #define CRAWLUNDER_DELAY 30 //Delay for crawling under a standing mob diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 674cc16980..f489833b8a 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -206,6 +206,10 @@ #define TRAIT_MUTATION_STASIS "mutation_stasis" //Prevents processed genetics mutations from processing. #define TRAIT_FAST_PUMP "fast_pump" #define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good... +/// Prevents stamina buffer regeneration +#define TRAIT_NO_STAMINA_BUFFER_REGENERATION "block_stamina_buffer_regen" +/// Prevents stamina regeneration +#define TRAIT_NO_STAMINA_REGENERATION "block_stamina_regen" // mobility flag traits // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index 5b179f7477..2cc99bdbe5 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,19 +4,19 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 75 + config_entry_value = 40 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer - config_entry_value = 8 + config_entry_value = 10 /// Base regeneration per second /datum/config_entry/number/stamina_combat/base_regeneration - config_entry_value = 1 + config_entry_value = 5 /// Combat mode regeneration per second /datum/config_entry/number/stamina_combat/combat_regeneration - config_entry_value = 5 + config_entry_value = 12.5 /// After out_of_combat_timer elapses, additionally regenerate this percent of total stamina per second. Unaffected by combat mode. /datum/config_entry/number/stamina_combat/percent_regeneration_out_of_combat @@ -24,8 +24,12 @@ /// Seconds after an action for which your regeneration is penalized /datum/config_entry/number/stamina_combat/post_action_penalty_delay - config_entry_value = 2 + config_entry_value = 5 /// Factor to multiply by for penalizing post-action-stamina-regen /datum/config_entry/number/stamina_combat/post_action_penalty_factor config_entry_value = 0.25 + +/// Factor to multiply by for stamina usage past buffer into health +/datum/config_entry/number/stamina_combat/overdraw_penalty_factor + config_entry_value = 1.5 diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 36a17ab82a..30785a0103 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -503,7 +503,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put /mob/living/carbon/handle_status_effects() ..() var/combat_mode = SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE) - if(getStaminaLoss()) + if(getStaminaLoss() && !HAS_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION)) adjustStaminaLoss((!CHECK_MOBILITY(src, MOBILITY_STAND) ? ((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) ? STAM_RECOVERY_STAM_CRIT : STAM_RECOVERY_RESTING) : STAM_RECOVERY_NORMAL) * (combat_mode? 0.25 : 1)) if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && incomingstammult != 1) diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm index 46b7c52075..1d8815d007 100644 --- a/code/modules/mob/living/living_active_block.dm +++ b/code/modules/mob/living/living_active_block.dm @@ -8,6 +8,8 @@ active_block_item = null REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT) REMOVE_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT) + REMOVE_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION, ACTIVE_BLOCK_TRAIT) + REMOVE_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION, ACTIVE_BLOCK_TRAIT) remove_movespeed_modifier(/datum/movespeed_modifier/active_block) var/datum/block_parry_data/data = I.get_block_parry_data() DelayNextAction(data.block_end_click_cd_add) @@ -27,6 +29,10 @@ ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT) //probably should be something else at some point if(data.block_lock_sprinting) ADD_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT) + if(data.block_no_stamina_regeneration) + ADD_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION, ACTIVE_BLOCK_TRAIT) + if(data.block_no_stambuffer_regeneration) + ADD_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION, ACTIVE_BLOCK_TRAIT) add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/active_block, multiplicative_slowdown = data.block_slowdown) active_block_effect_start() return TRUE diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm index 3bc7943c67..08ef674b33 100644 --- a/code/modules/mob/living/living_blocking_parrying.dm +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -74,8 +74,12 @@ GLOBAL_LIST_EMPTY(block_parry_data) /// Ratio of stamina incurred by chest (so after [block_stamina_limb_ratio] runs) that is buffered. var/block_stamina_buffer_ratio = 1 - /// Stamina dealt directly via adjustStaminaLossBuffered() per SECOND of block. + /// Stamina dealt directly via UseStaminaBuffer() per SECOND of block. var/block_stamina_cost_per_second = 1.5 + /// Prevent stamina buffer regeneration while block? + var/block_no_stambuffer_regeneration = TRUE + /// Prevent stamina regeneration while block? + var/block_no_stamina_regeneration = FALSE /// Bitfield for attack types that we can block while down. This will work in any direction. var/block_resting_attack_types_anydir = ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED | ATTACK_TYPE_TACKLE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 126672312a..5621fab9c1 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -165,3 +165,5 @@ var/stamina_buffer_regen_mod = 1 /// Last time stamina buffer regen was done var/stamina_buffer_regen_last = 0 + /// Last time we used stamina buffer + var/stamina_buffer_last_use = 0 diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index 0670f97204..c59498041f 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -4,15 +4,20 @@ * * Returns TRUE or FALSE based on if we have it. */ -/mob/living/proc/UseStaminaBuffer(amount, warn = FALSE) +/mob/living/proc/UseStaminaBuffer(amount, warn = FALSE, considered_action = TRUE) if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER)) return TRUE if(stamina_buffer < amount) - if(warn) - to_chat(src, "You do not have enough action stamina to do that!") - return - return FALSE - stamina_buffer -= amount + var/stamina_health = getStaminaLoss() + if(stamina_health < STAMINA_NO_OVERDRAW_THRESHOLD) + if(warn) + to_chat(src, "You do not have enough action stamina to do that!") + return FALSE + adjustStaminaLoss(amount * CONFIG_GET(number/stamina_combat/overdraw_penalty_factor)) + else + stamina_buffer -= amount + if(considered_action) + stamina_buffer_last_use = world.time UpdateStaminaBuffer() return TRUE @@ -20,15 +25,13 @@ * Updates our stamina buffer amount. */ /mob/living/proc/UpdateStaminaBuffer(updating_hud = TRUE) - if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER)) - return var/time = world.time - stamina_buffer_regen_last CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/buffer_max, buffer_max) stamina_buffer_regen_last = world.time - if(stamina_buffer >= buffer_max) + if((stamina_buffer >= buffer_max) || !(combat_flags & COMBAT_FLAG_STAMINA_BUFFER)) stamina_buffer = buffer_max return - else if(!time) + else if(!time || HAS_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION)) return CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/out_of_combat_timer, out_of_combat_timer) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/base_regeneration, base_regeneration) @@ -37,7 +40,7 @@ CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_delay, post_action_penalty_delay) CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor) var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration - var/time_since_last_action = world.time - last_action + var/time_since_last_action = world.time - stamina_buffer_last_use var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * percent_regeneration_out_of_combat * 0.01)) var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod From 4ab064a50d527ee04567c997787c6ec6d32ac132 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 20:58:33 -0700 Subject: [PATCH 25/39] fix --- code/controllers/configuration/entries/stamina_combat.dm | 8 ++++---- code/modules/mob/living/stamina_buffer.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index 2cc99bdbe5..3fa548366f 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,19 +4,19 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 40 + config_entry_value = 30 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer - config_entry_value = 10 + config_entry_value = 15 /// Base regeneration per second /datum/config_entry/number/stamina_combat/base_regeneration - config_entry_value = 5 + config_entry_value = 0.5 /// Combat mode regeneration per second /datum/config_entry/number/stamina_combat/combat_regeneration - config_entry_value = 12.5 + config_entry_value = 5 /// After out_of_combat_timer elapses, additionally regenerate this percent of total stamina per second. Unaffected by combat mode. /datum/config_entry/number/stamina_combat/percent_regeneration_out_of_combat diff --git a/code/modules/mob/living/stamina_buffer.dm b/code/modules/mob/living/stamina_buffer.dm index c59498041f..a410df582b 100644 --- a/code/modules/mob/living/stamina_buffer.dm +++ b/code/modules/mob/living/stamina_buffer.dm @@ -9,7 +9,7 @@ return TRUE if(stamina_buffer < amount) var/stamina_health = getStaminaLoss() - if(stamina_health < STAMINA_NO_OVERDRAW_THRESHOLD) + if(stamina_health > STAMINA_NO_OVERDRAW_THRESHOLD) if(warn) to_chat(src, "You do not have enough action stamina to do that!") return FALSE @@ -41,7 +41,7 @@ CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor) var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration var/time_since_last_action = world.time - stamina_buffer_last_use - var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1 + var/action_penalty = ((time_since_last_action) < (post_action_penalty_delay * 10))? post_action_penalty_factor : 1 var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * percent_regeneration_out_of_combat * 0.01)) var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod stamina_buffer += min((buffer_max - stamina_buffer), regen) From 2dddb2253e03f6200ff83e3199b22a6e33602047 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 21 Sep 2020 21:03:28 -0700 Subject: [PATCH 26/39] tweak --- code/controllers/configuration/entries/stamina_combat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/configuration/entries/stamina_combat.dm b/code/controllers/configuration/entries/stamina_combat.dm index 3fa548366f..65580899f1 100644 --- a/code/controllers/configuration/entries/stamina_combat.dm +++ b/code/controllers/configuration/entries/stamina_combat.dm @@ -4,7 +4,7 @@ /// Maximum stamina buffer /datum/config_entry/number/stamina_combat/buffer_max - config_entry_value = 30 + config_entry_value = 25 /// Seconds until percent_regeneration_out_of_combat kicks in /datum/config_entry/number/stamina_combat/out_of_combat_timer From 9a17c42321e1603af127f610743e92b11d086155 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 22 Sep 2020 01:53:16 -0700 Subject: [PATCH 27/39] sigh --- code/game/objects/items/tanks/jetpack.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 7cf25098e1..29961d12b4 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -55,6 +55,8 @@ RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/move_react) if(full_speed) user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) + else + user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack) /obj/item/tank/jetpack/proc/turn_off(mob/user) on = FALSE @@ -63,6 +65,7 @@ ion_trail.stop() UnregisterSignal(user, COMSIG_MOVABLE_MOVED) user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) + user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack) /obj/item/tank/jetpack/proc/move_react(mob/user) allow_thrust(0.01, user) From 15d04caa4348e19cf24511277ed49d5bc4237c41 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 22 Sep 2020 21:59:33 -0700 Subject: [PATCH 28/39] okay --- code/__DEFINES/combat/stamina_combat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm index c448e622f5..1f781ca3e0 100644 --- a/code/__DEFINES/combat/stamina_combat.dm +++ b/code/__DEFINES/combat/stamina_combat.dm @@ -28,8 +28,8 @@ #define STAM_COST_ATTACK_OBJ_MULT 0.75 #define STAM_COST_ATTACK_MOB_MULT 1 #define STAM_COST_BATON_MOB_MULT 0.85 -#define STAM_COST_THROW_MULT 2 -#define STAM_COST_THROW_MOB 2.5 //multiplied by (mob size + 1)^2. +#define STAM_COST_THROW_MULT 0.75 +#define STAM_COST_THROW_MOB 1.25 //multiplied by (mob size + 1)^2. /// Damage penalty when fighting prone. #define LYING_DAMAGE_PENALTY 0.7 From 822f1c9bf3eca70b0bc72fcb90aa23f02489f502 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 27 Sep 2020 03:07:51 -0700 Subject: [PATCH 29/39] fix --- code/_globalvars/lists/mobs.dm | 18 +++++++++++- .../configuration/entries/game_options.dm | 28 +++++++++++++------ code/modules/movespeed/_movespeed_modifier.dm | 8 ++++-- code/modules/movespeed/modifiers/mobs.dm | 6 ++++ 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 134f9d9cbe..64bac1f9af 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -40,6 +40,7 @@ GLOBAL_LIST_EMPTY(sentient_disease_instances) GLOBAL_LIST_EMPTY(latejoin_ai_cores) GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup) +GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup_floating) GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traitor-target purposes. @@ -47,14 +48,22 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito // NOTE: This is entirely based on the fact that byond typesof/subtypesof gets longer/deeper paths before shallower ones. // If that ever breaks this entire proc breaks. var/list/mob_types = typesof(/mob) - var/list/entry_value = CONFIG_GET(keyed_list/multiplicative_movespeed) + var/list/mob_types_floating = typesof(/mob) + var/list/entry_value = CONFIG_GET(keyed_list/multiplicative_movespeed/normal) + var/list/entry_value_floating = CONFIG_GET(keyed_list/multiplicative_movespeed/floating) var/list/configured_types = list() + var/list/configured_types_floating = list() for(var/path in entry_value) var/value = entry_value[path] if(isnull(value)) continue // associative list sets for elements that already exist preserve order mob_types[path] = value + for(var/path in entry_value_floating) + var/value = entry_value_floating[path] + if(isnull(value)) + continue + mob_types_floating[path] = value // now go back up through it to set everything, making absolute sure that base paths are overridden by child paths all the way down the path tree. for(var/i in length(mob_types) to 1 step -1) var/path = mob_types[i] @@ -63,7 +72,14 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito // we're going from bottom to top so it should be safe to do this without further checks.. for(var/subpath in typesof(path)) configured_types[subpath] = mob_types[path] + for(var/i in length(mob_types_floating) to 1 step -1) + var/path = mob_types_floating[i] + if(isnull(mob_types_floating[path])) + continue + for(var/subpath in typesof(path)) + configured_types_floating[subpath] = mob_types_floating[path] GLOB.mob_config_movespeed_type_lookup = configured_types + GLOB.mob_config_movespeed_type_lookup_floating = configured_types_floating if(update_mobs) update_mob_config_movespeeds() diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 9f79353e77..989cfbc262 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -230,14 +230,6 @@ /datum/config_entry/keyed_list/multiplicative_movespeed key_mode = KEY_MODE_TYPE value_mode = VALUE_MODE_NUM - config_entry_value = list( //DEFAULTS - /mob/living/simple_animal = 1, - /mob/living/silicon/pai = 1, - /mob/living/carbon/alien/humanoid/sentinel = 0.25, - /mob/living/carbon/alien/humanoid/drone = 0.5, - /mob/living/carbon/alien/humanoid/royal/praetorian = 1, - /mob/living/carbon/alien/humanoid/royal/queen = 3 - ) /datum/config_entry/keyed_list/multiplicative_movespeed/ValidateAndSet() . = ..() @@ -249,6 +241,24 @@ if(. && (var_name == NAMEOF(src, config_entry_value))) update_config_movespeed_type_lookup(TRUE) +/datum/config_entry/keyed_list/multiplicative_movespeed/normal + config_entry_value = list( //DEFAULTS + /mob/living/simple_animal = 1, + /mob/living/silicon/pai = 1, + /mob/living/carbon/alien/humanoid/sentinel = 0.25, + /mob/living/carbon/alien/humanoid/drone = 0.5, + /mob/living/carbon/alien/humanoid/royal/praetorian = 1, + /mob/living/carbon/alien/humanoid/royal/queen = 3 + ) + +/datum/config_entry/keyed_list/multiplicative_movespeed/floating + config_entry_value = list( + /mob/living = 0, + /mob/living/carbon/alien/humanoid = 0, + /mob/living/carbon/alien/humanoid/royal/praetorian = 0, + /mob/living/carbon/alien/humanoid/royal/queen = 2 + ) + /datum/config_entry/number/movedelay //Used for modifying movement speed for mobs. abstract_type = /datum/config_entry/number/movedelay integer = FALSE @@ -297,7 +307,7 @@ /////////////////////////////////////////////////Outdated move delay /datum/config_entry/number/outdated_movedelay - deprecated_by = /datum/config_entry/keyed_list/multiplicative_movespeed + deprecated_by = /datum/config_entry/keyed_list/multiplicative_movespeed/normal abstract_type = /datum/config_entry/number/outdated_movedelay var/movedelay_type diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index 0cbb3d34f3..9c8036bd55 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -187,13 +187,15 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) /// Set or update the global movespeed config on a mob /mob/proc/update_config_movespeed() add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/mob_config_speedmod, multiplicative_slowdown = get_config_multiplicative_speed()) + add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/mob_config_speedmod_floating, multiplicative_slowdown = get_config_multiplicative_speed(TRUE)) /// Get the global config movespeed of a mob by type -/mob/proc/get_config_multiplicative_speed() - if(!islist(GLOB.mob_config_movespeed_type_lookup) || !GLOB.mob_config_movespeed_type_lookup[type]) +/mob/proc/get_config_multiplicative_speed(floating = FALSE) + var/list/read = floating? GLOB.mob_config_movespeed_type_lookup_floating : GLOB.mob_config_movespeed_type_lookup + if(!islist(read) || !read[type]) return 0 else - return GLOB.mob_config_movespeed_type_lookup[type] + return read[type] /// Go through the list of movespeed modifiers and calculate a final movespeed. ANY ADD/REMOVE DONE IN UPDATE_MOVESPEED MUST HAVE THE UPDATE ARGUMENT SET AS FALSE! /mob/proc/update_movespeed() diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index 49515313ea..f6cf84eb83 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -111,6 +111,12 @@ /datum/movespeed_modifier/mob_config_speedmod variable = TRUE + blacklisted_movetypes = FLOATING + flags = IGNORE_NOSLOW + +/datum/movespeed_modifier/mob_config_speedmod_floating + variable = TRUE + movetypes = FLOATING flags = IGNORE_NOSLOW /datum/movespeed_modifier/liver_cirrhosis From 21d3d8fcd9b2b10be4edf3b2f144e1a6efb82a4c Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 3 Oct 2020 14:17:13 -0700 Subject: [PATCH 30/39] sigh --- _maps/map_files/PubbyStation/job_changes.dm | 20 ----- _maps/pubbystation.json | 7 +- code/__DEFINES/maps.dm | 5 -- code/controllers/subsystem/job.dm | 3 +- code/modules/jobs/job_types/_job.dm | 28 ++++++- code/modules/jobs/map_changes/map_changes.dm | 4 - code/modules/mapping/map_config.dm | 85 ++++++++++++++++++++ tgstation.dme | 1 - 8 files changed, 118 insertions(+), 35 deletions(-) delete mode 100644 _maps/map_files/PubbyStation/job_changes.dm delete mode 100644 code/modules/jobs/map_changes/map_changes.dm diff --git a/_maps/map_files/PubbyStation/job_changes.dm b/_maps/map_files/PubbyStation/job_changes.dm deleted file mode 100644 index 726601725b..0000000000 --- a/_maps/map_files/PubbyStation/job_changes.dm +++ /dev/null @@ -1,20 +0,0 @@ -#define JOB_MODIFICATION_MAP_NAME "PubbyStation" - -/datum/job/hos/New() - ..() - MAP_JOB_CHECK - access += ACCESS_CREMATORIUM - minimal_access += ACCESS_CREMATORIUM - -/datum/job/warden/New() - ..() - MAP_JOB_CHECK - access += ACCESS_CREMATORIUM - minimal_access += ACCESS_CREMATORIUM - -/datum/job/officer/New() - ..() - MAP_JOB_CHECK - access += ACCESS_CREMATORIUM - minimal_access += ACCESS_CREMATORIUM - diff --git a/_maps/pubbystation.json b/_maps/pubbystation.json index f99cca57c5..acf49b773b 100644 --- a/_maps/pubbystation.json +++ b/_maps/pubbystation.json @@ -7,5 +7,10 @@ "whiteship": "whiteship_pubby", "ferry": "ferry_fancy", "cargo": "cargo_box" - } + }, + "job_access_add": { + "/datum/job/hos": [27], + "/datum/job/officer": [27], + "/datum/job/detective": [27] + } } diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index c5c2dd58c2..854b6c9dcf 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -20,11 +20,6 @@ Multi-Z stations are supported and multi-Z mining and away missions would require only minor tweaks. */ -// helpers for modifying jobs, used in various job_changes.dm files -#define MAP_JOB_CHECK if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return; } -#define MAP_JOB_CHECK_BASE if(SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) { return ..(); } -#define MAP_REMOVE_JOB(jobpath) /datum/job/##jobpath/map_check() { return (SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) && ..() } - #define SPACERUIN_MAP_EDGE_PAD 15 // traits diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 4f59992ace..a81b062d5a 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -55,9 +55,10 @@ SUBSYSTEM_DEF(job) continue if(!job.config_check()) continue - if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new + if(!job.map_check(SSmapping.config)) //Even though we initialize before mapping, this is fine because the config is loaded at new testing("Removed [job.type] due to map config"); continue + job.process_map_overrides(SSmapping.config) occupations += job name_occupations[job.title] = job type_occupations[J] = job diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 0feceaf1a8..b0ac5248c1 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -73,6 +73,31 @@ /// Starting skill modifiers. var/list/starting_modifiers +/** + * Checks if we should be created on a certain map + */ +/datum/job/proc/map_check(datum/map_config/C) + return (length(C.job_whitelist)? (type in C.job_whitelist) : !(type in C.job_blacklist)) + +/** + * Processes map specific overrides + */ +/datum/job/proc/process_map_overrides(datum/map_config/C) + if(type in C.job_override_spawn_positions) + spawn_positions = C.job_override_spawn_positions[type] + if(type in C.job_override_total_positions) + total_positions = C.job_override_total_positions[type] + if(type in C.job_access_override) + access = C.job_access_override[type] + minimal_access = access + else + if(type in C.job_access_add) + access += C.job_access_add[type] + minimal_access += C.job_access_add[type] + if(type in C.job_access_remove) + access -= C.job_access_add[type] + minimal_access -= C.job_access_remove[type] + //Only override this proc //H is usually a human unless an /equip override transformed it /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE) @@ -175,9 +200,6 @@ /datum/job/proc/config_check() return TRUE -/datum/job/proc/map_check() - return TRUE - /datum/job/proc/radio_help_message(mob/M) to_chat(M, "Prefix your message with :h to speak on your department's radio. To see other prefixes, look closely at your headset.") diff --git a/code/modules/jobs/map_changes/map_changes.dm b/code/modules/jobs/map_changes/map_changes.dm deleted file mode 100644 index 575075037b..0000000000 --- a/code/modules/jobs/map_changes/map_changes.dm +++ /dev/null @@ -1,4 +0,0 @@ -//this needs to come after the job_types subfolder to keep the correct ordering - -#include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm" -#undef JOB_MODIFICATION_MAP_NAME \ No newline at end of file diff --git a/code/modules/mapping/map_config.dm b/code/modules/mapping/map_config.dm index c03ef65f43..d18ca1e1e3 100644 --- a/code/modules/mapping/map_config.dm +++ b/code/modules/mapping/map_config.dm @@ -43,6 +43,21 @@ /// Orientation to load in by default. var/orientation = SOUTH //byond defaults to placing everyting SOUTH. + /// Jobs whitelist - if this is not empty, ONLY these jobs are allowed. Overrides blacklist. + var/list/job_whitelist + /// Jobs blacklist - if this is not empty, jobs in this aren't allowed. + var/list/job_blacklist + /// Job spawn position mod - type = number + var/list/job_override_spawn_positions + /// Job total position mod - type = number + var/list/job_override_total_positions + /// Add these accesses to jobs - type = list() + var/list/job_access_add + /// Remove these accesses from jobs - type = list() + var/list/job_access_remove + /// Override job accesses - type = list() - overrides everything else + var/list/job_access_override + /proc/load_map_config(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE) var/datum/map_config/config = new if (default_to_box) @@ -161,6 +176,69 @@ allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE + if("job_whitelist" in json) + job_whitelist = list() + for(var/path in json["job_whitelist"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_whitelist += type + + if("job_blacklist" in json) + job_blacklist = list() + for(var/path in json["job_blacklist"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_blacklist += type + + if("job_override_spawn_positions" in json) + job_override_spawn_positions = list() + for(var/path in json["job_override_spawn_positions"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_override_spawn_positions += type + + if("job_override_total_positions" in json) + job_override_total_positions = list() + for(var/path in json["job_override_total_positions"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_override_total_positions += type + + if("job_access_add" in json) + job_access_add = list() + for(var/path in json["job_acces_add"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_access_add[type] = json["job_access_add"] + + if("job_access_remove" in json) + job_access_remove = list() + for(var/path in json["job_acces_add"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_access_remove[type] = json["job_access_remove"] + + if("job_access_override" in json) + job_access_override = list() + for(var/path in json["job_acces_add"]) + var/type = text2path(path) + if(!path) + log_config("map datum [config_filename] failed to validate path [path] in job overrides.") + continue + job_access_override[type] = json["job_access_override"] + defaulted = FALSE return TRUE #undef CHECK_EXISTS @@ -190,6 +268,13 @@ jsonlist["announcertype"] = announcertype jsonlist["orientation"] = orientation jsonlist["allow_custom_shuttles"] = allow_custom_shuttles + jsonlist["job_whitelist"] = job_whitelist + jsonlist["job_blacklist"] = job_blacklist + jsonlist["job_override_spawn_positions"] = job_override_spawn_positions + jsonlist["job_override_total_positions"] = job_override_total_positions + jsonlist["job_access_add"] = job_access_add + jsonlist["job_access_remove"] = job_access_remove + jsonlist["job_access_override"] = job_access_override if(fexists("data/next_map.json")) fdel("data/next_map.json") var/F = file("data/next_map.json") diff --git a/tgstation.dme b/tgstation.dme index 23f262d7a5..b3541599ff 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2274,7 +2274,6 @@ #include "code\modules\jobs\job_types\station_engineer.dm" #include "code\modules\jobs\job_types\virologist.dm" #include "code\modules\jobs\job_types\warden.dm" -#include "code\modules\jobs\map_changes\map_changes.dm" #include "code\modules\keybindings\bindings_atom.dm" #include "code\modules\keybindings\bindings_client.dm" #include "code\modules\keybindings\focus.dm" From c5d5493cfc2f2cb87b1f984a879b230bbb01b261 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 4 Oct 2020 09:45:03 -0700 Subject: [PATCH 31/39] Update output.dm --- code/modules/integrated_electronics/subtypes/output.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 1fc08c9aaa..833b2963ad 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -52,7 +52,7 @@ for(var/mob/M in range(1, get_turf(src))) mobs += M else - for(var/mob/M in range(2, get_turf(src)) + for(var/mob/M in range(2, get_turf(src))) mobs += M var/atom/host = assembly || src From 7c07863179658435ea34e85c77a95443eb5aee7a Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 5 Oct 2020 13:29:53 -0700 Subject: [PATCH 32/39] fix --- code/controllers/subsystem/input.dm | 12 ++++---- code/controllers/subsystem/npcpool.dm | 29 ++++++++++++++----- code/modules/keybindings/bindings_client.dm | 2 ++ code/modules/keybindings/setup.dm | 3 ++ code/modules/mob/living/say.dm | 1 + .../mob/living/simple_animal/bot/ed209bot.dm | 4 +-- .../living/simple_animal/hostile/wizard.dm | 3 ++ .../mob/living/simple_animal/parrot.dm | 15 ++++++---- 8 files changed, 47 insertions(+), 22 deletions(-) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 32936af9e9..bc3f6cf51b 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -64,10 +64,10 @@ SUBSYSTEM_DEF(input) // Misc macroset_classic_input["Tab"] = "\".winset \\\"mainwindow.macro=[SKIN_MACROSET_CLASSIC_HOTKEYS] map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"" macroset_classic_input["Escape"] = "\".winset \\\"input.text=\\\"\\\"\\\"\"" - + // FINALLY, WE CAN DO SOMETHING MORE NORMAL FOR THE SNOWFLAKE-BUT-LESS KEYSET. - - // HAHA - SIKE. Because of BYOND weirdness (tl;dr not specifically binding this way results in potentially duplicate chatboxes when + + // HAHA - SIKE. Because of BYOND weirdness (tl;dr not specifically binding this way results in potentially duplicate chatboxes when // conflicts occur with something like say indicator vs say), we're going to snowflake this anyways var/list/hard_binds = list( "O" = "ooc", @@ -80,7 +80,7 @@ SUBSYSTEM_DEF(input) for(var/key in hard_binds) for(var/modifier in anti_collision_modifiers) hard_bind_anti_collision["[modifier]+[key]"] = ".NONSENSICAL_VERB_THAT_DOES_NOTHING" - + macroset_classic_hotkey = list( "Any" = "\"KeyDown \[\[*\]\]\"", "Any+UP" = "\"KeyUp \[\[*\]\]\"", @@ -88,7 +88,7 @@ SUBSYSTEM_DEF(input) "Escape" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", ) - + macroset_classic_hotkey |= hard_binds macroset_classic_hotkey |= hard_bind_anti_collision @@ -100,7 +100,7 @@ SUBSYSTEM_DEF(input) "Escape" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", ) - + macroset_hotkey |= hard_binds macroset_hotkey |= hard_bind_anti_collision diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index c67deaede1..c20820c092 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -5,6 +5,10 @@ SUBSYSTEM_DEF(npcpool) runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun = list() + /// catches sleeping + var/invoking = FALSE + /// Invoke start time + var/invoke_start = 0 /datum/controller/subsystem/npcpool/stat_entry(msg) var/list/activelist = GLOB.simple_animals[AI_ON] @@ -12,7 +16,6 @@ SUBSYSTEM_DEF(npcpool) return ..() /datum/controller/subsystem/npcpool/fire(resumed = FALSE) - if (!resumed) var/list/activelist = GLOB.simple_animals[AI_ON] src.currentrun = activelist.Copy() @@ -24,12 +27,22 @@ SUBSYSTEM_DEF(npcpool) var/mob/living/simple_animal/SA = currentrun[currentrun.len] --currentrun.len - if(!SA.ckey && !SA.mob_transforming) - if(SA.stat != DEAD) - SA.handle_automated_movement() - if(SA.stat != DEAD) - SA.handle_automated_action() - if(SA.stat != DEAD) - SA.handle_automated_speech() + invoking = TRUE + invoke_start = world.time + INVOKE_ASYNC(src, .proc/invoke_process, SA) + if(invoking) + stack_trace("WARNING: [SA] ([SA.type]) slept during NPCPool processing.") + invoking = FALSE + if (MC_TICK_CHECK) return + +/datum/controller/subsystem/npcpool/proc/invoke_process(mob/living/simple_animal/SA) + if(!SA.ckey && !SA.mob_transforming) + if(SA.stat != DEAD) + SA.handle_automated_movement() + if(SA.stat != DEAD) + SA.handle_automated_action() + if(SA.stat != DEAD) + SA.handle_automated_speech() + invoking = FALSE diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index 3a47cd2315..3d12f89cfe 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -1,6 +1,7 @@ // Clients aren't datums so we have to define these procs indpendently. // These verbs are called for all key press and release events /client/verb/keyDown(_key as text) + SHOULD_NOT_SLEEP(TRUE) set instant = TRUE set hidden = TRUE @@ -83,6 +84,7 @@ keyUp("[key]") /client/verb/keyUp(_key as text) + SHOULD_NOT_SLEEP(TRUE) set instant = TRUE set hidden = TRUE diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index a53820b5d2..e577fe61b0 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -1,10 +1,13 @@ /datum/proc/key_down(key, client/user) // Called when a key is pressed down initially + SHOULD_NOT_SLEEP(TRUE) return /datum/proc/key_up(key, client/user) // Called when a key is released + SHOULD_NOT_SLEEP(TRUE) return /datum/proc/keyLoop(client/user) // Called once every frame + SHOULD_NOT_SLEEP(TRUE) set waitfor = FALSE return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 66c2cd96c7..4c03e74d70 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -82,6 +82,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( return new_msg /mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) + set waitfor = FALSE var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) var/talk_key = get_key(message) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 3f28fd6e01..8375d621d4 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -236,7 +236,7 @@ Auto Patrol[]"}, if(targets.len>0) var/mob/living/carbon/t = pick(targets) if((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. - shootAt(t) + INVOKE_ASYNC(src, .proc/shootAt, t) switch(mode) if(BOT_IDLE) // idle @@ -254,7 +254,7 @@ Auto Patrol[]"}, if(target) // make sure target exists if(Adjacent(target) && isturf(target.loc)) // if right next to perp - stun_attack(target) + INVOKE_ASYNC(src, .proc/stun_attack, target) mode = BOT_PREP_ARREST anchored = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm index b3523fc42c..59bd67e42a 100644 --- a/code/modules/mob/living/simple_animal/hostile/wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm @@ -62,6 +62,9 @@ /mob/living/simple_animal/hostile/wizard/handle_automated_action() . = ..() + INVOKE_ASYNC(src, .proc/AutomatedCast) + +/mob/living/simple_animal/hostile/wizard/proc/AutomatedCast() if(target && next_cast < world.time) if((get_dir(src,target) in list(SOUTH,EAST,WEST,NORTH)) && fireball.cast_check(0,src)) //Lined up for fireball src.setDir(get_dir(src,target)) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 3ca29b6746..1ff7e2f799 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -436,12 +436,7 @@ newspeak.Add(possible_phrase) speak = newspeak - //Search for item to steal - parrot_interest = search_for_item() - if(parrot_interest) - emote("me", EMOTE_VISIBLE, "looks in [parrot_interest]'s direction and takes flight.") - parrot_state = PARROT_SWOOP | PARROT_STEAL - icon_state = icon_living + INVOKE_ASYNC(src, .proc/attempt_item_theft) return //-----WANDERING - This is basically a 'I dont know what to do yet' state @@ -620,6 +615,14 @@ parrot_lastmove = src.loc return 0 +/mob/living/simple_animal/parrot/proc/attempt_item_theft() + //Search for item to steal + search_for_item() + if(parrot_interest) + emote("me", EMOTE_VISIBLE, "looks in [parrot_interest]'s direction and takes flight.") + parrot_state = PARROT_SWOOP | PARROT_STEAL + icon_state = icon_living + /mob/living/simple_animal/parrot/proc/search_for_item() var/item for(var/atom/movable/AM in view(src)) From a428311696c8c7c9925f929b126fdbac80bbe8e0 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 5 Oct 2020 22:05:23 -0700 Subject: [PATCH 33/39] Update setup.dm --- code/modules/keybindings/setup.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index e577fe61b0..47dbfd855f 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -1,15 +1,11 @@ /datum/proc/key_down(key, client/user) // Called when a key is pressed down initially SHOULD_NOT_SLEEP(TRUE) - return /datum/proc/key_up(key, client/user) // Called when a key is released SHOULD_NOT_SLEEP(TRUE) - return /datum/proc/keyLoop(client/user) // Called once every frame SHOULD_NOT_SLEEP(TRUE) - set waitfor = FALSE - return // removes all the existing macros /client/proc/erase_all_macros() From 7a674fc51ddb79a5826bc3ec6910343b5533dd14 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 6 Oct 2020 11:50:39 -0700 Subject: [PATCH 34/39] Update supermatter.dm --- code/modules/power/supermatter/supermatter.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e3fdbd3654..f02d071bc3 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -928,8 +928,13 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/mob/living/user = AM if(user.status_flags & GODMODE) return - message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].") - investigate_log("has consumed [key_name(user)].", INVESTIGATE_SUPERMATTER) + var/add + if(user.mind?.assigned_role == "Clown") + var/denergy = rand(-1000, 1000) + var/ddamage = rand(-150, clamp(150, 0, (explosion_point - damage) + 150)) + add = ", adding [denergy] energy and [ddamage] damage to the crystal" + message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)][add].") + investigate_log("has consumed [key_name(user)][add].", INVESTIGATE_SUPERMATTER) user.dust(force = TRUE) if(power_changes) matter_power += 200 From b341a71550b9e69860e6e731e2d903ddd6af8763 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 6 Oct 2020 11:52:18 -0700 Subject: [PATCH 35/39] Update supermatter.dm --- code/modules/power/supermatter/supermatter.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f02d071bc3..d61220a1a2 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -932,6 +932,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if(user.mind?.assigned_role == "Clown") var/denergy = rand(-1000, 1000) var/ddamage = rand(-150, clamp(150, 0, (explosion_point - damage) + 150)) + energy += denergy + damage += ddamage add = ", adding [denergy] energy and [ddamage] damage to the crystal" message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)][add].") investigate_log("has consumed [key_name(user)][add].", INVESTIGATE_SUPERMATTER) From 7200f2b004ce97979d4b5376bc93075180ee76eb Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 10 Oct 2020 02:47:28 -0700 Subject: [PATCH 36/39] Update emote.dm --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 1d78979cbd..4ee52a08a6 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -562,7 +562,7 @@ if(. && iscarbon(user)) var/mob/living/carbon/C = user if(isjellyperson(C)) - pick(playsound(C, 'sound/effects/attackblob.ogg', 50, 1),playsound(C, 'sound/effects/blobattack.ogg', 50, 1)) + playsound(C, 'sound/effects/attackblob.ogg', 50, 1) /datum/emote/living/audio_emote/blurp key = "blurp" From f4cfc6c1e0fa85fa129b83f8cd948a65606f8762 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 10 Oct 2020 16:47:03 -0700 Subject: [PATCH 37/39] Update holidays.dm --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 83bb67b879..f6e4684e21 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -351,7 +351,7 @@ /datum/holiday/halloween name = HALLOWEEN - begin_day = 28 + begin_day = 1 begin_month = OCTOBER end_day = 2 end_month = NOVEMBER From 8a8b30a17a76841d2e92f9a49b53bf0f50b6bf90 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 11 Oct 2020 00:42:52 -0500 Subject: [PATCH 38/39] Automatic changelog generation for PR #13193 [ci skip] --- html/changelogs/AutoChangeLog-pr-13193.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13193.yml diff --git a/html/changelogs/AutoChangeLog-pr-13193.yml b/html/changelogs/AutoChangeLog-pr-13193.yml new file mode 100644 index 0000000000..980a9366d8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13193.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - tweak: "medium screens are better now" From bcd4ddabeca4e754996b5afcd9c1e414192cceba Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 11 Oct 2020 00:43:52 -0500 Subject: [PATCH 39/39] Automatic changelog generation for PR #13530 [ci skip] --- html/changelogs/AutoChangeLog-pr-13530.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13530.yml diff --git a/html/changelogs/AutoChangeLog-pr-13530.yml b/html/changelogs/AutoChangeLog-pr-13530.yml new file mode 100644 index 0000000000..b99ed1c545 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13530.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "Clowns now have unpredictable effects on supermatter crystals when dusting from contact."