Skip to content

Commit

Permalink
Merge pull request #180 from Foxlider/feature/Update-1.9
Browse files Browse the repository at this point in the history
[Merge] Feature/update 1.9 into Master
  • Loading branch information
jupster authored Apr 18, 2024
2 parents d950840 + e991924 commit cf3101c
Show file tree
Hide file tree
Showing 36 changed files with 734 additions and 316 deletions.
26 changes: 17 additions & 9 deletions FASTER Maintenance/Models/16Models.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ namespace FASTER_Maintenance.Models._16Models
[XmlInclude(typeof(Value))]
public class Setting
{
[XmlAttribute(AttributeName = "name")] public string Name { get; set; }
[XmlAttribute(AttributeName = "name")]
public string Name { get; set; }

[XmlAttribute(AttributeName = "serializeAs")]
public string SerializeAs { get; set; }

[XmlElement(ElementName = "value")] public object Value { get; set; }
[XmlElement(ElementName = "value")]
public object Value { get; set; }
}

[XmlRoot(ElementName = "SteamMod")]
Expand Down Expand Up @@ -58,7 +60,8 @@ public class SteamModCollection
[XmlRoot(ElementName = "ServerProfile")]
public class ServerProfile
{
[XmlElement(ElementName = "SafeName")] public string SafeName { get; set; }
[XmlElement(ElementName = "SafeName")]
public string SafeName { get; set; }

[XmlElement(ElementName = "DisplayName")]
public string DisplayName { get; set; }
Expand All @@ -69,15 +72,17 @@ public class ServerProfile
[XmlElement(ElementName = "Executable")]
public string Executable { get; set; }

[XmlElement(ElementName = "Password")] public string Password { get; set; }
[XmlElement(ElementName = "Password")]
public string Password { get; set; }

[XmlElement(ElementName = "AdminPassword")]
public string AdminPassword { get; set; }

[XmlElement(ElementName = "MaxPlayers")]
public string MaxPlayers { get; set; }

[XmlElement(ElementName = "Port")] public string Port { get; set; }
[XmlElement(ElementName = "Port")]
public string Port { get; set; }

[XmlElement(ElementName = "HeadlessClientEnabled")]
public string HeadlessClientEnabled { get; set; }
Expand Down Expand Up @@ -172,12 +177,14 @@ public class ServerProfile
[XmlElement(ElementName = "MissionsClass")]
public string MissionsClass { get; set; }

[XmlElement(ElementName = "Missions")] public string Missions { get; set; }
[XmlElement(ElementName = "Missions")]
public string Missions { get; set; }

[XmlElement(ElementName = "PersistentBattlefield")]
public string PersistentBattlefield { get; set; }

[XmlElement(ElementName = "AutoInit")] public string AutoInit { get; set; }
[XmlElement(ElementName = "AutoInit")]
public string AutoInit { get; set; }

[XmlElement(ElementName = "DifficultyPreset")]
public string DifficultyPreset { get; set; }
Expand Down Expand Up @@ -279,7 +286,8 @@ public class ServerProfile
[XmlElement(ElementName = "MaxPingEnabled")]
public string MaxPingEnabled { get; set; }

[XmlElement(ElementName = "MaxPing")] public string MaxPing { get; set; }
[XmlElement(ElementName = "MaxPing")]
public string MaxPing { get; set; }

[XmlElement(ElementName = "MaxDesyncEnabled")]
public string MaxDesyncEnabled { get; set; }
Expand Down Expand Up @@ -408,4 +416,4 @@ public class UserSettings
[XmlElement(ElementName = "FASTER.Properties.Settings")]
public Settings Settings { get; set; }
}
}
}
53 changes: 44 additions & 9 deletions FASTER Maintenance/Models/17Models.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ namespace FASTER_Maintenance.Models._17Models
[XmlRoot(ElementName = "ArrayOfString")]
public class ArrayOfString
{
[XmlElement(ElementName = "string")] public string String { get; set; }
[XmlElement(ElementName = "string")]
public string String { get; set; }

[XmlAttribute(AttributeName = "xsi", Namespace = "http://www.w3.org/2000/xmlns/")]
public string Xsi { get; set; }
Expand Down Expand Up @@ -125,7 +126,8 @@ public class ServerCfg
[XmlElement(ElementName = "MaxDesync")]
public string MaxDesync { get; set; }

[XmlElement(ElementName = "MaxPing")] public string MaxPing { get; set; }
[XmlElement(ElementName = "MaxPing")]
public string MaxPing { get; set; }

[XmlElement(ElementName = "MaxPacketLoss")]
public string MaxPacketLoss { get; set; }
Expand All @@ -142,6 +144,33 @@ public class ServerCfg
[XmlElement(ElementName = "RandomMissionOrder")]
public string RandomMissionOrder { get; set; }

[XmlElement(ElementName = "BriefingTimeOut")]
public string BriefingTimeOut { get; set; }

[XmlElement(ElementName = "RoleTimeOut")]
public string RoleTimeOut { get; set; }

[XmlElement(ElementName = "VotingTimeOut")]
public string VotingTimeOut { get; set; }

[XmlElement(ElementName = "DebriefingTimeOut")]
public string DebriefingTimeOut { get; set; }

[XmlElement(ElementName = "LogObjectNotFound")]
public string LogObjectNotFound { get; set; }

[XmlElement(ElementName = "SkipDescriptionParsing")]
public string SkipDescriptionParsing { get; set; }

[XmlElement(ElementName = "IgnoreMissionLoadErrors")]
public string IgnoreMissionLoadErrors { get; set; }

[XmlElement(ElementName = "ArmaUnitsTimeout")]
public string ArmaUnitsTimeout { get; set; }

[XmlElement(ElementName = "QueueSizeLogG")]
public string QueueSizeLogG { get; set; }

[XmlElement(ElementName = "VerifySignatures")]
public string VerifySignatures { get; set; }

Expand All @@ -154,7 +183,8 @@ public class ServerCfg
[XmlElement(ElementName = "VonCodecQuality")]
public string VonCodecQuality { get; set; }

[XmlElement(ElementName = "VonCodec")] public string VonCodec { get; set; }
[XmlElement(ElementName = "VonCodec")]
public string VonCodec { get; set; }

[XmlElement(ElementName = "SkipLobby")]
public string SkipLobby { get; set; }
Expand Down Expand Up @@ -189,12 +219,14 @@ public class ServerCfg
[XmlElement(ElementName = "MissionContentOverride")]
public string MissionContentOverride { get; set; }

[XmlElement(ElementName = "AutoInit")] public string AutoInit { get; set; }
[XmlElement(ElementName = "AutoInit")]
public string AutoInit { get; set; }

[XmlElement(ElementName = "Difficulty")]
public string Difficulty { get; set; }

[XmlElement(ElementName = "Missions")] public Missions Missions { get; set; }
[XmlElement(ElementName = "Missions")]
public Missions Missions { get; set; }

[XmlElement(ElementName = "MaxMemOverride")]
public string MaxMemOverride { get; set; }
Expand Down Expand Up @@ -230,7 +262,8 @@ public class ArmaProfile
[XmlElement(ElementName = "DetectedMines")]
public string DetectedMines { get; set; }

[XmlElement(ElementName = "Commands")] public string Commands { get; set; }
[XmlElement(ElementName = "Commands")]
public string Commands { get; set; }

[XmlElement(ElementName = "Waypoints")]
public string Waypoints { get; set; }
Expand Down Expand Up @@ -262,7 +295,8 @@ public class ArmaProfile
[XmlElement(ElementName = "DeathMessages")]
public string DeathMessages { get; set; }

[XmlElement(ElementName = "VonID")] public string VonID { get; set; }
[XmlElement(ElementName = "VonID")]
public string VonID { get; set; }

[XmlElement(ElementName = "MapContentFriendly")]
public string MapContentFriendly { get; set; }
Expand All @@ -285,7 +319,8 @@ public class ArmaProfile
[XmlElement(ElementName = "AiLevelPreset")]
public string AiLevelPreset { get; set; }

[XmlElement(ElementName = "SkillAi")] public string SkillAi { get; set; }
[XmlElement(ElementName = "SkillAi")]
public string SkillAi { get; set; }

[XmlElement(ElementName = "PrecisionAi")]
public string PrecisionAi { get; set; }
Expand Down Expand Up @@ -392,4 +427,4 @@ public class Configuration
[XmlElement(ElementName = "userSettings")]
public UserSettings UserSettings { get; set; }
}
}
}
Loading

0 comments on commit cf3101c

Please sign in to comment.