From 4746fe34f5a8d3f9933ac2e0b8396ae5d6a6f180 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 26 Apr 2015 16:02:32 -0600 Subject: [PATCH 1/4] Gang Update 5.1 I'm quite satisfied in the current state of gang and I feel that I no longer have any more significant changes to make. Gang 5.1 includes primarily minor tweaks. - Goal reduced back down to 50% - Boss icon made more obvious. They're now red Gs - Better descriptions for distributing spraycans and victory conditions - Lieutenants receive objectives now - Increased spraycan use to 20 - Poseur tags no longer pick gang B's tag --- code/__HELPERS/names.dm | 1 + code/game/gamemodes/gang/gang.dm | 12 ++++++------ code/game/objects/items/crayons.dm | 2 +- code/game/objects/items/devices/recaller.dm | 2 ++ icons/mob/hud.dmi | Bin 3711 -> 3726 bytes 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index fecd159e8d9..d1ea5365d4d 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -139,6 +139,7 @@ var/gang_B_name = null gang_A_name = pick(gang_name_pool) gang_name_pool -= gang_A_name gang_B_name = pick(gang_name_pool) + gang_name_pool -= gang_B_name if(gang == "A") return gang_A_name diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 4b5fed604e8..f663fa249b2 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -26,7 +26,7 @@ recommended_enemies = 2 enemy_minimum_age = 14 var/finished = 0 - var/goal_scalar = 0.6 //Goal = Total territories x goal_scalar + var/goal_scalar = 0.5 //Goal = Total territories x goal_scalar /////////////////////////// //Announces the game type// @@ -94,7 +94,7 @@ /datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind - rival_obj.explanation_text = "Claim more than 60% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." + rival_obj.explanation_text = "Claim more than 50% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." boss_mind.objectives += rival_obj @@ -152,7 +152,7 @@ if (!where3) mob << "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start." else - mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get." + mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. Distribute these to your gangsters to grow your influence faster." . += 1 mob.update_icons() @@ -194,8 +194,8 @@ carbon_mob.flash_eyes(1, 1) gangster_mind.current.Stun(5) gangster_mind.current << "You are now a member of the [gang=="A" ? gang_name("A") : gang_name("B")] Gang!" - gangster_mind.current << "Help your bosses take over the station by claiming territory with the special spraycans they provide. Simply spray on any unclaimed area of the station." - gangster_mind.current << "You can identify your bosses by their brown \"G\" icon." + gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." + gangster_mind.current << "You can identify your bosses by their red \[G\] icon." gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]!" gangster_mind.special_role = "[gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]" update_gang_icons_added(gangster_mind,gang) @@ -285,7 +285,7 @@ if(!finished) world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before either gang could claim it!"]" else - world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang has taken over the station!" + world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang has claimed over [round(100*goal_scalar,1)]% of the station and has assumed control!" ..() return 1 diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 2013d180b59..958edb93f01 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -158,5 +158,5 @@ desc = "A suspicious-looking spraycan modified to use special paint used by gangsters to mark territory." icon_state = "spraycan_gang_cap" gang = 1 - uses = 15 + uses = 20 instant = -1 diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index ed4750d62fa..fab45720ef1 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -165,6 +165,8 @@ log_game("[key_name(user)] has been promoted to Lieutenant in the [gang_name("B")] Gang (B)") promoted = 1 if(promoted) + ticker.mode.forge_gang_objectives(user.mind) + ticker.mode.greet_gang(user.mind,0) ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "[user] has been promoted to Lieutenant.") user << "You have been promoted to Lieutenant!" user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station." diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 84ed7d9fc07ce331381ae6269c5db58e012e689a..a8e2032719a79d4888a17bc9e7b34bb6576792e0 100644 GIT binary patch delta 2702 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 Date: Sun, 26 Apr 2015 16:14:21 -0600 Subject: [PATCH 2/4] - Tweaks to instructional text - Promotion costs reduced to 10, 30, 50 influence each - changelog --- code/game/gamemodes/gang/gang.dm | 2 +- code/game/objects/items/devices/recaller.dm | 65 ++++++++++++--------- html/changelogs/Ikarrus-gang5_1.yml | 8 +++ 3 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 html/changelogs/Ikarrus-gang5_1.yml diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index f663fa249b2..6e73207af65 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -138,7 +138,7 @@ else gangtool.register_device(mob) mob << "The Gangtool in your [where] will allow you to use your influence to purchase items and prevent the station from evacuating before you can take over. Use it to recall the emergency shuttle from anywhere on the station." - mob << "You can also promote your gang members to lieutenant by giving them an unregistered gangtool. Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools." + mob << "You can also promote your gang members to lieutenant by giving them an unregistered gangtool. Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools." . += 1 var/where2 = mob.equip_in_one_of_slots(T, slots) diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index fab45720ef1..1fdf9794b96 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -12,7 +12,7 @@ var/gang //Which gang uses this? var/boss = 1 //If it has the power to promote gang members var/recalling = 0 - var/promotion_cost = 20 + var/promotions = 0 /obj/item/device/gangtool/New() //Initialize supply point income if it hasn't already been started if(!ticker.mode.gang_points) @@ -46,38 +46,45 @@ dat += "Time until Influence grows: [(points >= 100) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))]
" dat += "Purchase Items:
" + dat += "(10 Influence) " if(points >= 10) - dat += "(10 Influence) Territory Spraycan
" + dat += "Territory Spraycan
" else - dat += "(10 Influence) Territory Spraycan
" + dat += "Territory Spraycan
" + dat += "(10 Influence) " + if(points >= 10) + dat += "Switchblade
" + else + dat += "Switchblade
" + + dat += "(25 Influence) " if(points >= 25) - dat += "(25 Influence) 10mm Pistol
" + dat += "10mm Pistol
" else - dat += "(25 Influence) 10mm Pistol
" + dat += "10mm Pistol
" + dat += "(10 Influence) " if(points >= 10) - dat += "(10 Influence) 10mm Ammo
" + dat += "10mm Ammo
" else - dat += "(10 Influence) 10mm Ammo
" - - if(points >= 10) - dat += "(10 Influence) Switchblade
" - else - dat += "(10 Influence) Switchblade
" + dat += "10mm Ammo
" + dat += "(50 Influence) " if(points >= 50) - dat += "(50 Influence) Recruitment Pen
" + dat += "Recruitment Pen
" else - dat += "(50 Influence) Recruitment Pen
" + dat += "Recruitment Pen
" if(boss) - if(promotion_cost > 100) - dat += "(Maximum Reached) Promote a Gangster
" - else if(points >= promotion_cost) - dat += "([promotion_cost] Influence) Promote a Gangster
" + if(promotions >= 3) + dat += "(Out of stock) Promote a Gangster
" else - dat += "([promotion_cost] Influence) Promote a Gangster
" + dat += "([(promotions*20)+10] Influence, [3-promotions] left) " + if(points >= (promotions*20)+10) + dat += "Promote a Gangster
" + else + dat += "Promote a Gangster
" dat += "
" dat += "Refresh
" @@ -100,6 +107,10 @@ if(points >= 10) item_type = /obj/item/toy/crayon/spraycan/gang points = 10 + if("switchblade") + if(points >= 10) + item_type = /obj/item/weapon/switchblade + points = 10 if("pistol") if(points >= 25) item_type = /obj/item/weapon/gun/projectile/automatic/pistol @@ -108,19 +119,15 @@ if(points >= 10) item_type = /obj/item/ammo_box/magazine/m10mm points = 10 - if("switchblade") - if(points >= 10) - item_type = /obj/item/weapon/switchblade - points = 10 if("pen") if(points >= 50) item_type = /obj/item/weapon/pen/gang points = 50 if("gangtool") - if(points >= promotion_cost) + if((promotions < 3) && (points >= (promotions*20)+10)) item_type = /obj/item/device/gangtool/lt - points = promotion_cost - promotion_cost += 30 + points = (promotions*20)+10 + promotions++ if(item_type) if(gang == "A") @@ -165,12 +172,12 @@ log_game("[key_name(user)] has been promoted to Lieutenant in the [gang_name("B")] Gang (B)") promoted = 1 if(promoted) - ticker.mode.forge_gang_objectives(user.mind) - ticker.mode.greet_gang(user.mind,0) ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "[user] has been promoted to Lieutenant.") user << "You have been promoted to Lieutenant!" + ticker.mode.forge_gang_objectives(user.mind) + ticker.mode.greet_gang(user.mind,0) user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station." - user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them." + user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them." if(!gang) usr << "ACCESS DENIED: Unauthorized user." diff --git a/html/changelogs/Ikarrus-gang5_1.yml b/html/changelogs/Ikarrus-gang5_1.yml new file mode 100644 index 00000000000..1679e2fa21f --- /dev/null +++ b/html/changelogs/Ikarrus-gang5_1.yml @@ -0,0 +1,8 @@ +author: Ikarrus + +delete-after: True + +changes: + - tweak: "Gang Capture goal reduced to 50%" + - tweak: "Gang spraycan use increased to 20" + - tweak: "Gang Boss icon is now a red [G] icon to make it stand out better from regular gang icons" \ No newline at end of file From 5972a03481ccf1f6d01d4271d6d609e1c8a2f559 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 26 Apr 2015 18:03:01 -0600 Subject: [PATCH 3/4] - Reduced income to 3 minute intervals - Income delay is now a editable var in game for debug and testing purposes - Income rate no longer scales down if you're over 15 territories --- code/game/gamemodes/gang/gang.dm | 13 +++++++------ html/changelogs/Ikarrus-gang5_1.yml | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 6e73207af65..a5481346f30 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -194,7 +194,7 @@ carbon_mob.flash_eyes(1, 1) gangster_mind.current.Stun(5) gangster_mind.current << "You are now a member of the [gang=="A" ? gang_name("A") : gang_name("B")] Gang!" - gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." + gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." gangster_mind.current << "You can identify your bosses by their red \[G\] icon." gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]!" gangster_mind.special_role = "[gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]" @@ -343,11 +343,12 @@ /datum/gang_points var/A = 30 var/B = 30 - var/next_point_time = 0 + var/next_point_interval = 1800 + var/next_point_time /datum/gang_points/proc/start() - next_point_time = world.time + 3000 - spawn(3000) + next_point_time = world.time + next_point_interval + spawn(next_point_interval) income() /datum/gang_points/proc/income() @@ -375,7 +376,7 @@ //Calculate and report influence growth ticker.mode.message_gangtools(ticker.mode.A_tools,"[gang_name("A")] Gang Status Report:") - var/A_new = min(100,A + 15 + min(ticker.mode.A_territory.len, 15) + round(max(ticker.mode.A_territory.len - 15, 0) * 0.5,1)) + var/A_new = min(100,A + 15 + ticker.mode.A_territory.len) var/A_message = "" if(A_new != A) A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories." @@ -385,7 +386,7 @@ ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0) ticker.mode.message_gangtools(ticker.mode.B_tools,"[gang_name("B")] Gang Status Report:") - var/B_new = min(100,B + 15 + min(ticker.mode.B_territory.len, 15) + round(max(ticker.mode.B_territory.len - 15, 0) * 0.5,1)) + var/B_new = min(100,B + 15 + ticker.mode.B_territory.len) var/B_message = "" if(B_new != B) B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories." diff --git a/html/changelogs/Ikarrus-gang5_1.yml b/html/changelogs/Ikarrus-gang5_1.yml index 1679e2fa21f..1bd6f90efdf 100644 --- a/html/changelogs/Ikarrus-gang5_1.yml +++ b/html/changelogs/Ikarrus-gang5_1.yml @@ -3,6 +3,7 @@ author: Ikarrus delete-after: True changes: + - tweak: "Gang income delay reduced to 3 minutes intervals." - tweak: "Gang Capture goal reduced to 50%" - tweak: "Gang spraycan use increased to 20" - tweak: "Gang Boss icon is now a red [G] icon to make it stand out better from regular gang icons" \ No newline at end of file From 4444f30040bf28844b724be0f243ff4bc37e4b95 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 27 Apr 2015 22:29:28 -0600 Subject: [PATCH 4/4] Round Integers --- code/modules/admin/player_panel.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index dc82a42143a..0fc7af88b6f 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -386,7 +386,7 @@ dat += "" if(ticker.mode.A_bosses.len || ticker.mode.A_gang.len) - dat += "
" + dat += "
[gang_name("A")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.A] Influence, " : "")][round((ticker.mode.A_territory.len/start_state.num_territories)*100, 0.1)]% Control
" for(var/datum/mind/N in ticker.mode.A_bosses) var/mob/M = N.current if(!M) @@ -402,7 +402,7 @@ dat += "
[gang_name("A")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.A] Influence, " : "")][round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)]% Control
" if(ticker.mode.B_bosses.len || ticker.mode.B_gang.len) - dat += "
" + dat += "
[gang_name("B")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.B] Influence, " : "")][round((ticker.mode.B_territory.len/start_state.num_territories)*100, 0.1)]% Control
" for(var/datum/mind/N in ticker.mode.B_bosses) var/mob/M = N.current if(!M)
[gang_name("B")] Gang: [(ticker.mode.gang_points ? "[ticker.mode.gang_points.B] Influence, " : "")][round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)]% Control