cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for kobold doing stuff while dead

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-03 19:17:34 +10:00
parent 6caa6c62cc
commit baac6fe04c
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/game/gamemodes/newobjective.dm
View File

@@ -107,14 +107,15 @@
// the lowest to multiply it by the proper success ratio. // the lowest to multiply it by the proper success ratio.
var/weight = max(ordered_success) var/weight = max(ordered_success)
ordered_success -= weight ordered_success -= weight
if(weight == steal_success) switch(weight)
steal_weight *= steal_success*success_weights[i] if(steal_success)
else if(weight == frame_success) steal_weight *= steal_success*success_weights[i]
frame_weight *= frame_success*success_weights[i] if(frame_success)
else if(weight == protect_success) frame_weight *= frame_success*success_weights[i]
protect_weight *= protect_success*success_weights[i] if(protect_success)
else if(weight == kill_success) protect_weight *= protect_success*success_weights[i]
kill_weight *= kill_success*success_weights[i] if(kill_success)
kill_weight *= kill_success*success_weights[i]
var/total_weights = kill_weight + protect_weight + frame_weight + steal_weight var/total_weights = kill_weight + protect_weight + frame_weight + steal_weight
frame_weight = round(frame_weight/total_weights) frame_weight = round(frame_weight/total_weights)
@@ -310,7 +311,7 @@ datum
target = targeta target = targeta
job = joba job = joba
weight = get_points(job) weight = get_points(job)
explanation_text = "[target.current.real_name], the [target.assigned_role] is a relative of a high ranking Syndicate Leader. Make sure they get off the ship safely, while minimizing intervention." explanation_text = "[target.current.real_name], the [target.assigned_role] is a [pick("relative of a","friend of a","") + pick("high ranking","important","well-liked")] Syndicate [pick("Leader","Officer","Agent","sympathiser"]. Make sure they get off the station safely, while minimizing intervention."
check_completion() check_completion()
if(emergency_shuttle.location<2) if(emergency_shuttle.location<2)
@@ -354,7 +355,7 @@ datum
target = targeta target = targeta
job = joba job = joba
weight = get_points(job) weight = get_points(job)
explanation_text = "Assassinate [target.current.real_name], the [target.assigned_role]." explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]."
check_completion() check_completion()
if(target && target.current) if(target && target.current)
@@ -393,7 +394,7 @@ datum
break break
if(target && target.current) if(target && target.current)
explanation_text = "Assassinate [target.current.real_name], the [target.assigned_role]." explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]."
else else
explanation_text = "Free Objective" explanation_text = "Free Objective"
@@ -411,7 +412,7 @@ datum
target = pick(possible_targets) target = pick(possible_targets)
if(target && target.current) if(target && target.current)
explanation_text = "Assassinate [target.current.real_name], the [target.assigned_role]." explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]."
else else
explanation_text = "Free Objective" explanation_text = "Free Objective"

5
code/modules/mob/simple_animal/kobold.dm
View File

@@ -20,9 +20,10 @@
/mob/living/simple_animal/kobold/Life() /mob/living/simple_animal/kobold/Life()
..() ..()
if(prob(15) && turns_since_move) if(prob(15) && turns_since_move && !stat)
flick("kobold_act",src) flick("kobold_act",src)
/mob/living/simple_animal/kobold/Move(var/dir) /mob/living/simple_animal/kobold/Move(var/dir)
..() ..()
flick("kobold_walk",src) if(!stat)
flick("kobold_walk",src)