Merge branch 'add-dodec-station-model' into develop

Tkael · Tkael · commit 1ed60b64bde2 · 2025-12-08T02:47:48.000-08:00
diff --git a/DataDefinitions/CommunityGoal.cs b/DataDefinitions/CommunityGoal.cs
@@ -31,7 +31,7 @@ public class CommunityGoal
         [JsonProperty("CurrentTotal")]
         public long total { get; set; }
 
-        [JsonProperty("PlayerContribution")]
+        [JsonProperty("PlayerContribution")] // Player's total contribution to date
         public long contribution { get; set; }
 
         [JsonProperty("NumContributors")]
diff --git a/DataDefinitions/Mission.cs b/DataDefinitions/Mission.cs
@@ -344,6 +344,8 @@ private static string FallbackGetDestinationStation ( string localisedName )
 
         public int communalTier { get; set; }
 
+        public long communalContribution { get; set; }
+
         #endregion
 
         #region Passenger Data
diff --git a/DataDefinitions/Properties/StationModels.de.resx b/DataDefinitions/Properties/StationModels.de.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -189,4 +189,7 @@
     <value>Squadron Carrier</value>
     <comment>A Squadron Carrier</comment>
   </data>
+  <data name="Dodec" xml:space="preserve">
+    <value>Dodec-Sternenhafen</value>
+  </data>
 </root>
diff --git a/DataDefinitions/Properties/StationModels.resx b/DataDefinitions/Properties/StationModels.resx
@@ -189,4 +189,8 @@
     <value>Squadron Carrier</value>
     <comment>A Squadron Carrier</comment>
   </data>
+  <data name="Dodec" xml:space="preserve">
+    <value>Dodec Starport</value>
+    <comment>A Dodec Starport</comment>
+  </data>
 </root>
diff --git a/DataDefinitions/StationModel.cs b/DataDefinitions/StationModel.cs
@@ -21,6 +21,7 @@ static StationModel()
         public static readonly StationModel MegaShipCivilian = new StationModel("MegaShipCivilian");
         public static readonly StationModel Ocellus = new StationModel("Ocellus");
         public static readonly StationModel Orbis = new StationModel("Orbis");
+        public static readonly StationModel Dodec = new StationModel("Dodec");
         public static readonly StationModel Outpost = new StationModel("Outpost");
         public static readonly StationModel SurfaceStation = new StationModel("SurfaceStation"); // No longer used in the player journal
         public static readonly StationModel CraterOutpost = new StationModel("CraterOutpost");
diff --git a/Events/CommunityGoalEvent.cs b/Events/CommunityGoalEvent.cs
@@ -10,7 +10,7 @@ public class CommunityGoalEvent : Event
     {
         public const string NAME = "Community goal";
         public const string DESCRIPTION = "Triggered when the status of a community goal changes";
-        public static Event SAMPLE = new CommunityGoalEvent(DateTime.UtcNow, new List<CGUpdate>() { new CGUpdate("Tier", "Increase"), new CGUpdate("Percentile", "Increase") }, new CommunityGoal()
+        public static Event SAMPLE = new CommunityGoalEvent(DateTime.UtcNow, new List<CGUpdate> { new CGUpdate("Tier", "Increase", 4, 5), new CGUpdate("Percentile", "Increase", 25, 10) }, new CommunityGoal()
         {
             cgid = 641,
             name = "Defence of the Galactic Summit",
@@ -93,16 +93,28 @@ public CommunityGoalEvent(DateTime timestamp, List<CGUpdate> cgupdates, Communit
 
     public class CGUpdate
     {
-        [PublicAPI]
+        [PublicAPI("Update Type")]
         public string type { get; private set; }
 
-        [PublicAPI]
+        [PublicAPI( "Update Direction" )]
         public string direction { get; private set; }
 
-        public CGUpdate(string updateType, string updateDirection)
+        [PublicAPI( "The old value" )]
+        public long? oldvalue { get; private set; }
+
+        [PublicAPI( "The new value" )]
+        public long? newvalue { get; private set; }
+
+        [PublicAPI( "The difference between the old and new values" )]
+        public long? change { get; private set; }
+
+        public CGUpdate ( string updateType, string updateDirection, long oldVal, long newVal )
         {
             type = updateType;
             direction = updateDirection;
+            oldvalue = oldVal;
+            newvalue = newVal;
+            change = newVal - oldVal;
         }
     }
 }
diff --git a/MissionMonitor/MissionMonitor.cs b/MissionMonitor/MissionMonitor.cs
@@ -580,28 +580,39 @@ public void _handleCommunityGoalsEvent(CommunityGoalsEvent @event)
                 {
                     // Raise events for the notable changes in community goal status.
                     var cgUpdates = new List<CGUpdate>();
-                    if (mission.communalTier < goal.tier)
+
+                    // Check for community goal tier changes
+                    if ( mission.communalTier < goal.tier )
                     {
-                        // Did the goal's current tier change?
-                        cgUpdates.Add(new CGUpdate("Tier", "Increase"));
+                        cgUpdates.Add( new CGUpdate( "Tier", "Increase",
+                            mission.communalTier, goal.tier ) );
                     }
-                    if (goal.contribution > 0)
+
+                    // Check for player contribution changes
+                    if ( goal.contribution > mission.communalContribution )
                     {
-                        // Smaller percentile bands are better, larger percentile bands are worse
-                        if (mission.communalPercentileBand > goal.percentileband)
+                        cgUpdates.Add( new CGUpdate( "Contribution", "Increase",
+                            mission.communalContribution, goal.contribution ) );
+                    }
+
+                    // Check for player percentile band changes
+                    if ( goal.contribution > 0 )
+                    {
+                        if ( mission.communalPercentileBand > goal.percentileband )
                         {
-                            // Did the player's percentile band increase (reach a smaller value)?
-                            cgUpdates.Add(new CGUpdate("Percentile", "Increase"));
+                            cgUpdates.Add( new CGUpdate( "Percentile", "Increase",
+                                mission.communalPercentileBand, goal.percentileband ) );
                         }
-                        if (mission.communalPercentileBand < goal.percentileband)
+                        if ( mission.communalPercentileBand < goal.percentileband )
                         {
-                            // Did the player's percentile band decrease (reach a larger value)?
-                            cgUpdates.Add(new CGUpdate("Percentile", "Decrease"));
+                            cgUpdates.Add( new CGUpdate( "Percentile", "Decrease",
+                                mission.communalPercentileBand, goal.percentileband ) );
                         }
                     }
-                    if (cgUpdates.Any())
+
+                    if ( cgUpdates.Any() )
                     {
-                        EDDI.Instance.enqueueEvent(new CommunityGoalEvent(DateTime.UtcNow, cgUpdates, goal));
+                        EDDI.Instance.enqueueEvent( new CommunityGoalEvent( DateTime.UtcNow, cgUpdates, goal ) );
                     }
 
                     // Update our mission records
@@ -614,16 +625,18 @@ public void _handleCommunityGoalsEvent(CommunityGoalsEvent @event)
                     mission.communal = true;
                     mission.communalPercentileBand = goal.percentileband;
                     mission.communalTier = goal.tier;
+                    mission.communalContribution = goal.contribution;
                     mission.expiry = goal.expiryDateTime;
-                    if (goal.iscomplete)
+
+                    if ( goal.iscomplete )
                     {
-                        if (goal.contribution > 0)
+                        if ( goal.contribution > 0 )
                         {
                             mission.statusDef = MissionStatus.Claim;
                         }
                         else
                         {
-                            RemoveMissionWithMissionId(mission.missionid);
+                            RemoveMissionWithMissionId( mission.missionid );
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class CommunityGoalEvent : Event`
`10`	`10`	`{`
`11`	`11`	`public const string NAME = "Community goal";`
`12`	`12`	`public const string DESCRIPTION = "Triggered when the status of a community goal changes";`
`13`		`- public static Event SAMPLE = new CommunityGoalEvent(DateTime.UtcNow, new List<CGUpdate>() { new CGUpdate("Tier", "Increase"), new CGUpdate("Percentile", "Increase") }, new CommunityGoal()`
	`13`	`+ public static Event SAMPLE = new CommunityGoalEvent(DateTime.UtcNow, new List<CGUpdate> { new CGUpdate("Tier", "Increase", 4, 5), new CGUpdate("Percentile", "Increase", 25, 10) }, new CommunityGoal()`
`14`	`14`	`{`
`15`	`15`	`cgid = 641,`
`16`	`16`	`name = "Defence of the Galactic Summit",`
`@@ -93,16 +93,28 @@ public CommunityGoalEvent(DateTime timestamp, List<CGUpdate> cgupdates, Communit`
`93`	`93`
`94`	`94`	`public class CGUpdate`
`95`	`95`	`{`
`96`		`- [PublicAPI]`
	`96`	`+ [PublicAPI("Update Type")]`
`97`	`97`	`public string type { get; private set; }`
`98`	`98`
`99`		`- [PublicAPI]`
	`99`	`+ [PublicAPI( "Update Direction" )]`
`100`	`100`	`public string direction { get; private set; }`
`101`	`101`
`102`		`- public CGUpdate(string updateType, string updateDirection)`
	`102`	`+ [PublicAPI( "The old value" )]`
	`103`	`+ public long? oldvalue { get; private set; }`
	`104`	`+`
	`105`	`+ [PublicAPI( "The new value" )]`
	`106`	`+ public long? newvalue { get; private set; }`
	`107`	`+`
	`108`	`+ [PublicAPI( "The difference between the old and new values" )]`
	`109`	`+ public long? change { get; private set; }`
	`110`	`+`
	`111`	`+ public CGUpdate ( string updateType, string updateDirection, long oldVal, long newVal )`
`103`	`112`	`{`
`104`	`113`	`type = updateType;`
`105`	`114`	`direction = updateDirection;`
	`115`	`+ oldvalue = oldVal;`
	`116`	`+ newvalue = newVal;`
	`117`	`+ change = newVal - oldVal;`
`106`	`118`	`}`
`107`	`119`	`}`
`108`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -580,28 +580,39 @@ public void _handleCommunityGoalsEvent(CommunityGoalsEvent @event)`
`580`	`580`	`{`
`581`	`581`	`// Raise events for the notable changes in community goal status.`
`582`	`582`	`var cgUpdates = new List<CGUpdate>();`
`583`		`- if (mission.communalTier < goal.tier)`
	`583`	`+`
	`584`	`+ // Check for community goal tier changes`
	`585`	`+ if ( mission.communalTier < goal.tier )`
`584`	`586`	`{`
`585`		`- // Did the goal's current tier change?`
`586`		`- cgUpdates.Add(new CGUpdate("Tier", "Increase"));`
	`587`	`+ cgUpdates.Add( new CGUpdate( "Tier", "Increase",`
	`588`	`+ mission.communalTier, goal.tier ) );`
`587`	`589`	`}`
`588`		`- if (goal.contribution > 0)`
	`590`	`+`
	`591`	`+ // Check for player contribution changes`
	`592`	`+ if ( goal.contribution > mission.communalContribution )`
`589`	`593`	`{`
`590`		`- // Smaller percentile bands are better, larger percentile bands are worse`
`591`		`- if (mission.communalPercentileBand > goal.percentileband)`
	`594`	`+ cgUpdates.Add( new CGUpdate( "Contribution", "Increase",`
	`595`	`+ mission.communalContribution, goal.contribution ) );`
	`596`	`+ }`
	`597`	`+`
	`598`	`+ // Check for player percentile band changes`
	`599`	`+ if ( goal.contribution > 0 )`
	`600`	`+ {`
	`601`	`+ if ( mission.communalPercentileBand > goal.percentileband )`
`592`	`602`	`{`
`593`		`- // Did the player's percentile band increase (reach a smaller value)?`
`594`		`- cgUpdates.Add(new CGUpdate("Percentile", "Increase"));`
	`603`	`+ cgUpdates.Add( new CGUpdate( "Percentile", "Increase",`
	`604`	`+ mission.communalPercentileBand, goal.percentileband ) );`
`595`	`605`	`}`
`596`		`- if (mission.communalPercentileBand < goal.percentileband)`
	`606`	`+ if ( mission.communalPercentileBand < goal.percentileband )`
`597`	`607`	`{`
`598`		`- // Did the player's percentile band decrease (reach a larger value)?`
`599`		`- cgUpdates.Add(new CGUpdate("Percentile", "Decrease"));`
	`608`	`+ cgUpdates.Add( new CGUpdate( "Percentile", "Decrease",`
	`609`	`+ mission.communalPercentileBand, goal.percentileband ) );`
`600`	`610`	`}`
`601`	`611`	`}`
`602`		`- if (cgUpdates.Any())`
	`612`	`+`
	`613`	`+ if ( cgUpdates.Any() )`
`603`	`614`	`{`
`604`		`- EDDI.Instance.enqueueEvent(new CommunityGoalEvent(DateTime.UtcNow, cgUpdates, goal));`
	`615`	`+ EDDI.Instance.enqueueEvent( new CommunityGoalEvent( DateTime.UtcNow, cgUpdates, goal ) );`
`605`	`616`	`}`
`606`	`617`
`607`	`618`	`// Update our mission records`
`@@ -614,16 +625,18 @@ public void _handleCommunityGoalsEvent(CommunityGoalsEvent @event)`
`614`	`625`	`mission.communal = true;`
`615`	`626`	`mission.communalPercentileBand = goal.percentileband;`
`616`	`627`	`mission.communalTier = goal.tier;`
	`628`	`+ mission.communalContribution = goal.contribution;`
`617`	`629`	`mission.expiry = goal.expiryDateTime;`
`618`		`- if (goal.iscomplete)`
	`630`	`+`
	`631`	`+ if ( goal.iscomplete )`
`619`	`632`	`{`
`620`		`- if (goal.contribution > 0)`
	`633`	`+ if ( goal.contribution > 0 )`
`621`	`634`	`{`
`622`	`635`	`mission.statusDef = MissionStatus.Claim;`
`623`	`636`	`}`
`624`	`637`	`else`
`625`	`638`	`{`
`626`		`- RemoveMissionWithMissionId(mission.missionid);`
	`639`	`+ RemoveMissionWithMissionId( mission.missionid );`
`627`	`640`	`}`
`628`	`641`	`}`
`629`	`642`	`}`