From 4842e29c2e0d5cacca1433696d86e41950f39f68 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 07:09:50 -0500 Subject: [PATCH 1/6] buffs carps again --- .../mob/living/simple_animal/hostile/carp.dm | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 4122cab6d9..d8da7c04c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -17,8 +17,8 @@ emote_taunt = list("gnashes") taunt_chance = 30 speed = 0 - maxHealth = 25 - health = 25 + maxHealth = 35 + health = 35 spacewalk = TRUE harm_intent_damage = 8 @@ -59,8 +59,8 @@ icon_living = "megacarp" icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" - maxHealth = 20 - health = 20 + maxHealth = 30 + health = 30 pixel_x = -16 mob_size = MOB_SIZE_LARGE @@ -73,9 +73,9 @@ /mob/living/simple_animal/hostile/carp/megacarp/Initialize() . = ..() name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]" - melee_damage_lower += rand(2, 10) + melee_damage_lower += rand(4, 10) melee_damage_upper += rand(10,20) - maxHealth += rand(30,60) + maxHealth += rand(40,60) move_to_delay = rand(3,7) /mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) @@ -104,4 +104,14 @@ melee_damage_lower = 15 melee_damage_upper = 18 +/mob/living/simple_animal/hostile/carp/cayenne/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(.) + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/cayenne/Life() + . = ..() + if(regen_cooldown < world.time) + heal_overall_damage(8) + #undef REGENERATION_DELAY From f66d40151689eec55b31e60f700e5c22435a8ecf Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 4 Feb 2020 07:16:15 -0500 Subject: [PATCH 2/6] forgot to move the var --- code/modules/mob/living/simple_animal/hostile/carp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index d8da7c04c3..17d8b2dff0 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -21,6 +21,8 @@ health = 35 spacewalk = TRUE + var/regen_cooldown = 0 //Used for Mega carp and Cayenne + harm_intent_damage = 8 obj_damage = 50 melee_damage_lower = 15 @@ -68,8 +70,6 @@ melee_damage_lower = 20 melee_damage_upper = 20 - var/regen_cooldown = 0 - /mob/living/simple_animal/hostile/carp/megacarp/Initialize() . = ..() name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]" From fb2498781cdaa59c6bb3859dbf129e2f69ec8f3e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Feb 2020 20:29:50 -0500 Subject: [PATCH 3/6] Update carp.dm --- .../mob/living/simple_animal/hostile/carp.dm | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 17d8b2dff0..d990362088 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -21,7 +21,9 @@ health = 35 spacewalk = TRUE - var/regen_cooldown = 0 //Used for Mega carp and Cayenne + var/regen = FALSE //Can it heal over time or not? + var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds + var/heal_amout = 0 //How much is healed pre regen cooldown harm_intent_damage = 8 obj_damage = 50 @@ -31,6 +33,20 @@ attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("gnashes") + //Some carps heal over time + +/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(regen != TRUE) + return + else + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/Life() + . = ..() + if(regen_cooldown < world.time) + heal_overall_damage(heal_amout) + //Space carp aren't affected by cold. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -61,6 +77,10 @@ icon_living = "megacarp" icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" + + heal_amout = 6 + regen = TRUE + maxHealth = 30 health = 30 pixel_x = -16 @@ -78,25 +98,19 @@ maxHealth += rand(40,60) move_to_delay = rand(3,7) -/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(.) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/megacarp/Life() - . = ..() - if(regen_cooldown < world.time) - heal_overall_damage(4) - /mob/living/simple_animal/hostile/carp/cayenne name = "Cayenne" desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE + + regen = TRUE + heal_amout = 8 + speak_emote = list("squeaks") maxHealth = 90 health = 90 gold_core_spawnable = NO_SPAWN - faction = list(ROLE_SYNDICATE) + faction = list(ROLE_SYNDICATE, "carp") //They are still a carp AIStatus = AI_OFF harm_intent_damage = 12 @@ -104,14 +118,4 @@ melee_damage_lower = 15 melee_damage_upper = 18 -/mob/living/simple_animal/hostile/carp/cayenne/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(.) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/cayenne/Life() - . = ..() - if(regen_cooldown < world.time) - heal_overall_damage(8) - #undef REGENERATION_DELAY From 4ecbd1e407da1a1d4a4ab72168120840f2069fa1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:00:33 -0500 Subject: [PATCH 4/6] Update carp.dm --- code/modules/mob/living/simple_animal/hostile/carp.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index d990362088..fbe46f9665 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -37,14 +37,12 @@ /mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() - if(regen != TRUE) - return - else + if(regen) regen_cooldown = world.time + REGENERATION_DELAY /mob/living/simple_animal/hostile/carp/Life() . = ..() - if(regen_cooldown < world.time) + if(regen && regen_cooldown < world.time) heal_overall_damage(heal_amout) //Space carp aren't affected by cold. From 57ac5c3d66f1a97e145e58505db58afadccd89da Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Wed, 5 Feb 2020 06:12:57 +0100 Subject: [PATCH 5/6] Update carp.dm --- .../mob/living/simple_animal/hostile/carp.dm | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index fbe46f9665..440dd38f0c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -20,11 +20,6 @@ maxHealth = 35 health = 35 spacewalk = TRUE - - var/regen = FALSE //Can it heal over time or not? - var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds - var/heal_amout = 0 //How much is healed pre regen cooldown - harm_intent_damage = 8 obj_damage = 50 melee_damage_lower = 15 @@ -32,19 +27,6 @@ attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("gnashes") - - //Some carps heal over time - -/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(regen) - regen_cooldown = world.time + REGENERATION_DELAY - -/mob/living/simple_animal/hostile/carp/Life() - . = ..() - if(regen && regen_cooldown < world.time) - heal_overall_damage(heal_amout) - //Space carp aren't affected by cold. atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -53,6 +35,19 @@ movement_type = FLYING pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN + //some carps heal over time + var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds + var/regen_amount = 0 //How much is healed pre regen cooldown + +/mob/living/simple_animal/hostile/carp/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + if(regen_amount) + regen_cooldown = world.time + REGENERATION_DELAY + +/mob/living/simple_animal/hostile/carp/Life() + . = ..() + if(regen_amount && regen_cooldown < world.time) + heal_overall_damage(regen_amount) /mob/living/simple_animal/hostile/carp/AttackingTarget() . = ..() @@ -76,8 +71,7 @@ icon_dead = "megacarp_dead" icon_gib = "megacarp_gib" - heal_amout = 6 - regen = TRUE + regen_amount = 6 maxHealth = 30 health = 30 @@ -101,8 +95,7 @@ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE - regen = TRUE - heal_amout = 8 + regen_amout = 8 speak_emote = list("squeaks") maxHealth = 90 From 1547f99ddb33a596547ca8254ba1bd9b56e6a99a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Feb 2020 00:59:16 -0500 Subject: [PATCH 6/6] Update carp.dm --- code/modules/mob/living/simple_animal/hostile/carp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 440dd38f0c..d527a40120 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -95,7 +95,7 @@ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE - regen_amout = 8 + regen_amount = 8 speak_emote = list("squeaks") maxHealth = 90