Merge pull request #24 from adri1wcrow/master

fix the 1.0.1 crash
smellyriver · Jun 26, 2018 · 2e37117 · 2e37117
2 parents 4bcb54c + 4d062c5
commit 2e37117
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 4 deletions.
diff --git a/TankInspector/Modeling/Tank/ConsumableScript.cs b/TankInspector/Modeling/Tank/ConsumableScript.cs
@@ -26,12 +26,18 @@ public static ConsumableScript Resolve(XmlReader reader, Database database)
                 case "RemovedRpmLimiter":
                     script = new RemovedRpmLimiterScript(database);
                     break;
-                case "Artillery":
+                case "RageArtillery":
+                case "ConsumableArtillery":
                     script = new ArtilleryScript(database);
                     break;
-                case "Bomber":
+                case "RageBomber":
+                case "ConsumableBomber":
                     script = new BomberScript(database);
                     break;
+                case "EpicRecon":
+                case "ConsumableRecon":
+                    script = new ReconScript(database);
+                    break;
                 case "Afterburning":
                     script = new AfterburningScript(database);
                     break;
@@ -60,7 +66,9 @@ public static ConsumableScript Resolve(XmlReader reader, Database database)
 					script = new LastEffortBattleBoosterScript(database);
 					break;
 				default:
-                    throw new NotSupportedException();
+                    script = new DefaultScript(database,type);
+                    break;
+                    //TODO throw new NotSupportedException();
             }
 
             script.Deserialize(reader);

diff --git a/TankInspector/Modeling/Tank/DefaultScript.cs b/TankInspector/Modeling/Tank/DefaultScript.cs
@@ -0,0 +1,29 @@
+using System.Xml;
+
+namespace Smellyriver.TankInspector.Modeling
+{
+	internal class DefaultScript : ConsumableScript
+    {
+        public override string[] EffectiveDomains => new[] { "unknown" };
+
+	    public DefaultScript(Database database,string type)
+            : base(database)
+        {
+            EffectiveDomains.SetValue(type, 0);
+        }
+
+        public override bool DeserializeSection(string name, XmlReader reader)
+        {
+            switch (name)
+            {
+                default:
+                    return base.DeserializeSection(name, reader);
+            }
+        }
+
+        public override void Execute(ModificationContext context, object args)
+        {
+
+        }
+    }
+}
diff --git a/TankInspector/Modeling/Tank/ReconScript.cs b/TankInspector/Modeling/Tank/ReconScript.cs
@@ -0,0 +1,29 @@
+using System.Xml;
+
+namespace Smellyriver.TankInspector.Modeling
+{
+	internal class ReconScript : ConsumableScript
+    {
+        public override string[] EffectiveDomains => new[] { "recon" };
+
+	    public ReconScript(Database database)
+            : base(database)
+        {
+
+        }
+
+        public override bool DeserializeSection(string name, XmlReader reader)
+        {
+            switch (name)
+            {
+                default:
+                    return base.DeserializeSection(name, reader);
+            }
+        }
+
+        public override void Execute(ModificationContext context, object args)
+        {
+
+        }
+    }
+}
diff --git a/TankInspector/Modeling/Tank/Shell.cs b/TankInspector/Modeling/Tank/Shell.cs
@@ -120,6 +120,8 @@ private ShellType ParseShellType(string type)
                     return ShellType.APHE;
                 case "HIGH_EXPLOSIVE_PREMIUM":
                     return ShellType.PremiumHE;
+                case "SMOKE":
+                    return ShellType.SMOKE;
                 default:
                     throw new NotSupportedException();
             }

diff --git a/TankInspector/Modeling/Tank/ShellType.cs b/TankInspector/Modeling/Tank/ShellType.cs
@@ -10,7 +10,8 @@ public enum ShellType
         HE,
         PremiumHE,
         HEAT,
-        APHE
+        APHE,
+        SMOKE
     }
 
 	internal static class ShellTypeExtensions
@@ -21,6 +22,7 @@ public static bool IsKineticShellType(this ShellType type)
             {
                 case ShellType.HE:
                 case ShellType.PremiumHE:
+                case ShellType.SMOKE:
                     return false;
                 case ShellType.AP:
                 case ShellType.APCR:
@@ -39,6 +41,7 @@ public static bool HasNormalizationEffect(this ShellType type)
                 case ShellType.HE:
                 case ShellType.PremiumHE:
                 case ShellType.HEAT:
+                case ShellType.SMOKE:
                     return false;
                 case ShellType.AP:
                 case ShellType.APCR:
@@ -56,6 +59,7 @@ public static double BasicNormalization(this ShellType type)
                 case ShellType.HE:
                 case ShellType.PremiumHE:
                 case ShellType.HEAT:
+                case ShellType.SMOKE:
                     return 0.0;
                 case ShellType.AP:
                 case ShellType.APHE:
@@ -71,6 +75,8 @@ public static double RicochetAngle(this ShellType type)
         {
             switch (type)
             {
+                case ShellType.SMOKE:
+                    return 0.0;
                 case ShellType.HE:  
                 case ShellType.PremiumHE:
                     return 90.0;