From 04fb80d12306c9722ffa7de5c515c192e97b5a3e Mon Sep 17 00:00:00 2001 From: InsightfulParasite <109536843+InsightfulParasite@users.noreply.github.com> Date: Sun, 15 Oct 2023 00:36:52 -0400 Subject: [PATCH] Sweeper get diminishing returns from eating other sweepers (#1382) Update indigo.dm --- .../simple_animal/hostile/ordeal/indigo.dm | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm index fd566d5f9b7f..eb8500188ba0 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm @@ -1,3 +1,5 @@ +#define SWEEPER_TYPES /mob/living/simple_animal/hostile/ordeal/indigo_dawn || /mob/living/simple_animal/hostile/ordeal/indigo_noon || /mob/living/simple_animal/hostile/ordeal/indigo_dusk || /mob/living/simple_animal/hostile/ordeal/indigo_midnight + /mob/living/simple_animal/hostile/ordeal/indigo_dawn name = "unknown scout" desc = "A tall humanoid with a walking cane. It's wearing indigo armor." @@ -38,7 +40,11 @@ visible_message( "[src] devours [L]!", "You feast on [L], restoring your health!") - adjustBruteLoss(-(maxHealth/2)) + if(istype(L, SWEEPER_TYPES)) + //Would have made it based on biotypes but that has its own issues. + adjustBruteLoss(-20) + else + adjustBruteLoss(-(maxHealth/2)) L.gib() return TRUE @@ -98,7 +104,10 @@ visible_message( "[src] devours [L]!", "You feast on [L], restoring your health!") - adjustBruteLoss(-(maxHealth/2)) + if(istype(L, SWEEPER_TYPES)) + adjustBruteLoss(-20) + else + adjustBruteLoss(-(maxHealth/2)) L.gib() return TRUE @@ -263,7 +272,10 @@ visible_message( "[src] devours [L]!", "You feast on [L], restoring your health!") - adjustBruteLoss(-(maxHealth/2)) + if(istype(L, SWEEPER_TYPES)) + adjustBruteLoss(-20) + else + adjustBruteLoss(-(maxHealth/2)) L.gib() return TRUE @@ -458,7 +470,10 @@ visible_message( "[src] devours [L]!", "You feast on [L], restoring your health!") - adjustBruteLoss(-(maxHealth*0.3)) + if(istype(L, SWEEPER_TYPES)) + adjustBruteLoss(-20) + else + adjustBruteLoss(-(maxHealth*0.3)) L.gib() //Increase the Vore counter by 1 belly += 1 @@ -566,6 +581,8 @@ sleep(delay) slamming = FALSE +#undef SWEEPER_TYPES + /obj/effect/sweeperspawn name = "bloodpool" desc = "A target warning you of incoming pain"