PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-03-09 23:40:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolutions 3; exo-suit conventions

Browse source
This commit is contained in:
FateJH 2019-12-11 10:16:54 -05:00
parent c4bb0a77f6
commit a782e7bc46
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
View file

@ -1530,7 +1530,8 @@ object GlobalDefinitions {
Standard.ResistanceSplash = 15
Standard.ResistanceAggravated = 8
Agile.Name = "agile"
Agile.Name = "lite_armor"
Agile.Descriptor = "agile"
Agile.MaxArmor = 100
Agile.InventoryScale = InventoryTile.Tile99
Agile.InventoryOffset = 6
@ -1542,7 +1543,8 @@ object GlobalDefinitions {
Agile.ResistanceSplash = 25
Agile.ResistanceAggravated = 10
Reinforced.Name = "reinforced"
Reinforced.Name = "med_armor"
Reinforced.Descriptor = "reinforced"
Reinforced.Permissions = List(CertificationType.ReinforcedExoSuit)
Reinforced.MaxArmor = 200
Reinforced.InventoryScale = InventoryTile.Tile1209
@ -1580,18 +1582,21 @@ object GlobalDefinitions {
}
CommonMaxConfig(VSMAX)
VSMAX.Name = "vshev"
VSMAX.MaxCapacitor = 50
VSMAX.CapacitorRechargeDelayMillis = 5000
VSMAX.CapacitorRechargePerSecond = 3
VSMAX.CapacitorDrainPerSecond = 20
CommonMaxConfig(TRMAX)
TRMAX.Name = "trhev"
TRMAX.MaxCapacitor = 300
TRMAX.CapacitorRechargeDelayMillis = 10000
TRMAX.CapacitorRechargePerSecond = 10
TRMAX.CapacitorDrainPerSecond = 30
CommonMaxConfig(NCMAX)
NCMAX.Name = "nchev"
NCMAX.MaxCapacitor = 400
NCMAX.CapacitorRechargeDelayMillis = 10000
NCMAX.CapacitorRechargePerSecond = 4

1
common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala
View file

@ -114,6 +114,7 @@ class ExoSuitDefinition(private val suitType : ExoSuitType.Value) extends BasicD
class SpecialExoSuitDefinition(private val suitType : ExoSuitType.Value) extends ExoSuitDefinition(suitType) {
Name = "heavy_armor"
Descriptor = "heavy_armor"
private var activatedSpecial : SpecialExoSuitDefinition.Mode.Value = SpecialExoSuitDefinition.Mode.Normal

2
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -7791,7 +7791,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
sendResponse(PlanetsideAttributeMessage(amenityId, 47, if(silo.LowNtuWarningOn) 1 else 0))
if(silo.ChargeLevel == 0) {
sendResponse(PlanetsideAttributeMessage(silo.Owner.asInstanceOf[Building].GUID, 48, 1))
sendResponse(PlanetsideAttributeMessage(silo.Owner.GUID, 48, 1))
}
case _ => ;
}