Move a bunch of scenario classes to Model

Author: axx0

Engine/src/Game.cs

@@ -7,6 +7,7 @@
 using Civ2engine.MapObjects;
 using Civ2engine.Scripting;
 using Civ2engine.Units;
+using Model;
 using Model.Core;
 
 namespace Civ2engine

Engine/src/IO/EventsLoader.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Civ2engine.OriginalSaves;
+using Model;
 
 namespace Civ2engine.IO
 {

Engine/src/SaveLoad/ILoadedGameObjects.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Civ2engine.MapObjects;
 using Civ2engine.Units;
+using Model;
 
 namespace Civ2engine.OriginalSaves;
 

Engine/src/SaveLoad/JsonSaveObjects.cs

@@ -2,6 +2,7 @@
 using Civ2engine.MapObjects;
 using Civ2engine.OriginalSaves;
 using Civ2engine.Units;
+using Model;
 
 namespace Civ2engine.SaveLoad;
 

Engine/src/Scenario.cs renamed to Model/Core/Scenario.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class Scenario
 {

Engine/src/ScenarioEvents/Actions/BestowImprovement.cs renamed to Model/Core/ScenarioEvents/Actions/BestowImprovement.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class BestowImprovement : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/ChangeMoney.cs renamed to Model/Core/ScenarioEvents/Actions/ChangeMoney.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ChangeMoney : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/ChangeTerrain.cs renamed to Model/Core/ScenarioEvents/Actions/ChangeTerrain.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ChangeTerrain : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/CreateUnit.cs renamed to Model/Core/ScenarioEvents/Actions/CreateUnit.cs

@@ -1,7 +1,8 @@
-using Civ2engine.Enums;
+using Civ2engine;
+using Civ2engine.Enums;
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class CreateUnit : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/DestroyCiv.cs renamed to Model/Core/ScenarioEvents/Actions/DestroyCiv.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class DestroyCiv : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/DontplayWonders.cs renamed to Model/Core/ScenarioEvents/Actions/DontplayWonders.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class DontplayWonders : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/EnableTechnology.cs renamed to Model/Core/ScenarioEvents/Actions/EnableTechnology.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class EnableTechnology : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/EndGame.cs renamed to Model/Core/ScenarioEvents/Actions/EndGame.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class EndGame : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/EndGameOverride.cs renamed to Model/Core/ScenarioEvents/Actions/EndGameOverride.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class EndGameOverride : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/FlagAction.cs renamed to Model/Core/ScenarioEvents/Actions/FlagAction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 /// <summary>
 /// (Who + Technology + Flag)

Engine/src/ScenarioEvents/Actions/GiveTech.cs renamed to Model/Core/ScenarioEvents/Actions/GiveTech.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class GiveTech : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/IScenarioAction.cs renamed to Model/Core/ScenarioEvents/Actions/IScenarioAction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public interface IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/MakeAggression.cs renamed to Model/Core/ScenarioEvents/Actions/MakeAggression.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class MakeAggression : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/ModifyReputation.cs renamed to Model/Core/ScenarioEvents/Actions/ModifyReputation.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ModifyReputation : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/MoveUnit.cs renamed to Model/Core/ScenarioEvents/Actions/MoveUnit.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class MoveUnit : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/Negotiator.cs renamed to Model/Core/ScenarioEvents/Actions/Negotiator.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class Negotiator : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/PlayAvi.cs renamed to Model/Core/ScenarioEvents/Actions/PlayAvi.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class PlayAvi : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/PlayCDtrack.cs renamed to Model/Core/ScenarioEvents/Actions/PlayCDtrack.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class PlayCDtrack : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/PlayWav.cs renamed to Model/Core/ScenarioEvents/Actions/PlayWav.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class PlayWav : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/TakeTechnology.cs renamed to Model/Core/ScenarioEvents/Actions/TakeTechnology.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class TakeTechnology : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/TextAction.cs renamed to Model/Core/ScenarioEvents/Actions/TextAction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class TextAction : IScenarioAction
 {

Engine/src/ScenarioEvents/Actions/TransportAction.cs renamed to Model/Core/ScenarioEvents/Actions/TransportAction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class TransportAction : IScenarioAction
 {

Engine/src/ScenarioEvents/ScenarioEvent.cs renamed to Model/Core/ScenarioEvents/ScenarioEvent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ScenarioEvent
 {

Engine/src/ScenarioEvents/Triggers/AlphaCentauriArrival.cs renamed to Model/Core/ScenarioEvents/Triggers/AlphaCentauriArrival.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class AlphaCentauriArrival : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/BribeUnit.cs renamed to Model/Core/ScenarioEvents/Triggers/BribeUnit.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class BribeUnit : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/CheckFlag.cs renamed to Model/Core/ScenarioEvents/Triggers/CheckFlag.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 /// <summary>
 /// (Who + Technology + Flag)

Engine/src/ScenarioEvents/Triggers/CityDestroyed.cs renamed to Model/Core/ScenarioEvents/Triggers/CityDestroyed.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class CityDestroyed : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/CityProduction.cs renamed to Model/Core/ScenarioEvents/Triggers/CityProduction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class CityProduction : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/CityTaken.cs renamed to Model/Core/ScenarioEvents/Triggers/CityTaken.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using Civ2engine;
+using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class CityTaken : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/ITrigger.cs renamed to Model/Core/ScenarioEvents/Triggers/ITrigger.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public interface ITrigger
 {

Engine/src/ScenarioEvents/Triggers/Negotiation1.cs renamed to Model/Core/ScenarioEvents/Triggers/Negotiation1.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class Negotiation1 : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/Negotiation2.cs renamed to Model/Core/ScenarioEvents/Triggers/Negotiation2.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class Negotiation2 : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/NoSchism.cs renamed to Model/Core/ScenarioEvents/Triggers/NoSchism.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class NoSchism : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/RandomTurn.cs renamed to Model/Core/ScenarioEvents/Triggers/RandomTurn.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class RandomTurn : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/ReceivedTechnology.cs renamed to Model/Core/ScenarioEvents/Triggers/ReceivedTechnology.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ReceivedTechnology : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/ScenarioLoaded.cs renamed to Model/Core/ScenarioEvents/Triggers/ScenarioLoaded.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class ScenarioLoaded : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/TurnInterval.cs renamed to Model/Core/ScenarioEvents/Triggers/TurnInterval.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class TurnInterval : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/TurnTrigger.cs renamed to Model/Core/ScenarioEvents/Triggers/TurnTrigger.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class TurnTrigger : ITrigger
 {

Engine/src/ScenarioEvents/Triggers/UnitKilled.cs renamed to Model/Core/ScenarioEvents/Triggers/UnitKilled.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Civ2engine;
+namespace Model;
 
 public class UnitKilled : ITrigger
 {