From 551c4936019ae31017d01445173761edfb15d913 Mon Sep 17 00:00:00 2001
From: InsaneRed <47158596+InsaneRed@users.noreply.github.com>
Date: Thu, 21 Dec 2023 16:39:20 +0300
Subject: [PATCH] Converts some xeno abilities to SECONDS (#5241)
# About the pull request
Converts xeno code cooldown = to seconds
# Explain why it's good for the game
easier to read
# Testing Photographs and Procedure
Screenshots & Videos
its readable
# Changelog
:cl:
code: Converts xenomorph cooldowns into SECONDS
/:cl:
---------
Co-authored-by: InsaneRed
---
.../abilities/boiler/boiler_abilities.dm | 8 +++----
.../abilities/crusher/crusher_abilities.dm | 2 +-
.../abilities/defender/defender_abilities.dm | 4 ++--
.../facehugger/facehugger_abilities.dm | 2 +-
.../abilities/lurker/lurker_abilities.dm | 4 ++--
.../praetorian/praetorian_abilities.dm | 22 +++++++++----------
.../abilities/ravager/ravager_abilities.dm | 4 ++--
.../abilities/runner/runner_abilities.dm | 4 ++--
.../abilities/spitter/spitter_abilities.dm | 2 +-
.../abilities/warrior/warrior_abilities.dm | 6 ++---
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm
index ea1c734d9482..e7f72e7e013e 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm
@@ -13,7 +13,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_lance
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 190
+ xeno_cooldown = 19 SECONDS
// Config
var/stack_time = 10
@@ -96,7 +96,7 @@
macro_path = /datum/action/xeno_action/verb/verb_boiler_trap
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
- xeno_cooldown = 205
+ xeno_cooldown = 20.5 SECONDS
/// Config
var/trap_ttl = 100
@@ -112,7 +112,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_mine
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 55
+ xeno_cooldown = 5.5 SECONDS
var/empowered = FALSE
@@ -127,7 +127,7 @@
macro_path = /datum/action/xeno_action/verb/verb_acid_shotgun
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
- xeno_cooldown = 130
+ xeno_cooldown = 13 SECONDS
var/ammo_type = /datum/ammo/xeno/acid_shotgun
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm
index 87f58df34472..4691d70321c3 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm
@@ -39,7 +39,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crusher_stomp
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 180
+ xeno_cooldown = 18 SECONDS
plasma_cost = 30
var/damage = 65
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm
index 3949e4ac9b80..22d5f4b57aa2 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm
@@ -18,7 +18,7 @@
macro_path = /datum/action/xeno_action/verb/verb_headbutt
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 40
+ xeno_cooldown = 4 SECONDS
/datum/action/xeno_action/onclick/tail_sweep
name = "Tail Sweep"
@@ -28,7 +28,7 @@
action_type = XENO_ACTION_ACTIVATE
ability_primacy = XENO_PRIMARY_ACTION_3
plasma_cost = 10
- xeno_cooldown = 110
+ xeno_cooldown = 11 SECONDS
/datum/action/xeno_action/activable/fortify
name = "Fortify"
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
index 91bda707ec45..ee1fed3094a7 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
@@ -5,7 +5,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
- xeno_cooldown = 30
+ xeno_cooldown = 3 SECONDS
plasma_cost = 0
// Config options
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
index 2facee1edc9d..fd525701b12d 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
@@ -2,7 +2,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
- xeno_cooldown = 60
+ xeno_cooldown = 6 SECONDS
plasma_cost = 20
// Config options
@@ -70,7 +70,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crippling_strike
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_ACTIVATE
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
plasma_cost = 20
var/buff_duration = 50
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm
index 11317bed9af1..7327454ab74e 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm
@@ -25,7 +25,7 @@
macro_path = /datum/action/xeno_action/verb/verb_dash
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 110
+ xeno_cooldown = 11 SECONDS
plasma_cost = 50
// Config options
@@ -51,7 +51,7 @@
macro_path = /datum/action/xeno_action/verb/verb_cleave
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
- xeno_cooldown = 120
+ xeno_cooldown = 12 SECONDS
// Root config
var/root_duration_unbuffed = 1 SECONDS
@@ -138,7 +138,7 @@
macro_path = /datum/action/xeno_action/verb/verb_oppressor_punch
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
plasma_cost = 55
// Configurables
@@ -164,7 +164,7 @@
macro_path = /datum/action/xeno_action/verb/verb_crush
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
- xeno_cooldown = 130
+ xeno_cooldown = 13 SECONDS
plasma_cost = 80
// Config
@@ -180,7 +180,7 @@
macro_path = /datum/action/xeno_action/verb/verb_prae_impale
ability_primacy = XENO_PRIMARY_ACTION_1
action_type = XENO_ACTION_CLICK
- xeno_cooldown = 130
+ xeno_cooldown = 13 SECONDS
plasma_cost = 80
/datum/action/xeno_action/onclick/prae_dodge
@@ -191,7 +191,7 @@
ability_primacy = XENO_PRIMARY_ACTION_2
action_type = XENO_ACTION_CLICK
plasma_cost = 200
- xeno_cooldown = 190
+ xeno_cooldown = 19 SECONDS
// Config
var/duration = 70
@@ -204,7 +204,7 @@
macro_path = /datum/action/xeno_action/verb/verb_prae_tail_trip
ability_primacy = XENO_PRIMARY_ACTION_3
action_type = XENO_ACTION_CLICK
- xeno_cooldown = 130
+ xeno_cooldown = 13 SECONDS
plasma_cost = 30
// Config
@@ -224,7 +224,7 @@
macro_path = /datum/action/xeno_action/verb/verb_dash
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
plasma_cost = 40
// Config options
@@ -255,7 +255,7 @@
ability_primacy = XENO_PRIMARY_ACTION_4
plasma_cost = 80
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
// Configurable options
spray_type = ACID_SPRAY_LINE
@@ -270,7 +270,7 @@
/datum/action/xeno_action/activable/spray_acid/prae_warden
ability_primacy = XENO_PRIMARY_ACTION_2
plasma_cost = 130
- xeno_cooldown = 130
+ xeno_cooldown = 13 SECONDS
// Configurable options
@@ -288,7 +288,7 @@
// todo: macro
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
plasma_cost = 100
// Config
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm
index 4f9c5f298637..3744fb7823e8 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm
@@ -136,7 +136,7 @@
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
plasma_cost = 0
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
// Config
var/shard_cost = 75
@@ -150,7 +150,7 @@
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
plasma_cost = 0
- xeno_cooldown = 300
+ xeno_cooldown = 30 SECONDS
// Config values
var/shard_cost = 50
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm
index 510f161d8a86..2880dd15eb5a 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm
@@ -5,7 +5,7 @@
macro_path = /datum/action/xeno_action/verb/verb_pounce
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
- xeno_cooldown = 30
+ xeno_cooldown = 3 SECONDS
plasma_cost = 0
// Config options
@@ -28,7 +28,7 @@
macro_path = /datum/action/xeno_action/verb/verb_runner_bonespurs
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 110
+ xeno_cooldown = 11 SECONDS
plasma_cost = 0
var/ammo_type = /datum/ammo/xeno/bone_chips/spread/runner_skillshot
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm
index abc1e43bfccd..20febc22c4a4 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm
@@ -34,7 +34,7 @@
action_type = XENO_ACTION_CLICK
plasma_cost = 50
- xeno_cooldown = 80
+ xeno_cooldown = 8 SECONDS
// Configurable options
spray_type = ACID_SPRAY_LINE // Enum for the shape of spray to do
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
index 2c16477c1414..4f40e1914540 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
@@ -6,7 +6,7 @@
macro_path = /datum/action/xeno_action/verb/verb_fling
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_3
- xeno_cooldown = 60
+ xeno_cooldown = 6 SECONDS
// Configurables
var/fling_distance = 4
@@ -22,7 +22,7 @@
macro_path = /datum/action/xeno_action/verb/verb_lunge
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_2
- xeno_cooldown = 100
+ xeno_cooldown = 10 SECONDS
// Configurables
var/grab_range = 4
@@ -36,7 +36,7 @@
macro_path = /datum/action/xeno_action/verb/verb_punch
action_type = XENO_ACTION_CLICK
ability_primacy = XENO_PRIMARY_ACTION_1
- xeno_cooldown = 45
+ xeno_cooldown = 4.5 SECONDS
// Configurables
var/base_damage = 25