From b39d5329271971fe24bc1d58ada69f0e02fc9315 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Thu, 28 Nov 2024 02:04:02 +0100 Subject: [PATCH 1/4] better player examines --- .../mob/living/advanced/player/_player.dm | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/code/_core/mob/living/advanced/player/_player.dm b/code/_core/mob/living/advanced/player/_player.dm index b68e5d23f..42d8d7115 100644 --- a/code/_core/mob/living/advanced/player/_player.dm +++ b/code/_core/mob/living/advanced/player/_player.dm @@ -115,6 +115,44 @@ expiration_time = SECONDS_TO_DECISECONDS(180) +/mob/living/advanced/player/get_examine_list(var/mob/living/examiner) + var/list/species_to_names = list( + "human" = "human", + "reptile_advanced" = prob(10) ? "spine dragger" : "lizard", + "cyborg" = prob(10) ? "tin can": "cyborg", + "diona" = "dionae", + "moth" = prob(10) ? "moff" : "moth" + ) + + . = list( + div("examine_title", src.name), + div("center bold","Level [level] [species_to_names[species]]"), + div("examine_description_long", src.desc_extended) + ) + + var/activity_text = get_activity_text() + if(activity_text) + . += activity_text + + var/examine_level = istype(examiner) ? examiner.get_skill_level(SKILL_SURVIVAL) : 1 + if(examine_level >= 50) + var/weakness_name = "" + var/weakness = 0 + for(var/i in overall_clothing_defense_rating) + if(i == "items" || overall_clothing_defense_rating[i] < -10000) // If someone is THAT weak, they are lying for attention + continue + + if(weakness > overall_clothing_defense_rating[i]) + weakness_name = i + weakness = overall_clothing_defense_rating[i] + + if(weakness < 0) + . += div("notice", "[src.name]'s weakness seems to be [weakness_name] damage.") + + var/damage_description = get_damage_description(examiner) + if(damage_description) + . += damage_description + /mob/living/advanced/player/Finalize() . = ..() setup_difficulty() From 8ff121b4722b173f5880a9d5f8c3ca2da191d13d Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:39:24 +0100 Subject: [PATCH 2/4] removes survival stuffs --- code/_core/mob/living/advanced/player/_player.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/_core/mob/living/advanced/player/_player.dm b/code/_core/mob/living/advanced/player/_player.dm index 42d8d7115..07c409f5f 100644 --- a/code/_core/mob/living/advanced/player/_player.dm +++ b/code/_core/mob/living/advanced/player/_player.dm @@ -134,21 +134,6 @@ if(activity_text) . += activity_text - var/examine_level = istype(examiner) ? examiner.get_skill_level(SKILL_SURVIVAL) : 1 - if(examine_level >= 50) - var/weakness_name = "" - var/weakness = 0 - for(var/i in overall_clothing_defense_rating) - if(i == "items" || overall_clothing_defense_rating[i] < -10000) // If someone is THAT weak, they are lying for attention - continue - - if(weakness > overall_clothing_defense_rating[i]) - weakness_name = i - weakness = overall_clothing_defense_rating[i] - - if(weakness < 0) - . += div("notice", "[src.name]'s weakness seems to be [weakness_name] damage.") - var/damage_description = get_damage_description(examiner) if(damage_description) . += damage_description From cbd913eda94793c610f90e9ec9157497dc7644fa Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:36:33 +0100 Subject: [PATCH 3/4] applies burger's suggestion --- code/_core/mob/living/advanced/player/_player.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/_core/mob/living/advanced/player/_player.dm b/code/_core/mob/living/advanced/player/_player.dm index 07c409f5f..a26d4603d 100644 --- a/code/_core/mob/living/advanced/player/_player.dm +++ b/code/_core/mob/living/advanced/player/_player.dm @@ -116,17 +116,9 @@ expiration_time = SECONDS_TO_DECISECONDS(180) /mob/living/advanced/player/get_examine_list(var/mob/living/examiner) - var/list/species_to_names = list( - "human" = "human", - "reptile_advanced" = prob(10) ? "spine dragger" : "lizard", - "cyborg" = prob(10) ? "tin can": "cyborg", - "diona" = "dionae", - "moth" = prob(10) ? "moff" : "moth" - ) - . = list( div("examine_title", src.name), - div("center bold","Level [level] [species_to_names[species]]"), + div("center bold","Level [level] [SPECIES(species)]"), div("examine_description_long", src.desc_extended) ) From 8594006c72089b0ce29174e995eba03e64a15ea7 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:31:42 +0100 Subject: [PATCH 4/4] updates tha name --- code/_core/mob/living/advanced/player/_player.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/_core/mob/living/advanced/player/_player.dm b/code/_core/mob/living/advanced/player/_player.dm index a26d4603d..40c91b292 100644 --- a/code/_core/mob/living/advanced/player/_player.dm +++ b/code/_core/mob/living/advanced/player/_player.dm @@ -116,9 +116,10 @@ expiration_time = SECONDS_TO_DECISECONDS(180) /mob/living/advanced/player/get_examine_list(var/mob/living/examiner) + var/species/owner_species = SPECIES(species) . = list( div("examine_title", src.name), - div("center bold","Level [level] [SPECIES(species)]"), + div("center bold","Level [level] [owner_species.name]"), div("examine_description_long", src.desc_extended) )