From 0972689cfce7ad73734efd43c98ac0d148406005 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 6 May 2017 10:44:56 -0500 Subject: [PATCH 1/3] Updated: Reduces dominator timer ceiling, changes territory scaling --- code/game/gamemodes/gang/gang.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/game/gamemodes/gang/gang.dm.rej diff --git a/code/game/gamemodes/gang/gang.dm.rej b/code/game/gamemodes/gang/gang.dm.rej new file mode 100644 index 0000000000..02c5581f3c --- /dev/null +++ b/code/game/gamemodes/gang/gang.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm (rejected hunks) +@@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," + return gang_bosses + + /proc/determine_domination_time(var/datum/gang/G) +- return max(180,600 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9)) ++ return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9)) + + + ////////////////////////////////////////////////////////////////////// From 6bf46e1a6da48cbf8f1e73e0da583b547f9788ed Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 22:35:48 -0700 Subject: [PATCH 2/3] Delete gang.dm.rej --- code/game/gamemodes/gang/gang.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/game/gamemodes/gang/gang.dm.rej diff --git a/code/game/gamemodes/gang/gang.dm.rej b/code/game/gamemodes/gang/gang.dm.rej deleted file mode 100644 index 02c5581f3c..0000000000 --- a/code/game/gamemodes/gang/gang.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm (rejected hunks) -@@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," - return gang_bosses - - /proc/determine_domination_time(var/datum/gang/G) -- return max(180,600 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9)) -+ return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9)) - - - ////////////////////////////////////////////////////////////////////// From 4a5968280349538dd77a6e0e730109ea8654b23f Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 7 May 2017 22:35:54 -0700 Subject: [PATCH 3/3] Update gang.dm --- code/game/gamemodes/gang/gang.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 9c31edf55f..20cce72b4e 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," return gang_bosses /proc/determine_domination_time(var/datum/gang/G) - return max(180,900 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 12)) + return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9)) ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated//