From 9510c8e5751954f523aaf29d25f172a7c431e019 Mon Sep 17 00:00:00 2001 From: Ansari Date: Tue, 10 Oct 2017 16:52:57 +0800 Subject: [PATCH 1/4] Warop TC scale to 4 per player above 50. Easier config --- code/game/gamemodes/nuclear/nuclear_challenge.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 5ce318bf273..70752d8a76f 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -1,3 +1,5 @@ +#define CHALLENGE_TELECRYSTALS 280 +#define CHALLENGE_SCALE_FACTOR 1 // For ease of balancing the TC scaling from war ops #define CHALLENGE_TIME_LIMIT 6000 #define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable. @@ -52,7 +54,7 @@ var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(get_turf(user)) U.hidden_uplink.uplink_owner= "[user.key]" - U.hidden_uplink.uses = 280 + U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + (((player_list.len * 4) - CHALLENGE_MIN_PLAYERS * 4) * CHALLENGE_SCALE_FACTOR) // Add 4 telecrystals per player above CHLALENGE_MIN_PLAYERS (50). Scale factor multiply it. config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY qdel(src) @@ -78,3 +80,5 @@ #undef CHALLENGE_TIME_LIMIT #undef CHALLENGE_MIN_PLAYERS #undef CHALLENGE_SHUTTLE_DELAY +#undef CHALLENGE_TELECRYSTALS +#undef CHALLENGE_SCALE_FACTOR From 565bfd95f9ed5a4773d6a164fe0ce38487f167a3 Mon Sep 17 00:00:00 2001 From: Ansari Date: Tue, 10 Oct 2017 17:09:03 +0800 Subject: [PATCH 2/4] Better math as per Birb --- code/game/gamemodes/nuclear/nuclear_challenge.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 70752d8a76f..2244e2834bf 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -54,7 +54,7 @@ var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(get_turf(user)) U.hidden_uplink.uplink_owner= "[user.key]" - U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + (((player_list.len * 4) - CHALLENGE_MIN_PLAYERS * 4) * CHALLENGE_SCALE_FACTOR) // Add 4 telecrystals per player above CHLALENGE_MIN_PLAYERS (50). Scale factor multiply it. + U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + (((player_list.len + CHALLENGE_MIN_PLAYERS) * 4) * CHALLENGE_SCALE_FACTOR) // Add 4 telecrystals per player above CHLALENGE_MIN_PLAYERS (50). Scale factor multiply it. config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY qdel(src) From 98865e662fdb0b7cd7ea15768e34d7c6811d2f6a Mon Sep 17 00:00:00 2001 From: Ansari Date: Wed, 11 Oct 2017 07:57:51 +0800 Subject: [PATCH 3/4] Change formula as per FalseIncarnate's suggestion. Add in message for uplink spawn. --- code/game/gamemodes/nuclear/nuclear_challenge.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 2244e2834bf..5af2321002e 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -1,6 +1,7 @@ #define CHALLENGE_TELECRYSTALS 280 -#define CHALLENGE_SCALE_FACTOR 1 // For ease of balancing the TC scaling from war ops #define CHALLENGE_TIME_LIMIT 6000 +#define CHALLENGE_SCALE_PLAYER 1 // How many player per scaling bonus +#define CHALLENGE_SCALE_BONUS 4 // How many TC per scaling bonus #define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable. @@ -48,13 +49,14 @@ event_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg') to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") + to_chat(user, "Look below you on the floor for the extra uplink") for(var/obj/machinery/computer/shuttle/syndicate/S in machines) S.challenge = TRUE var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(get_turf(user)) U.hidden_uplink.uplink_owner= "[user.key]" - U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + (((player_list.len + CHALLENGE_MIN_PLAYERS) * 4) * CHALLENGE_SCALE_FACTOR) // Add 4 telecrystals per player above CHLALENGE_MIN_PLAYERS (50). Scale factor multiply it. + U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + round((((player_list.len - CHALLENGE_MIN_PLAYERS)/CHALLENGE_SCALE_PLAYER) * CHALLENGE_SCALE_BONUS)) // No. of player - Min. Player to dec, divided by player per bonus, then multipled by TC per bonus. Rounded. config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY qdel(src) @@ -81,4 +83,5 @@ #undef CHALLENGE_MIN_PLAYERS #undef CHALLENGE_SHUTTLE_DELAY #undef CHALLENGE_TELECRYSTALS -#undef CHALLENGE_SCALE_FACTOR +#undef CHALLENGE_SCALE_PLAYER +#undef CHALLENGE_SCALE_BONUS From 4369b8a5992277e3223731d32d6b4d27fbbe32f0 Mon Sep 17 00:00:00 2001 From: Ansari Date: Sun, 15 Oct 2017 07:00:07 +0800 Subject: [PATCH 4/4] TC reduced to 2 pp --- code/game/gamemodes/nuclear/nuclear_challenge.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 5af2321002e..5d3c958de34 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -1,7 +1,7 @@ #define CHALLENGE_TELECRYSTALS 280 #define CHALLENGE_TIME_LIMIT 6000 #define CHALLENGE_SCALE_PLAYER 1 // How many player per scaling bonus -#define CHALLENGE_SCALE_BONUS 4 // How many TC per scaling bonus +#define CHALLENGE_SCALE_BONUS 2 // How many TC per scaling bonus #define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable.