Rebase

.editorconfig

@@ -9,15 +9,11 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 ; 4-column tab indentation
-[*.yaml]
-indent_style = tab
-indent_size = 4
-
-; 4-column tab indentation and .NET coding conventions
-[*.cs]
+[*.{cs,csproj,yaml,lua,sh,ps1}]
 indent_style = tab
 indent_size = 4
 
+; .NET coding conventions
 #### Code Style Rules
 #### https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/
 
@@ -950,37 +946,180 @@ dotnet_diagnostic.CA2251.severity = warning
 # Ensure ThreadStatic is only used with static fields.
 dotnet_diagnostic.CA2259.severity = suggestion # TODO: Change to warning once using .NET 7 or later.
 
-### Roslynator
-### https://github.com/JosefPihrt/Roslynator/tree/main/docs/analyzers
+### Roslynator.Analyzers
+### https://josefpihrt.github.io/docs/roslynator/analyzers
 
+# We disable the rule category by setting severity to none.
 # Below we enable specific rules by setting severity to warning.
+dotnet_analyzer_diagnostic.category-roslynator.severity = none
+
+# Remove redundant 'sealed' modifier.
+dotnet_diagnostic.RCS1034.severity = warning
+
+# Remove argument list from attribute.
+dotnet_diagnostic.RCS1039.severity = warning
+
+# Remove empty initializer.
+dotnet_diagnostic.RCS1041.severity = warning
+
+# Remove enum default underlying type.
+dotnet_diagnostic.RCS1042.severity = warning
+
+# Remove 'partial' modifier from type with a single part.
+dotnet_diagnostic.RCS1043.severity = warning
+
+# Use lambda expression instead of anonymous method.
+dotnet_diagnostic.RCS1048.severity = warning
+
+# Simplify boolean comparison.
+dotnet_diagnostic.RCS1049.severity = warning
+
+# Use compound assignment.
+dotnet_diagnostic.RCS1058.severity = warning
+
+# Avoid locking on publicly accessible instance.
+dotnet_diagnostic.RCS1059.severity = warning
+
+# Remove empty 'finally' clause.
+dotnet_diagnostic.RCS1066.severity = warning
+
+# Simplify logical negation.
+dotnet_diagnostic.RCS1068.severity = warning
+
+# Remove redundant base constructor call.
+dotnet_diagnostic.RCS1071.severity = warning
+
+# Remove empty namespace declaration.
+dotnet_diagnostic.RCS1072.severity = warning
+
+# Remove redundant constructor.
+dotnet_diagnostic.RCS1074.severity = warning
 
 # Use 'Count' property instead of 'Any' method.
 dotnet_diagnostic.RCS1080.severity = warning
 
-# Use read-only auto-implemented property.
-dotnet_diagnostic.RCS1170.severity = warning
+# Use coalesce expression instead of conditional expression.
+dotnet_diagnostic.RCS1084.severity = warning
 
-# Unnecessary interpolated string.
-dotnet_diagnostic.RCS1214.severity = warning
+# Remove empty region.
+dotnet_diagnostic.RCS1091.severity = warning
+
+# Default label should be the last label in a switch section.
+dotnet_diagnostic.RCS1099.severity = warning
+
+# Unnecessary interpolation.
+dotnet_diagnostic.RCS1105.severity = warning
+
+# Remove redundant 'ToCharArray' call.
+dotnet_diagnostic.RCS1107.severity = warning
+
+# Add 'static' modifier to all partial class declarations.
+dotnet_diagnostic.RCS1108.severity = warning
+
+# Combine 'Enumerable.Where' method chain.
+dotnet_diagnostic.RCS1112.severity = warning
+
+# Use 'string.IsNullOrEmpty' method.
+dotnet_diagnostic.RCS1113.severity = warning
+
+# Bitwise operation on enum without Flags attribute.
+dotnet_diagnostic.RCS1130.severity = warning
+
+# Remove redundant overriding member.
+dotnet_diagnostic.RCS1132.severity = warning
+
+# Remove redundant Dispose/Close call.
+dotnet_diagnostic.RCS1133.severity = warning
+
+# Remove redundant statement.
+dotnet_diagnostic.RCS1134.severity = warning
+
+# Merge switch sections with equivalent content.
+dotnet_diagnostic.RCS1136.severity = warning
+
+# Simplify coalesce expression.
+dotnet_diagnostic.RCS1143.severity = warning
+
+# Remove redundant cast.
+dotnet_diagnostic.RCS1151.severity = warning
+
+# Use StringComparison when comparing strings.
+dotnet_diagnostic.RCS1155.severity = warning
+
+# Use EventHandler<T>.
+dotnet_diagnostic.RCS1159.severity = warning
+
+# Unused type parameter.
+dotnet_diagnostic.RCS1164.severity = warning
+
+# Use 'is' operator instead of 'as' operator.
+dotnet_diagnostic.RCS1172.severity = warning
+
+# Unused 'this' parameter.
+dotnet_diagnostic.RCS1175.severity = warning
+
+# Unnecessary assignment.
+dotnet_diagnostic.RCS1179.severity = warning
+
+# Use constant instead of field.
+dotnet_diagnostic.RCS1187.severity = warning
+
+# Join string expressions.
+dotnet_diagnostic.RCS1190.severity = warning
+
+# Declare enum value as combination of names.
+dotnet_diagnostic.RCS1191.severity = warning
 
 # Unnecessary usage of verbatim string literal.
 dotnet_diagnostic.RCS1192.severity = warning
 
-# Use pattern matching instead of combination of 'as' operator and null check.
-dotnet_diagnostic.RCS1221.severity = warning
+# Overriding member should not change 'params' modifier.
+dotnet_diagnostic.RCS1193.severity = warning
+
+# Use ^ operator.
+dotnet_diagnostic.RCS1195.severity = warning
+
+# Unnecessary null check.
+dotnet_diagnostic.RCS1199.severity = warning
+
+# Use EventArgs.Empty.
+dotnet_diagnostic.RCS1204.severity = warning
+
+# Order type parameter constraints.
+dotnet_diagnostic.RCS1209.severity = warning
+
+# Unnecessary interpolated string.
+dotnet_diagnostic.RCS1214.severity = warning
 
 # Expression is always equal to 'true'.
 dotnet_diagnostic.RCS1215.severity = warning
 
-# Use StringComparison when comparing strings.
-dotnet_diagnostic.RCS1155.severity = warning
+# Unnecessary unsafe context.
+dotnet_diagnostic.RCS1216.severity = warning
+
+# Simplify code branching.
+dotnet_diagnostic.RCS1218.severity = warning
+
+# Use pattern matching instead of combination of 'is' operator and cast operator.
+dotnet_diagnostic.RCS1220.severity = warning
+
+# Make class sealed.
+dotnet_diagnostic.RCS1225.severity = warning
+
+# Add paragraph to documentation comment.
+dotnet_diagnostic.RCS1226.severity = warning
+
+# Validate arguments correctly.
+dotnet_diagnostic.RCS1227.severity = warning
+
+# Unnecessary explicit use of enumerator.
+dotnet_diagnostic.RCS1230.severity = warning
 
-# Abstract type should not have public constructors.
-dotnet_diagnostic.RCS1160.severity = warning
+# Use short-circuiting operator.
+dotnet_diagnostic.RCS1233.severity = warning
 
-# Optimize 'Dictionary<TKey, TValue>.ContainsKey' call.
+# Optimize method call.
 dotnet_diagnostic.RCS1235.severity = warning
 
-# Call extension method as instance method.
-dotnet_diagnostic.RCS1196.severity = warning
+# Use 'for' statement instead of 'while' statement.
+dotnet_diagnostic.RCS1239.severity = warning

.gitattributes

@@ -5,6 +5,7 @@
 *.csproj eol=lf
 *.sln eol=lf
 * text=lf
+*.csproj eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.gitignore

@@ -54,3 +54,6 @@ update.log
 
 # IntelliJ files
 .idea
+
+#Attacque Supérior
+/mods/as/

AUTHORS

@@ -150,6 +150,7 @@ Also thanks to:
     * Teemu Nieminen (Temeez)
     * Thomas Christlieb (ThomasChr)
     * Tim Mylemans (gecko)
+    * Tinix
     * Tirili
     * Tomas Einarsson (Mesacer)
     * Tom van Leth (tovl)

AUTHORS.AS

@@ -0,0 +1,110 @@
+Attacque Supérior is a third-party logic
+extension based on OpenRA.
+
+The plugin is maintained by
+ * Gyula Zimmermann (Graion Dilach)
+
+ Authors of logics:
+ * Gyula Zimmermann (Graion Dilach)
+   > everything unless listed
+
+ * Andre Mohren (IceReaper)
+   > KKND laser implementation
+
+ * Boolbada/forcecore
+   > RadBeam implementation
+   > initial AIDeployHelper
+   > GrantStackableConditionOnFire aka Gattling
+   > ArcRenderable
+   > Nydus tunnel logic
+   > mind control traits
+   > Berserkable
+   > TintedCells (former radioactivity)
+   > PointDefense logic
+   > Prism Forwarding logic
+   > Slave Miner logic
+
+ * CastleJing
+   > Bugfixes on mind controller logic
+
+ * CombinE88
+   > BackFireShrapnelWarhead
+
+ * Darkademic
+   > Production Tooltip armor type indicator
+   > Shielded logic
+
+ * darkscrypt (Devon/wolfbyte)
+   > Major rewrite on garrison code
+   > Smart deploy logic
+
+ * DnAp
+   > Initial garrison logic
+
+ * Dnqbob
+   > All AI squad logic fix
+   > PowerDownBotModule
+   > CncEngineerBotModule
+   > PowerDownBotModule
+   > LoadCargoBotModule
+   > LoadGarrisonerBotModule
+   > SharedCargoBotModule
+   > SendUnitToAttackBotModule
+   > WeaponTriggerCells
+   > TriggerLayerWeaponWarhead
+   > IgnoreHeightDamageWarhead
+   > MissileTA fix up
+
+ * DoDoCat
+   > Slave Miner maintaince
+
+ * EoralMilk
+   > Initial MissileTA
+
+ * Holloweye
+   > SmokeParticle(Emitter) basic implementation
+
+ * lucasss
+   > (Gives)ProximityBounty basic implementation
+
+ * Matthias Mailänder (Mailaender)
+   > WithExitOverlay
+
+ * Martin Lang (Gerseras/Seraphinexxx)
+   > DelayedWeapon system
+
+ * Mustafa Alperen Seki (MustaphaTR)
+   > mindcontrol traits cleanup
+   > /taunt command
+   > Intelligence logic
+   > Infect logic
+   > ClearsResources
+   > GrantTimedCondition
+   > GrantConditionAfterDelay
+   > Garrison logic maintainance
+   > OpenToppedDamageWarhead
+   > Ranged GPS
+   > CPs and Upgrades Observer Tab
+   > Selected Actors Widgets
+   > Contition Prerequisite
+   > Instant Cash Drain
+
+ * Sean Hunt (coppro)
+   > Chrono Miner implementation (ChronoResourceDelivery)
+
+ * jrb0001
+   > AmmoPool support for ExplodeWeapon
+
+ * Wojciech Walaszek (Voidwalker)
+   > TeleportNetwork maintaince
+   > WarheadTrailProjectile
+   > TintedCells maintaince
+
+ Authors of documents used in this plugin:
+  * Apollo
+   > additional blending modes
+
+The project owes thanks for OpenRA for it's modularity
+which allows this project to exist in the first place.
+
+Also thanks for you, the user for using this project.

Directory.Build.props

@@ -33,7 +33,7 @@
     <Optimize>false</Optimize>
     <!-- Enable only for Debug builds to improve compile-time performance for Release builds -->
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <!-- Enabling GenerateDocumentationFile is required for IDE0005 (Remove unnecessary import) 
+    <!-- Enabling GenerateDocumentationFile is required for IDE0005 (Remove unnecessary import)
       rule to run in command line builds. https://github.com/dotnet/roslyn/issues/41640
       Enable only for Debug builds to improve compile-time performance for Release builds -->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -51,8 +51,10 @@
     </ItemGroup>
   </Target>
 
-  <!-- StyleCop -->
+  <!-- StyleCop/Roslynator -->
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
+    <!-- Roslynator analyzers fail to run under Mono (AD0001) -->
+    <PackageReference Include="Roslynator.Analyzers" Version="4.2.0" PrivateAssets="All" Condition="'$(MSBuildRuntimeType)'!='Mono'" />
   </ItemGroup>
 </Project>

Makefile

@@ -153,6 +153,9 @@ tests:
 
 ############# LOCAL INSTALLATION AND DOWNSTREAM PACKAGING ##############
 #
+setupasfolder:
+	@mkdir -p ./mods/as
+
 version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
 ifeq ($(VERSION),)
 	$(error Unable to determine new version (requires git or override of variable VERSION))
@@ -161,7 +164,7 @@ endif
 	@sh -c '. ./packaging/functions.sh; set_mod_version "$(VERSION)" mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
 
 install:
-	@sh -c '. ./packaging/functions.sh; install_assemblies $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) $(RUNTIME) True True True'
+	@sh -c '. ./packaging/functions.sh; install_assemblies $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) $(RUNTIME) True True True True'
 	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'
 
 install-linux-shortcuts: