Request from Kaii (#191)

vinaghost · web-flow · commit 4f8988a78815 · 2022-11-23T10:20:13.000+07:00
* npc for warehouse

* add scroll to vilalge setting

* add ignore Roman tribe 's Advantage
diff --git a/MainCore/AppDbContext.cs b/MainCore/AppDbContext.cs
@@ -507,6 +507,8 @@ public void AddVersionInfo()
                 KeyValuePair.Create(202210061322,"NPCMigrations"),
                 KeyValuePair.Create(202210162304,"TroopsMigrations"),
                 KeyValuePair.Create(202210181120,"UpgradeTroopMigrations"),
+                KeyValuePair.Create(202210271504,"NPCForWarhouse"),
+                KeyValuePair.Create(2022102716038,"IgnoreRomanAdvantage"),
             };
             foreach (var migration in migrations)
             {
diff --git a/MainCore/Helper/UpgradeBuildingHelper.cs b/MainCore/Helper/UpgradeBuildingHelper.cs
@@ -27,17 +27,18 @@ public static PlanTask NextBuildingTask(AppDbContext context, IPlanManager planM
                 var accountInfo = context.AccountsInfo.Find(accountId);
                 var tribe = accountInfo.Tribe;
                 var hasPlusAccount = accountInfo.HasPlusAccount;
+                var setting = context.VillagesSettings.Find(villageId);
 
                 var maxBuild = 1;
                 if (hasPlusAccount) maxBuild++;
-                if (tribe == TribeEnums.Romans) maxBuild++;
+                if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage) maxBuild++;
                 if (totalBuild == maxBuild)
                 {
                     logManager.Information(accountId, "Amount of currently building is equal with maximum building can build in same time");
                     return null;
                 }
 
-                if (tribe == TribeEnums.Romans && maxBuild - totalBuild == 1)
+                if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage && maxBuild - totalBuild == 1)
                 {
                     var numRes = currentList.Count(x => x.Type.IsResourceField());
                     var numInfra = totalBuild - numRes;
diff --git a/MainCore/Migrations/202210271504_NPCForWarhouse.cs b/MainCore/Migrations/202210271504_NPCForWarhouse.cs
@@ -0,0 +1,22 @@
+﻿using FluentMigrator;
+
+namespace MainCore.Migrations
+{
+    [Migration(202210271504)]
+    public class NPCForWarhouse : Migration
+    {
+        public override void Down()
+        {
+            Delete
+                .Column("IsNPCOverflow")
+                .Column("AutoNPCWarehousePercent").FromTable("VillagesSettings");
+        }
+
+        public override void Up()
+        {
+            Alter.Table("VillagesSettings")
+                .AddColumn("IsNPCOverflow").AsBoolean().WithDefaultValue(false)
+                .AddColumn("AutoNPCWarehousePercent").AsInt32().WithDefaultValue(90);
+        }
+    }
+}
diff --git a/MainCore/Migrations/2022102716038_IgnoreRomanAdvantage.cs b/MainCore/Migrations/2022102716038_IgnoreRomanAdvantage.cs
@@ -0,0 +1,20 @@
+﻿using FluentMigrator;
+
+namespace MainCore.Migrations
+{
+    [Migration(2022102716038)]
+    public class IgnoreRomanAdvantage : Migration
+    {
+        public override void Down()
+        {
+            Delete
+                .Column("IsIgnoreRomanAdvantage").FromTable("VillagesSettings");
+        }
+
+        public override void Up()
+        {
+            Alter.Table("VillagesSettings")
+                .AddColumn("IsIgnoreRomanAdvantage").AsBoolean().WithDefaultValue(false);
+        }
+    }
+}
diff --git a/MainCore/Models/Database/VillageSetting.cs b/MainCore/Models/Database/VillageSetting.cs
@@ -6,7 +6,7 @@ public class VillageSetting
     {
         public int VillageId { get; set; }
         public bool IsUseHeroRes { get; set; }
-
+        public bool IsIgnoreRomanAdvantage { get; set; }
         public bool IsInstantComplete { get; set; }
         public int InstantCompleteTime { get; set; }
 
@@ -18,7 +18,9 @@ public class VillageSetting
         public int AutoRefreshTimeMax { get; set; }
 
         public bool IsAutoNPC { get; set; }
+        public bool IsNPCOverflow { get; set; }
         public int AutoNPCPercent { get; set; }
+        public int AutoNPCWarehousePercent { get; set; }
         public int AutoNPCWood { get; set; }
         public int AutoNPCClay { get; set; }
         public int AutoNPCIron { get; set; }
diff --git a/MainCore/Tasks/Update/UpdateVillage.cs b/MainCore/Tasks/Update/UpdateVillage.cs
@@ -129,10 +129,13 @@ private void AutoNPC(AppDbContext context)
             var setting = context.VillagesSettings.Find(VillageId);
             if (!setting.IsAutoNPC) return;
             if (setting.AutoNPCPercent == 0) return;
+            if (setting.AutoNPCWarehousePercent == 0) return;
 
             var resource = context.VillagesResources.Find(VillageId);
-            var ratio = resource.Crop * 100.0f / resource.Granary;
-            if (ratio < setting.AutoNPCPercent) return;
+            var ratioGranary = resource.Crop * 100.0f / resource.Granary;
+            var maxResource = Math.Max(resource.Wood, Math.Max(resource.Clay, resource.Iron));
+            var ratioWarehouse = maxResource * 100.0f / resource.Warehouse;
+            if (ratioGranary < setting.AutoNPCPercent && ratioWarehouse < setting.AutoNPCWarehousePercent) return;
 
             _taskManager.Add(AccountId, new NPCTask(VillageId, AccountId));
         }
diff --git a/WPFUI/Models/VillageSetting.cs b/WPFUI/Models/VillageSetting.cs
@@ -9,6 +9,7 @@ public class VillageSetting : ReactiveObject
         public void CopyFrom(MainCore.Models.Database.VillageSetting settings)
         {
             IsUseHeroRes = settings.IsUseHeroRes;
+            IsIgnoreRomanAdvantage = settings.IsIgnoreRomanAdvantage;
             IsInstantComplete = settings.IsInstantComplete;
             InstantCompleteTime = settings.InstantCompleteTime.ToString();
             IsAdsUpgrade = settings.IsAdsUpgrade;
@@ -19,7 +20,10 @@ public void CopyFrom(MainCore.Models.Database.VillageSetting settings)
             AutoRefreshTimeTolerance = $"{(settings.AutoRefreshTimeMax - settings.AutoRefreshTimeMin) / 2}";
 
             IsAutoNPC = settings.IsAutoNPC;
+            IsNPCOverflow = settings.IsNPCOverflow;
+
             AutoNPCPercent = settings.AutoNPCPercent.ToString();
+            AutoNPCWarehousePercent = settings.AutoNPCWarehousePercent.ToString();
             AutoNPCWood = settings.AutoNPCWood.ToString();
             AutoNPCClay = settings.AutoNPCClay.ToString();
             AutoNPCIron = settings.AutoNPCIron.ToString();
@@ -32,6 +36,7 @@ public void CopyFrom(MainCore.Models.Database.VillageSetting settings)
         public void CopyTo(MainCore.Models.Database.VillageSetting settings)
         {
             settings.IsUseHeroRes = IsUseHeroRes;
+            settings.IsIgnoreRomanAdvantage = IsIgnoreRomanAdvantage;
             settings.IsInstantComplete = IsInstantComplete;
             settings.InstantCompleteTime = int.Parse(InstantCompleteTime);
             if (settings.InstantCompleteTime < 0) settings.InstantCompleteTime = 0;
@@ -47,7 +52,9 @@ public void CopyTo(MainCore.Models.Database.VillageSetting settings)
             settings.AutoRefreshTimeMax = autoRefreshTime + autoRefreshTimeTolerance;
 
             settings.IsAutoNPC = IsAutoNPC;
+            settings.IsNPCOverflow = IsNPCOverflow;
             settings.AutoNPCPercent = int.Parse(AutoNPCPercent);
+            settings.AutoNPCWarehousePercent = int.Parse(AutoNPCWarehousePercent);
             if (settings.AutoRefreshTimeMin < 4) settings.AutoRefreshTimeMin = 4;
             settings.AutoNPCWood = int.Parse(AutoNPCWood);
             settings.AutoNPCClay = int.Parse(AutoNPCClay);
@@ -117,6 +124,14 @@ public bool IsUseHeroRes
             set => this.RaiseAndSetIfChanged(ref _isUseHeroRes, value);
         }
 
+        private bool _isIgnoreRomanAdvantage;
+
+        public bool IsIgnoreRomanAdvantage
+        {
+            get => _isIgnoreRomanAdvantage;
+            set => this.RaiseAndSetIfChanged(ref _isIgnoreRomanAdvantage, value);
+        }
+
         private bool _isInstantComplete;
 
         public bool IsInstantComplete
@@ -181,6 +196,14 @@ public bool IsAutoNPC
             set => this.RaiseAndSetIfChanged(ref _isAutoNPC, value);
         }
 
+        private bool _isNPCOverflow;
+
+        public bool IsNPCOverflow
+        {
+            get => _isNPCOverflow;
+            set => this.RaiseAndSetIfChanged(ref _isNPCOverflow, value);
+        }
+
         private string _autoNPCPercent;
 
         public string AutoNPCPercent
@@ -189,6 +212,14 @@ public string AutoNPCPercent
             set => this.RaiseAndSetIfChanged(ref _autoNPCPercent, value);
         }
 
+        private string _autoNPCWarehousePercent;
+
+        public string AutoNPCWarehousePercent
+        {
+            get => _autoNPCWarehousePercent;
+            set => this.RaiseAndSetIfChanged(ref _autoNPCWarehousePercent, value);
+        }
+
         private string _autoNPCWood;
 
         public string AutoNPCWood
diff --git a/WPFUI/Views/Tabs/Villages/SettingsPage.xaml b/WPFUI/Views/Tabs/Villages/SettingsPage.xaml
@@ -21,32 +21,36 @@
             <Button x:Name="ExportButton" Grid.Column="1" Content="Export" FontSize="15" Margin="5,0,5,0" />
             <Button x:Name="SaveButton" Grid.Column="2" Content="Save" FontSize="15" FontWeight="Normal" Margin="5,0,5,0" />
         </Grid>
-
-        <StackPanel Grid.Row="1" Margin="10,0,10,0">
+        <ScrollViewer VerticalScrollBarVisibility = "Auto" Grid.Row="1" Margin="10,0,10,0">
             <StackPanel>
-                <TextBlock TextWrapping="Wrap" Text="Build settings" VerticalAlignment="Center" FontWeight="Bold" />
-                <CheckBox x:Name="UseHeroResCheckBox" Content="Use resource from hero inventory" />
-                <controls:CheckBoxWithInputUc x:Name="Complete" />
-                <controls:CheckBoxWithInputUc x:Name="WatchAds" />
-            </StackPanel>
+                <StackPanel>
+                    <TextBlock TextWrapping="Wrap" Text="Build settings" VerticalAlignment="Center" FontWeight="Bold" />
+                    <CheckBox x:Name="UseHeroResCheckBox" Content="Use resource from hero inventory" />
+                    <CheckBox x:Name="IgnoreRomanAdvantageCheckBox" Content="Ignore Roman tribe's advantage" />
+                    <controls:CheckBoxWithInputUc x:Name="Complete" />
+                    <controls:CheckBoxWithInputUc x:Name="WatchAds" />
+                </StackPanel>
 
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap" Text="Refresh settings" VerticalAlignment="Center" FontWeight="Bold" />
-                <CheckBox x:Name="RefreshCheckBox" Content="Auto refresh village" />
-                <controls:ToleranceUc x:Name="Refresh" />
-            </StackPanel>
+                <StackPanel>
+                    <TextBlock TextWrapping="Wrap" Text="Refresh settings" VerticalAlignment="Center" FontWeight="Bold" />
+                    <CheckBox x:Name="RefreshCheckBox" Content="Auto refresh village" />
+                    <controls:ToleranceUc x:Name="Refresh" />
+                </StackPanel>
 
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap" Text="NPC settings" VerticalAlignment="Center" FontWeight="Bold" />
-                <controls:CheckBoxWithInputUc x:Name="AutoNPC" />
-                <controls:ResourcesUc x:Name="AutoNPCRatio" />
-            </StackPanel>
+                <StackPanel>
+                    <TextBlock TextWrapping="Wrap" Text="NPC settings" VerticalAlignment="Center" FontWeight="Bold" />
+                    <CheckBox x:Name="NPCCheckBox" Content="NPC even if after NPC resource is overflow (this may make TBS stuck)" />
+                    <controls:CheckBoxWithInputUc x:Name="AutoNPC" />
+                    <controls:CheckBoxWithInputUc x:Name="AutoNPCWarehouse" />
+                    <controls:ResourcesUc x:Name="AutoNPCRatio" />
+                </StackPanel>
 
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap" Text="Troop settings" VerticalAlignment="Center" FontWeight="Bold" />
-                <CheckBox x:Name="TroopUpgradeCheckBox" Content="Auto improve troop" />
-                <controls:TroopsWithCheckBoxUc x:Name="TroopUpgrade" />
+                <StackPanel>
+                    <TextBlock TextWrapping="Wrap" Text="Troop settings" VerticalAlignment="Center" FontWeight="Bold" />
+                    <CheckBox x:Name="TroopUpgradeCheckBox" Content="Auto improve troop" />
+                    <controls:TroopsWithCheckBoxUc x:Name="TroopUpgrade" />
+                </StackPanel>
             </StackPanel>
-        </StackPanel>
+        </ScrollViewer>
     </Grid>
 </reactiveui:ReactivePage>
diff --git a/WPFUI/Views/Tabs/Villages/SettingsPage.xaml.cs b/WPFUI/Views/Tabs/Villages/SettingsPage.xaml.cs
@@ -17,6 +17,7 @@ public SettingsPage()
             WatchAds.ViewModel = new("Using ads upgrade button when building time is longer than", "min(s)");
             Refresh.ViewModel = new("Refresh interval", "min(s)");
             AutoNPC.ViewModel = new("Auto NPC when crop is more than", "% of granary");
+            AutoNPCWarehouse.ViewModel = new("Auto NPC when any resource is more than", "% of warehouse");
             AutoNPCRatio.ViewModel = new("Ratio");
             TroopUpgrade.ViewModel = new("Troop will be upgraded");
             this.WhenActivated(d =>
@@ -26,6 +27,7 @@ public SettingsPage()
                 this.BindCommand(ViewModel, vm => vm.SaveCommand, v => v.SaveButton).DisposeWith(d);
 
                 this.Bind(ViewModel, vm => vm.Settings.IsUseHeroRes, v => v.UseHeroResCheckBox.IsChecked).DisposeWith(d);
+                this.Bind(ViewModel, vm => vm.Settings.IsIgnoreRomanAdvantage, v => v.IgnoreRomanAdvantageCheckBox.IsChecked).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.IsInstantComplete, v => v.Complete.ViewModel.IsChecked).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.InstantCompleteTime, v => v.Complete.ViewModel.Value).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.IsAdsUpgrade, v => v.WatchAds.ViewModel.IsChecked).DisposeWith(d);
@@ -36,7 +38,9 @@ public SettingsPage()
                 this.Bind(ViewModel, vm => vm.Settings.AutoRefreshTimeTolerance, v => v.Refresh.ViewModel.ToleranceValue).DisposeWith(d);
 
                 this.Bind(ViewModel, vm => vm.Settings.IsAutoNPC, v => v.AutoNPC.ViewModel.IsChecked).DisposeWith(d);
+                this.Bind(ViewModel, vm => vm.Settings.IsNPCOverflow, v => v.NPCCheckBox.IsChecked).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.AutoNPCPercent, v => v.AutoNPC.ViewModel.Value).DisposeWith(d);
+                this.Bind(ViewModel, vm => vm.Settings.AutoNPCWarehousePercent, v => v.AutoNPCWarehouse.ViewModel.Value).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.AutoNPCWood, v => v.AutoNPCRatio.ViewModel.Wood).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.AutoNPCClay, v => v.AutoNPCRatio.ViewModel.Clay).DisposeWith(d);
                 this.Bind(ViewModel, vm => vm.Settings.AutoNPCIron, v => v.AutoNPCRatio.ViewModel.Iron).DisposeWith(d);

Original file line number	Diff line number	Diff line change
`@@ -507,6 +507,8 @@ public void AddVersionInfo()`
`507`	`507`	`KeyValuePair.Create(202210061322,"NPCMigrations"),`
`508`	`508`	`KeyValuePair.Create(202210162304,"TroopsMigrations"),`
`509`	`509`	`KeyValuePair.Create(202210181120,"UpgradeTroopMigrations"),`
	`510`	`+ KeyValuePair.Create(202210271504,"NPCForWarhouse"),`
	`511`	`+ KeyValuePair.Create(2022102716038,"IgnoreRomanAdvantage"),`
`510`	`512`	`};`
`511`	`513`	`foreach (var migration in migrations)`
`512`	`514`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,18 @@ public static PlanTask NextBuildingTask(AppDbContext context, IPlanManager planM`
`27`	`27`	`var accountInfo = context.AccountsInfo.Find(accountId);`
`28`	`28`	`var tribe = accountInfo.Tribe;`
`29`	`29`	`var hasPlusAccount = accountInfo.HasPlusAccount;`
	`30`	`+ var setting = context.VillagesSettings.Find(villageId);`
`30`	`31`
`31`	`32`	`var maxBuild = 1;`
`32`	`33`	`if (hasPlusAccount) maxBuild++;`
`33`		`- if (tribe == TribeEnums.Romans) maxBuild++;`
	`34`	`+ if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage) maxBuild++;`
`34`	`35`	`if (totalBuild == maxBuild)`
`35`	`36`	`{`
`36`	`37`	`logManager.Information(accountId, "Amount of currently building is equal with maximum building can build in same time");`
`37`	`38`	`return null;`
`38`	`39`	`}`
`39`	`40`
`40`		`- if (tribe == TribeEnums.Romans && maxBuild - totalBuild == 1)`
	`41`	`+ if (tribe == TribeEnums.Romans && !setting.IsIgnoreRomanAdvantage && maxBuild - totalBuild == 1)`
`41`	`42`	`{`
`42`	`43`	`var numRes = currentList.Count(x => x.Type.IsResourceField());`
`43`	`44`	`var numInfra = totalBuild - numRes;`