diff --git a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala b/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala index 96a243b3..8eb16fb5 100644 --- a/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala +++ b/common/src/main/scala/net/psforever/objects/ShieldGeneratorDeployable.scala @@ -56,7 +56,11 @@ class ShieldGeneratorControl(gen : ShieldGeneratorDeployable) extends Actor case _ => ; } - + /* + while the shield generator is technically a supported jammable target, how that works is currently unknown + electing to use a "status only, no sound" approach by overriding one with an empty function is not entirely arbitrary + the superclass of "status" calls also sets the jammed object property + */ override def StartJammeredSound(target : Any, dur : Int) : Unit = { } override def StartJammeredStatus(target : Any, dur : Int) : Unit = target match { diff --git a/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala b/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala index 53a8f3fe..5d87b924 100644 --- a/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/GenericObjectActionMessage.scala @@ -23,6 +23,7 @@ import shapeless.{::, HNil} * 15 - Displays "This facility's generator is under attack!" * 16 - Displays "Generator has Overloaded! Evacuate Generator Room Immediately!" * 17 - Displays "This facility's generator is back on line" + * 19 - Cause mines to explode * 20 - Hit flinch? (orig, 82->80) * 21 - Reset build cooldown from using an ACE * 22 - ???? (Has been seen on vehicle pad objects, possibly some sort of reset flag after base faction flip / hack clear?) diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index a0574387..f7e5c9d3 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -1521,7 +1521,7 @@ class WorldSessionActor extends Actor sendResponse(ObjectDeleteMessage(guid, 0)) case LocalResponse.Detonate(guid, obj : ExplosiveDeployable) => - sendResponse(GenericObjectActionMessage(guid, 76)) + sendResponse(GenericObjectActionMessage(guid, 19)) sendResponse(PlanetsideAttributeMessage(guid, 29, 1)) sendResponse(ObjectDeleteMessage(guid, 0))