fix ore vents spawning the wrong wolves and remove simple wolves (#81864)

## About The Pull Request
wolves got refactored but the ore vents were still spawning the old
versions, this fixes it and removes the old wolves from the code

## Why It's Good For The Game
fixes ore vents spawning old wolves

## Changelog
🆑
fix: fixes ore vent spawned wolves being untammable
/🆑
This commit is contained in:
Ben10Omintrix
2024-03-07 11:10:07 -07:00
committed by GitHub
parent 0056f134e1
commit 6b6bd5ce95
5 changed files with 16 additions and 76 deletions
@@ -470,3 +470,17 @@
continue
return possible_turf
return get_turf(user)
//wolf trophy
/obj/item/crusher_trophy/wolf_ear
name = "wolf ear"
desc = "It's a wolf ear."
icon_state = "wolf_ear"
denied_type = /obj/item/crusher_trophy/wolf_ear
/obj/item/crusher_trophy/wolf_ear/effect_desc()
return "mark detonation to gain a slight speed boost temporarily"
/obj/item/crusher_trophy/wolf_ear/on_mark_detonation(mob/living/target, mob/living/user)
user.apply_status_effect(/datum/status_effect/speed_boost, 1 SECONDS)
@@ -1,72 +0,0 @@
/mob/living/simple_animal/hostile/asteroid/wolf
name = "white wolf"
desc = "A beast that survives by feasting on weaker opponents, they're much stronger with numbers."
icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi'
icon_state = "whitewolf"
icon_living = "whitewolf"
icon_dead = "whitewolf_dead"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
mouse_opacity = MOUSE_OPACITY_ICON
friendly_verb_continuous = "howls at"
friendly_verb_simple = "howl at"
speak_emote = list("howls")
speed = 5
move_to_delay = 5
maxHealth = 130
health = 130
obj_damage = 15
melee_damage_lower = 7.5
melee_damage_upper = 7.5
rapid_melee = 2 // every second attack
dodging = TRUE
dodge_prob = 50
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
vision_range = 7
aggro_vision_range = 7
move_force = MOVE_FORCE_WEAK
move_resist = MOVE_FORCE_WEAK
pull_force = MOVE_FORCE_WEAK
butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/stack/sheet/sinew/wolf = 2, /obj/item/stack/sheet/bone = 2)
loot = list()
crusher_loot = /obj/item/crusher_trophy/wolf_ear
stat_attack = HARD_CRIT
robust_searching = TRUE
footstep_type = FOOTSTEP_MOB_CLAW
/// Message for when the wolf decides to start running away
var/retreat_message_said = FALSE
/mob/living/simple_animal/hostile/asteroid/wolf/Move(atom/newloc)
if(newloc && newloc.z == z && (islava(newloc) || ischasm(newloc)))
return FALSE
return ..()
/mob/living/simple_animal/hostile/asteroid/wolf/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = ..()
if(stat == DEAD || health > maxHealth*0.1)
retreat_distance = initial(retreat_distance)
return
if(!retreat_message_said && target)
visible_message(span_danger("The [name] tries to flee from [target]!"))
retreat_message_said = TRUE
retreat_distance = 30
/mob/living/simple_animal/hostile/asteroid/wolf/Life(seconds_per_tick = SSMOBS_DT, times_fired)
. = ..()
if(!. || target)
return
retreat_message_said = FALSE
/obj/item/crusher_trophy/wolf_ear
name = "wolf ear"
desc = "It's a wolf ear."
icon_state = "wolf_ear"
denied_type = /obj/item/crusher_trophy/wolf_ear
/obj/item/crusher_trophy/wolf_ear/effect_desc()
return "mark detonation to gain a slight speed boost temporarily"
/obj/item/crusher_trophy/wolf_ear/on_mark_detonation(mob/living/target, mob/living/user)
user.apply_status_effect(/datum/status_effect/speed_boost, 1 SECONDS)
@@ -43,7 +43,6 @@
/mob/living/simple_animal/hostile/asteroid/elite/pandora,
/mob/living/simple_animal/hostile/asteroid/polarbear,
/mob/living/simple_animal/hostile/asteroid/polarbear/lesser,
/mob/living/simple_animal/hostile/asteroid/wolf,
/mob/living/simple_animal/hostile/dark_wizard,
/mob/living/simple_animal/hostile/illusion,
/mob/living/simple_animal/hostile/illusion/escape,