From d20a7a50f1cdfe34790908c32c9f6bdad6e2149c Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Fri, 3 Aug 2012 19:56:45 +1000 Subject: [PATCH] compile fixes Signed-off-by: Cael_Aislinn --- code/game/gamemodes/newobjective.dm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index e949e65ae2c..18bdd84416b 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -107,15 +107,14 @@ // the lowest to multiply it by the proper success ratio. var/weight = max(ordered_success) ordered_success -= weight - switch(weight) - if(steal_success) - steal_weight *= steal_success*success_weights[i] - if(frame_success) - frame_weight *= frame_success*success_weights[i] - if(protect_success) - protect_weight *= protect_success*success_weights[i] - if(kill_success) - kill_weight *= kill_success*success_weights[i] + if(weight == steal_success) + steal_weight *= steal_success*success_weights[i] + else if(weight == frame_success) + frame_weight *= frame_success*success_weights[i] + else if(weight == protect_success) + protect_weight *= protect_success*success_weights[i] + else if(weight == kill_success) + kill_weight *= kill_success*success_weights[i] var/total_weights = kill_weight + protect_weight + frame_weight + steal_weight frame_weight = round(frame_weight/total_weights) @@ -311,7 +310,7 @@ datum target = targeta job = joba weight = get_points(job) - 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." + 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() if(emergency_shuttle.location<2) @@ -355,7 +354,7 @@ datum target = targeta job = joba weight = get_points(job) - explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]." + explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : target.assigned_role]." check_completion() if(target && target.current) @@ -394,7 +393,7 @@ datum break if(target && target.current) - explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]." + explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : target.assigned_role]." else explanation_text = "Free Objective" @@ -412,7 +411,7 @@ datum target = pick(possible_targets) if(target && target.current) - explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : (!role_type ? target.assigned_role : target.special_role)]." + explanation_text = "Assassinate [target.current.real_name], the [target.role_alt_title ? target.role_alt_title : target.assigned_role]." else explanation_text = "Free Objective"