From 9683f1b4b3e65de5e9681ffdfe61a724efccd898 Mon Sep 17 00:00:00 2001
From: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com>
Date: Fri, 7 Aug 2020 00:14:15 -0400
Subject: [PATCH] Critical Arcade Audio fix pls speedmerge (#7419)
This prevents arcades from literally deafening you from 10+ tiles away.
They will now only play on your tile and the tile next to you.
---
code/game/machinery/computer/arcade.dm | 42 +++++++++++++-------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 4f6b5421b8..8ef01c9b64 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -146,7 +146,7 @@
blocked = 1
var/attackamt = rand(2,6)
temp = "You attack for [attackamt] damage!"
- playsound(src, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
if(turtle > 0)
turtle--
@@ -159,7 +159,7 @@
var/pointamt = rand(1,3)
var/healamt = rand(6,8)
temp = "You use [pointamt] magic to heal for [healamt] damage!"
- playsound(src, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
turtle++
sleep(10)
@@ -172,7 +172,7 @@
blocked = 1
var/chargeamt = rand(4,7)
temp = "You regain [chargeamt] points"
- playsound(src, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
player_mp += chargeamt
if(turtle > 0)
turtle--
@@ -203,7 +203,7 @@
if(!gameover)
gameover = 1
temp = "[enemy_name] has fallen! Rejoice!"
- playsound(src, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
if(emagged)
feedback_inc("arcade_win_emagged")
@@ -224,13 +224,13 @@
else if (emagged && (turtle >= 4))
var/boomamt = rand(5,10)
enemy_action = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
- playsound(src, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
player_hp -= boomamt
else if ((enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3)
enemy_action = "[enemy_name] steals [stealamt] of your power!"
- playsound(src, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
player_mp -= stealamt
if (player_mp <= 0)
@@ -245,20 +245,20 @@
else if ((enemy_hp <= 10) && (enemy_mp > 4))
enemy_action = "[enemy_name] heals for 4 health!"
- playsound(src, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
enemy_hp += 4
enemy_mp -= 4
else
var/attackamt = rand(3,6)
enemy_action = "[enemy_name] attacks for [attackamt] damage!"
- playsound(src, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
player_hp -= attackamt
if ((player_mp <= 0) || (player_hp <= 0))
gameover = 1
temp = "You have been crushed! GAME OVER"
- playsound(src, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
if(emagged)
feedback_inc("arcade_loss_hp_emagged")
usr.gib()
@@ -392,7 +392,7 @@
user.set_machine(src)
var/dat = ""
if(gameStatus == ORION_STATUS_GAMEOVER)
- playsound(src, 'sound/arcade/Ori_fail.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/Ori_fail.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
dat = "Game Over
"
dat += "Like many before you, your crew never made it to Orion, lost to space...
forever."
if(settlers.len == 0)
@@ -527,7 +527,7 @@
else if(href_list["newgame"]) //Reset everything
if(gameStatus == ORION_STATUS_START)
- playsound(src, 'sound/arcade/Ori_begin.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/Ori_begin.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
newgame()
else if(href_list["menu"]) //back to the main menu
if(gameStatus == ORION_STATUS_GAMEOVER)
@@ -599,7 +599,7 @@
else if(href_list["killcrew"]) //shoot a crewmember
if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_MUTINY)
- playsound(src, 'sound/arcade/kill_crew.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/kill_crew.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
var/sheriff = remove_crewmember() //I shot the sheriff
var/mob/living/L = usr
if(!istype(L))
@@ -625,7 +625,7 @@
else if(href_list["buycrew"]) //buy a crewmember
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided && food >= 10 && fuel >= 10)
- playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
var/bought = add_crewmember()
last_spaceport_action = "You hired [bought] as a new crewmember."
fuel -= 10
@@ -635,7 +635,7 @@
else if(href_list["sellcrew"]) //sell a crewmember
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided && settlers.len > 1)
- playsound(src, 'sound/arcade/lose_fuel.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/lose_fuel.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
var/sold = remove_crewmember()
last_spaceport_action = "You sold your crewmember, [sold]!"
fuel += 7
@@ -653,7 +653,7 @@
else if(href_list["raid_spaceport"])
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided)
- playsound(src, 'sound/arcade/raid.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/raid.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
var/success = min(15 * alive,100) //default crew (4) have a 60% chance
spaceport_raided = 1
@@ -692,7 +692,7 @@
else if(href_list["buyparts"])
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided && fuel > 5)
- playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
switch(text2num(href_list["buyparts"]))
if(1) //Engine Parts
engine++
@@ -709,7 +709,7 @@
else if(href_list["trade"])
if(gameStatus == ORION_STATUS_MARKET)
if(!spaceport_raided)
- playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/get_fuel.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
switch(text2num(href_list["trade"]))
if(1) //Fuel
if(fuel > 5)
@@ -752,7 +752,7 @@
canContinueEvent = 1
if(ORION_TRAIL_FLUX)
- playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
eventdat += "This region of space is highly turbulent.
If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies."
eventdat += "
What will you do?"
eventdat += "Slow Down Continue
"
@@ -767,7 +767,7 @@
canContinueEvent = 1
if(ORION_TRAIL_BREAKDOWN)
- playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
eventdat += "Oh no! The engine has broken down!"
eventdat += "
You can repair it with an engine part, or you can make repairs for 3 days."
if(engine >= 1)
@@ -786,7 +786,7 @@
eventdat += "Close
"
if(ORION_TRAIL_COLLISION)
- playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/explo.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
eventdat += "Something hit us! Looks like there's some hull damage."
if(prob(25))
var/sfood = rand(5,15)
@@ -1002,7 +1002,7 @@
/obj/machinery/computer/arcade/orion_trail/proc/win()
gameStatus = ORION_STATUS_START
src.visible_message("\The [src] plays a triumpant tune, stating 'CONGRATULATIONS, YOU HAVE MADE IT TO ORION.'")
- playsound(src, 'sound/arcade/Ori_win.ogg', 50, 1, extrarange = -3, falloff = 10)
+ playsound(src, 'sound/arcade/Ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
if(emagged)
new /obj/item/weapon/orion_ship(src.loc)
message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")