Skip to content

Commit

Permalink
balance: pain hunter is now excluded from antagonist objectives (#5955)
Browse files Browse the repository at this point in the history
* увы!!

* откат

* >daeberdir is talking
  • Loading branch information
NightDawnFox authored Sep 30, 2024
1 parent 9ffd4c3 commit 423bf2d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 27 deletions.
40 changes: 16 additions & 24 deletions code/modules/antagonists/space_ninja/ninja_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,40 +442,32 @@
// RnD Hack: Flag set to complete in the DrainAct in ninjaDrainAct.dm
add_objective(/datum/objective/research_corrupt)

var/pick_chance = rand(0, 100)
if(pick_chance <= 25)
if(prob(50))
var/datum/objective/plant_explosive/bomb_objective = add_objective(/datum/objective/plant_explosive)
bomb_objective.give_bomb(delayed = 0)

else if(pick_chance <= 50)
else
var/datum/objective/set_up/set_up_objective = add_objective(/datum/objective/set_up)
if(!set_up_objective.target)
qdel(set_up_objective)

else
var/datum/objective/pain_hunter/pain_hunter_objective = add_objective(/datum/objective/pain_hunter)
if(!pain_hunter_objective.target)
qdel(pain_hunter_objective)

switch(pick(1,2))
if(1)
add_objective(/datum/objective/get_money)
if(prob(50))
add_objective(/datum/objective/get_money)

if(2)
add_objective(/datum/objective/find_and_scan)
else
add_objective(/datum/objective/find_and_scan)

switch(pick(1,2))
if(1)
for(var/i in 1 to 2)
var/datum/objective/assassinate/assassinate_objective = add_objective(/datum/objective/assassinate)
if(!assassinate_objective.target)
qdel(assassinate_objective)
if(prob(50))
for(var/i in 1 to 2)
var/datum/objective/assassinate/assassinate_objective = add_objective(/datum/objective/assassinate)
if(!assassinate_objective.target)
qdel(assassinate_objective)

if(2)
for(var/i in 1 to 2)
var/datum/objective/steal/steal_objective = add_objective(/datum/objective/steal)
if(!steal_objective.steal_target)
qdel(steal_objective)
else
for(var/i in 1 to 2)
var/datum/objective/steal/steal_objective = add_objective(/datum/objective/steal)
if(!steal_objective.steal_target)
qdel(steal_objective)

var/list/all_objectives = owner.get_all_objectives()
if(!(locate(/datum/objective/escape) in all_objectives) && !(locate(/datum/objective/survive) in all_objectives))
Expand Down
3 changes: 0 additions & 3 deletions code/modules/antagonists/traitor/datum_traitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@
else if(prob(5))
add_objective(/datum/objective/debrain)

else if(prob(30))
add_objective(/datum/objective/pain_hunter)

else if(prob(20))
add_objective(/datum/objective/protect)

Expand Down

0 comments on commit 423bf2d

Please sign in to comment.