Skip to content

Commit

Permalink
Merge pull request #6019 from AaronGullickson/fix-hiring-halls
Browse files Browse the repository at this point in the history 
Change xml recording of hiring halls
  • Loading branch information
@HammerGS
HammerGS authored Feb 11, 2025
2 parents 419af8e + 3f39021 commit f8838e8
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 232 deletions.
49 changes: 49 additions & 0 deletions MekHQ/data/universe/planetary_systems/system_events.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49693,6 +49693,10 @@
<date>2690-01-01</date>
<population source="noncanon">527861</population>
</event>
<event>
<date>2694-01-01</date>
<hiringHall source="Merc Supplemental 2">QUESTIONABLE</hiringHall>
</event>
<event>
<date>2700-01-01</date>
<population source="noncanon">950115</population>
Expand Down Expand Up @@ -55967,6 +55971,10 @@
<date>3050-01-01</date>
<population source="noncanon">2049886673</population>
</event>
<event>
<date>3057-01-01</date>
<hiringHall source="Mercenary FM revised">STANDARD</hiringHall>
</event>
<event>
<date>3057-11-20</date>
<faction source="canon">LA,CWIE</faction>
Expand Down Expand Up @@ -67379,6 +67387,10 @@
<date>2910-01-01</date>
<population source="noncanon">203935</population>
</event>
<event>
<date>2912-01-01</date>
<hiringHall source="Merc Supplememntal 2">QUESTIONABLE</hiringHall>
</event>
<event>
<date>2914-01-01</date>
<socioIndustrial source="noncanon">D-D-C-C-D</socioIndustrial>
Expand Down Expand Up @@ -290655,6 +290667,10 @@
<date>3057-11-01</date>
<faction source="canon">CM</faction>
</event>
<event>
<date>3058-01-01</date>
<hiringHall source="Mercenary FM Revised">MINOR</hiringHall>
</event>
<event>
<date>3060-01-01</date>
<population source="noncanon">1068129202</population>
Expand All @@ -290679,6 +290695,10 @@
<date>3080-01-01</date>
<population source="noncanon">1092871580</population>
</event>
<event>
<date>3081-03-15</date>
<hiringHall source="Merc Supplemental Update">NONE</hiringHall>
</event>
<event>
<date>3081-10-16</date>
<faction source="canon">ROS</faction>
Expand Down Expand Up @@ -302936,6 +302956,7 @@
<event>
<date>2650-01-01</date>
<population source="noncanon">594885097</population>
<hiringHall source="Merc Supplemental 1">GREAT</hiringHall>
</event>
<event>
<date>2660-01-01</date>
Expand Down Expand Up @@ -362457,6 +362478,7 @@
<event>
<date>3020-01-01</date>
<population source="noncanon">252601</population>
<hiringHall source="Merc Supplemental 2">MINOR</hiringHall>
</event>
<event>
<date>3025-01-01</date>
Expand Down Expand Up @@ -484649,6 +484671,10 @@
<date>2810-01-01</date>
<population source="noncanon">117826489</population>
</event>
<event>
<date>2811-01-01</date>
<hiringHall source="Handbook House Davion">MINOR</hiringHall>
</event>
<event>
<date>2820-01-01</date>
<population source="noncanon">110752446</population>
Expand Down Expand Up @@ -484757,6 +484783,10 @@
<date>3042-01-01</date>
<socioIndustrial source="canon">D-D-B-F-D</socioIndustrial>
</event>
<event>
<date>3045-01-01</date>
<hiringHall source="Handbook House Davion">NONE</hiringHall>
</event>
<event>
<date>3050-01-01</date>
<population source="noncanon">56349558</population>
Expand Down Expand Up @@ -623087,6 +623117,10 @@
<date>3050-01-01</date>
<population source="noncanon">167836896</population>
</event>
<event>
<date>3052-01-01</date>
<hiringHall source="Merc Supplemental 2">MINOR</hiringHall>
</event>
<event>
<date>3057-09-18</date>
<faction source="canon">LA</faction>
Expand Down Expand Up @@ -625447,6 +625481,10 @@
<date>3050-01-01</date>
<population source="noncanon">1638867276</population>
</event>
<event>
<date>3057-01-01</date>
<hiringHall source="Merc Supplemental 1">STANDARD</hiringHall>
</event>
<event>
<date>3057-11-01</date>
<faction source="canon">MERC</faction>
Expand All @@ -625471,6 +625509,10 @@
<date>3080-01-01</date>
<population source="noncanon">1673814775</population>
</event>
<event>
<date>3081-03-15</date>
<hiringHall>NONE</hiringHall>
</event>
<event>
<date>3081-08-13</date>
<faction source="canon">ROS</faction>
Expand Down Expand Up @@ -648431,6 +648473,7 @@
<faction source="canon">MERC</faction>
<population source="noncanon">1696188118</population>
<socioIndustrial source="noncanon">B-B-C-B-B</socioIndustrial>
<hiringHall source="Merc FM Revised">GREAT</hiringHall>
</event>
<event>
<date>3040-01-01</date>
Expand All @@ -648448,6 +648491,10 @@
<date>3060-01-01</date>
<population source="noncanon">1747320462</population>
</event>
<event>
<date>3067-10-15</date>
<hiringHall>NONE</hiringHall>
</event>
<event>
<date>3067-12-26</date>
<faction source="canon">WOB</faction>
Expand Down Expand Up @@ -786669,6 +786716,7 @@
<event>
<date>2700-01-01</date>
<population source="noncanon">1302174644</population>
<hiringHall source="Merc FM Revised">MINOR</hiringHall>
</event>
<event>
<date>2710-01-01</date>
Expand Down Expand Up @@ -916662,6 +916710,7 @@
<event>
<date>3000-01-01</date>
<population source="noncanon">987050454</population>
<hiringHall source="Merc Supplemental 1">STANDARD</hiringHall>
</event>
<event>
<date>3010-01-01</date>
Expand Down
52 changes: 0 additions & 52 deletions MekHQ/data/universe/systems.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35472,10 +35472,6 @@ A few Stone Age tribes exist in the planet's deep deserts and jungles, far from
<ycood>281.417</ycood>
<spectralType source="canon">K4IV</spectralType>
<primarySlot>3</primarySlot>
<hiringHall>
<start>2694-01-01</start>
<level>QUESTIONABLE</level>
</hiringHall>
<planet>
<name>Riverhead</name>
<type>Giant Terrestrial</type>
Expand Down Expand Up @@ -40717,10 +40713,6 @@ Arboris has a history of fierce independence. In 2308, Arboris seceded from the
<ycood>226.576</ycood>
<spectralType source="canon">G3V</spectralType>
<primarySlot>4</primarySlot>
<hiringHall>
<start>3057-01-01</start>
<level>STANDARD</level>
</hiringHall>
<planet>
<name>Plowden's Stand</name>
<type>Dwarf Terrestrial</type>
Expand Down Expand Up @@ -48869,10 +48861,6 @@ Though a major exporter of heavy metals and radioactive elements, as well as sma
<ycood>-315.408</ycood>
<spectralType source="canon">G4V</spectralType>
<primarySlot>3</primarySlot>
<hiringHall>
<start>2912-01-01</start>
<level>QUESTIONABLE</level>
</hiringHall>
<planet>
<name>Frey</name>
<type>Dwarf Terrestrial</type>
Expand Down Expand Up @@ -221726,11 +221714,6 @@ Coalition Armory</desc>
<ycood>-23.569</ycood>
<spectralType source="canon">G4V</spectralType>
<primarySlot>7</primarySlot>
<hiringHall>
<start>3058-01-01</start>
<end>3081-03-15</end>
<level>MINOR</level>
</hiringHall>
<planet>
<name>Csurgói Járás</name>
<type>Terrestrial</type>
Expand Down Expand Up @@ -230648,10 +230631,6 @@ At the dawn the thirty-second century, a surgical strike from the Lyran Commonwe
<ycood>34.077</ycood>
<spectralType source="canon">F8II</spectralType>
<primarySlot>6</primarySlot>
<hiringHall>
<start>2650-01-01</start>
<level>GREAT</level>
</hiringHall>
<planet>
<name>Skouzas's Frontier</name>
<type>Terrestrial</type>
Expand Down Expand Up @@ -280574,10 +280553,6 @@ Freeport Armorworks</desc>
<ycood>-430.11</ycood>
<spectralType source="canon">G3IV</spectralType>
<primarySlot>2</primarySlot>
<hiringHall>
<start>3020-01-01</start>
<level>MINOR</level>
</hiringHall>
<planet>
<name>Mugoma</name>
<type>Giant Terrestrial</type>
Expand Down Expand Up @@ -373852,11 +373827,6 @@ Aside from the large island continent of Galapagos in the northern hemisphere of
<ycood>18.309</ycood>
<spectralType source="canon">G0III</spectralType>
<primarySlot>4</primarySlot>
<hiringHall>
<start>2811-01-01</start>
<end>3045-01-01</end>
<level>MINOR</level>
</hiringHall>
<planet>
<name>Port de Nedelec</name>
<type>Terrestrial</type>
Expand Down Expand Up @@ -480826,10 +480796,6 @@ Niops V and VI were settled primarily to expand the available resources to the N
<ycood>148.073</ycood>
<spectralType source="canon">K0V</spectralType>
<primarySlot>3</primarySlot>
<hiringHall>
<start>3052-01-01</start>
<level>MINOR</level>
</hiringHall>
<planet>
<name>Kaarst</name>
<type>Terrestrial</type>
Expand Down Expand Up @@ -482497,11 +482463,6 @@ During the Fourth Succession War, the Federated Suns leaked false reports of ung
<ycood>-2.891</ycood>
<spectralType source="canon">G2IV</spectralType>
<primarySlot>2</primarySlot>
<hiringHall>
<start>3057-01-01</start>
<end>3081-03-15</end>
<level>GREAT</level>
</hiringHall>
<planet>
<name>Bloomsburg</name>
<type>Giant Terrestrial</type>
Expand Down Expand Up @@ -499005,11 +498966,6 @@ Rim Motors</desc>
<ycood>-34.688</ycood>
<spectralType source="canon">K9V</spectralType>
<primarySlot>2</primarySlot>
<hiringHall>
<start>3031-01-01</start>
<end>3067-10-15</end>
<level>GREAT</level>
</hiringHall>
<planet>
<name>Chen</name>
<type>Dwarf Terrestrial</type>
Expand Down Expand Up @@ -601733,10 +601689,6 @@ During the Jihad, the Word of Blake forces invaded after they neutralized the de
<ycood>-7.025</ycood>
<spectralType source="canon">K1V</spectralType>
<primarySlot>7</primarySlot>
<hiringHall>
<start>2700-01-01</start>
<level>MINOR</level>
</hiringHall>
<planet>
<name>Sanopi</name>
<type>Dwarf Terrestrial</type>
Expand Down Expand Up @@ -701619,10 +701571,6 @@ Wei is home to one of the many Duchy RTC training facilities in the Confederatio
<ycood>-276.084</ycood>
<spectralType source="canon">G3V</spectralType>
<primarySlot>2</primarySlot>
<hiringHall>
<start>3000-01-01</start>
<level>GREAT</level>
</hiringHall>
<planet>
<name>High Kelling</name>
<type>Giant Terrestrial</type>
Expand Down
35 changes: 35 additions & 0 deletions MekHQ/src/mekhq/adapter/HiringHallAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (c) 2019-2025 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MekHQ.
*
* MekHQ is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* MekHQ is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MekHQ. If not, see <http://www.gnu.org/licenses/>.
*/

package mekhq.adapter;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import mekhq.campaign.universe.enums.HiringHallLevel;

public class HiringHallAdapter extends XmlAdapter<String, HiringHallLevel> {
@Override
public HiringHallLevel unmarshal(String v) throws Exception {
return HiringHallLevel.parseHiringHallLevel(v);
}

@Override
public String marshal(HiringHallLevel v) throws Exception {
return v.toString();
}
}
Loading

0 comments on commit f8838e8

Please sign in to comment.