From 06e0ccc7e13a45421cbfd788fe57bba185da3cd6 Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 29 Mar 2023 19:08:06 -0400 Subject: [PATCH 1/3] Adjusts cult speed, adds nibbles for two, and hitscan get off the mobs. --- .../simple_mob/subtypes/humanoid/cultboss.dm | 3 +- .../subtypes/humanoid/cultist_ch.dm | 120 +++++++++++++++++- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm index 58a486eebe..415992939f 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm @@ -10,7 +10,7 @@ var/grenade_timer = 5 heat_resist = 1 cold_resist = 1 - movement_cooldown = 1.5 + movement_cooldown = -1.5 var/leap_warmup = 2 SECOND var/leap_sound = 'sound/weapons/gauss_shoot.ogg' var/jaunt_warning = 1.0 SECONDS // How long the jaunt telegraphing is. @@ -28,6 +28,7 @@ vore_capacity = 6 vore_bump_chance = 20 size_multiplier = 1.10 + faction = "demon" armor_soak = list( "melee" = 5, diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm index fdae87c5ad..de4401ffde 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm @@ -1,3 +1,29 @@ +/mob/living/simple_mob/humanoid/cultist/human + movement_cooldown = 1 + +/mob/living/simple_mob/humanoid/cultist/caster + movement_cooldown = 1 + projectiletype = /obj/item/projectile/energy/inversion + +/mob/living/simple_mob/humanoid/cultist/tesh + movement_cooldown = -1 + +/mob/living/simple_mob/humanoid/cultist/castertesh + movement_cooldown = -1 + projectiletype = /obj/item/projectile/energy/inversion + +/mob/living/simple_mob/humanoid/cultist/elite + movement_cooldown = 1 + +/mob/living/simple_mob/humanoid/cultist/magus + movement_cooldown = 1 + projectiletype = /obj/item/projectile/energy/inversion + +/mob/living/simple_mob/humanoid/cultist/hunter + maxHealth = 175 //Ehhh, this AI is like mini-boss at best + health = 175 + movement_cooldown = 0 + /mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball //Teleporting Cultists, now with fireballs name = "Burning Mage" desc = "An indiuval wrapped up in red robes, with orange highlights, their paws glowing.." @@ -6,6 +32,7 @@ special_attack_min_range = 4 special_attack_max_range = 7 special_attack_cooldown = 10 SECONDS + movement_cooldown = 0 harm_intent_damage = 5 melee_damage_lower = 5 @@ -38,8 +65,97 @@ attacktext = list("slashed", "stabbed") armor = list(melee = 60, bullet = 40, laser = 60, energy = 80, bomb = 25, bio = 100, rad = 100) attack_sound = 'sound/weapons/rapidslice.ogg' - movement_cooldown = 4 projectiletype = /obj/item/projectile/energy/plasma/vepr projectilesound = 'sound/weapons/spiderlunge.ogg' movement_cooldown = 2 - ai_holder_type = /datum/ai_holder/simple_mob/ranged \ No newline at end of file + ai_holder_type = /datum/ai_holder/simple_mob/ranged + +//Nibbler// +/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball + vore_active = 1 + vore_capacity = 6 + vore_max_size = RESIZE_HUGE + vore_min_size = RESIZE_SMALL + vore_pounce_chance = 0 // Beat them into crit before eating. + vore_icons = null + + can_be_drop_prey = FALSE //CHOMP Add + +/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = " Through fire and smoke, you have been grappled and shoved head first into a gapping maw. Rippling powerful red flesh dragging deep into the mage's gullet, your frame causing their stomach is swell out against crimson robes. As you're forced to curl up in the stomach, the walls would ripple, flickers of orange dancing as they press and knead against your flesh. Laughter, and gutteral stomach noises would fill your ears as the cultist firmly kneads their hanging gutt, sloshing it further about." + + B.emote_lists[DM_HOLD] = list( + "Your useless struggling and squirming only causes the cultist to pause, firmly grasping their gut and shoving down on their belly.", + "As you lay within the gullet, you would be rocked about as the cultist jaunts around the physical and redspace realm.", + "The bloated organ around you groans and rumbles, the flesh rippling as a wave of heat washes over you.",) + + B.emote_lists[DM_DIGEST] = list( + "Your useless struggling would seem to just cause pleasured rubblings and cackling. The taunt stomach jostling around even further, as if attempt to encourage your squirming further.", + "Your body would be ushered upwards, you glimpsing the outside world as it looked as if you're about to be released. The cultist then gulps down, sending you plummet back down into the gullet, their taunt belly jiggling as it's walls squish firmly against you..", + "Caustic juices splash over to you as the predator's stomach sways, the belly walls rumbling and rippling as they release a loud caustic belch." ,) + + +/mob/living/simple_mob/humanoid/cultist/noodle + vore_active = 1 + vore_capacity = 6 + vore_max_size = RESIZE_HUGE + vore_min_size = RESIZE_SMALL + vore_pounce_chance = 0 // Beat them into crit before eating. + vore_icons = null + + can_be_drop_prey = FALSE //CHOMP Add + +/mob/living/simple_mob/humanoid/cultist/noodle/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/humanoid/cultist/noodle/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/humanoid/cultist/noodle/bloodjaunt/fireball/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = " Through fire and smoke, you have been grappled and shoved head first into a gapping maw. Rippling powerful red flesh dragging deep into the mage's gullet, your frame causing their stomach is swell out against crimson robes. As you're forced to curl up in the stomach, the walls would ripple, and knead against your flesh. Laughter, and gutteral stomach noises would fill your ears as the cultist firmly kneads their hanging gut, sloshing it further about before shoving you deeper into their system, descending deep within the serpent." + + B.emote_lists[DM_HOLD] = list( + "As you're forced to lay down in the gullet, you can feel each swift and strong movement of their tail. the stomach walls forcing your body to shift alongside it.", + "As you shift around, the dark red flesh would ripple, air rushing past you as the beast lets out a thunderous belch.", + "As you shift about, the beast lifts their tail and slams it down, trying to encourage you to relax. Your their's.",) + + B.emote_lists[DM_DIGEST] = list( + "Your squirming and thrasing only causes the serpent to curl their tail around your frame, squeeze down on it in sync with the muscles, pressing you further into the caustic acids.", + "Your body would swish and slosh in the burbling caustic acid as it nips at your armor and flesh.", + "The serpent cultist would let out a lazy out, streching, then remebers your exsist pressing a claw into the you shaped bulge and grumbling." ,) + +//Projectile// +/obj/item/projectile/energy/inversion + name = "inversion blast" + icon_state = "impact_invert" + damage = 15 + armor_penetration = 60 + damage_type = BURN + check_armour = "laser" + color = "#ffffff" \ No newline at end of file From a92fcd8e15b44da72b5acd4ffbf41a4136f4809a Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 29 Mar 2023 20:07:48 -0400 Subject: [PATCH 2/3] Fixed a typo Fixed a typo --- .../mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm index de4401ffde..8ef67bae2e 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm @@ -148,7 +148,7 @@ B.emote_lists[DM_DIGEST] = list( "Your squirming and thrasing only causes the serpent to curl their tail around your frame, squeeze down on it in sync with the muscles, pressing you further into the caustic acids.", "Your body would swish and slosh in the burbling caustic acid as it nips at your armor and flesh.", - "The serpent cultist would let out a lazy out, streching, then remebers your exsist pressing a claw into the you shaped bulge and grumbling." ,) + "The serpent cultist would let out a lazy out, streching, then remebers your exsistance pressing a claw into the you shaped bulge and grumbling." ,) //Projectile// /obj/item/projectile/energy/inversion From be096251607287df2b7920fdee6398f1c28c9a08 Mon Sep 17 00:00:00 2001 From: Fluff Date: Fri, 31 Mar 2023 13:35:05 -0400 Subject: [PATCH 3/3] Fixing a typo, and make the boss function Rift mangus does not exsist with pain, aka players nuke them to oblivion once they try to melee. And uhhh nuked the typo that made more mobs. --- .../modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm | 1 + .../mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm index 415992939f..0804a8c77e 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm @@ -29,6 +29,7 @@ vore_bump_chance = 20 size_multiplier = 1.10 faction = "demon" + damage_fatigue_mult = 0 armor_soak = list( "melee" = 5, diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm index 8ef67bae2e..6628ac017d 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm @@ -132,7 +132,7 @@ /mob/living/simple_mob/humanoid/cultist/noodle/MouseDrop_T(mob/living/M, mob/living/user) return -/mob/living/simple_mob/humanoid/cultist/noodle/bloodjaunt/fireball/init_vore() +/mob/living/simple_mob/humanoid/cultist/noodle/init_vore() if(!voremob_loaded) return .=..()