diff --git a/code/modules/critters/critter.dm b/code/modules/critters/critter.dm index 96daac131c9..bd46ecaf047 100644 --- a/code/modules/critters/critter.dm +++ b/code/modules/critters/critter.dm @@ -10,6 +10,8 @@ alive = 1 health = 10 max_health = 10 + aggression = 100 + speed = 8 list/access_list = list()//accesses go here //AI things task = "thinking" @@ -119,4 +121,4 @@ -*/ \ No newline at end of file +*/ diff --git a/code/modules/critters/critter_AI.dm b/code/modules/critters/critter_AI.dm index 18e0fac6e46..169ce48974c 100644 --- a/code/modules/critters/critter_AI.dm +++ b/code/modules/critters/critter_AI.dm @@ -33,7 +33,7 @@ src.target_lastloc = M.loc else var/turf/olddist = get_dist(src, src.target) - walk_to(src, src.target,1,4) + walk_to(src, src.target,1,speed) if ((get_dist(src, src.target)) >= (olddist)) src.frustration++ else @@ -106,6 +106,8 @@ seek_target() + if(!prob(aggression)) return // make them attack depending on aggression levels + src.anchored = 0 var/T = null for(var/mob/living/C in view(src.seekrange,src))//TODO: mess with this @@ -198,4 +200,4 @@ smoke.set_up(10, 0, src.loc) smoke.start() src.task = "thinking" -*/ \ No newline at end of file +*/ diff --git a/code/modules/critters/critters.dm b/code/modules/critters/critters.dm index 9d86cb5bbe3..59be056737b 100644 --- a/code/modules/critters/critters.dm +++ b/code/modules/critters/critters.dm @@ -135,9 +135,10 @@ name = "Spess Carp" desc = "A ferocious, fang-bearing creature that resembles a fish." icon_state = "spesscarp" - health = 25 - max_health = 25 + health = 100 + max_health = 100 aggressive = 1 + aggression = 20 defensive = 1 wanderer = 1 atkcarbon = 1 @@ -152,6 +153,7 @@ attacktext = "bites" attack_sound = 'bite.ogg' attack_speed = 10 + speed = 8 var/stunchance = 10 // chance to tackle things down @@ -185,8 +187,8 @@ /obj/effect/critter/spesscarp/elite desc = "Oh shit, you're really fucked now. It has an evil gleam in its eye." - health = 50 - max_health = 50 + health = 200 + max_health = 200 melee_damage_lower = 20 melee_damage_upper = 35 stunchance = 15