From 6a021f938d50ee3ca923477045b42f4fbeeaca44 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 9 Feb 2024 12:00:33 -0500 Subject: [PATCH] charter class enum completed. --- src/engine/Enum.java | 55 +++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/src/engine/Enum.java b/src/engine/Enum.java index 21ffe345..81ec857a 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -2413,8 +2413,8 @@ public class Enum { {"High Magus"}, {"Archmagus"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Bard, PromoteType.Channeler, PromoteType.Doomsayer, + PromoteType.Fury, PromoteType.Necromancer, PromoteType.Priest, PromoteType.Warlock, PromoteType.Wizard)), MERCENARY("Mercenary Company", new String[][]{ {"Soldier"}, {"Man-at-Arms"}, @@ -2425,8 +2425,8 @@ public class Enum { {"High Commander"}, {"Warlord"}}, new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Bard, PromoteType.Priest, PromoteType.Scout, + PromoteType.Thief, PromoteType.Warlock, PromoteType.Warrior)), THIEVES("Thieve's Den", new String[][]{ {"Urchin"}, {"Footpad"}, @@ -2438,8 +2438,8 @@ public class Enum { {"Grandmaster Thief"}, {"Grandfather"}}, new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Barbarian, PromoteType.Bard, PromoteType.Priest, + PromoteType.Scout, PromoteType.Thief, PromoteType.Wizard)), DWARF("Dwarf Hold", new String[][]{ {"Citizen"}, {"Master"}, @@ -2448,8 +2448,8 @@ public class Enum { {"Great Thane"}, {"High Thane"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Crusader, PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, + PromoteType.Warrior)), HIGHCOURT("High Court", new String[][]{ {"Eccekebe"}, {"Saedulor"}, @@ -2461,8 +2461,9 @@ public class Enum { {"Aglaeron"}, {"Ellestor", "Elestril"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Bard, PromoteType.Channeler, PromoteType.Druid, + PromoteType.Necromancer, PromoteType.Priest, PromoteType.Ranger, PromoteType.Scout, + PromoteType.Thief, PromoteType.Warrior, PromoteType.Wizard)), VIRAKT("Virakt", new String[][]{ {"Jov'uus"}, {"Urikhan"}, @@ -2473,8 +2474,9 @@ public class Enum { {"Khar'uus"}, {"Kryqh'khalin"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Bard, PromoteType.Channeler, PromoteType.Fury, + PromoteType.Huntress, PromoteType.Nightstalker, PromoteType.Priest, PromoteType.Ranger, + PromoteType.Scout, PromoteType.Thief, PromoteType.Warrior, PromoteType.Wizard)), BRIALIA("Coven of Brialia", new String[][]{ // Unknown Rank names {"Devotee"}, {"Initiated"}, @@ -2485,8 +2487,8 @@ public class Enum { {"Hierophant"}, {"Witch King", "Witch Queen"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.allOf(PromoteType.class)), + UNHOLY("Unholy Legion", new String[][]{ // Unknown Rank names {"Footman"}, {"Fell Legionaire"}, @@ -2497,8 +2499,9 @@ public class Enum { {"Dread Master", "Dread Mistress"}, {"Dread Lord", "Dread Lady"}}, new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Assassin, PromoteType.Channeler, PromoteType.Necromancer, PromoteType.Priest, + PromoteType.Scout, PromoteType.Thief, PromoteType.Warlock, PromoteType.Warrior, + PromoteType.Wizard)), SCOURGE("Cult of the Scourge", new String[][]{ {"Thrall"}, {"Mudir"}, @@ -2506,8 +2509,8 @@ public class Enum { {"Hand of the Dark"}, {"Dark Father", "Dark Mother"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Doomsayer, PromoteType.Priest, + PromoteType.Scout, PromoteType.Warrior, PromoteType.Wizard)), PIRATE("Pirate Crew", new String[][]{ {"Midshipman", "Midshipwoman"}, {"Sailor"}, @@ -2516,8 +2519,7 @@ public class Enum { {"First Mate"}, {"Captain"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.allOf(PromoteType.class)), HERALD("Academy of Heralds", new String[][]{ {"Pupil"}, {"Scribe"}, @@ -2528,8 +2530,7 @@ public class Enum { {"Archivist"}, {"Loremaster"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.allOf(PromoteType.class)), CENTAUR("Centaur Cohort", new String[][]{ {"Hoplite"}, {"Peltast"}, @@ -2540,8 +2541,9 @@ public class Enum { {"Praetorian"}, {"Paragon"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)), + EnumSet.of(PromoteType.Barbarian, PromoteType.Crusader, PromoteType.Druid, PromoteType.Huntress, + PromoteType.Prelate, PromoteType.Priest, PromoteType.Ranger, PromoteType.Sentinel, + PromoteType.Warrior)), KHREE("Aracoix Kh'ree", new String[][]{ {"Duriacor"}, {"Exarch"}, @@ -2554,8 +2556,9 @@ public class Enum { {"Araceos"}, {"Hierarch"}}, new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}, - EnumSet.of(PromoteType.Bard, PromoteType.Channeler, PromoteType.Crusader, PromoteType.Nightstalker, - PromoteType.Prelate, PromoteType.Priest, PromoteType.Sentinel, PromoteType.Scout)); + EnumSet.of(PromoteType.Assassin, PromoteType.Barbarian, PromoteType.Bard, PromoteType.Huntress, + PromoteType.Priest, PromoteType.Ranger, PromoteType.Scout, PromoteType.Thief, + PromoteType.Warlock, PromoteType.Warrior)); private final String name; private final String[][] ranks; //Stored Rank#->Gender(M,F)