Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix faction canonicity #6328

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix faction canonicity #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53a1b2a
Remove duplicate planetary event on Revivim
AaronGullickson Mar 21, 2025
759df21
Merge branch 'master' into fix-faction-canonicity
AaronGullickson Mar 24, 2025
f188773
Fix Karachi source
AaronGullickson Mar 26, 2025
d8b5fa4
Remove fake canon references for factions
AaronGullickson Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
40 changes: 13 additions & 27 deletions MekHQ/data/universe/planetary_systems/canon_systems/APlace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ planet:
event:
- date: '2235-04-30'
faction:
source: canon
value:
- IND
- IND
population: 41458.0
socioIndustrial: D-C-A-D-C
- date: '2240-01-01'
Expand Down Expand Up @@ -104,9 +102,7 @@ planet:
population: 111039134.0
- date: '2362-05-07'
faction:
source: canon
value:
- LA
- LA
- date: '2370-01-01'
population: 138341732.0
- date: '2380-01-01'
Expand Down Expand Up @@ -248,33 +244,29 @@ planet:
population: 482148465.0
- date: '3020-01-01'
population: 462716592.0
- date: '3028-08-20'
faction:
source: 20 Year Update
value:
- FC
- date: '3030-01-01'
population: 457823982.0
- date: '3036-01-01'
socioIndustrial: B-D-B-C-C
- date: '3040-01-01'
population: 463165662.0
- date: '3040-01-19'
faction:
source: canon
value:
- FC
- date: '3041-01-01'
socioIndustrial: A-C-A-C-B
- date: '3050-01-01'
population: 469695584.0
- date: '3057-12-01'
faction:
source: canon
value:
- ARDC
- ARDC
- date: '3060-01-01'
population: 476031863.0
- date: '3067-04-24'
faction:
source: canon
value:
- LA
- LA
- date: '3070-01-01'
population: 481297119.0
- date: '3080-01-01'
Expand All @@ -291,27 +283,21 @@ planet:
population: 494864897.0
- date: '3130-08-04'
faction:
source: canon
value:
- CJF
- LA
- CJF
- LA
population: 496053999.0
- date: '3132-08-07'
hpg: X
- date: '3135-01-15'
faction:
source: canon
value:
- CJF
- CJF
- date: '3140-01-01'
population: 497942591.0
- date: '3145-01-01'
population: 498341104.0
- date: '3152-06-01'
faction:
source: canon
value:
- IND
- IND
- name: Sraosa Belt
type: ASTEROID_BELT
orbitalDist: 0.9
Expand Down
8 changes: 2 additions & 6 deletions MekHQ/data/universe/planetary_systems/canon_systems/Aalzorg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ planet:
event:
- date: '2653-09-06'
faction:
source: canon
value:
- OA
- OA
population: 50365.0
socioIndustrial: C-D-B-D-D
- date: '2660-01-01'
Expand Down Expand Up @@ -96,9 +94,7 @@ planet:
population: 152053.0
- date: '2794-04-19'
faction:
source: canon
value:
- ABN
- ABN
hpg: X
population: 0.0
socioIndustrial: X-X-X-X-X
Expand Down
48 changes: 10 additions & 38 deletions MekHQ/data/universe/planetary_systems/canon_systems/Abadan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ planet:
event:
- date: '2168-01-31'
faction:
source: canon
value:
- TA
- TA
population: 49239.0
socioIndustrial: D-D-D-D-D
- date: '2170-01-01'
Expand All @@ -147,9 +145,7 @@ planet:
population: 2726622.0
- date: '2241-06-16'
faction:
source: canon
value:
- MCM
- MCM
- date: '2250-01-01'
population: 3802795.0
- date: '2260-01-01'
Expand All @@ -158,7 +154,7 @@ planet:
population: 6732521.0
- date: '2271-06-01'
faction:
source: canon
source: 'Handbook: House Marik'
value:
- FWL
- date: '2280-01-01'
Expand Down Expand Up @@ -324,14 +320,10 @@ planet:
population: 62226135.0
- date: '3014-10-15'
faction:
source: canon
value:
- FWLR
- FWLR
- date: '3014-11-03'
faction:
source: canon
value:
- FWL
- FWL
- date: '3020-01-01'
population: 62198520.0
- date: '3030-01-01'
Expand All @@ -352,16 +344,12 @@ planet:
socioIndustrial: C-C-D-B-C
- date: '3079-03-24'
faction:
source: canon
value:
- MSC
- MSC
- date: '3080-01-01'
population: 65293840.0
- date: '3082-07-01'
faction:
source: canon
value:
- ROS
- ROS
- date: '3090-01-01'
population: 66506368.0
- date: '3100-01-01'
Expand All @@ -378,33 +366,17 @@ planet:
hpg: X
- date: '3135-10-01'
faction:
source: canon
value:
- IND
- IND
- date: '3137-08-01'
faction:
source: canon
value:
- MiC
- MiC
- date: '3139-07-01'
faction:
source: canon
value:
- CP
- CP
- date: '3140-01-01'
population: 71829675.0
- date: '3145-01-01'
population: 72435586.0
- date: '3151-01-01'
faction:
source: sucs
value:
- FWL
- date: '3152-06-01'
faction:
source: sucs
value:
- CP
- name: Mictlancihuatl Belt
type: ASTEROID_BELT
orbitalDist: 5.2
Expand Down
4 changes: 1 addition & 3 deletions MekHQ/data/universe/planetary_systems/canon_systems/Abagnar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ planet:
event:
- date: '2712-06-25'
faction:
source: canon
value:
- DC
- DC
population: 60590.0
socioIndustrial: C-C-C-D-D
- date: '2713-12-24'
Expand Down
16 changes: 7 additions & 9 deletions MekHQ/data/universe/planetary_systems/canon_systems/Abbadiyah.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ planet:
event:
- date: '2423-01-19'
faction:
source: canon
value:
- LA
- LA
population: 60083.0
socioIndustrial: C-D-A-D-D
- date: '2430-01-01'
Expand Down Expand Up @@ -192,15 +190,15 @@ planet:
population: 107302861.0
- date: '3027-01-01'
socioIndustrial: C-C-B-C-C
- date: '3028-08-20'
faction:
source: 20 Year Update
value:
- FC
- date: '3030-01-01'
population: 105408793.0
- date: '3040-01-01'
population: 106478816.0
- date: '3040-01-19'
faction:
source: canon
value:
- FC
- date: '3044-01-01'
socioIndustrial: C-B-A-C-C
- date: '3045-01-01'
Expand All @@ -209,7 +207,7 @@ planet:
population: 107323330.0
- date: '3057-09-18'
faction:
source: canon
source: Chaos March
value:
- LA
- date: '3060-01-01'
Expand Down
16 changes: 7 additions & 9 deletions MekHQ/data/universe/planetary_systems/canon_systems/Abbeville.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ planet:
event:
- date: '2380-07-28'
faction:
source: canon
value:
- FS
- FS
population: 47651.0
socioIndustrial: D-D-B-C-F
- date: '2390-01-01'
Expand Down Expand Up @@ -229,23 +227,23 @@ planet:
population: 30282617.0
- date: '3025-01-01'
socioIndustrial: B-D-B-D-F
- date: '3028-08-20'
faction:
source: 20 Year Update
value:
- FC
- date: '3030-01-01'
population: 30349743.0
- date: '3040-02-24'
population: 30685433.0
socioIndustrial: C-D-B-D-F
- date: '3040-01-19'
faction:
source: canon
value:
- FC
- date: '3050-01-01'
population: 30987628.0
- date: '3060-01-01'
population: 31327241.0
- date: '3067-04-20'
faction:
source: canon
source: FedCom Civil War
value:
- FS
- date: '3070-01-01'
Expand Down
16 changes: 7 additions & 9 deletions MekHQ/data/universe/planetary_systems/canon_systems/Abejorral.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ planet:
event:
- date: '2632-08-27'
faction:
source: canon
value:
- LA
- LA
population: 55962.0
socioIndustrial: C-C-B-D-B
- date: '2634-01-01'
Expand Down Expand Up @@ -184,24 +182,24 @@ planet:
population: 301248412.0
- date: '3020-01-01'
population: 294409019.0
- date: '3028-08-20'
faction:
source: 20 Year Update
value:
- FC
- date: '3030-01-01'
population: 292769249.0
- date: '3032-01-01'
socioIndustrial: C-C-C-C-B
- date: '3040-01-01'
population: 294884794.0
- date: '3040-01-19'
faction:
source: canon
value:
- FC
- date: '3044-01-01'
socioIndustrial: B-B-B-B-A
- date: '3050-01-01'
population: 296778109.0
- date: '3057-09-18'
faction:
source: canon
source: Chaos March
value:
- LA
- date: '3060-01-01'
Expand Down
Loading