PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1240 from Fate-JH/max-switch-to-zero

Browse source 
Min Capacitor
This commit is contained in:
Fate-JH 2024-10-01 16:02:31 -04:00 committed by GitHub
parent 177a1f72d9 11cb11bd79
commit 623a60d28c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/actors/session/normal/AvatarHandlerLogic.scala
View file

@ -310,6 +310,7 @@ class AvatarHandlerLogic(val ops: SessionAvatarHandlers, implicit val context: A
delete.foreach { case (obj, _) => TaskWorkflow.execute(GUIDTask.unregisterEquipment(continent.GUID, obj)) } delete.foreach { case (obj, _) => TaskWorkflow.execute(GUIDTask.unregisterEquipment(continent.GUID, obj)) }
//redraw //redraw
if (maxhand) { if (maxhand) {
sendResponse(PlanetsideAttributeMessage(target, attribute_type=7, player.Capacitor.toLong))
TaskWorkflow.execute(HoldNewEquipmentUp(player)( TaskWorkflow.execute(HoldNewEquipmentUp(player)(
Tool(GlobalDefinitions.MAXArms(subtype, player.Faction)), Tool(GlobalDefinitions.MAXArms(subtype, player.Faction)),
0 0
@ -381,7 +382,7 @@ class AvatarHandlerLogic(val ops: SessionAvatarHandlers, implicit val context: A
drops drops
) if resolvedPlayerGuid == target => ) if resolvedPlayerGuid == target =>
sendResponse(ArmorChangedMessage(target, exosuit, subtype)) sendResponse(ArmorChangedMessage(target, exosuit, subtype))
sendResponse(PlanetsideAttributeMessage(target, attribute_type = 4, armor)) sendResponse(PlanetsideAttributeMessage(target, attribute_type=4, armor))
//happening to this player //happening to this player
sendResponse(ObjectHeldMessage(target, Player.HandsDownSlot, unk1=true)) sendResponse(ObjectHeldMessage(target, Player.HandsDownSlot, unk1=true))
//cleanup //cleanup
@ -393,6 +394,7 @@ class AvatarHandlerLogic(val ops: SessionAvatarHandlers, implicit val context: A
drops.foreach(item => sendResponse(ObjectDeleteMessage(item.obj.GUID, unk1=0))) drops.foreach(item => sendResponse(ObjectDeleteMessage(item.obj.GUID, unk1=0)))
//redraw //redraw
if (maxhand) { if (maxhand) {
sendResponse(PlanetsideAttributeMessage(target, attribute_type=7, player.Capacitor.toLong))
TaskWorkflow.execute(HoldNewEquipmentUp(player)( TaskWorkflow.execute(HoldNewEquipmentUp(player)(
Tool(GlobalDefinitions.MAXArms(subtype, player.Faction)), Tool(GlobalDefinitions.MAXArms(subtype, player.Faction)),
slot = 0 slot = 0

6
src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -642,7 +642,10 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
//was max //was max
val (delete, insert) = beforeHolsters.partition(elem => elem.obj.Size == EquipmentSize.Max) val (delete, insert) = beforeHolsters.partition(elem => elem.obj.Size == EquipmentSize.Max)
if (willBecomeMax) { if (willBecomeMax) {
//changing to a different kind(?) of max if (originalSubtype != subtype) {
//changing to a different kind of max
player.Capacitor = 0
}
(delete, Nil, insert, beforeInventory) (delete, Nil, insert, beforeInventory)
} else { } else {
//changing to a vanilla exo-suit //changing to a vanilla exo-suit
@ -653,6 +656,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
} }
} else if (willBecomeMax) { } else if (willBecomeMax) {
//will be max, drop everything but melee slot //will be max, drop everything but melee slot
player.Capacitor = 0
val (melee, other) = beforeHolsters.partition(elem => elem.obj.Size == EquipmentSize.Melee) val (melee, other) = beforeHolsters.partition(elem => elem.obj.Size == EquipmentSize.Melee)
val (inventory, unplacedInventory) = GridInventory.recoverInventory(beforeInventory ++ other, player.Inventory) val (inventory, unplacedInventory) = GridInventory.recoverInventory(beforeInventory ++ other, player.Inventory)
val (dropFromUnplaced, deleteFromUnplaced) = unplacedInventory.map(InventoryItem(_, -1)).partition(dropPred) val (dropFromUnplaced, deleteFromUnplaced) = unplacedInventory.map(InventoryItem(_, -1)).partition(dropPred)