mirror of
https://github.com/2revoemag/PSF-BotServer.git
synced 2026-07-12 06:55:10 +00:00
Merits mistake
This commit is contained in:
SouNourS
parent
3e5e8a2573
commit
efd7cef5ce
1 changed files with 37 additions and 38 deletions
|
|
@ -68,7 +68,6 @@ object MeritCommendation extends Enumeration {
|
||||||
Avenger6,
|
Avenger6,
|
||||||
//50
|
//50
|
||||||
Avenger7,
|
Avenger7,
|
||||||
AwardColors, //what?
|
|
||||||
BendingMovieActor,
|
BendingMovieActor,
|
||||||
BFRAdvanced,
|
BFRAdvanced,
|
||||||
BFRAdvanced2,
|
BFRAdvanced2,
|
||||||
|
|
@ -77,8 +76,8 @@ object MeritCommendation extends Enumeration {
|
||||||
BFRAdvanced5,
|
BFRAdvanced5,
|
||||||
BFRBuster1,
|
BFRBuster1,
|
||||||
BFRBuster2,
|
BFRBuster2,
|
||||||
//60
|
|
||||||
BFRBuster3,
|
BFRBuster3,
|
||||||
|
//60
|
||||||
BFRBuster4,
|
BFRBuster4,
|
||||||
BFRBuster5,
|
BFRBuster5,
|
||||||
BFRBuster6,
|
BFRBuster6,
|
||||||
|
|
@ -88,8 +87,8 @@ object MeritCommendation extends Enumeration {
|
||||||
BlackOpsHunter3,
|
BlackOpsHunter3,
|
||||||
BlackOpsHunter4,
|
BlackOpsHunter4,
|
||||||
BlackOpsHunter5,
|
BlackOpsHunter5,
|
||||||
//70
|
|
||||||
BlackOpsParticipant,
|
BlackOpsParticipant,
|
||||||
|
//70
|
||||||
BlackOpsVictory,
|
BlackOpsVictory,
|
||||||
Bombadier1,
|
Bombadier1,
|
||||||
Bombadier2,
|
Bombadier2,
|
||||||
|
|
@ -99,8 +98,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Bombadier6,
|
Bombadier6,
|
||||||
Bombadier7,
|
Bombadier7,
|
||||||
BomberAce1,
|
BomberAce1,
|
||||||
//80
|
|
||||||
BomberAce2,
|
BomberAce2,
|
||||||
|
//80
|
||||||
BomberAce3,
|
BomberAce3,
|
||||||
BomberAce4,
|
BomberAce4,
|
||||||
BomberAce5,
|
BomberAce5,
|
||||||
|
|
@ -110,8 +109,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Boomer2,
|
Boomer2,
|
||||||
Boomer3,
|
Boomer3,
|
||||||
Boomer4,
|
Boomer4,
|
||||||
//90
|
|
||||||
Boomer5,
|
Boomer5,
|
||||||
|
//90
|
||||||
Boomer6,
|
Boomer6,
|
||||||
Boomer7,
|
Boomer7,
|
||||||
CalvaryDriver1,
|
CalvaryDriver1,
|
||||||
|
|
@ -121,8 +120,8 @@ object MeritCommendation extends Enumeration {
|
||||||
CalvaryDriver5,
|
CalvaryDriver5,
|
||||||
CalvaryDriver6,
|
CalvaryDriver6,
|
||||||
CalvaryDriver7,
|
CalvaryDriver7,
|
||||||
//100
|
|
||||||
CalvaryPilot,
|
CalvaryPilot,
|
||||||
|
//100
|
||||||
CalvaryPilot2,
|
CalvaryPilot2,
|
||||||
CalvaryPilot3,
|
CalvaryPilot3,
|
||||||
CalvaryPilot4,
|
CalvaryPilot4,
|
||||||
|
|
@ -132,8 +131,8 @@ object MeritCommendation extends Enumeration {
|
||||||
CMTopOutfit,
|
CMTopOutfit,
|
||||||
CombatMedic,
|
CombatMedic,
|
||||||
CombatMedic2,
|
CombatMedic2,
|
||||||
//110
|
|
||||||
CombatMedic3,
|
CombatMedic3,
|
||||||
|
//110
|
||||||
CombatMedic4,
|
CombatMedic4,
|
||||||
CombatMedic5,
|
CombatMedic5,
|
||||||
CombatMedic6,
|
CombatMedic6,
|
||||||
|
|
@ -143,8 +142,8 @@ object MeritCommendation extends Enumeration {
|
||||||
CombatRepair3,
|
CombatRepair3,
|
||||||
CombatRepair4,
|
CombatRepair4,
|
||||||
CombatRepair5,
|
CombatRepair5,
|
||||||
//120
|
|
||||||
CombatRepair6,
|
CombatRepair6,
|
||||||
|
//120
|
||||||
CombatRepair7,
|
CombatRepair7,
|
||||||
ContestFirstBR40,
|
ContestFirstBR40,
|
||||||
ContestMovieMaker,
|
ContestMovieMaker,
|
||||||
|
|
@ -154,8 +153,8 @@ object MeritCommendation extends Enumeration {
|
||||||
CSAppreciation,
|
CSAppreciation,
|
||||||
DefenseNC1,
|
DefenseNC1,
|
||||||
DefenseNC2,
|
DefenseNC2,
|
||||||
//130
|
|
||||||
DefenseNC3,
|
DefenseNC3,
|
||||||
|
//130
|
||||||
DefenseNC4,
|
DefenseNC4,
|
||||||
DefenseNC5,
|
DefenseNC5,
|
||||||
DefenseNC6,
|
DefenseNC6,
|
||||||
|
|
@ -165,8 +164,8 @@ object MeritCommendation extends Enumeration {
|
||||||
DefenseTR3,
|
DefenseTR3,
|
||||||
DefenseTR4,
|
DefenseTR4,
|
||||||
DefenseTR5,
|
DefenseTR5,
|
||||||
//40
|
|
||||||
DefenseTR6,
|
DefenseTR6,
|
||||||
|
//140
|
||||||
DefenseTR7,
|
DefenseTR7,
|
||||||
DefenseVS1,
|
DefenseVS1,
|
||||||
DefenseVS2,
|
DefenseVS2,
|
||||||
|
|
@ -176,8 +175,8 @@ object MeritCommendation extends Enumeration {
|
||||||
DefenseVS6,
|
DefenseVS6,
|
||||||
DefenseVS7,
|
DefenseVS7,
|
||||||
DevilDogsMovie,
|
DevilDogsMovie,
|
||||||
//150
|
|
||||||
DogFighter1,
|
DogFighter1,
|
||||||
|
//150
|
||||||
DogFighter2,
|
DogFighter2,
|
||||||
DogFighter3,
|
DogFighter3,
|
||||||
DogFighter4,
|
DogFighter4,
|
||||||
|
|
@ -187,8 +186,8 @@ object MeritCommendation extends Enumeration {
|
||||||
DriverGunner1,
|
DriverGunner1,
|
||||||
DriverGunner2,
|
DriverGunner2,
|
||||||
DriverGunner3,
|
DriverGunner3,
|
||||||
//160
|
|
||||||
DriverGunner4,
|
DriverGunner4,
|
||||||
|
//160
|
||||||
DriverGunner5,
|
DriverGunner5,
|
||||||
DriverGunner6,
|
DriverGunner6,
|
||||||
DriverGunner7,
|
DriverGunner7,
|
||||||
|
|
@ -198,8 +197,8 @@ object MeritCommendation extends Enumeration {
|
||||||
EliteAssault3,
|
EliteAssault3,
|
||||||
EliteAssault4,
|
EliteAssault4,
|
||||||
EliteAssault5,
|
EliteAssault5,
|
||||||
//170
|
|
||||||
EliteAssault6,
|
EliteAssault6,
|
||||||
|
//170
|
||||||
EliteAssault7,
|
EliteAssault7,
|
||||||
EmeraldVeteran,
|
EmeraldVeteran,
|
||||||
Engineer1,
|
Engineer1,
|
||||||
|
|
@ -209,8 +208,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Engineer5,
|
Engineer5,
|
||||||
Engineer6,
|
Engineer6,
|
||||||
EquipmentSupport1,
|
EquipmentSupport1,
|
||||||
//180
|
|
||||||
EquipmentSupport2,
|
EquipmentSupport2,
|
||||||
|
//180
|
||||||
EquipmentSupport3,
|
EquipmentSupport3,
|
||||||
EquipmentSupport4,
|
EquipmentSupport4,
|
||||||
EquipmentSupport5,
|
EquipmentSupport5,
|
||||||
|
|
@ -220,8 +219,8 @@ object MeritCommendation extends Enumeration {
|
||||||
EventNCElite,
|
EventNCElite,
|
||||||
EventNCSoldier,
|
EventNCSoldier,
|
||||||
EventTRCommander,
|
EventTRCommander,
|
||||||
//190
|
|
||||||
EventTRElite,
|
EventTRElite,
|
||||||
|
//190
|
||||||
EventTRSoldier,
|
EventTRSoldier,
|
||||||
EventVSCommander,
|
EventVSCommander,
|
||||||
EventVSElite,
|
EventVSElite,
|
||||||
|
|
@ -231,8 +230,8 @@ object MeritCommendation extends Enumeration {
|
||||||
FiveYearTR,
|
FiveYearTR,
|
||||||
FiveYearVS,
|
FiveYearVS,
|
||||||
FourYearNC,
|
FourYearNC,
|
||||||
//200
|
|
||||||
FourYearTR,
|
FourYearTR,
|
||||||
|
//200
|
||||||
FourYearVS,
|
FourYearVS,
|
||||||
GalaxySupport1,
|
GalaxySupport1,
|
||||||
GalaxySupport2,
|
GalaxySupport2,
|
||||||
|
|
@ -242,8 +241,8 @@ object MeritCommendation extends Enumeration {
|
||||||
GalaxySupport6,
|
GalaxySupport6,
|
||||||
GalaxySupport7,
|
GalaxySupport7,
|
||||||
Grenade1,
|
Grenade1,
|
||||||
//210
|
|
||||||
Grenade2,
|
Grenade2,
|
||||||
|
//210
|
||||||
Grenade3,
|
Grenade3,
|
||||||
Grenade4,
|
Grenade4,
|
||||||
Grenade5,
|
Grenade5,
|
||||||
|
|
@ -253,8 +252,8 @@ object MeritCommendation extends Enumeration {
|
||||||
GroundGunner2,
|
GroundGunner2,
|
||||||
GroundGunner3,
|
GroundGunner3,
|
||||||
GroundGunner4,
|
GroundGunner4,
|
||||||
//220
|
|
||||||
GroundGunner5,
|
GroundGunner5,
|
||||||
|
//220
|
||||||
GroundGunner6,
|
GroundGunner6,
|
||||||
GroundGunner7,
|
GroundGunner7,
|
||||||
HackingSupport1,
|
HackingSupport1,
|
||||||
|
|
@ -264,8 +263,8 @@ object MeritCommendation extends Enumeration {
|
||||||
HackingSupport5,
|
HackingSupport5,
|
||||||
HackingSupport6,
|
HackingSupport6,
|
||||||
HackingSupport7,
|
HackingSupport7,
|
||||||
//230
|
|
||||||
HeavyAssault1,
|
HeavyAssault1,
|
||||||
|
//230
|
||||||
HeavyAssault2,
|
HeavyAssault2,
|
||||||
HeavyAssault3,
|
HeavyAssault3,
|
||||||
HeavyAssault4,
|
HeavyAssault4,
|
||||||
|
|
@ -275,8 +274,8 @@ object MeritCommendation extends Enumeration {
|
||||||
HeavyInfantry,
|
HeavyInfantry,
|
||||||
HeavyInfantry2,
|
HeavyInfantry2,
|
||||||
HeavyInfantry3,
|
HeavyInfantry3,
|
||||||
//240
|
|
||||||
HeavyInfantry4,
|
HeavyInfantry4,
|
||||||
|
//240
|
||||||
InfantryExpert1,
|
InfantryExpert1,
|
||||||
InfantryExpert2,
|
InfantryExpert2,
|
||||||
InfantryExpert3,
|
InfantryExpert3,
|
||||||
|
|
@ -286,8 +285,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Jacking4,
|
Jacking4,
|
||||||
Jacking5,
|
Jacking5,
|
||||||
Jacking6,
|
Jacking6,
|
||||||
//250
|
|
||||||
Jacking7,
|
Jacking7,
|
||||||
|
//250
|
||||||
KnifeCombat1,
|
KnifeCombat1,
|
||||||
KnifeCombat2,
|
KnifeCombat2,
|
||||||
KnifeCombat3,
|
KnifeCombat3,
|
||||||
|
|
@ -297,8 +296,8 @@ object MeritCommendation extends Enumeration {
|
||||||
KnifeCombat7,
|
KnifeCombat7,
|
||||||
LightInfantry,
|
LightInfantry,
|
||||||
LockerCracker1,
|
LockerCracker1,
|
||||||
//260
|
|
||||||
LockerCracker2,
|
LockerCracker2,
|
||||||
|
//260
|
||||||
LockerCracker3,
|
LockerCracker3,
|
||||||
LockerCracker4,
|
LockerCracker4,
|
||||||
LockerCracker5,
|
LockerCracker5,
|
||||||
|
|
@ -308,8 +307,8 @@ object MeritCommendation extends Enumeration {
|
||||||
LodestarSupport2,
|
LodestarSupport2,
|
||||||
LodestarSupport3,
|
LodestarSupport3,
|
||||||
LodestarSupport4,
|
LodestarSupport4,
|
||||||
//270
|
|
||||||
LodestarSupport5,
|
LodestarSupport5,
|
||||||
|
//270
|
||||||
LodestarSupport6,
|
LodestarSupport6,
|
||||||
LodestarSupport7,
|
LodestarSupport7,
|
||||||
Loser,
|
Loser,
|
||||||
|
|
@ -319,8 +318,8 @@ object MeritCommendation extends Enumeration {
|
||||||
MarkovVeteran,
|
MarkovVeteran,
|
||||||
Max1,
|
Max1,
|
||||||
Max2,
|
Max2,
|
||||||
//280
|
|
||||||
Max3,
|
Max3,
|
||||||
|
//280
|
||||||
Max4,
|
Max4,
|
||||||
Max5,
|
Max5,
|
||||||
Max6,
|
Max6,
|
||||||
|
|
@ -330,8 +329,8 @@ object MeritCommendation extends Enumeration {
|
||||||
MaxBuster4,
|
MaxBuster4,
|
||||||
MaxBuster5,
|
MaxBuster5,
|
||||||
MaxBuster6,
|
MaxBuster6,
|
||||||
//290
|
|
||||||
MediumAssault1,
|
MediumAssault1,
|
||||||
|
//290
|
||||||
MediumAssault2,
|
MediumAssault2,
|
||||||
MediumAssault3,
|
MediumAssault3,
|
||||||
MediumAssault4,
|
MediumAssault4,
|
||||||
|
|
@ -341,8 +340,8 @@ object MeritCommendation extends Enumeration {
|
||||||
OneYearNC,
|
OneYearNC,
|
||||||
OneYearTR,
|
OneYearTR,
|
||||||
OneYearVS,
|
OneYearVS,
|
||||||
//300
|
|
||||||
Orion1,
|
Orion1,
|
||||||
|
//300
|
||||||
Orion2,
|
Orion2,
|
||||||
Orion3,
|
Orion3,
|
||||||
Orion4,
|
Orion4,
|
||||||
|
|
@ -352,8 +351,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Osprey1,
|
Osprey1,
|
||||||
Osprey2,
|
Osprey2,
|
||||||
Osprey3,
|
Osprey3,
|
||||||
//310
|
|
||||||
Osprey4,
|
Osprey4,
|
||||||
|
//310
|
||||||
Osprey5,
|
Osprey5,
|
||||||
Osprey6,
|
Osprey6,
|
||||||
Osprey7,
|
Osprey7,
|
||||||
|
|
@ -363,8 +362,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Phalanx4,
|
Phalanx4,
|
||||||
Phalanx5,
|
Phalanx5,
|
||||||
Phalanx6,
|
Phalanx6,
|
||||||
//320
|
|
||||||
Phalanx7,
|
Phalanx7,
|
||||||
|
//320
|
||||||
PSUMaAttendee,
|
PSUMaAttendee,
|
||||||
PSUMbAttendee,
|
PSUMbAttendee,
|
||||||
QAAppreciation,
|
QAAppreciation,
|
||||||
|
|
@ -374,8 +373,8 @@ object MeritCommendation extends Enumeration {
|
||||||
ReinforcementVehicleSpecialist,
|
ReinforcementVehicleSpecialist,
|
||||||
RouterSupport1,
|
RouterSupport1,
|
||||||
RouterSupport2,
|
RouterSupport2,
|
||||||
//330
|
|
||||||
RouterSupport3,
|
RouterSupport3,
|
||||||
|
//330
|
||||||
RouterSupport4,
|
RouterSupport4,
|
||||||
RouterSupport5,
|
RouterSupport5,
|
||||||
RouterSupport6,
|
RouterSupport6,
|
||||||
|
|
@ -385,8 +384,8 @@ object MeritCommendation extends Enumeration {
|
||||||
RouterTelepadDeploy3,
|
RouterTelepadDeploy3,
|
||||||
RouterTelepadDeploy4,
|
RouterTelepadDeploy4,
|
||||||
RouterTelepadDeploy5,
|
RouterTelepadDeploy5,
|
||||||
//340
|
|
||||||
RouterTelepadDeploy6,
|
RouterTelepadDeploy6,
|
||||||
|
//340
|
||||||
RouterTelepadDeploy7,
|
RouterTelepadDeploy7,
|
||||||
ScavengerNC1,
|
ScavengerNC1,
|
||||||
ScavengerNC2,
|
ScavengerNC2,
|
||||||
|
|
@ -396,8 +395,8 @@ object MeritCommendation extends Enumeration {
|
||||||
ScavengerNC6,
|
ScavengerNC6,
|
||||||
ScavengerTR1,
|
ScavengerTR1,
|
||||||
ScavengerTR2,
|
ScavengerTR2,
|
||||||
//350
|
|
||||||
ScavengerTR3,
|
ScavengerTR3,
|
||||||
|
//350
|
||||||
ScavengerTR4,
|
ScavengerTR4,
|
||||||
ScavengerTR5,
|
ScavengerTR5,
|
||||||
ScavengerTR6,
|
ScavengerTR6,
|
||||||
|
|
@ -407,8 +406,8 @@ object MeritCommendation extends Enumeration {
|
||||||
ScavengerVS4,
|
ScavengerVS4,
|
||||||
ScavengerVS5,
|
ScavengerVS5,
|
||||||
ScavengerVS6,
|
ScavengerVS6,
|
||||||
//360
|
|
||||||
SixYearNC,
|
SixYearNC,
|
||||||
|
//360
|
||||||
SixYearTR,
|
SixYearTR,
|
||||||
SixYearVS,
|
SixYearVS,
|
||||||
Sniper1,
|
Sniper1,
|
||||||
|
|
@ -418,8 +417,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Sniper5,
|
Sniper5,
|
||||||
Sniper6,
|
Sniper6,
|
||||||
Sniper7,
|
Sniper7,
|
||||||
//370
|
|
||||||
SpecialAssault1,
|
SpecialAssault1,
|
||||||
|
//370
|
||||||
SpecialAssault2,
|
SpecialAssault2,
|
||||||
SpecialAssault3,
|
SpecialAssault3,
|
||||||
SpecialAssault4,
|
SpecialAssault4,
|
||||||
|
|
@ -429,8 +428,8 @@ object MeritCommendation extends Enumeration {
|
||||||
StandardAssault1,
|
StandardAssault1,
|
||||||
StandardAssault2,
|
StandardAssault2,
|
||||||
StandardAssault3,
|
StandardAssault3,
|
||||||
//380
|
|
||||||
StandardAssault4,
|
StandardAssault4,
|
||||||
|
//380
|
||||||
StandardAssault5,
|
StandardAssault5,
|
||||||
StandardAssault6,
|
StandardAssault6,
|
||||||
StandardAssault7,
|
StandardAssault7,
|
||||||
|
|
@ -440,8 +439,8 @@ object MeritCommendation extends Enumeration {
|
||||||
Supply3,
|
Supply3,
|
||||||
Supply4,
|
Supply4,
|
||||||
Supply5,
|
Supply5,
|
||||||
//390
|
|
||||||
Supply6,
|
Supply6,
|
||||||
|
//390
|
||||||
Supply7,
|
Supply7,
|
||||||
TankBuster1,
|
TankBuster1,
|
||||||
TankBuster2,
|
TankBuster2,
|
||||||
|
|
@ -451,8 +450,8 @@ object MeritCommendation extends Enumeration {
|
||||||
TankBuster6,
|
TankBuster6,
|
||||||
TankBuster7,
|
TankBuster7,
|
||||||
ThreeYearNC,
|
ThreeYearNC,
|
||||||
//400
|
|
||||||
ThreeYearTR,
|
ThreeYearTR,
|
||||||
|
//400
|
||||||
ThreeYearVS,
|
ThreeYearVS,
|
||||||
TinyRoboticSupport1,
|
TinyRoboticSupport1,
|
||||||
TinyRoboticSupport2,
|
TinyRoboticSupport2,
|
||||||
|
|
@ -462,8 +461,8 @@ object MeritCommendation extends Enumeration {
|
||||||
TinyRoboticSupport6,
|
TinyRoboticSupport6,
|
||||||
TinyRoboticSupport7,
|
TinyRoboticSupport7,
|
||||||
Transport1,
|
Transport1,
|
||||||
//410
|
|
||||||
Transport2,
|
Transport2,
|
||||||
|
//410
|
||||||
Transport3,
|
Transport3,
|
||||||
Transport4,
|
Transport4,
|
||||||
Transport5,
|
Transport5,
|
||||||
|
|
@ -473,8 +472,8 @@ object MeritCommendation extends Enumeration {
|
||||||
TransportationCitation2,
|
TransportationCitation2,
|
||||||
TransportationCitation3,
|
TransportationCitation3,
|
||||||
TransportationCitation4,
|
TransportationCitation4,
|
||||||
//420
|
|
||||||
TransportationCitation5,
|
TransportationCitation5,
|
||||||
|
//420
|
||||||
TwoYearNC,
|
TwoYearNC,
|
||||||
TwoYearTR,
|
TwoYearTR,
|
||||||
TwoYearVS,
|
TwoYearVS,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue