From 73dbfa2eefc5c23f6f759b4907175d26a899195f Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:31:22 +0100 Subject: [PATCH 1/7] Follows in the footsteps of my hero!! SAVE THOSE TREEZ!!! --- code/game/mob/living/carbon/human/death.dm | 166 ++++++++++++--------- 1 file changed, 95 insertions(+), 71 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index e9532c78a2..70e6f3012c 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -85,32 +85,40 @@ if (MAP_ALLEYWAY) if (civilization && civilization in map.scores) - if (civilization == "Yamaguchi-Gumi") - if (original_job && original_job.title == "Yama Wakagashira") - map.scores["Ichiwa-Kai"] += 10 - to_chat(world, "The Yamaguchi-Gumi underboss has been killed!") + switch (civilization) + if ("Yamaguchi-Gumi") + if (original_job) + switch (original_job.title) + if ("Yama Wakagashira") + map.scores["Ichiwa-Kai"] += 10 + to_chat(world, "The Yamaguchi-Gumi underboss has been killed!") + else + map.scores["Ichiwa-Kai"] += 1 else - map.scores["Ichiwa-Kai"] += 1 - else - if (original_job && original_job.title == "Ichi Wakagashira") - map.scores["Yamaguchi-Gumi"] += 10 - to_chat(world, "The Ichiwa-Kai underboss has been killed!") - else - map.scores["Yamaguchi-Gumi"] += 1 + if (original_job) + switch (original_job.title) + if ("Ichi Wakagashira") + map.scores["Yamaguchi-Gumi"] += 10 + to_chat(world, "The Ichiwa-Kai underboss has been killed!") + else + map.scores["Yamaguchi-Gumi"] += 1 if (MAP_YELTSIN) if (civilization && civilization in map.scores) - if (civilization == "Russian Army") - if (original_job && original_job.title == "Russian Army Sergeant") - map.scores["Militia"] += 5 - to_chat(world, "A Russian Army Sergeant has been killed!") - else if (original_job && original_job.title == "Russian Army Lieutenant") - map.scores["Militia"] += 10 - to_chat(world, "The Russian Army Lieutenant has been killed!") + switch (civilization) + if ("Russian Army") + if (original_job) + switch (original_job.title) + if ("Russian Army Sergeant") + map.scores["Militia"] += 5 + to_chat(world, "A Russian Army Sergeant has been killed!") + if ("Russian Army Lieutenant") + map.scores["Militia"] += 10 + to_chat(world, "The Russian Army Lieutenant has been killed!") + else + map.scores["Militia"] += 1 else - map.scores["Militia"] += 1 - else - map.scores["Russian Army"] += 1 + map.scores["Russian Army"] += 1 if (MAP_OPERATION_FALCON) if (original_job.is_commander) @@ -122,64 +130,80 @@ if (MAP_CAPITOL_HILL) if (civilization && civilization in map.scores) - if (civilization == "National Guard") - map.scores["Militia"] += 1 - else - map.scores["National Guard"] += 1 - if(original_job && original_job.title == "President of the USA") - to_chat(world, "The President has been killed!") - else if(original_job && original_job.title == "Vice-President of the USA") - to_chat(world, "The Vice-President has been killed!") - else if(original_job && original_job.title == "Speaker of the House") - to_chat(world, "The Speaker of the House has been killed!") + switch (civilization) + if ("National Guard") + map.scores["Militia"] += 1 + else + map.scores["National Guard"] += 1 + + if (original_job) + switch (original_job.title) + if ("President of the USA") + to_chat(world, "The President has been killed!") + if ("Vice-President of the USA") + to_chat(world, "The Vice-President has been killed!") + if ("Speaker of the House") + to_chat(world, "The Speaker of the House has been killed!") if (MAP_KANDAHAR) var/obj/map_metadata/kandahar/MP = map - if (faction_text == RUSSIAN && original_job.title == "Soviet Army Captain") - MP.muj_points += 15 - to_chat(world, "A Soviet Army Lieutenant has been killed!") - if (faction_text == RUSSIAN && original_job.title == "Soviet Army Lieutenant") - MP.muj_points += 12 - to_chat(world, "A Soviet Army Lieutenant has been killed!") - else if (faction_text == RUSSIAN && original_job.title == "Soviet Army Sergeant") - MP.muj_points += 5 - else if (faction_text == RUSSIAN && original_job.title == "Soviet Army Radio Operator") - MP.muj_points += 3 - else if (faction_text == CIVILIAN && original_job.title == "DRA Governor") - MP.muj_points += 15 - to_chat(world, "The DRA Governor has been killed!") - else if (faction_text == CIVILIAN && original_job.title == "DRA Lieutenant") - to_chat(world, "A DRA Lieutenant has been killed!") - MP.muj_points += 10 - else if (faction_text == CIVILIAN && original_job.title == "DRA Sergeant") - to_chat(world, "A DRA Sergeant has been killed!") - MP.muj_points += 5 - else if (faction_text == ARAB && original_job.title == "Mujahideen Warchief") - MP.sov_points += 15 - to_chat(world, "The Mujahideen Warchief has been killed!") - else if (faction_text == ARAB && original_job.title == "Mujahideen Group Leader") - MP.sov_points += 5 - to_chat(world, "The Mujahideen Group Leader has been killed!") + if (original_job) + switch (faction_text) + if (RUSSIAN) + switch (original_job.title) + if ("Soviet Army Captain") + MP.muj_points += 15 + to_chat(world, "A Soviet Army Captain has been killed!") + if ("Soviet Army Lieutenant") + MP.muj_points += 12 + to_chat(world, "A Soviet Army Lieutenant has been killed!") + if ("Soviet Army Sergeant") + MP.muj_points += 5 + if ("Soviet Army Radio Operator") + MP.muj_points += 3 + if (CIVILIAN) + switch (original_job.title) + if ("DRA Governor") + MP.muj_points += 15 + to_chat(world, "The DRA Governor has been killed!") + if ("DRA Lieutenant") + to_chat(world, "A DRA Lieutenant has been killed!") + MP.muj_points += 10 + if ("DRA Sergeant") + to_chat(world, "A DRA Sergeant has been killed!") + MP.muj_points += 5 + if (ARAB) + switch (original_job.title) + if ("Mujahideen Warchief") + MP.sov_points += 15 + to_chat(world, "The Mujahideen Warchief has been killed!") + if ("Mujahideen Group Leader") + MP.sov_points += 5 + to_chat(world, "The Mujahideen Group Leader has been killed!") if (MAP_SEKIGAHARA) if (civilization && civilization in map.scores) - if (civilization == "Eastern Army") - if (original_job && original_job.title == "Azuma no Daimyo") - map.scores["Western Army"] += 10 - to_chat(world, "The Eastern Army daimyo has been killed!") - else if (original_job && original_job.title == "Tobu no Samurai") - map.scores["Western Army"] += 5 + switch (civilization) + if ("Eastern Army") + switch (original_job.title) + if ("Azuma no Daimyo") + map.scores["Western Army"] += 10 + to_chat(world, "The Eastern Army daimyo has been killed!") + if ("Tobu no Samurai") + map.scores["Western Army"] += 5 + else + map.scores["Western Army"] += 1 else - map.scores["Western Army"] += 1 - else - if (original_job && original_job.title == "Sei no Daimyo") - map.scores["Eastern Army"] += 10 - to_chat(world, "The Western Army daimyo has been killed!") - else if (original_job && original_job.title == "Sei no Samurai") - map.scores["Eastern Army"] += 5 - else - map.scores["Eastern Army"] += 1 + switch (original_job.title) + if ("Sei no Daimyo") + map.scores["Eastern Army"] += 10 + to_chat(world, "The Western Army daimyo has been killed!") + if ("Sei no Samurai") + map.scores["Eastern Army"] += 5 + else + map.scores["Eastern Army"] += 1 + /* if (MAP_AFRICAN_WARLORDS) if (faction_text == CIVILIAN && original_job_title == "United Nations Doctor") From 40730aa9b4da2b5f95ff5d7f22abccf9f82d807e Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:43:44 +0100 Subject: [PATCH 2/7] kabooooom? --- code/game/mob/living/carbon/human/death.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index fa1df5acf6..d320a25cbb 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -117,9 +117,12 @@ to_chat(world, "The Russian Army Lieutenant has been killed!") else map.scores["Militia"] += 1 + else + map.scores["Militia"] += 1 else map.scores["Russian Army"] += 1 + if (MAP_OPERATION_FALCON) if (original_job.is_commander) switch (faction_text) From 893dd7757e106b160813ec5ee9e9532b0796cc4a Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:46:13 +0100 Subject: [PATCH 3/7] original job... --- code/game/mob/living/carbon/human/death.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index d320a25cbb..c1d2603120 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -139,12 +139,6 @@ else map.scores["National Guard"] += 1 - if (original_job) - switch (original_job.title) - if (civilization == "National Guard") - map.scores["Militia"] += 1 - else - map.scores["National Guard"] += 1 if (original_job) switch(original_job.title) if ("President of the USA") From 3d56d960e48877f24738366a2c2ec76103f1d957 Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:50:09 +0100 Subject: [PATCH 4/7] correct else --- code/game/mob/living/carbon/human/death.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index c1d2603120..b446567300 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -105,8 +105,7 @@ if (MAP_YELTSIN) if (civilization && civilization in map.scores) - switch (civilization) - if ("Russian Army") + if (civilization == "Russian Army") if (original_job) switch (original_job.title) if ("Russian Army Sergeant") @@ -119,8 +118,8 @@ map.scores["Militia"] += 1 else map.scores["Militia"] += 1 - else - map.scores["Russian Army"] += 1 + else + map.scores["Russian Army"] += 1 if (MAP_OPERATION_FALCON) From 6877283c1365090db71654c550afc21e60599936 Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:52:37 +0100 Subject: [PATCH 5/7] ok nevermind its right this way --- code/game/mob/living/carbon/human/death.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index b446567300..3eb56163fb 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -118,8 +118,8 @@ map.scores["Militia"] += 1 else map.scores["Militia"] += 1 - else - map.scores["Russian Army"] += 1 + else + map.scores["Russian Army"] += 1 if (MAP_OPERATION_FALCON) From 8b1d937aaf8bad8733cffe135d7ca8041895bfb9 Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:58:19 +0100 Subject: [PATCH 6/7] Revert "ok nevermind its right this way" This reverts commit 6877283c1365090db71654c550afc21e60599936. --- code/game/mob/living/carbon/human/death.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index 3eb56163fb..b446567300 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -118,8 +118,8 @@ map.scores["Militia"] += 1 else map.scores["Militia"] += 1 - else - map.scores["Russian Army"] += 1 + else + map.scores["Russian Army"] += 1 if (MAP_OPERATION_FALCON) From 7dd66a97b8081a9ca6bbede367f5aec916d31510 Mon Sep 17 00:00:00 2001 From: HaultyAnonie Date: Tue, 28 May 2024 16:58:24 +0100 Subject: [PATCH 7/7] Revert "correct else" This reverts commit 3d56d960e48877f24738366a2c2ec76103f1d957. --- code/game/mob/living/carbon/human/death.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm index b446567300..c1d2603120 100644 --- a/code/game/mob/living/carbon/human/death.dm +++ b/code/game/mob/living/carbon/human/death.dm @@ -105,7 +105,8 @@ if (MAP_YELTSIN) if (civilization && civilization in map.scores) - if (civilization == "Russian Army") + switch (civilization) + if ("Russian Army") if (original_job) switch (original_job.title) if ("Russian Army Sergeant") @@ -118,8 +119,8 @@ map.scores["Militia"] += 1 else map.scores["Militia"] += 1 - else - map.scores["Russian Army"] += 1 + else + map.scores["Russian Army"] += 1 if (MAP_OPERATION_FALCON)