PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-02-20 07:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #168 from Fate-JH/cert-term

Browse source 
Certification Terminals
This commit is contained in:
Fate-JH 2017-10-07 15:38:51 -04:00 • committed by GitHub
commit 9b8f5ca251
9 changed files with 166 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import net.psforever.objects.definition.converter.{CommandDetonaterConverter, Lo
import net.psforever.objects.equipment.CItem.DeployedItem
import net.psforever.objects.equipment._
import net.psforever.objects.inventory.InventoryTile
import net.psforever.objects.terminals.OrderTerminalDefinition
import net.psforever.objects.terminals.{CertTerminalDefinition, OrderTerminalDefinition}
import net.psforever.packet.game.objectcreate.ObjectClass
import net.psforever.types.PlanetSideEmpire
@ -1239,5 +1239,7 @@ object GlobalDefinitions {
fury.TrunkOffset = 30
val
orderTerminal = new OrderTerminalDefinition
order_terminal = new OrderTerminalDefinition
val
cert_terminal = new CertTerminalDefinition
}

100
common/src/main/scala/net/psforever/objects/terminals/CertTerminalDefinition.scala Normal file
View file

@ -0,0 +1,100 @@
// Copyright (c) 2017 PSForever
package net.psforever.objects.terminals
import net.psforever.objects.Player
import net.psforever.packet.game.ItemTransactionMessage
import net.psforever.types.CertificationType
/**
* The definition for any `Terminal` that is of a type "cert_terminal" (certification terminal).
* `Learn` and `Sell` `CertificationType` entries, gaining access to different `Equipment` and `Vehicles`.
*/
class CertTerminalDefinition extends TerminalDefinition(171) {
Name = "cert_terminal"
/**
* The certifications available.
* All entries are listed on page (tab) number 0.
*/
private val certificationList : Map[String, (CertificationType.Value, Int)] = Map(
"medium_assault" -> (CertificationType.MediumAssault, 2),
"reinforced_armo" -> (CertificationType.ReinforcedExoSuit, 3),
"quad_all" -> (CertificationType.ATV, 1),
"switchblade" -> (CertificationType.Switchblade, 1),
"harasser" -> (CertificationType.Harasser, 1),
"anti_vehicular" -> (CertificationType.AntiVehicular, 3),
"heavy_assault" -> (CertificationType.HeavyAssault, 4),
"sniper" -> (CertificationType.Sniping, 3),
"special_assault" -> (CertificationType.SpecialAssault, 3),
"special_assault_2" -> (CertificationType.EliteAssault, 1),
"infiltration_suit" -> (CertificationType.InfiltrationSuit, 2),
"max_anti_personnel" -> (CertificationType.AIMAX, 3),
"max_anti_vehicular" -> (CertificationType.AVMAX, 3),
"max_anti_aircraft" -> (CertificationType.AAMAX, 2),
"max_all" -> (CertificationType.UniMAX, 6),
"air_cavalry_scout" -> (CertificationType.AirCavalryScout, 3),
"air_cavalry_assault" -> (CertificationType.AirCavalryAssault, 2),
"air_cavalry_interceptor" -> (CertificationType.AirCavalryInterceptor, 2),
"air_support" -> (CertificationType.AirSupport, 3),
"gunship" -> (CertificationType.GalaxyGunship, 2),
"phantasm" -> (CertificationType.Phantasm, 3),
"armored_assault1" -> (CertificationType.ArmoredAssault1, 2),
"armored_assault2" -> (CertificationType.ArmoredAssault2, 1),
"flail" -> (CertificationType.Flail, 1),
"assault_buggy" -> (CertificationType.AssaultBuggy, 3),
"ground_support" -> (CertificationType.GroundSupport, 2),
"ground_transport" -> (CertificationType.GroundTransport, 2),
"light_scout" -> (CertificationType.LightScout, 5),
"Repair" -> (CertificationType.Engineering, 3),
"combat_engineering" -> (CertificationType.CombatEngineering, 2),
"ce_offense" -> (CertificationType.AssaultEngineering, 3),
"ce_defense" -> (CertificationType.FortificationEngineering, 3),
"ce_advanced" -> (CertificationType.AdvancedEngineering, 5),
"Hacking" -> (CertificationType.Hacking, 3),
"advanced_hacking" -> (CertificationType.AdvancedHacking, 2),
"expert_hacking" -> (CertificationType.ExpertHacking, 2),
"virus_hacking" -> (CertificationType.DataCorruption, 3),
"electronics_expert" -> (CertificationType.ElectronicsExpert, 4),
"Medical" -> (CertificationType.Medical, 3),
"advanced_medical" -> (CertificationType.AdvancedMedical, 2)
//TODO bfr certification entries
)
/**
* Process a `TransactionType.Learn` action by the user.
* @param player the player
* @param msg the original packet carrying the request
* @return an actionable message that explains how to process the request
*/
def Buy(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = { //Learn
certificationList.get(msg.item_name) match {
case Some((cert, cost)) =>
Terminal.LearnCertification(cert, cost)
case None =>
Terminal.NoDeal()
}
}
/**
* Process a `TransactionType.Sell` action by the user.
* @param player the player
* @param msg the original packet carrying the request
* @return an actionable message that explains how to process the request
*/
def Sell(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = {
certificationList.get(msg.item_name) match {
case Some((cert, cost)) =>
Terminal.SellCertification(cert, cost)
case None =>
Terminal.NoDeal()
}
}
/**
* This action is not supported by this type of `Terminal`.
* @param player the player
* @param msg the original packet carrying the request
* @return `Terminal.NoEvent` always
*/
def Loadout(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = Terminal.NoDeal()
}

12
common/src/main/scala/net/psforever/objects/terminals/OrderTerminalDefinition.scala
View file

@ -10,6 +10,11 @@ import net.psforever.packet.game.ItemTransactionMessage
import scala.annotation.switch
/**
* The definition for any `Terminal` that is of a type "order_terminal".
* `Buy` and `Sell` `Equipment` items and `AmmoBox` items.
* Change `ExoSuitType` and retrieve `InfantryLoadout` entries.
*/
class OrderTerminalDefinition extends TerminalDefinition(612) {
Name = "order_terminal"
@ -21,10 +26,10 @@ class OrderTerminalDefinition extends TerminalDefinition(612) {
/**
* Process a `TransactionType.Buy` action by the user.
* Either attempt to purchase equipment or attempt to switch directly to a different exo-suit.
* @param player the player
* @param msg the original packet carrying the request
* @return an actionable message that explains how to process the request;
* either you attempt to purchase equipment or attempt to switch directly to a different exo-suit
* @return an actionable message that explains how to process the request
*/
def Buy(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = {
(msg.item_page : @switch) match {
@ -64,6 +69,7 @@ class OrderTerminalDefinition extends TerminalDefinition(612) {
/**
* Process a `TransactionType.Sell` action by the user.
* There is no specific `order_terminal` tab associated with this action.
* Additionally, the equipment to be sold ia almost always in the player's `FreeHand` slot.
* Selling `Equipment` is always permitted.
* @param player the player
* @param msg the original packet carrying the request
@ -81,7 +87,7 @@ class OrderTerminalDefinition extends TerminalDefinition(612) {
* @param msg the original packet carrying the request
* @return an actionable message that explains how to process the request
*/
def InfantryLoadout(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = {
def Loadout(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = {
if(msg.item_page == 4) { //Favorites tab
player.LoadLoadout(msg.unk1) match {
case Some(loadout) =>

10
common/src/main/scala/net/psforever/objects/terminals/Terminal.scala
View file

@ -66,14 +66,14 @@ class Terminal(tdef : TerminalDefinition) extends PlanetSideGameObject {
*/
def Request(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange = {
msg.transaction_type match {
case TransactionType.Buy =>
case TransactionType.Buy | TransactionType.Learn =>
tdef.Buy(player, msg)
case TransactionType.Sell =>
tdef.Sell(player, msg)
case TransactionType.InfantryLoadout =>
tdef.InfantryLoadout(player, msg)
tdef.Loadout(player, msg)
case _ =>
Terminal.NoDeal()
@ -132,6 +132,12 @@ object Terminal {
*/
//TODO if there are exceptions, find them
final case class SellEquipment() extends Exchange
import net.psforever.types.CertificationType
final case class LearnCertification(cert : CertificationType.Value, cost : Int) extends Exchange
final case class SellCertification(cert : CertificationType.Value, cost : Int) extends Exchange
/**
* Recover a former exo-suit and `Equipment` configuration that the `Player` possessed.
* A result of a processed request.

16
common/src/main/scala/net/psforever/objects/terminals/TerminalDefinition.scala
View file

@ -7,8 +7,6 @@ import net.psforever.objects.equipment.Equipment
import net.psforever.packet.game.ItemTransactionMessage
import net.psforever.types.ExoSuitType
import scala.collection.immutable.HashMap
/**
* The definition for any `Terminal`.
* @param objectId the object's identifier number
@ -17,7 +15,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
Name = "terminal"
/**
* The unimplemented functionality for this `Terminal`'s `TransactionType.Buy` activity.
* The unimplemented functionality for this `Terminal`'s `TransactionType.Buy` and `TransactionType.Learn` activity.
*/
def Buy(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange
@ -29,7 +27,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
/**
* The unimplemented functionality for this `Terminal`'s `TransactionType.InfantryLoadout` activity.
*/
def InfantryLoadout(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange
def Loadout(player : Player, msg : ItemTransactionMessage) : Terminal.Exchange
/**
* A `Map` of information for changing exo-suits.
@ -49,7 +47,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
* key - an identification string sent by the client
* value - a curried function that builds the object
*/
protected val infantryAmmunition : HashMap[String, ()=>Equipment] = HashMap(
protected val infantryAmmunition : Map[String, ()=>Equipment] = Map(
"9mmbullet" -> MakeAmmoBox(bullet_9mm),
"9mmbullet_AP" -> MakeAmmoBox(bullet_9mm_AP),
"shotgun_shell" -> MakeAmmoBox(shotgun_shell),
@ -75,7 +73,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
* key - an identification string sent by the client
* value - a curried function that builds the object
*/
protected val supportAmmunition : HashMap[String, ()=>Equipment] = HashMap(
protected val supportAmmunition : Map[String, ()=>Equipment] = Map(
"health_canister" -> MakeAmmoBox(health_canister),
"armor_canister" -> MakeAmmoBox(armor_canister),
"upgrade_canister" -> MakeAmmoBox(upgrade_canister)
@ -86,7 +84,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
* key - an identification string sent by the client
* value - a curried function that builds the object
*/
protected val vehicleAmmunition : HashMap[String, ()=>Equipment] = HashMap(
protected val vehicleAmmunition : Map[String, ()=>Equipment] = Map(
"35mmbullet" -> MakeAmmoBox(bullet_35mm),
"hellfire_ammo" -> MakeAmmoBox(hellfire_ammo),
"liberator_bomb" -> MakeAmmoBox(liberator_bomb),
@ -129,7 +127,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
* key - an identification string sent by the client
* value - a curried function that builds the object
*/
protected val infantryWeapons : HashMap[String, ()=>Equipment] = HashMap(
protected val infantryWeapons : Map[String, ()=>Equipment] = Map(
"ilc9" -> MakeTool(ilc9, bullet_9mm),
"repeater" -> MakeTool(repeater, bullet_9mm),
"isp" -> MakeTool(isp, shotgun_shell), //amp
@ -173,7 +171,7 @@ abstract class TerminalDefinition(objectId : Int) extends ObjectDefinition(objec
* key - an identification string sent by the client
* value - a curried function that builds the object
*/
protected val supportWeapons : HashMap[String, ()=>Equipment] = HashMap(
protected val supportWeapons : Map[String, ()=>Equipment] = Map(
"medkit" -> MakeKit(medkit),
"super_medkit" -> MakeKit(super_medkit),
"super_armorkit" -> MakeKit(super_armorkit),

3
common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala
View file

@ -20,7 +20,7 @@ import scodec.codecs._
* `17 - BEP. Value seems to be the same as BattleExperienceMessage`<br>
* `18 - CEP.`<br>
* `19 - Anchors. Value is 0 to disengage, 1 to engage.`<br>
* `24 - Certifications with value :`<br>
* `24 - Learn certifications with value :`<br>
* 01 : Medium Assault<br>
* 02 : Heavy Assault<br>
* 03 : Special Assault<br>
@ -66,6 +66,7 @@ import scodec.codecs._
* 43 : Fortification Engineering<br>
* 44 : Assault Engineering<br>
* 45 : Advanced Engineering (= Fortification Engineering + Assault Engineering) Must have Combat Engineering<br>
* `25 - Forget certifications (same order as 24)`
* `29 - Visible ?! That's not the cloaked effect, Maybe for spectator mode ?. Value is 0 to visible, 1 to invisible.`<br>
* `31 - Info under avatar name : 0 = LFS, 1 = Looking For Squad Members`<br>
* `32 - Info under avatar name : 0 = Looking For Squad Members, 1 = LFS`<br>

6
common/src/main/scala/net/psforever/types/CertificationType.scala
View file

@ -30,9 +30,9 @@ object CertificationType extends Enumeration {
AntiVehicular,
Sniping,
EliteAssault,
AirCalvaryScout,
AirCalvaryInterceptor,
AirCalvaryAssault,
AirCavalryScout,
AirCavalryInterceptor,
AirCavalryAssault,
//10
AirSupport,
ATV,