From eb64769734fc5c4188075a4ccdf1e8d8f1058e24 Mon Sep 17 00:00:00 2001 From: Whitellama Date: Sat, 26 Jul 2014 17:41:03 -0700 Subject: [PATCH] Cleaned up mistake implementing dynamic flavour text --- code/modules/client/preferences.dm | 42 +++++++++++++++++++ code/modules/mob/living/carbon/human/human.dm | 14 +------ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 11dfcb9630..1479506430 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -945,6 +945,48 @@ datum/preferences ShowChoices(user) return 1 + else if (href_list["preference"] == "loadout") + + if(href_list["task"] == "input") + + var/list/valid_gear_choices = list() + + for(var/gear_name in gear_datums) + var/datum/gear/G = gear_datums[gear_name] + if(G.whitelisted && !is_alien_whitelisted(user, G.whitelisted)) + continue + valid_gear_choices += gear_name + + var/choice = input(user, "Select gear to add: ") as null|anything in valid_gear_choices + + if(choice && gear_datums[choice]) + + var/total_cost = 0 + + if(isnull(gear) || !islist(gear)) gear = list() + + if(gear && gear.len) + for(var/gear_name in gear) + if(gear_datums[gear_name]) + var/datum/gear/G = gear_datums[gear_name] + total_cost += G.cost + + var/datum/gear/C = gear_datums[choice] + total_cost += C.cost + if(C && total_cost <= MAX_GEAR_COST) + gear += choice + user << "\blue Added [choice] for [C.cost] points ([MAX_GEAR_COST - total_cost] points remaining)." + else + user << "\red That item will exceed the maximum loadout cost of [MAX_GEAR_COST] points." + + else if(href_list["task"] == "remove") + var/to_remove = href_list["gear"] + if(!to_remove) return + for(var/gear_name in gear) + if(gear_name == to_remove) + gear -= gear_name + break + switch(href_list["task"]) if("random") switch(href_list["preference"]) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 43620e932a..d561271aa3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -74,18 +74,6 @@ prev_gender = gender // Debug for plural genders make_blood() - /* - flavor_texts["general"] = flavor_general - flavor_texts["head"] = flavor_head - flavor_texts["face"] = flavor_face - flavor_texts["eyes"] = flavor_eyes - flavor_texts["torso"] = flavor_torso - flavor_texts["arms"] = flavor_arms - flavor_texts["hands"] = flavor_hands - flavor_texts["legs"] = flavor_legs - flavor_texts["feet"] = flavor_feet*/ - - /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes) if ((!( yes ) || now_pushing)) return @@ -1573,4 +1561,4 @@ if((T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed)) flavor_text += flavor_texts[T] flavor_text += "\n\n" - return ..() + return ..()