Customer Service

src/main/resources/application.conf

@@ -27,7 +27,7 @@ world {
 
   # How the server is displayed in the server browser.
   # One of: released beta development
-  server-type = released
+  server-type = development
 }
 
 # Admin API configuration
@@ -408,8 +408,14 @@ game {
           base = 25
         }
         {
-          name = "router"
+          name = "router-driver"
           base = 15
+          shots-multiplier = 1.0
+        }
+        {
+          name = "telepad-use"
+          base = 20
+          shots-multiplier = 1.0
         }
         {
           name = "hotdrop"

src/main/scala/net/psforever/actors/session/AvatarActor.scala

@@ -1131,6 +1131,11 @@ class AvatarActor(
   var supportExperienceTimer: Cancellable          = Default.Cancellable
   var experienceDebt: Long = 0L
 
+  private def setSession(newSession: Session): Unit = {
+    session = Some(newSession)
+    _avatar = Option(newSession.avatar)
+  }
+
   def avatar: Avatar = _avatar.get
 
   def avatar_=(avatar: Avatar): Unit = {
@@ -1156,7 +1161,7 @@ class AvatarActor(
           postLoginBehaviour()
 
         case SetSession(newSession) =>
-          session = Some(newSession)
+          setSession(newSession)
           postLoginBehaviour()
 
         case other =>
@@ -1176,7 +1181,7 @@ class AvatarActor(
     Behaviors
       .receiveMessage[Command] {
         case SetSession(newSession) =>
-          session = Some(newSession)
+          setSession(newSession)
           Behaviors.same
 
         case SetLookingForSquad(lfs) =>
@@ -1329,7 +1334,7 @@ class AvatarActor(
     Behaviors
       .receiveMessagePartial[Command] {
         case SetSession(newSession) =>
-          session = Some(newSession)
+          setSession(newSession)
           Behaviors.same
 
         case ReplaceAvatar(newAvatar) =>

src/main/scala/net/psforever/actors/session/SessionActor.scala

@@ -160,7 +160,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
     if (mode != newMode) {
       logic.switchFrom(data.session)
       mode = newMode
-      logic = mode.setup(data)
+      logic = newMode.setup(data)
     }
     logic.switchTo(data.session)
   }