Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Progtot reward rebalancing 1/2 #4645

Closed
wants to merge 14 commits into from
Closed

Progtot reward rebalancing 1/2 #4645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
07a5242
fine so far
Dec 19, 2024
b39bec0
saving
Dec 20, 2024
eb940da
save
Dec 21, 2024
11dad6e
making PR
Dec 22, 2024
e6f9d8a
lowered assassination
Dec 22, 2024
f39d268
more changes
Dec 22, 2024
1a350a7
for later
Dec 23, 2024
ec3c8d7
Merge branch 'Monkestation:master' into epic
Shoddd Jan 3, 2025
bc613e3
Merge branch 'Monkestation:master' into epic
Shoddd Jan 12, 2025
f3f3565
rep changes undone
Jan 12, 2025
99d873f
Merge branch 'epic' of https://github.com/Shoddd/MonkeShod into epic
Jan 12, 2025
1142008
forgot one
Jan 12, 2025
a119126
bartender shotgun
Jan 12, 2025
cea90af
forgot edit
Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/modules/antagonists/traitor/objectives/assassination.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@
name = "Assassinate %TARGET% the %JOB TITLE%, and plant a calling card"
description = "Kill your target and plant a calling card in the pockets of your victim. If your calling card gets destroyed before you are able to plant it, this objective will fail."
progression_reward = 2 MINUTES
telecrystal_reward = list(2, 4)
telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 2, 4

var/obj/item/paper/calling_card/card

/datum/traitor_objective/target_player/assassinate/calling_card/heads_of_staff
progression_reward = 4 MINUTES
telecrystal_reward = list(2, 3)
telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 2, 3

heads_of_staff = TRUE

/datum/traitor_objective/target_player/assassinate/behead
name = "Behead %TARGET%, the %JOB TITLE%"
description = "Behead and hold %TARGET%'s head to succeed this objective. If the head gets destroyed before you can do this, you will fail this objective."
progression_reward = 2 MINUTES
telecrystal_reward = list(2, 4)
telecrystal_reward = 7 //MONKESTATION EDIT ORG: 2, 4

///the body who needs to hold the head
var/mob/living/needs_to_hold_head
Expand All @@ -71,7 +71,7 @@

/datum/traitor_objective/target_player/assassinate/behead/heads_of_staff
progression_reward = 4 MINUTES
telecrystal_reward = list(3, 5)
telecrystal_reward = list(7, 8) //MONKESTATION EDIT ORG: 3, 5

heads_of_staff = TRUE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/traitor/objectives/demoralise_assault.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
progression_minimum = 0 MINUTES
progression_maximum = 30 MINUTES
progression_reward = list(4 MINUTES, 8 MINUTES)
telecrystal_reward = list(0, 1)
telecrystal_reward = list(2, 3) //MONKESTATION EDIT ORG: 0, 1

/// Min attacks required to pass the objective. Picked at random between this and max.
var/min_attacks_required = 2
Expand Down
8 changes: 4 additions & 4 deletions code/modules/antagonists/traitor/objectives/destroy_heirloom.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
progression_minimum = 0 MINUTES
progression_maximum = 30 MINUTES
progression_reward = list(8 MINUTES, 12 MINUTES)
telecrystal_reward = list(1, 2)
telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 1, 2
target_jobs = list(
// Medical
/datum/job/doctor,
Expand Down Expand Up @@ -73,7 +73,7 @@
progression_minimum = 0 MINUTES
progression_maximum = 45 MINUTES
progression_reward = list(8 MINUTES, 12 MINUTES)
telecrystal_reward = list(1, 2)
telecrystal_reward = list(4, 5) //MONKESTATION EDIT ORG: 1, 2
target_jobs = list(
// Cargo
/datum/job/quartermaster,
Expand All @@ -92,7 +92,7 @@
/// 60 minutes in, syndicate won't care about rare heirlooms anymore
progression_maximum = 60 MINUTES
progression_reward = list(10 MINUTES, 14 MINUTES)
telecrystal_reward = list(2, 3)
telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 2, 3
target_jobs = list(
// Security
/datum/job/security_officer,
Expand All @@ -107,7 +107,7 @@
/datum/traitor_objective/destroy_heirloom/captain
progression_minimum = 30 MINUTES
progression_reward = list(10 MINUTES, 14 MINUTES)
telecrystal_reward = 4
telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 4
target_jobs = list(
/datum/job/head_of_security,
/datum/job/captain
Expand Down
7 changes: 4 additions & 3 deletions code/modules/antagonists/traitor/objectives/destroy_item.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
progression_minimum = 10 MINUTES
progression_maximum = 35 MINUTES
progression_reward = list(5 MINUTES, 10 MINUTES)
telecrystal_reward = 1
telecrystal_reward = 3 //MONKESTATION EDIT ORG: 1

possible_items = list(
/datum/objective_item/steal/traitor/bartender_shotgun,
// /datum/objective_item/steal/traitor/bartender_shotgun, MONKESTATION REMOVAL
/datum/objective_item/steal/traitor/fireaxe,
/datum/objective_item/steal/traitor/nullrod,
/datum/objective_item/steal/traitor/big_crowbar,
Expand All @@ -28,10 +28,11 @@
/datum/traitor_objective/destroy_item/very_risky
progression_minimum = 40 MINUTES
progression_reward = 15 MINUTES
telecrystal_reward = list(6, 9)
telecrystal_reward = list(3, 4) //MONKESTATION EDIT ORG: 6, 9 Nice

possible_items = list(
/datum/objective_item/steal/blackbox,
/datum/objective_item/steal/traitor/bartender_shotgun, //MONKESTATION ADDITION
)

/// Super early-game destroy objective intended to be items easily tided that the crew tends to value.
Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/traitor/objectives/eyesnatching.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
progression_minimum = 10 MINUTES

progression_reward = list(4 MINUTES, 8 MINUTES)
telecrystal_reward = list(1, 2)
telecrystal_reward = list(5, 6) //MONKESTATION EDIT ORG: 1, 2

/// If we're targeting heads of staff or not
var/heads_of_staff = FALSE
Expand All @@ -37,7 +37,7 @@

/datum/traitor_objective/target_player/eyesnatching/heads
progression_reward = list(6 MINUTES, 12 MINUTES)
telecrystal_reward = list(2, 3)
telecrystal_reward = list(6, 7) //MONKESTATION EDIT ORG: 2, 3

heads_of_staff = TRUE

Expand Down
3 changes: 2 additions & 1 deletion code/modules/antagonists/traitor/objectives/kill_pet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
description = "The %DEPARTMENT HEAD% has particularly annoyed us by sending us spam emails and we want their %PET% dead to show them what happens when they cross us. "

progression_minimum = 0 MINUTES
telecrystal_reward = list(1, 2)
//progression_maximum = 20 MINUTES //MONKESTATION ADDITION 4 later
telecrystal_reward = list(0, 1) //MONKESTATION EDIT ORG: 1, 2
progression_reward = list(3 MINUTES, 6 MINUTES)

/// Possible heads mapped to their pet type. Can be a list of possible pets
Expand Down
4 changes: 2 additions & 2 deletions code/modules/antagonists/traitor/objectives/sleeper_protocol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
progression_minimum = 0 MINUTES

progression_reward = list(8 MINUTES, 15 MINUTES)
telecrystal_reward = 1
telecrystal_reward = 2 //MONKESTATION EDIT ORG: 1

var/list/limited_to = list(
JOB_CHIEF_MEDICAL_OFFICER,
Expand Down Expand Up @@ -133,6 +133,6 @@
/datum/traitor_objective/sleeper_protocol/everybody //Much harder for non-med and non-robo
progression_minimum = 30 MINUTES
progression_reward = list(8 MINUTES, 15 MINUTES)
telecrystal_reward = 3
telecrystal_reward = 4 //MONKESTATION EDIT ORG: 3

inverted_limitation = TRUE
9 changes: 5 additions & 4 deletions code/modules/antagonists/traitor/objectives/steal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
/// The current target item that we are stealing.
var/datum/objective_item/steal/target_item
/// A list of 2 elements, which contain the range that the time will be in. Represented in minutes.
var/hold_time_required = list(5, 15)
var/hold_time_required = list(5, 10) //MONKESTATION EDIT ORG: 5, 15
/// The current time fulfilled around the item
var/time_fulfilled = 0
/// The maximum distance between the bug and the objective taker for time to count as fulfilled
Expand All @@ -91,11 +91,11 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
progression_minimum = 10 MINUTES
progression_maximum = 35 MINUTES
progression_reward = list(5 MINUTES, 10 MINUTES)
telecrystal_reward = 0
telecrystal_reward = 1 //MONKESTATION EDIT ORG: 0
minutes_per_telecrystal = 6

possible_items = list(
/datum/objective_item/steal/traitor/cargo_budget,
//datum/objective_item/steal/traitor/cargo_budget, MONKESTATION EDIT MOVED TO SOMEWHAT RISKY
/datum/objective_item/steal/traitor/clown_shoes,
/datum/objective_item/steal/traitor/lawyers_badge,
/datum/objective_item/steal/traitor/chef_moustache,
Expand All @@ -109,7 +109,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
telecrystal_reward = 2

possible_items = list(
/datum/objective_item/steal/traitor/chief_engineer_belt
/datum/objective_item/steal/traitor/chief_engineer_belt,
/datum/objective_item/steal/traitor/cargo_budget, //MONKESTATION ADDITION
)

/datum/traitor_objective/steal_item/very_risky
Expand Down
Loading