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

Refactor interfaces and enumerations into appropriate namespaces #301

Merged
merged 3 commits into from
Feb 10, 2024
Merged

Refactor interfaces and enumerations into appropriate namespaces #301

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ecd847
Refactor interfaces from FrEee.Interfaces namespace out to appropriat…
ekolis Feb 10, 2024
5591594
Split up FrEee.Enumerations too
ekolis Feb 10, 2024
08b101b
Move FrEee.Modding.Interfaces and FrEee.Modding.Enumerations as well
ekolis Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Split up FrEee.Enumerations too
@ekolis
ekolis committed Feb 10, 2024
commit 55915943e93f1b03f9fe5cec77824e98f20366ed
65 changes: 46 additions & 19 deletions FrEee.Assets/GameSetups/Quickstart.gsu
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FrEee.Setup.GameSetup, FrEee.Core:
p30:
p31:
AllowedTrades:
:All;
EmpirePlacement:
@@ -13,19 +13,19 @@ p30:
AIName:
:"AI_Default";
Color:
:255,170,0,170;
:255,85,85,0;
CultureName:
:"Neutral";
:"Warriors";
InsigniaName:
:"Fractalian";
:"XiChung";
IsPlayerEmpire:
:True;
LeaderName:
:"fefe";
:"Queen Zebu";
LeaderPortraitName:
:"Fractalian";
:"XiChung";
Name:
:"Fefe Empie";
:"Xi'Chung Hive";
PrimaryRace:
:p7:
Aptitudes:
@@ -41,24 +41,24 @@ p30:
:100;
:"Environmental Resistance";
:100;
:"Maintenance Aptitude";
:"Defensiveness";
:100;
:"Construction Aptitude";
:100;
:"Defensiveness";
:100;
:"Farming Aptitude";
:"Maintenance Aptitude";
:100;
:"Happiness";
:100;
:"Farming Aptitude";
:100;
:"Political Savvy";
:100;
:"Repair Aptitude";
:100;
:"Aggressiveness";
:100;
:"Intelligence";
:100;
:"Aggressiveness";
:100;
:"Physical Strength";
:100;
;
@@ -68,20 +68,22 @@ p30:
:"HappinessModel Peaceful";
;
Name:
:"fefe";
:"Xi'Chung";
NativeAtmosphere:
:"Methane";
:"Hydrogen";
NativeSurface:
:"Ice";
PopulationIconName:
:"Fractalian";
:"XiChung";
TraitNames:
System.Collections.Generic.List`1[[System.String, System.Private.CoreLib]], System.Private.CoreLib:
c0:
c2:
:"Propulsion Experts";
:"Advanced Storage Techniques";
;
;
ShipsetName:
:"Fractalian";
:"XiChung";
;
;
ForbiddenTechnologyNames:
@@ -98,6 +100,31 @@ p30:
:True;
GenerateUniqueRuins:
:True;
HomeworldSize:
:p11:
ConstructionAbilityID:
:"0";
MaxCargo:
:8000;
MaxCargoDomed:
:800;
MaxFacilities:
:20;
MaxFacilitiesDomed:
:4;
MaxPopulation:
:4000000000;
MaxPopulationDomed:
:400000000;
ModID:
:"StellarObjectSize Large";
Name:
:"Large";
StellarObjectType:
:"Planet";
StellarSize:
:Large;
;
HomeworldsPerEmpire:
:1;
HomeworldValue:
@@ -130,7 +157,7 @@ p30:
ResourceStorage:
:50000;
Seed:
:2101922;
:3238972;
StandardMiningModel:
:p2:
ValueBonus:
3 changes: 1 addition & 2 deletions FrEee.Tests/Objects/Space/MemoryTest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Civilization;
using FrEee.Objects.Space;
using FrEee.Objects.Vehicles;
using FrEee.Modding;
2 changes: 1 addition & 1 deletion FrEee.Tests/Objects/Technology/TechnologyTest.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Commands;
using FrEee.Processes;
using FrEee.Modding;
using FrEee.Extensions;
using NUnit.Framework;
using FrEee.Objects.GameState;
using FrEee.Objects.Technology;

namespace FrEee.Tests.Objects.Technology;

1 change: 0 additions & 1 deletion FrEee.WinForms/Controls/Cargolist.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Modding;
using FrEee.Utility;
2 changes: 1 addition & 1 deletion FrEee.WinForms/Controls/PlanetReport.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Commands;
using FrEee.Objects.Space;
@@ -11,6 +10,7 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using FrEee.Objects.GameState;

namespace FrEee.WinForms.Controls;

3 changes: 1 addition & 2 deletions FrEee.WinForms/Forms/CombatSimulatorForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using FrEee.Enumerations;
using FrEee.Objects;
using FrEee.Objects;
using FrEee.Objects.Civilization;
using FrEee.Objects.Combat;
using FrEee.Objects.Combat.Grid;
1 change: 0 additions & 1 deletion FrEee.WinForms/Forms/DesignListForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Commands;
using FrEee.Objects.Technology;
4 changes: 2 additions & 2 deletions FrEee.WinForms/Forms/DiplomacyForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Civilization;
using FrEee.Objects.Civilization.Diplomacy;
using FrEee.Objects.Civilization.Diplomacy.Clauses;
using FrEee.Objects.Commands;
@@ -18,6 +17,7 @@
using System.Windows.Forms;
using FrEee.Objects.Civilization.Diplomacy.Messages;
using FrEee.Objects.Civilization.Diplomacy.Actions;
using FrEee.Objects.Abilities;

namespace FrEee.WinForms.Forms;

2 changes: 1 addition & 1 deletion FrEee.WinForms/Forms/GameSetupForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FrEee.Enumerations;
using FrEee.Objects.Space;
using FrEee.Objects.Technology;
using FrEee.Objects.Vehicles;
@@ -20,6 +19,7 @@
using System.Threading;
using System.Windows.Forms;
using FrEee.Objects.GameState;
using FrEee.Objects.Civilization.Diplomacy;

namespace FrEee.WinForms.Forms;

4 changes: 2 additions & 2 deletions FrEee.WinForms/Forms/HullPickerForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Civilization;
using FrEee.Utility;
using FrEee.Extensions;
using FrEee.WinForms.Utility.Extensions;
@@ -9,6 +8,7 @@
using System.Linq;
using System.Windows.Forms;
using FrEee.Objects.Technology;
using FrEee.Objects.Vehicles;

namespace FrEee.WinForms.Forms;

1 change: 0 additions & 1 deletion FrEee.WinForms/Forms/MainGameForm.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FrEee.Enumerations;
using FrEee.Objects.Civilization;
using FrEee.Objects.Commands;
using FrEee.Objects.Space;
79 changes: 0 additions & 79 deletions FrEee/Enumerations/AbilityTargets.cs
View file

This file was deleted.

46 changes: 0 additions & 46 deletions FrEee/Enumerations/AbilityValueRule.cs
View file

This file was deleted.

39 changes: 0 additions & 39 deletions FrEee/Enumerations/AllianceLevel.cs
View file

This file was deleted.

Loading