From 64122fa2a4ca23380414809308752fbe8a4ed1f8 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sat, 21 Nov 2020 00:11:36 -0700 Subject: [PATCH] Nutrition and attack time updates --- .../living/simple_mob/subtypes/metroid/metBaseType.dm | 7 +++++-- .../mob/living/simple_mob/subtypes/metroid/metTypes.dm | 9 ++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm index f4db26a863..5a8290c11e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm @@ -53,14 +53,17 @@ vore_pounce_chance = 25 vore_icons = SA_ICON_LIVING + nutrition = 1000 //This actually gets overridden further down on initialize. max_nutrition = 2200 - nutrition = 0 var/evo_point = 0 var/evo_limit = 0 var/next - meat_type = /obj/item/toy/figure/bounty_hunter +/mob/living/simple_mob/metroid/Initialize() + nutrition = 100 //Have them start off pretty hungry still + return ..() + /datum/say_list/metroid speak = list("Skree.", "Eree.", "Errer?") emote_see = list("floats about","looks around", "rubs its talons") diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm index d78c44387c..eab2bf5c5b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm @@ -383,7 +383,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. melee_damage_lower = 15 melee_damage_upper = 25 melee_miss_chance = 5 - ranged_attack_delay = 2 SECOND + ranged_cooldown_time = 5 SECOND attack_armor_pen = 10 attacktext = list("slashed") armor = list( @@ -400,7 +400,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. nutrition = 0 makes_dirt = TRUE - ranged_cooldown_time = 5 SECOND + projectiletype = /obj/item/projectile/energy/metroidacid //The projectiles I shoot projectilesound = 'sound/weapons/slashmiss.ogg' // The sound I make when I do it @@ -480,7 +480,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. melee_damage_lower = 25 melee_damage_upper = 40 melee_miss_chance = 5 - ranged_attack_delay = 5 SECOND + ranged_cooldown_time = 2.5 SECOND attack_armor_pen = 20 attacktext = list("slashed") armor = list( @@ -496,7 +496,6 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. max_nutrition = 2200 nutrition = 0 makes_dirt = TRUE - ranged_cooldown_time = 2.5 SECOND projectiletype = /obj/item/projectile/beam/smalllaser // The projectiles I shoot projectilesound = 'sound/weapons/Flamer.ogg' // The sound I make when I do it @@ -593,7 +592,7 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. max_nutrition = 2200 nutrition = 0 makes_dirt = TRUE - ranged_cooldown_time = 1 SECOND + ranged_cooldown_time = 1.5 SECOND projectiletype = /obj/item/projectile/energy/metroidacid // The projectiles I shoot projectilesound = 'sound/weapons/slashmiss.ogg' // The sound I make when I do it