Merge pull request #6000 from FluffMedic/BehemothRework

Behemoth Rework and Loot

code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm

@@ -50,7 +50,7 @@
 	..()
 
 /mob/living/simple_mob/construct/juggernaut/bullet_act(var/obj/item/projectile/P)
-	var/reflectchance = 80 - round(P.damage/3)
+	var/reflectchance = 100 - round(P.damage)
 	if(prob(reflectchance))
 		var/damage_mod = rand(2,4)
 		var/projectile_dam_type = P.damage_type
@@ -125,7 +125,7 @@
 							)
 
 /mob/living/simple_mob/construct/juggernaut/behemoth/bullet_act(var/obj/item/projectile/P)
-	var/reflectchance = 80 - round(P.damage/3)
+	var/reflectchance = 100 - round(P.damage)
 	if(prob(reflectchance))
 		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
 						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")

modular_chomp/code/modules/clothing/spacesuits/rig/.behemoth.dm

@@ -0,0 +1,137 @@
+/obj/item/weapon/rig/ch/aegis
+	name = "aegis control module"
+	desc = "A hefty armor formed from fallen redspace construct."
+	suit_type = "aegis hardsuit"
+	icon = 'modular_chomp/icons/obj/rig_modules_ch.dmi'
+	icon_state = "aegis_rig"
+	armor = list(melee = 60, bullet = 60, laser = 60, energy = 30, bomb = 10, bio = 100, rad = 100)
+
+	slowdown = 6
+
+	chest_type = /obj/item/clothing/suit/space/rig/ch/aegis
+	helm_type = /obj/item/clothing/head/helmet/space/rig/ch/aegis
+	glove_type = /obj/item/clothing/gloves/gauntlets/rig/ch/aegis
+	boot_type = /obj/item/clothing/shoes/magboots/rig/ch/aegis
+
+/obj/item/clothing/suit/space/rig/ch/aegis
+	name = "chassis"
+	icon = 'icons/obj/clothing/spacesuits_ch.dmi'
+	desc = "A heft chestplate, humming with energy."
+
+/obj/item/clothing/head/helmet/space/rig/ch/aegis
+	name = "helmet"
+	icon = 'icons/obj/clothing/hats_ch.dmi'
+	desc = "A protective dome for your head."
+
+/obj/item/clothing/gloves/gauntlets/rig/ch/aegis
+	name = "hardlight gloves"
+	icon = 'icons/obj/clothing/gloves_ch.dmi'
+	desc = "Gloves created with alien tech"
+	var/block_chance = 15
+
+/obj/item/clothing/shoes/magboots/rig/ch/aegis
+	name = "hardlight boots"
+	icon = 'icons/obj/clothing/shoes_ch.dmi'
+	desc = "A pair of grabby boots"
+
+/obj/item/weapon/rig/ch/behemoth/bullet_act(var/obj/item/projectile/P)
+	var/reflectchance = 70 - round(P.damage)
+	if(prob(reflectchance))
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
+
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/turf/curloc = get_turf(src)
+
+			// redirect the projectile
+			P.redirect(new_x, new_y, curloc, src)
+			P.reflected = 1
+
+		return -1 // complete projectile permutation
+
+	return (..(P))
+
+/obj/item/clothing/suit/space/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+	var/reflectchance = 70 - round(P.damage)
+	if(prob(reflectchance))
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
+
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/turf/curloc = get_turf(src)
+
+			// redirect the projectile
+			P.redirect(new_x, new_y, curloc, src)
+			P.reflected = 1
+
+		return -1 // complete projectile permutation
+
+	return (..(P))
+
+/obj/item/clothing/head/helmet/space/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+	var/reflectchance = 70 - round(P.damage)
+	if(prob(reflectchance))
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
+
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/turf/curloc = get_turf(src)
+
+			// redirect the projectile
+			P.redirect(new_x, new_y, curloc, src)
+			P.reflected = 1
+
+		return -1 // complete projectile permutation
+
+	return (..(P))
+
+
+/obj/item/clothing/gloves/gauntlets/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+	var/reflectchance = 70 - round(P.damage)
+	if(prob(reflectchance))
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
+
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/turf/curloc = get_turf(src)
+
+			// redirect the projectile
+			P.redirect(new_x, new_y, curloc, src)
+			P.reflected = 1
+
+		return -1 // complete projectile permutation
+
+	return (..(P))
+
+
+/obj/item/clothing/shoes/magboots/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+	var/reflectchance = 70 - round(P.damage)
+	if(prob(reflectchance))
+		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
+						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
+
+		// Find a turf near or on the original location to bounce to
+		if(P.starting)
+			var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)
+			var/turf/curloc = get_turf(src)
+
+			// redirect the projectile
+			P.redirect(new_x, new_y, curloc, src)
+			P.reflected = 1
+
+		return -1 // complete projectile permutation
+
+	return (..(P))

modular_chomp/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm

@@ -3,13 +3,16 @@
 	real_name = "Behemoth"
 	desc = "The pinnacle of occult technology, Behemoths are nothing shy of both an Immovable Object, and Unstoppable Force."
 	melee_damage_lower = 45
-	melee_damage_upper = 55
+	melee_damage_upper = 65
 	ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
-	projectiletype = /obj/item/projectile/icicle
+	projectiletype = /obj/item/projectile/energy/electrode/cult
+	movement_cooldown = 1
+
+	loot_list = list(/obj/item/weapon/rig/ch/behemoth = 100)
 
 
 /mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable/bullet_act(var/obj/item/projectile/P)
-	var/reflectchance = 20 - round(P.damage/3)
+	var/reflectchance = 100 - round(P.damage)
 	if(prob(reflectchance))
 		visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
 						"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
@@ -27,3 +30,12 @@
 		return -1 // complete projectile permutation
 
 	return (..(P))
+
+
+/obj/item/projectile/energy/electrode/cult
+	color = "#FFFFFF"
+	agony = 0
+	damage = 15
+	damage_type = BURN
+	check_armour = "laser"
+	armor_penetration = 60

vorestation.dme

@@ -4575,6 +4575,7 @@
 #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm"
 #include "modular_chomp\code\modules\clothing\clothing.dm"
 #include "modular_chomp\code\modules\clothing\clothing_icons.dm"
+#include "modular_chomp\code\modules\clothing\spacesuits\rig\.behemoth.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\precursor.dm"
 #include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm"