cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gang Hotfix

Browse Source 
- Fixes takeover bonus reductions using a min() instead of a max() causing extremely short takeover times
- Also makes promotions and dominators cheaper
This commit is contained in:
Ikarrus
2015-06-14 13:31:04 -06:00
parent 4efbe37b69
commit 1e44560a89
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/gamemodes/gang/gang.dm
View File

@@ -455,10 +455,10 @@
gangmode = ticker.mode gangmode = ticker.mode
//Calculate and report influence growth //Calculate and report influence growth
ticker.mode.message_gangtools(ticker.mode.A_tools,"<b>[gang_name("A")] Gang Status Report:</b>") ticker.mode.message_gangtools(ticker.mode.A_tools,"*---------*<br><b>[gang_name("A")] Gang Status Report:</b>")
var/A_message = "" var/A_message = ""
if(gangmode && isnum(gangmode.A_timer)) if(gangmode && isnum(gangmode.A_timer))
var/new_time = min(180,gangmode.A_timer - (ticker.mode.A_territory.len * 2)) var/new_time = max(180,gangmode.A_timer - (ticker.mode.A_territory.len * 2))
if(new_time < gangmode.A_timer) if(new_time < gangmode.A_timer)
A_message += "Your takeover has been rushed by [gangmode.A_timer - new_time] seconds for holding on to [ticker.mode.A_territory.len] territories. " A_message += "Your takeover has been rushed by [gangmode.A_timer - new_time] seconds for holding on to [ticker.mode.A_territory.len] territories. "
gangmode.A_timer = new_time gangmode.A_timer = new_time
@@ -475,7 +475,7 @@
ticker.mode.message_gangtools(ticker.mode.B_tools,"<b>[gang_name("B")] Gang Status Report:</b>") ticker.mode.message_gangtools(ticker.mode.B_tools,"<b>[gang_name("B")] Gang Status Report:</b>")
var/B_message = "" var/B_message = ""
if(gangmode && isnum(gangmode.B_timer)) if(gangmode && isnum(gangmode.B_timer))
var/new_time = min(180,gangmode.B_timer - (ticker.mode.B_territory.len * 2)) var/new_time = max(180,gangmode.B_timer - (ticker.mode.B_territory.len * 2))
if(new_time < gangmode.B_timer) if(new_time < gangmode.B_timer)
B_message += "Your takeover has been rushed by [gangmode.B_timer - new_time] seconds for holding on to [ticker.mode.B_territory.len] territories. " B_message += "Your takeover has been rushed by [gangmode.B_timer - new_time] seconds for holding on to [ticker.mode.B_territory.len] territories. "
gangmode.B_timer = new_time gangmode.B_timer = new_time
@@ -525,8 +525,8 @@
var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1) var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)
var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1) var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)
ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has <b>[A_control]% control</b> of the station.",0) ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has <b>[A_control]% control</b> of the station.<BR>*---------*",0)
ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has <b>[B_control]% control</b> of the station.",0) ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has <b>[B_control]% control</b> of the station.<BR>*---------*",0)
//Increase outfit stock //Increase outfit stock
for(var/obj/item/device/gangtool/tool in (ticker.mode.A_tools | ticker.mode.B_tools)) for(var/obj/item/device/gangtool/tool in (ticker.mode.A_tools | ticker.mode.B_tools))

16
code/game/gamemodes/gang/recaller.dm
View File

@@ -113,14 +113,14 @@
if(promotions >= 3) if(promotions >= 3)
dat += "(Out of stock) Promote a Gangster<br>" dat += "(Out of stock) Promote a Gangster<br>"
else else
dat += "([(promotions*20)+10] Influence, [3-promotions] left) " dat += "([(promotions*10)+10] Influence, [3-promotions] left) "
if(points >= (promotions*20)+10) if(points >= (promotions*10)+10)
dat += "<a href='?src=\ref[src];purchase=gangtool'>Promote a Gangster</a><br>" dat += "<a href='?src=\ref[src];purchase=gangtool'>Promote a Gangster</a><br>"
else else
dat += "Promote a Gangster<br>" dat += "Promote a Gangster<br>"
if(gangmode) if(gangmode)
dat += "(50 Influence) " dat += "(30 Influence) "
if(points >= 50) if(points >= 30)
dat += "<a href='?src=\ref[src];purchase=dominator'><b>Station Dominator</b></a><br>" dat += "<a href='?src=\ref[src];purchase=dominator'><b>Station Dominator</b></a><br>"
else else
dat += "Station Dominator<br>" dat += "Station Dominator<br>"
@@ -180,9 +180,9 @@
item_type = /obj/item/weapon/pen/gang item_type = /obj/item/weapon/pen/gang
points = 30 points = 30
if("gangtool") if("gangtool")
if((promotions < 3) && (points >= (promotions*20)+10)) if((promotions < 3) && (points >= (promotions*10)+10))
item_type = /obj/item/device/gangtool/lt item_type = /obj/item/device/gangtool/lt
points = (promotions*20)+10 points = (promotions*10)+10
promotions++ promotions++
if("dominator") if("dominator")
if(istype(ticker.mode, /datum/game_mode/gang)) if(istype(ticker.mode, /datum/game_mode/gang))
@@ -201,9 +201,9 @@
usr << "<span class='warning'>There's not enough room here!</span>" usr << "<span class='warning'>There's not enough room here!</span>"
return return
if(points >= 50) if(points >= 30)
item_type = /obj/machinery/dominator item_type = /obj/machinery/dominator
points = 50 points = 30
if(item_type) if(item_type)
if(gang == "A") if(gang == "A")