Skip to content

Commit

Permalink
Imperfect Morsel Tweaks (#2570)
Browse files Browse the repository at this point in the history
Ordeal Pet Expansion

Tweaks ordeal pets based on some observed scenarios.

Scenario 1: A clerk was trying to get a Imperfect Morsel to the elevator but it kept wiggling out of their hands to go after gibs. Even though Morsel is a worm i felt some sympathy for their plight and now made morsel more grabbable, (They will not move to get food when being dragged).
  • Loading branch information
InsightfulParasite authored Dec 3, 2024
1 parent 37d45ea commit 0f5a76c
Showing 1 changed file with 19 additions and 10 deletions.
29 changes: 19 additions & 10 deletions ModularTegustation/tegu_mobs/lc13_outskirtdwellers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,19 @@
response_disarm_simple = "gently push aside"
verb_ask = "chitters"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
stop_automated_movement_when_pulled = 1
stop_automated_movement_when_pulled = TRUE
environment_smash = FALSE
density = FALSE
maxHealth = 120
health = 120
speed = 2
melee_damage_lower = 0
melee_damage_upper = 2
melee_damage_lower = 1
melee_damage_upper = 3
turns_per_move = 2
butcher_difficulty = 2
buffed = 0
death_message = "pops."
density = TRUE
search_objects = 1
tame_chance = 5
search_objects = TRUE
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
Expand All @@ -45,8 +43,7 @@
butcher_results = list(/obj/item/food/meat/slab/worm = 1)
guaranteed_butcher_results = list(/obj/item/food/meat/slab/worm = 1)
silk_results = list(/obj/item/stack/sheet/silk/amber_simple = 1)
wanted_objects = list(/obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ, /obj/item/bodypart/head, /obj/item/bodypart/r_arm, /obj/item/bodypart/l_arm, /obj/item/bodypart/l_leg, /obj/item/bodypart/r_leg)
food_type = list(/obj/item/organ, /obj/item/bodypart/head, /obj/item/bodypart/r_arm, /obj/item/bodypart/l_arm, /obj/item/bodypart/l_leg, /obj/item/bodypart/r_leg)
food_type = list(/obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ, /obj/item/bodypart/head, /obj/item/bodypart/r_arm, /obj/item/bodypart/l_arm, /obj/item/bodypart/l_leg, /obj/item/bodypart/r_leg)
var/current_size = RESIZE_DEFAULT_SIZE

/mob/living/simple_animal/hostile/morsel/examine(mob/user)
Expand All @@ -57,7 +54,7 @@

/mob/living/simple_animal/hostile/morsel/AttackingTarget()
retreat_distance = 0
if(is_type_in_typecache(target,wanted_objects)) //we eats
if(is_type_in_typecache(target,food_type)) //we eats
qdel(target)
buffed = (buffed + 1)
if(buffed >= 10)
Expand All @@ -84,6 +81,12 @@
if(!target)
retreat_distance = 0

//This is so morsel doesnt run to food while your trying to evacuate them.
/mob/living/simple_animal/hostile/morsel/FindTarget()
if(pulledby)
return
return ..()

/mob/living/simple_animal/hostile/morsel/AttackingTarget()
. = ..()
if(.)
Expand Down Expand Up @@ -117,11 +120,17 @@
visible_message(span_notice("[src] bites [O] and grinds it into a digestable paste."))
playsound(get_turf(user), 'sound/items/eatfood.ogg', 10, 3, 3)
buffed = (buffed + 1)
adjustBruteLoss(-5)
adjustBruteLoss(-15)
if(buffed >= 10)
PustuleChurn()
qdel(O)

/mob/living/simple_animal/hostile/morsel/CanAttack(atom/the_target)
if(isobj(the_target))
if(is_type_in_typecache(the_target, food_type))
return TRUE
return ..()

/mob/living/simple_animal/hostile/morsel/proc/PustuleChurn()
var/newsize = current_size
visible_message(span_notice("[src]'s grows more chitin."))
Expand Down

0 comments on commit 0f5a76c

Please sign in to comment.