Weighted random slashes for AI

cmss13-devs · Nov 3, 2023 · a6cc6f6 · a6cc6f6
1 parent 2141fcb
commit a6cc6f6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm b/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm
@@ -23,15 +23,6 @@
 	QDEL_NULL(ai_movement_handler)
 	return ..()
 
-GLOBAL_LIST_INIT(ai_target_limbs, list(
-	"head",
-	"chest",
-	"l_leg",
-	"r_leg",
-	"l_arm",
-	"r_arm"
-))
-
 /mob/living/carbon/xenomorph/proc/init_movement_handler()
 	return new /datum/xeno_ai_movement(src)
 

diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -92,7 +92,7 @@
 
 			M.flick_attack_overlay(src, "slash")
 			var/obj/limb/affecting
-			affecting = get_limb(rand_zone(M.zone_selected, 70))
+			affecting = get_limb(M.mob_flags & AI_CONTROLLED ? rand_zone() : rand_zone(M.zone_selected, 70))
 			if(!affecting) //No organ, just get a random one
 				affecting = get_limb(rand_zone(null, 0))
 			if(!affecting) //Still nothing??

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
@@ -116,7 +116,6 @@
 /mob/living/carbon/xenomorph/lurker/process_ai(delta_time)
 	if(get_active_hand())
 		swap_hand()
-	zone_selected = pick(GLOB.ai_target_limbs)
 	return ..()
 
 /datum/behavior_delegate/lurker_base

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm
@@ -134,7 +134,6 @@
 /mob/living/carbon/xenomorph/runner/process_ai(delta_time)
 	if(get_active_hand())
 		swap_hand()
-	zone_selected = pick(GLOB.ai_target_limbs)
 	return ..()
 
 /datum/behavior_delegate/runner_base

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -48,7 +48,7 @@ var/list/global/base_miss_chance = list(
 //Used to weight organs when an organ is hit randomly (i.e. not a directed, aimed attack).
 //Also used to weight the protection value that armor provides for covering that body part when calculating protection from full-body effects.
 var/list/global/organ_rel_size = list(
-	"head" = 15,
+	"head" = 20,
 	"chest" = 70,
 	"groin" = 30,
 	"l_leg" = 25,
@@ -60,7 +60,7 @@ var/list/global/organ_rel_size = list(
 	"l_foot" = 10,
 	"r_foot" = 10,
 	"eyes" = 5,
-	"mouth" = 15,
+	"mouth" = 5,
 )
 
 // This is much faster than a string comparison