diff --git a/Botbases/RSBot.Training/Bundle/Attack/AttackBundle.cs b/Botbases/RSBot.Training/Bundle/Attack/AttackBundle.cs index 3255c01b..d2697c3f 100644 --- a/Botbases/RSBot.Training/Bundle/Attack/AttackBundle.cs +++ b/Botbases/RSBot.Training/Bundle/Attack/AttackBundle.cs @@ -32,7 +32,7 @@ public void Invoke() return; } - var dontFollowMobs = PlayerConfig.Get("RSBot.Training.checkBoxDontFollowMobs"); + bool dontFollowMobs = PlayerConfig.Get("RSBot.Training.checkBoxDontFollowMobs"); if (dontFollowMobs && !Kernel.Bot.Botbase.Area.IsInSight(Game.SelectedEntity)) { Log.Debug("Deselecting entity because it moved far away from training area!"); @@ -43,6 +43,12 @@ public void Invoke() Game.SelectedEntity?.TryDeselect(); Game.SelectedEntity = null; + double distance = Game.Player.Position.DistanceTo(Container.Bot.Area.Position); + bool hasCollision = Game.Player.Position.HasCollisionBetween(Container.Bot.Area.Position); + + if (distance > Container.Bot.Area.Radius && !hasCollision) + Game.Player.MoveTo(Container.Bot.Area.Position, false); + return; } diff --git a/Botbases/RSBot.Training/Bundle/Resurrect/ResurrectBundle.cs b/Botbases/RSBot.Training/Bundle/Resurrect/ResurrectBundle.cs index 920b8742..ffb3cbe6 100644 --- a/Botbases/RSBot.Training/Bundle/Resurrect/ResurrectBundle.cs +++ b/Botbases/RSBot.Training/Bundle/Resurrect/ResurrectBundle.cs @@ -20,11 +20,14 @@ public void Invoke() if (!PlayerConfig.Get("RSBot.Skills.checkResurrectParty")) return; + ushort resDelay = PlayerConfig.Get("RSBot.Skills.numResDelay") ?? 120; + ushort resRadius = PlayerConfig.Get("RSBot.Skills.numResRadius") ?? 100; + foreach (var member in Game.Party.Members) { if ( _lastResurrectedPlayers.ContainsKey(member.Name) - && Kernel.TickCount - _lastResurrectedPlayers[member.Name] < 180 * 1000 + && Kernel.TickCount - _lastResurrectedPlayers[member.Name] < resDelay * 1000 ) continue; @@ -32,7 +35,7 @@ public void Invoke() ( member.Player?.Movement.Source.DistanceTo(Game.Player.Movement.Source) ?? member.Position.DistanceTo(Game.Player.Movement.Source) - ) > 100 + ) > resRadius || ( member.Player?.Movement.Source.HasCollisionBetween(Game.Player.Movement.Source) ?? member.Position.HasCollisionBetween(Game.Player.Movement.Source) diff --git a/Botbases/RSBot.Training/Bundle/Target/TargetBundle.cs b/Botbases/RSBot.Training/Bundle/Target/TargetBundle.cs index 1ec2ec95..d4acecba 100644 --- a/Botbases/RSBot.Training/Bundle/Target/TargetBundle.cs +++ b/Botbases/RSBot.Training/Bundle/Target/TargetBundle.cs @@ -99,12 +99,12 @@ public void Invoke() if (warlockModeEnabled && Game.SelectedEntity?.State.HasTwoDots() == true) return; - if (Game.SelectedEntity?.State.LifeState == LifeState.Alive) - return; - if (Game.SelectedEntity != null && Game.SelectedEntity is not SpawnedMonster) Game.SelectedEntity = null; + if (Game.SelectedEntity?.State.LifeState == LifeState.Alive) + return; + var monster = GetNearestEnemy(); if (monster == null) return; diff --git a/Dependencies/Languages/RSBot.Protection/ar_AR.rsl b/Dependencies/Languages/RSBot.Protection/ar_AR.rsl index ce6b546d..59cad794 100644 --- a/Dependencies/Languages/RSBot.Protection/ar_AR.rsl +++ b/Dependencies/Languages/RSBot.Protection/ar_AR.rsl @@ -1,34 +1,34 @@ DisplayName="Protection" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="ثواني." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="الارتقاء بالمستوى" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="جرد كامل للحيوانات الأليفة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="لم يتبق أي جرعات MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="لم يتبق أي جرعات HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="متانة المعدات منخفضة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="ميت مع تأخير" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="خزنه الشخصية ممتلئة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="لم يتبق أي أسهم " -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="مهارة:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="استخدام المهارة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="استخدام Universal Pills *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="مهارة:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="استخدم المهارة إذا كانت HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="استخدم المهارة إذا كان MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="استخدم جرعات HP إذا كان HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="استخدم Vigor إذا كان MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="استخدم جرعات MP إذا كان MP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="استخدم جرعات Vigor إذا كانت HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Auto summon growth & fellow pet" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="استخدام جرعاتrecovery potions i*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="احياء growth / fellow pet" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="شفاء الحصان إذا كان HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="استخدم جرعات HP إذا كان HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="استخدم جرعات HGP إذا كان الجوع *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="العودة إلى المدينة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="* سيتم تنفيذه أيضا ، إذا لم يتم بدء تشغيل البوت." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="حالة سيئة" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Health / Mana recovery" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Recovery - Pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="ثواني." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="الارتقاء بالمستوى" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="جرد كامل للحيوانات الأليفة" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="لم يتبق أي جرعات MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="لم يتبق أي جرعات HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="متانة المعدات منخفضة" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="ميت مع تأخير" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="خزنه الشخصية ممتلئة" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="لم يتبق أي أسهم " +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="مهارة:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="استخدام المهارة" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="استخدام Universal Pills *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="مهارة:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="استخدم المهارة إذا كانت HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="استخدم المهارة إذا كان MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="استخدم جرعات HP إذا كان HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="استخدم Vigor إذا كان MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="استخدم جرعات MP إذا كان MP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="استخدم جرعات Vigor إذا كانت HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Auto summon growth & fellow pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="استخدام جرعاتrecovery potions i*" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="احياء growth / fellow pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="شفاء الحصان إذا كان HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="استخدم جرعات HP إذا كان HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="استخدم جرعات HGP إذا كان الجوع *" +RSBot.Protection.Main.Panel.Panel.groupBackTown="العودة إلى المدينة" +RSBot.Protection.Main.Panel.Panel.label22="* سيتم تنفيذه أيضا ، إذا لم يتم بدء تشغيل البوت." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="حالة سيئة" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Health / Mana recovery" +RSBot.Protection.Main.Panel.Panel.groupPet="Recovery - Pet" ReturnToTownInventoryFull="العودة إلى المدينة: مخزون اللاعب ممتلئ." ReturnToTownPetInventoryFull="العودة إلى المدينة: مخزون الحيوانات الأليفة ممتلئ." ReturnToTownNoMana="العودة إلى المدينة: لا توجد جرعات مانا في مخزون اللاعبين." diff --git a/Dependencies/Languages/RSBot.Protection/de_DE.rsl b/Dependencies/Languages/RSBot.Protection/de_DE.rsl index ec17f812..0c04346c 100644 --- a/Dependencies/Languages/RSBot.Protection/de_DE.rsl +++ b/Dependencies/Languages/RSBot.Protection/de_DE.rsl @@ -1,34 +1,34 @@ DisplayName="Schutz" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="sek." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Level up" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Haustier Inventar voll" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="Keine MP Tränke vorhanden" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="Keine HP Tränke vorhanden" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Haltbarkeit der Ausrüstung gering" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Tot mit Verzögerung von" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Volles Inventar" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="Keine Pfeile/Bolzen mehr" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Skill:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="Benutze Skill" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="Benutze Universal Pills *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Skill:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="Benutze Skill wenn HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="Benutze Skill wenn MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP.checkUseHPPotionsPlayer="Benutze HP Tränke wenn HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="Benutze Vigor Tränke wenn MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="Benutze MP Tränke if MP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="Benutze Vigor Tränke wenn HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Automatisch angreifendes Haustier beschwören" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="Benutze abnormal state recovery Tränke *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="Angriffstier wiederbeleben" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="Heile Reittier wenn HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="Benutze HP Tränke wenn HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="Benutze HGP Tränke wenn Hunger *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Zurück zur Stadt" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="* Wird auch ausgeführt, wenn der Bot nicht gestartet ist." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Schlechter Status" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Gesundheit / Mana Erholung" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Erholung - Haustier" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="sek." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Level up" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Haustier Inventar voll" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="Keine MP Tränke vorhanden" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="Keine HP Tränke vorhanden" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Haltbarkeit der Ausrüstung gering" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Tot mit Verzögerung von" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Volles Inventar" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="Keine Pfeile/Bolzen mehr" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Skill:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="Benutze Skill" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="Benutze Universal Pills *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Skill:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="Benutze Skill wenn HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="Benutze Skill wenn MP" +RSBot.Protection.Main.Panel.Panel.groupHPMP.checkUseHPPotionsPlayer="Benutze HP Tränke wenn HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="Benutze Vigor Tränke wenn MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="Benutze MP Tränke if MP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="Benutze Vigor Tränke wenn HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Automatisch angreifendes Haustier beschwören" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="Benutze abnormal state recovery Tränke *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="Angriffstier wiederbeleben" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="Heile Reittier wenn HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="Benutze HP Tränke wenn HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="Benutze HGP Tränke wenn Hunger *" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Zurück zur Stadt" +RSBot.Protection.Main.Panel.Panel.label22="* Wird auch ausgeführt, wenn der Bot nicht gestartet ist." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Schlechter Status" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Gesundheit / Mana Erholung" +RSBot.Protection.Main.Panel.Panel.groupPet="Erholung - Haustier" ReturnToTownInventoryFull="Rückkehr in die Stadt: Spieler-Inventar voll." ReturnToTownPetInventoryFull="Rückkehr in die Stadt: Haustier-Inventar voll." ReturnToTownNoMana="Rückkehr in die Stadt: Keine Manatränke im Spielerinventar." @@ -37,7 +37,7 @@ ReturnToTownLevelUpAchieved="Rückkehr in die Stadt: Levelaufstieg erreicht." ReturnToTownDurLow="Rückkehr in die Stadt: Die Haltbarkeit des Gegenstandes {0} niedrig." ReturnToTownNoAmmo="Rückkehr in die Stadt: Keine Munition im Inventar." ResurrectSPointSeconds="Wiederbelebung an der angegebenen Stelle in {0} Sekunden" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupStatPoints="Statuspunke" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncInt="Erhöhe INT" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncStr="Erhöhe STR" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncBotStopped="Erhöhe auch wenn Bot gestoppt" +RSBot.Protection.Main.Panel.Panel.groupStatPoints="Statuspunke" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncInt="Erhöhe INT" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncStr="Erhöhe STR" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncBotStopped="Erhöhe auch wenn Bot gestoppt" diff --git a/Dependencies/Languages/RSBot.Protection/en_US.rsl b/Dependencies/Languages/RSBot.Protection/en_US.rsl index 20472c61..d193cb42 100644 --- a/Dependencies/Languages/RSBot.Protection/en_US.rsl +++ b/Dependencies/Languages/RSBot.Protection/en_US.rsl @@ -1,36 +1,36 @@ DisplayName="Protection" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="sec." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Level up" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Full pet inventory" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="MP Potions left" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="HP Potions left" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkShardFatigue="Shard fatigue" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label19="min." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Equipment durability low" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Dead with delay of " -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Full inventory" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="No arrows / bolts left" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Skill:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="Use Skill" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="Use Universal Pills *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Skill:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="Use skill if HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="Use skill if MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="Use HP potions if HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="Use Vigor Potions if MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="Use MP potions if MP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="Use Vigor Potions if HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Auto summon growth & fellow pet" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="Use abnormal state recovery potions *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="Revive growth / fellow pet" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="Heal mount if HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="Use HP potions if HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="Use HGP potions if hunger *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Back to town" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="* Will also be executed, if the bot is not started." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Bad status" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Health / Mana recovery" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Recovery - Pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="sec." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Level up" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Full pet inventory" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="MP Potions left" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="HP Potions left" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkShardFatigue="Shard fatigue" +RSBot.Protection.Main.Panel.Panel.GroupBox.label19="min." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Equipment durability low" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Dead with delay of " +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Full inventory" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="No arrows / bolts left" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Skill:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="Use Skill" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="Use Universal Pills *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Skill:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="Use skill if HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="Use skill if MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="Use HP potions if HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="Use Vigor Potions if MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="Use MP potions if MP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="Use Vigor Potions if HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Auto summon growth & fellow pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="Use abnormal state recovery potions *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="Revive growth / fellow pet" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="Heal mount if HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="Use HP potions if HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="Use HGP potions if hunger *" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Back to town" +RSBot.Protection.Main.Panel.Panel.label22="* Will also be executed, if the bot is not started." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Bad status" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Health / Mana recovery" +RSBot.Protection.Main.Panel.Panel.groupPet="Recovery - Pet" ReturnToTownInventoryFull="Returning to town: Player inventory full." ReturnToTownPetInventoryFull="Returning to town: Pet inventory full." ReturnToTownNoMana="Returning to town: No mana potions in player inventory." @@ -42,8 +42,8 @@ ReturnToTownAndDC="Returning to town: It's time for return and disconnect from t FatigueBotIsNotRunning="Returning to town: Canceled as the bot is not running." FatigueTimeExceeded="The fatigue time has been exceeded." ResurrectSPointSeconds="Resurrect at the specified point in {0} seconds" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.buttonRun="Run" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupStatPoints="Stat points" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncInt="Increase INT" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncStr="Increase STR" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncBotStopped="Increase even if bot is stopped" +RSBot.Protection.Main.Panel.Panel.GroupBox.buttonRun="Run" +RSBot.Protection.Main.Panel.Panel.groupStatPoints="Stat points" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncInt="Increase INT" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncStr="Increase STR" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncBotStopped="Increase even if bot is stopped" diff --git a/Dependencies/Languages/RSBot.Protection/es_ES.rsl b/Dependencies/Languages/RSBot.Protection/es_ES.rsl index 1215acde..e00a1f97 100644 --- a/Dependencies/Languages/RSBot.Protection/es_ES.rsl +++ b/Dependencies/Languages/RSBot.Protection/es_ES.rsl @@ -1,39 +1,39 @@ DisplayName="Proteccion" RSBot.Protection.Main.groupStatPoints="Puntos de Stats" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncStr= "Aumentar Str" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncInt= "Aumentar Int" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncBotStopped="Habilitado si el bot se detiene." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="seg." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Al Subir de Nivel" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Inventario de la Mascota lleno" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="Sin Pociones de MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="Sin Pociones de HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Durabilidad del equipo baja" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Muerto con retraso" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Inventario lleno" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="Sin arrows / bolts" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Habilidad:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="*Usar Habilidad" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="*Usar Pildoras Universales" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Habilidad:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="*Usar habilidad si el HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="*Usar habilidad si el MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="*Usar Poción de HP si el HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="*Usar Poción de Vigor si el MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="*Usar Poción de MP si el MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="*Usar Poción de Vigor si el HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="*Invocar Mascota de Attack / Fellow" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="*Usa Pociones de estado anormal" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="*Revivir Mascota" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="*Curar tu Mascota si el HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="*Usar Poción de HP si el HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="*Usar Poción HGP con hambre" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkStopBotOnReturnToTown="Detener bot cuando regrese a la ciudad" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Volver a la ciudad cuando:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="**También se ejecutará, si el bot no se inicia." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Estado Envenenado" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Recuperación de Salud/Maná" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Recuperación de Mascota" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncStr= "Aumentar Str" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncInt= "Aumentar Int" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncBotStopped="Habilitado si el bot se detiene." +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="seg." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Al Subir de Nivel" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Inventario de la Mascota lleno" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="Sin Pociones de MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="Sin Pociones de HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Durabilidad del equipo baja" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Muerto con retraso" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Inventario lleno" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="Sin arrows / bolts" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Habilidad:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="*Usar Habilidad" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="*Usar Pildoras Universales" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Habilidad:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="*Usar habilidad si el HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="*Usar habilidad si el MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="*Usar Poción de HP si el HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="*Usar Poción de Vigor si el MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="*Usar Poción de MP si el MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="*Usar Poción de Vigor si el HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="*Invocar Mascota de Attack / Fellow" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="*Usa Pociones de estado anormal" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="*Revivir Mascota" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="*Curar tu Mascota si el HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="*Usar Poción de HP si el HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="*Usar Poción HGP con hambre" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkStopBotOnReturnToTown="Detener bot cuando regrese a la ciudad" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Volver a la ciudad cuando:" +RSBot.Protection.Main.Panel.Panel.label22="**También se ejecutará, si el bot no se inicia." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Estado Envenenado" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Recuperación de Salud/Maná" +RSBot.Protection.Main.Panel.Panel.groupPet="Recuperación de Mascota" ReturnToTownInventoryFull="Regresando a la ciudad: Inventario lleno." ReturnToTownPetInventoryFull="Regresando a la ciudad: Inventario de la Mascota lleno." ReturnToTownNoMana="Regresando a la ciudad: Sin Pociones de MP." diff --git a/Dependencies/Languages/RSBot.Protection/ru_RU.rsl b/Dependencies/Languages/RSBot.Protection/ru_RU.rsl index d870dd16..632115ed 100644 --- a/Dependencies/Languages/RSBot.Protection/ru_RU.rsl +++ b/Dependencies/Languages/RSBot.Protection/ru_RU.rsl @@ -1,36 +1,36 @@ DisplayName="Защита" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="сек." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Уровень повышен" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Полный инвентарь пета" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="Осталось зелий MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="Осталось зелий HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkShardFatigue="Усталость шарды" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label19="мин." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Прочность экипировки низкая" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Умер и прошло" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Полный инвентарь" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="Стрел/болтов не осталось" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Скилл:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="Использовать скилл" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="Использовать универсальные таблетки *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Скилл:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="Использовать скилл, если HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="Использовать скилл, если MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="Использ. зелья HP, если HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="Использовать Vigor, если MP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="Использ. зелья MP, если MP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="Использовать Vigor, если HP" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Автопризыв спутника" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="Использовать зелья лечения аномальных статусов *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="Оживить спутника" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="Лечить маунта, если HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="Использ. зелья HP пета, если HP *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="Использ. зелья HGP, если голод *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Вернуться в город" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="* Выполняется даже если бот не запущен" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Плохой статус" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Восстановление здоровья/маны" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Питомцы" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="сек." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Уровень повышен" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Полный инвентарь пета" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="Осталось зелий MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="Осталось зелий HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkShardFatigue="Усталость шарды" +RSBot.Protection.Main.Panel.Panel.GroupBox.label19="мин." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Прочность экипировки низкая" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Умер и прошло" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Полный инвентарь" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="Стрел/болтов не осталось" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Скилл:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="Использовать скилл" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="Использовать универсальные таблетки *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Скилл:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="Использовать скилл, если HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="Использовать скилл, если MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="Использ. зелья HP, если HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="Использовать Vigor, если MP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="Использ. зелья MP, если MP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="Использовать Vigor, если HP" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Автопризыв спутника" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="Использовать зелья лечения аномальных статусов *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="Оживить спутника" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="Лечить маунта, если HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="Использ. зелья HP пета, если HP *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="Использ. зелья HGP, если голод *" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Вернуться в город" +RSBot.Protection.Main.Panel.Panel.label22="* Выполняется даже если бот не запущен" +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Плохой статус" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Восстановление здоровья/маны" +RSBot.Protection.Main.Panel.Panel.groupPet="Питомцы" ReturnToTownInventoryFull="Возвращение в город: Инвентарь игрока полон." ReturnToTownPetInventoryFull="Возвращение в город: инвентарь пета заполнен." ReturnToTownNoMana="Возвращение в город: в инвентаре игрока нет зелий маны." @@ -42,9 +42,9 @@ ReturnToTownAndDC="Возвращение в город: Пришло время FatigueBotIsNotRunning="Возвращение в город: Отменено, так как бот не запущен." FatigueTimeExceeded="Превышено время усталости." ResurrectSPointSeconds="Воскрешение в указанном месте через {0} секунд" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupStatPoints="Статы" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncStr= "Увеличить Str" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncInt= "Увеличить Int" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkIncBotStopped="Увеличить, даже если бот остановлен" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkStopBotOnReturnToTown="Стоп бот, когда вернулся в город" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.buttonRun="Запустить" +RSBot.Protection.Main.Panel.Panel.groupStatPoints="Статы" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncStr= "Увеличить Str" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncInt= "Увеличить Int" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkIncBotStopped="Увеличить, даже если бот остановлен" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkStopBotOnReturnToTown="Стоп бот, когда вернулся в город" +RSBot.Protection.Main.Panel.Panel.GroupBox.buttonRun="Запустить" diff --git a/Dependencies/Languages/RSBot.Protection/tr_TR.rsl b/Dependencies/Languages/RSBot.Protection/tr_TR.rsl index 52188142..dae28f2b 100644 --- a/Dependencies/Languages/RSBot.Protection/tr_TR.rsl +++ b/Dependencies/Languages/RSBot.Protection/tr_TR.rsl @@ -1,34 +1,34 @@ DisplayName="Koruma" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="sn." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Seviye Atladı" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Full pet inventory" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="MP pot bitince" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="HP pot bitince" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Ekipman dayanıklılığı düşünce" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Ölürsen veya dirilmediyse" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Envanter doluysa" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="Ok/Bolt biterse" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Beceri:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="Beceri Kullan" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="Universal Pill Kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Beceri:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="HP düşerse Beceri kullan" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="MP düşerse Beceri kullan" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="HP pot kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="MP için vigor kullan" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="MP pot kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="HP için vigor kullan" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Otomatik saldırı veya fellow pet çağır" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="Kötü durum pot'u kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="Atak veya fellow pet canlandır" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="Binek HP kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="Pet HP kullan *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="HGP pot kullan*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Dönüş" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="* Will also be executed, if the bot is not started." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Kötü durum" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Sağlık / Mana" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Pet - Koruma" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="sn." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Seviye Atladı" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Full pet inventory" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="MP pot bitince" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="HP pot bitince" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Ekipman dayanıklılığı düşünce" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Ölürsen veya dirilmediyse" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Envanter doluysa" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="Ok/Bolt biterse" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Beceri:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="Beceri Kullan" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="Universal Pill Kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Beceri:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="HP düşerse Beceri kullan" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="MP düşerse Beceri kullan" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="HP pot kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="MP için vigor kullan" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="MP pot kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="HP için vigor kullan" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Otomatik saldırı veya fellow pet çağır" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="Kötü durum pot'u kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="Atak veya fellow pet canlandır" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="Binek HP kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="Pet HP kullan *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="HGP pot kullan*" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Dönüş" +RSBot.Protection.Main.Panel.Panel.label22="* Will also be executed, if the bot is not started." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Kötü durum" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Sağlık / Mana" +RSBot.Protection.Main.Panel.Panel.groupPet="Pet - Koruma" ReturnToTownInventoryFull="Şehre dönülüyor: Oyuncu çantası dolu." ReturnToTownPetInventoryFull="Şehre dönülüyor: Pet çantası dolu." ReturnToTownNoMana="Şehre dönülüyor: Mana pot kalmadı." diff --git a/Dependencies/Languages/RSBot.Protection/vn_VN.rsl b/Dependencies/Languages/RSBot.Protection/vn_VN.rsl index ad288cd9..8e1405cb 100644 --- a/Dependencies/Languages/RSBot.Protection/vn_VN.rsl +++ b/Dependencies/Languages/RSBot.Protection/vn_VN.rsl @@ -1,34 +1,34 @@ DisplayName="Bảo Vệ" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label21="giây." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkLevelUp="Lên cấp độ" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkFullPetInventory="Thùng đồ thú nhặt đồ đã đầy" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoMPPotions="Không còn bình hồi phục năng lượng" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoHPPotions="Không còn bình hồi phục máu" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDurability="Độ bền trang bị thấp" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkDead="Chết với sự chậm chễ" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkInventory="Đầy thùng đồ" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkNoArrows="Hết tên" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label18="Kỹ năng:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseBadStatusSkill="Sử dụng kỹ năng" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseUniversalPills="Sử dụng máu tím *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.label17="Kỹ năng:" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillHP="Sử dụng kỹ năng khi Máu" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseSkillMP="Sử dụng kỹ năng khi Năng Lượng" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHPPotionsPlayer="Sử dụng bình hồi phục Máu khi Máu xuống *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorMP="Sử dụng Máu Tím khi Năng Lượng xuống" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMPPotionsPlayer="Sử dụng bình hồi phục Năng Lượng khi Năng Lượng xuống *" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseVigorHP="Sử dụng Máu Tím khi Máu xuống" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkAutoSummonAttackPet="Tự động triệu hồi thú chiến đấu" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseAbnormalStatePotion="Sử dụng thuốc giải độc*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkReviveAttackPet="Sử dụng hồi sinh thú chiến đấu" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseMountHP="Hồi máu cho Thú Cưỡi khi Máu xuống*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUsePetHP="Hồi máu cho Thú Chiến Đấu khi Máu xuống*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.GroupBox.checkUseHGP="Sử dụng bình HGP khi Thú Chiến Đấu đói*" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBackTown="Trở lại thành" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.label22="*Cũng sẽ thực thi cả khi không Bắt Đầu Bot." -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupBadStatus="Trạng thái xấu" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupHPMP="Hồi Phục Máu/Năng Lượng" -RSBot.Protection.Main.Panel.Panel.FlowLayoutPanel.groupPet="Hồi Phục Thú Nuôi" +RSBot.Protection.Main.Panel.Panel.GroupBox.label21="giây." +RSBot.Protection.Main.Panel.Panel.GroupBox.checkLevelUp="Lên cấp độ" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkFullPetInventory="Thùng đồ thú nhặt đồ đã đầy" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoMPPotions="Không còn bình hồi phục năng lượng" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoHPPotions="Không còn bình hồi phục máu" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDurability="Độ bền trang bị thấp" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkDead="Chết với sự chậm chễ" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkInventory="Đầy thùng đồ" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkNoArrows="Hết tên" +RSBot.Protection.Main.Panel.Panel.GroupBox.label18="Kỹ năng:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseBadStatusSkill="Sử dụng kỹ năng" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseUniversalPills="Sử dụng máu tím *" +RSBot.Protection.Main.Panel.Panel.GroupBox.label17="Kỹ năng:" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillHP="Sử dụng kỹ năng khi Máu" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseSkillMP="Sử dụng kỹ năng khi Năng Lượng" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHPPotionsPlayer="Sử dụng bình hồi phục Máu khi Máu xuống *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorMP="Sử dụng Máu Tím khi Năng Lượng xuống" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMPPotionsPlayer="Sử dụng bình hồi phục Năng Lượng khi Năng Lượng xuống *" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseVigorHP="Sử dụng Máu Tím khi Máu xuống" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkAutoSummonAttackPet="Tự động triệu hồi thú chiến đấu" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseAbnormalStatePotion="Sử dụng thuốc giải độc*" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkReviveAttackPet="Sử dụng hồi sinh thú chiến đấu" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseMountHP="Hồi máu cho Thú Cưỡi khi Máu xuống*" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUsePetHP="Hồi máu cho Thú Chiến Đấu khi Máu xuống*" +RSBot.Protection.Main.Panel.Panel.GroupBox.checkUseHGP="Sử dụng bình HGP khi Thú Chiến Đấu đói*" +RSBot.Protection.Main.Panel.Panel.groupBackTown="Trở lại thành" +RSBot.Protection.Main.Panel.Panel.label22="*Cũng sẽ thực thi cả khi không Bắt Đầu Bot." +RSBot.Protection.Main.Panel.Panel.groupBadStatus="Trạng thái xấu" +RSBot.Protection.Main.Panel.Panel.groupHPMP="Hồi Phục Máu/Năng Lượng" +RSBot.Protection.Main.Panel.Panel.groupPet="Hồi Phục Thú Nuôi" ReturnToTownInventoryFull="Đang trở về thành:Thùng đồ đã đầy." ReturnToTownPetInventoryFull="Đang trở về thành:Kho thú nhặt đồ đã đầy." ReturnToTownNoMana="Đang trở về thành:Đã hết bình hồi phục Năng Lượng." diff --git a/Dependencies/Languages/RSBot.Skills/ru_RU.rsl b/Dependencies/Languages/RSBot.Skills/ru_RU.rsl index 72e9c28f..3a04edd7 100644 --- a/Dependencies/Languages/RSBot.Skills/ru_RU.rsl +++ b/Dependencies/Languages/RSBot.Skills/ru_RU.rsl @@ -12,6 +12,9 @@ RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.groupBox2="Баффы" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.checkAcceptResurrection="Принимать воскрешение" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.label3="Рес скилл" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.checkResurrectParty="Автовоскрешение членов группы" +RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.lblResDelay="Не пытаться воскресить повторно" +RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.lblResDelaySec="сек." +RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.lblResRadius="Радиус воскрешения" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.checkCastBuffsDuringWalkBack="Каст баффов во время скрипта" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.checkCastBuffsBetweenAttacks="Каст баффов между атакующими скиллами" RSBot.Skills.Main.TabControl.TabPage.FlowLayoutPanel.GroupBox.checkCastBuffsInTowns="Каст баффов в городе" diff --git a/Plugins/RSBot.Skills/Views/Main.Designer.cs b/Plugins/RSBot.Skills/Views/Main.Designer.cs index ac8a5790..640757b3 100644 --- a/Plugins/RSBot.Skills/Views/Main.Designer.cs +++ b/Plugins/RSBot.Skills/Views/Main.Designer.cs @@ -50,19 +50,15 @@ private void InitializeComponent() btnRemoveBuffSkill = new SDUI.Controls.Button(); tabControl1 = new SDUI.Controls.TabControl(); tabPage1 = new System.Windows.Forms.TabPage(); + flowLayoutPanel1 = new SDUI.Controls.FlowLayoutPanel(); tabPage2 = new System.Windows.Forms.TabPage(); - groupAdvancedSetup = new SDUI.Controls.GroupBox(); - comboTeleportSkill = new SDUI.Controls.ComboBox(); - checkUseTeleportSkill = new SDUI.Controls.CheckBox(); - checkUseDefaultAttack = new SDUI.Controls.CheckBox(); - checkWarlockMode = new SDUI.Controls.CheckBox(); - grpMasteryUpdate = new SDUI.Controls.GroupBox(); - checkLearnMasteryBotStopped = new SDUI.Controls.CheckBox(); - label4 = new SDUI.Controls.Label(); - numMasteryGap = new SDUI.Controls.NumUpDown(); - comboLearnMastery = new SDUI.Controls.ComboBox(); - checkLearnMastery = new SDUI.Controls.CheckBox(); + flowLayoutPanel2 = new SDUI.Controls.FlowLayoutPanel(); groupBoxAutomatedResurrection = new SDUI.Controls.GroupBox(); + lblResRadius = new SDUI.Controls.Label(); + numResRadius = new SDUI.Controls.NumUpDown(); + lblResDelaySec = new SDUI.Controls.Label(); + lblResDelay = new SDUI.Controls.Label(); + numResDelay = new SDUI.Controls.NumUpDown(); comboResurrectionSkill = new SDUI.Controls.ComboBox(); checkAcceptResurrection = new SDUI.Controls.CheckBox(); label3 = new SDUI.Controls.Label(); @@ -71,6 +67,17 @@ private void InitializeComponent() checkCastBuffsBetweenAttacks = new SDUI.Controls.CheckBox(); checkCastBuffsDuringWalkBack = new SDUI.Controls.CheckBox(); checkCastBuffsInTowns = new SDUI.Controls.CheckBox(); + grpMasteryUpdate = new SDUI.Controls.GroupBox(); + checkLearnMasteryBotStopped = new SDUI.Controls.CheckBox(); + label4 = new SDUI.Controls.Label(); + numMasteryGap = new SDUI.Controls.NumUpDown(); + comboLearnMastery = new SDUI.Controls.ComboBox(); + checkLearnMastery = new SDUI.Controls.CheckBox(); + groupAdvancedSetup = new SDUI.Controls.GroupBox(); + comboTeleportSkill = new SDUI.Controls.ComboBox(); + checkUseTeleportSkill = new SDUI.Controls.CheckBox(); + checkUseDefaultAttack = new SDUI.Controls.CheckBox(); + checkWarlockMode = new SDUI.Controls.CheckBox(); tabControl2 = new SDUI.Controls.TabControl(); tabPage3 = new System.Windows.Forms.TabPage(); listSkills = new SDUI.Controls.ListView(); @@ -92,24 +99,22 @@ private void InitializeComponent() listActiveBuffs = new SDUI.Controls.ListView(); colActiveName = new System.Windows.Forms.ColumnHeader(); colActiveLevel = new System.Windows.Forms.ColumnHeader(); - flowLayoutPanel1 = new SDUI.Controls.FlowLayoutPanel(); - flowLayoutPanel2 = new SDUI.Controls.FlowLayoutPanel(); groupBoxAttackingSkills.SuspendLayout(); groupBox2.SuspendLayout(); tabControl1.SuspendLayout(); tabPage1.SuspendLayout(); + flowLayoutPanel1.SuspendLayout(); tabPage2.SuspendLayout(); - groupAdvancedSetup.SuspendLayout(); - grpMasteryUpdate.SuspendLayout(); + flowLayoutPanel2.SuspendLayout(); groupBoxAutomatedResurrection.SuspendLayout(); groupBoxAdvancedBuff.SuspendLayout(); + grpMasteryUpdate.SuspendLayout(); + groupAdvancedSetup.SuspendLayout(); tabControl2.SuspendLayout(); tabPage3.SuspendLayout(); skillContextMenu.SuspendLayout(); panelPlayerSkills.SuspendLayout(); tabPage4.SuspendLayout(); - flowLayoutPanel1.SuspendLayout(); - flowLayoutPanel2.SuspendLayout(); SuspendLayout(); // // groupBoxAttackingSkills @@ -172,7 +177,7 @@ private void InitializeComponent() listAttackingSkills.FullRowSelect = true; listAttackingSkills.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; listAttackingSkills.Location = new System.Drawing.Point(8, 31); - listAttackingSkills.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + listAttackingSkills.Margin = new System.Windows.Forms.Padding(4); listAttackingSkills.Name = "listAttackingSkills"; listAttackingSkills.Size = new System.Drawing.Size(393, 182); listAttackingSkills.TabIndex = 8; @@ -216,7 +221,7 @@ private void InitializeComponent() comboMonsterType.ItemHeight = 17; comboMonsterType.Items.AddRange(new object[] { "General (Default)", "Champion", "Giant", "General (Party)", "Champion (Party)", "Giant (Party)", "Elite", "Strong", "Unique", "Event" }); comboMonsterType.Location = new System.Drawing.Point(68, 225); - comboMonsterType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + comboMonsterType.Margin = new System.Windows.Forms.Padding(4); comboMonsterType.Name = "comboMonsterType"; comboMonsterType.Radius = 5; comboMonsterType.ShadowDepth = 4F; @@ -229,7 +234,7 @@ private void InitializeComponent() btnMoveAttackSkillDown.Color = System.Drawing.Color.Transparent; btnMoveAttackSkillDown.Font = new System.Drawing.Font("Webdings", 9.75F); btnMoveAttackSkillDown.Location = new System.Drawing.Point(409, 106); - btnMoveAttackSkillDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnMoveAttackSkillDown.Margin = new System.Windows.Forms.Padding(4); btnMoveAttackSkillDown.Name = "btnMoveAttackSkillDown"; btnMoveAttackSkillDown.Radius = 6; btnMoveAttackSkillDown.ShadowDepth = 4F; @@ -244,7 +249,7 @@ private void InitializeComponent() btnMoveAttackSkillUp.Color = System.Drawing.Color.Transparent; btnMoveAttackSkillUp.Font = new System.Drawing.Font("Webdings", 9.75F); btnMoveAttackSkillUp.Location = new System.Drawing.Point(409, 69); - btnMoveAttackSkillUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnMoveAttackSkillUp.Margin = new System.Windows.Forms.Padding(4); btnMoveAttackSkillUp.Name = "btnMoveAttackSkillUp"; btnMoveAttackSkillUp.Radius = 6; btnMoveAttackSkillUp.ShadowDepth = 4F; @@ -259,7 +264,7 @@ private void InitializeComponent() btnRemoveAttackSkill.Color = System.Drawing.Color.Transparent; btnRemoveAttackSkill.Font = new System.Drawing.Font("Webdings", 9.75F); btnRemoveAttackSkill.Location = new System.Drawing.Point(409, 31); - btnRemoveAttackSkill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnRemoveAttackSkill.Margin = new System.Windows.Forms.Padding(4); btnRemoveAttackSkill.Name = "btnRemoveAttackSkill"; btnRemoveAttackSkill.Radius = 6; btnRemoveAttackSkill.ShadowDepth = 4F; @@ -297,7 +302,7 @@ private void InitializeComponent() listBuffs.FullRowSelect = true; listBuffs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; listBuffs.Location = new System.Drawing.Point(8, 34); - listBuffs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + listBuffs.Margin = new System.Windows.Forms.Padding(4); listBuffs.Name = "listBuffs"; listBuffs.Size = new System.Drawing.Size(393, 172); listBuffs.TabIndex = 8; @@ -318,7 +323,7 @@ private void InitializeComponent() btnMoveBuffSkillDown.Color = System.Drawing.Color.Transparent; btnMoveBuffSkillDown.Font = new System.Drawing.Font("Webdings", 9.75F); btnMoveBuffSkillDown.Location = new System.Drawing.Point(409, 109); - btnMoveBuffSkillDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnMoveBuffSkillDown.Margin = new System.Windows.Forms.Padding(4); btnMoveBuffSkillDown.Name = "btnMoveBuffSkillDown"; btnMoveBuffSkillDown.Radius = 6; btnMoveBuffSkillDown.ShadowDepth = 4F; @@ -337,7 +342,7 @@ private void InitializeComponent() comboImbue.IntegralHeight = false; comboImbue.ItemHeight = 17; comboImbue.Location = new System.Drawing.Point(68, 214); - comboImbue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + comboImbue.Margin = new System.Windows.Forms.Padding(4); comboImbue.Name = "comboImbue"; comboImbue.Radius = 5; comboImbue.ShadowDepth = 4F; @@ -350,7 +355,7 @@ private void InitializeComponent() btnMoveBuffSkillUp.Color = System.Drawing.Color.Transparent; btnMoveBuffSkillUp.Font = new System.Drawing.Font("Webdings", 9.75F); btnMoveBuffSkillUp.Location = new System.Drawing.Point(409, 71); - btnMoveBuffSkillUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnMoveBuffSkillUp.Margin = new System.Windows.Forms.Padding(4); btnMoveBuffSkillUp.Name = "btnMoveBuffSkillUp"; btnMoveBuffSkillUp.Radius = 6; btnMoveBuffSkillUp.ShadowDepth = 4F; @@ -383,7 +388,7 @@ private void InitializeComponent() btnRemoveBuffSkill.Color = System.Drawing.Color.Transparent; btnRemoveBuffSkill.Font = new System.Drawing.Font("Webdings", 9.75F); btnRemoveBuffSkill.Location = new System.Drawing.Point(409, 34); - btnRemoveBuffSkill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + btnRemoveBuffSkill.Margin = new System.Windows.Forms.Padding(4); btnRemoveBuffSkill.Name = "btnRemoveBuffSkill"; btnRemoveBuffSkill.Radius = 6; btnRemoveBuffSkill.ShadowDepth = 4F; @@ -400,7 +405,7 @@ private void InitializeComponent() tabControl1.Dock = System.Windows.Forms.DockStyle.Right; tabControl1.ItemSize = new System.Drawing.Size(80, 24); tabControl1.Location = new System.Drawing.Point(452, 0); - tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabControl1.Margin = new System.Windows.Forms.Padding(4); tabControl1.Name = "tabControl1"; tabControl1.Radius = new System.Windows.Forms.Padding(4); tabControl1.SelectedIndex = 0; @@ -418,6 +423,21 @@ private void InitializeComponent() tabPage1.TabIndex = 0; tabPage1.Text = "General setup"; // + // flowLayoutPanel1 + // + flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; + flowLayoutPanel1.Border = new System.Windows.Forms.Padding(0, 0, 0, 0); + flowLayoutPanel1.BorderColor = System.Drawing.Color.Transparent; + flowLayoutPanel1.Controls.Add(groupBoxAttackingSkills); + flowLayoutPanel1.Controls.Add(groupBox2); + flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); + flowLayoutPanel1.Name = "flowLayoutPanel1"; + flowLayoutPanel1.Radius = 10; + flowLayoutPanel1.ShadowDepth = 4F; + flowLayoutPanel1.Size = new System.Drawing.Size(482, 552); + flowLayoutPanel1.TabIndex = 3; + // // tabPage2 // tabPage2.BackColor = System.Drawing.Color.White; @@ -429,196 +449,31 @@ private void InitializeComponent() tabPage2.TabIndex = 1; tabPage2.Text = "Advanced setup"; // - // groupAdvancedSetup - // - groupAdvancedSetup.BackColor = System.Drawing.Color.Transparent; - groupAdvancedSetup.Controls.Add(comboTeleportSkill); - groupAdvancedSetup.Controls.Add(checkUseTeleportSkill); - groupAdvancedSetup.Controls.Add(checkUseDefaultAttack); - groupAdvancedSetup.Controls.Add(checkWarlockMode); - groupAdvancedSetup.Location = new System.Drawing.Point(7, 394); - groupAdvancedSetup.Margin = new System.Windows.Forms.Padding(7, 5, 0, 0); - groupAdvancedSetup.Name = "groupAdvancedSetup"; - groupAdvancedSetup.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); - groupAdvancedSetup.Radius = 10; - groupAdvancedSetup.ShadowDepth = 4; - groupAdvancedSetup.Size = new System.Drawing.Size(465, 154); - groupAdvancedSetup.TabIndex = 14; - groupAdvancedSetup.TabStop = false; - groupAdvancedSetup.Text = "Advanced setup"; - // - // comboTeleportSkill - // - comboTeleportSkill.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - comboTeleportSkill.DropDownHeight = 100; - comboTeleportSkill.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - comboTeleportSkill.FormattingEnabled = true; - comboTeleportSkill.IntegralHeight = false; - comboTeleportSkill.ItemHeight = 16; - comboTeleportSkill.Location = new System.Drawing.Point(176, 110); - comboTeleportSkill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - comboTeleportSkill.Name = "comboTeleportSkill"; - comboTeleportSkill.Radius = 5; - comboTeleportSkill.ShadowDepth = 4F; - comboTeleportSkill.Size = new System.Drawing.Size(259, 22); - comboTeleportSkill.TabIndex = 9; - comboTeleportSkill.SelectedIndexChanged += comboTeleportSkill_SelectedIndexChanged; - // - // checkUseTeleportSkill - // - checkUseTeleportSkill.AutoSize = true; - checkUseTeleportSkill.BackColor = System.Drawing.Color.Transparent; - checkUseTeleportSkill.Depth = 0; - checkUseTeleportSkill.Location = new System.Drawing.Point(19, 105); - checkUseTeleportSkill.Margin = new System.Windows.Forms.Padding(0); - checkUseTeleportSkill.MouseLocation = new System.Drawing.Point(-1, -1); - checkUseTeleportSkill.Name = "checkUseTeleportSkill"; - checkUseTeleportSkill.Ripple = true; - checkUseTeleportSkill.Size = new System.Drawing.Size(148, 30); - checkUseTeleportSkill.TabIndex = 2; - checkUseTeleportSkill.Text = "Use teleport skill:"; - checkUseTeleportSkill.UseVisualStyleBackColor = false; - checkUseTeleportSkill.CheckedChanged += settings_CheckedChanged; - // - // checkUseDefaultAttack - // - checkUseDefaultAttack.AutoSize = true; - checkUseDefaultAttack.BackColor = System.Drawing.Color.Transparent; - checkUseDefaultAttack.Checked = true; - checkUseDefaultAttack.CheckState = System.Windows.Forms.CheckState.Checked; - checkUseDefaultAttack.Depth = 0; - checkUseDefaultAttack.Location = new System.Drawing.Point(19, 72); - checkUseDefaultAttack.Margin = new System.Windows.Forms.Padding(0); - checkUseDefaultAttack.MouseLocation = new System.Drawing.Point(-1, -1); - checkUseDefaultAttack.Name = "checkUseDefaultAttack"; - checkUseDefaultAttack.Ripple = true; - checkUseDefaultAttack.Size = new System.Drawing.Size(295, 30); - checkUseDefaultAttack.TabIndex = 1; - checkUseDefaultAttack.Text = "Use normal attack if no skill is available"; - checkUseDefaultAttack.UseVisualStyleBackColor = false; - checkUseDefaultAttack.CheckedChanged += settings_CheckedChanged; - // - // checkWarlockMode - // - checkWarlockMode.AutoSize = true; - checkWarlockMode.BackColor = System.Drawing.Color.Transparent; - checkWarlockMode.Depth = 0; - checkWarlockMode.Location = new System.Drawing.Point(19, 39); - checkWarlockMode.Margin = new System.Windows.Forms.Padding(0); - checkWarlockMode.MouseLocation = new System.Drawing.Point(-1, -1); - checkWarlockMode.Name = "checkWarlockMode"; - checkWarlockMode.Ripple = true; - checkWarlockMode.Size = new System.Drawing.Size(213, 30); - checkWarlockMode.TabIndex = 0; - checkWarlockMode.Text = "Change target after 2 DoTs"; - checkWarlockMode.UseVisualStyleBackColor = false; - checkWarlockMode.CheckedChanged += settings_CheckedChanged; - // - // grpMasteryUpdate - // - grpMasteryUpdate.BackColor = System.Drawing.Color.Transparent; - grpMasteryUpdate.Controls.Add(checkLearnMasteryBotStopped); - grpMasteryUpdate.Controls.Add(label4); - grpMasteryUpdate.Controls.Add(numMasteryGap); - grpMasteryUpdate.Controls.Add(comboLearnMastery); - grpMasteryUpdate.Controls.Add(checkLearnMastery); - grpMasteryUpdate.Location = new System.Drawing.Point(7, 278); - grpMasteryUpdate.Margin = new System.Windows.Forms.Padding(7, 5, 0, 0); - grpMasteryUpdate.Name = "grpMasteryUpdate"; - grpMasteryUpdate.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); - grpMasteryUpdate.Radius = 10; - grpMasteryUpdate.ShadowDepth = 4; - grpMasteryUpdate.Size = new System.Drawing.Size(465, 111); - grpMasteryUpdate.TabIndex = 13; - grpMasteryUpdate.TabStop = false; - grpMasteryUpdate.Text = "Mastery update"; - // - // checkLearnMasteryBotStopped - // - checkLearnMasteryBotStopped.AutoSize = true; - checkLearnMasteryBotStopped.BackColor = System.Drawing.Color.Transparent; - checkLearnMasteryBotStopped.Depth = 0; - checkLearnMasteryBotStopped.Location = new System.Drawing.Point(19, 70); - checkLearnMasteryBotStopped.Margin = new System.Windows.Forms.Padding(0); - checkLearnMasteryBotStopped.MouseLocation = new System.Drawing.Point(-1, -1); - checkLearnMasteryBotStopped.Name = "checkLearnMasteryBotStopped"; - checkLearnMasteryBotStopped.Ripple = true; - checkLearnMasteryBotStopped.Size = new System.Drawing.Size(237, 30); - checkLearnMasteryBotStopped.TabIndex = 25; - checkLearnMasteryBotStopped.Text = "Increase even if bot is stopped"; - checkLearnMasteryBotStopped.UseVisualStyleBackColor = false; - checkLearnMasteryBotStopped.CheckedChanged += settings_CheckedChanged; - // - // label4 - // - label4.ApplyGradient = false; - label4.AutoSize = true; - label4.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); - label4.Gradient = new System.Drawing.Color[] - { - System.Drawing.Color.Gray, - System.Drawing.Color.Black - }; - label4.GradientAnimation = false; - label4.Location = new System.Drawing.Point(304, 45); - label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(36, 20); - label4.TabIndex = 3; - label4.Text = "Gap"; - // - // numMasteryGap - // - numMasteryGap.BackColor = System.Drawing.Color.Transparent; - numMasteryGap.Font = new System.Drawing.Font("Segoe UI", 9.25F); - numMasteryGap.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); - numMasteryGap.Location = new System.Drawing.Point(346, 40); - numMasteryGap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - numMasteryGap.Maximum = new decimal(new int[] { 9, 0, 0, 0 }); - numMasteryGap.Minimum = new decimal(new int[] { 0, 0, 0, 0 }); - numMasteryGap.MinimumSize = new System.Drawing.Size(100, 31); - numMasteryGap.Name = "numMasteryGap"; - numMasteryGap.Size = new System.Drawing.Size(100, 31); - numMasteryGap.TabIndex = 2; - numMasteryGap.Value = new decimal(new int[] { 0, 0, 0, 0 }); - numMasteryGap.ValueChanged += numSettings_ValueChanged; - // - // comboLearnMastery - // - comboLearnMastery.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - comboLearnMastery.DropDownHeight = 100; - comboLearnMastery.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - comboLearnMastery.FormattingEnabled = true; - comboLearnMastery.IntegralHeight = false; - comboLearnMastery.ItemHeight = 17; - comboLearnMastery.Location = new System.Drawing.Point(114, 41); - comboLearnMastery.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - comboLearnMastery.Name = "comboLearnMastery"; - comboLearnMastery.Radius = 5; - comboLearnMastery.ShadowDepth = 4F; - comboLearnMastery.Size = new System.Drawing.Size(175, 23); - comboLearnMastery.TabIndex = 1; - comboLearnMastery.SelectedIndexChanged += comboLearnMastery_SelectedIndexChanged; - // - // checkLearnMastery + // flowLayoutPanel2 // - checkLearnMastery.AutoSize = true; - checkLearnMastery.BackColor = System.Drawing.Color.Transparent; - checkLearnMastery.Depth = 0; - checkLearnMastery.Location = new System.Drawing.Point(19, 36); - checkLearnMastery.Margin = new System.Windows.Forms.Padding(0); - checkLearnMastery.MouseLocation = new System.Drawing.Point(-1, -1); - checkLearnMastery.Name = "checkLearnMastery"; - checkLearnMastery.Ripple = true; - checkLearnMastery.Size = new System.Drawing.Size(87, 30); - checkLearnMastery.TabIndex = 0; - checkLearnMastery.Text = "Mastery"; - checkLearnMastery.UseVisualStyleBackColor = false; - checkLearnMastery.CheckedChanged += settings_CheckedChanged; + flowLayoutPanel2.BackColor = System.Drawing.Color.Transparent; + flowLayoutPanel2.Border = new System.Windows.Forms.Padding(0, 0, 0, 0); + flowLayoutPanel2.BorderColor = System.Drawing.Color.Transparent; + flowLayoutPanel2.Controls.Add(groupBoxAutomatedResurrection); + flowLayoutPanel2.Controls.Add(groupBoxAdvancedBuff); + flowLayoutPanel2.Controls.Add(grpMasteryUpdate); + flowLayoutPanel2.Controls.Add(groupAdvancedSetup); + flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + flowLayoutPanel2.Location = new System.Drawing.Point(0, 0); + flowLayoutPanel2.Name = "flowLayoutPanel2"; + flowLayoutPanel2.Radius = 10; + flowLayoutPanel2.ShadowDepth = 4F; + flowLayoutPanel2.Size = new System.Drawing.Size(482, 552); + flowLayoutPanel2.TabIndex = 15; // // groupBoxAutomatedResurrection // groupBoxAutomatedResurrection.BackColor = System.Drawing.Color.Transparent; + groupBoxAutomatedResurrection.Controls.Add(lblResRadius); + groupBoxAutomatedResurrection.Controls.Add(numResRadius); + groupBoxAutomatedResurrection.Controls.Add(lblResDelaySec); + groupBoxAutomatedResurrection.Controls.Add(lblResDelay); + groupBoxAutomatedResurrection.Controls.Add(numResDelay); groupBoxAutomatedResurrection.Controls.Add(comboResurrectionSkill); groupBoxAutomatedResurrection.Controls.Add(checkAcceptResurrection); groupBoxAutomatedResurrection.Controls.Add(label3); @@ -629,11 +484,97 @@ private void InitializeComponent() groupBoxAutomatedResurrection.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); groupBoxAutomatedResurrection.Radius = 10; groupBoxAutomatedResurrection.ShadowDepth = 4; - groupBoxAutomatedResurrection.Size = new System.Drawing.Size(465, 149); + groupBoxAutomatedResurrection.Size = new System.Drawing.Size(465, 193); groupBoxAutomatedResurrection.TabIndex = 11; groupBoxAutomatedResurrection.TabStop = false; groupBoxAutomatedResurrection.Text = "Automated resurrection"; // + // lblResRadius + // + lblResRadius.ApplyGradient = false; + lblResRadius.AutoSize = true; + lblResRadius.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + lblResRadius.Gradient = new System.Drawing.Color[] + { + System.Drawing.Color.Gray, + System.Drawing.Color.Black + }; + lblResRadius.GradientAnimation = false; + lblResRadius.Location = new System.Drawing.Point(25, 160); + lblResRadius.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblResRadius.Name = "lblResRadius"; + lblResRadius.Size = new System.Drawing.Size(139, 20); + lblResRadius.TabIndex = 14; + lblResRadius.Text = "Resurrection radius "; + // + // numResRadius + // + numResRadius.BackColor = System.Drawing.Color.Transparent; + numResRadius.Font = new System.Drawing.Font("Segoe UI", 9.25F); + numResRadius.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + numResRadius.Location = new System.Drawing.Point(304, 155); + numResRadius.Margin = new System.Windows.Forms.Padding(4); + numResRadius.Maximum = new decimal(new int[] { 100, 0, 0, 0 }); + numResRadius.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numResRadius.MinimumSize = new System.Drawing.Size(100, 31); + numResRadius.Name = "numResRadius"; + numResRadius.Size = new System.Drawing.Size(100, 31); + numResRadius.TabIndex = 13; + numResRadius.Value = new decimal(new int[] { 100, 0, 0, 0 }); + numResRadius.ValueChanged += numSettings_ValueChanged; + // + // lblResDelaySec + // + lblResDelaySec.ApplyGradient = false; + lblResDelaySec.AutoSize = true; + lblResDelaySec.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + lblResDelaySec.Gradient = new System.Drawing.Color[] + { + System.Drawing.Color.Gray, + System.Drawing.Color.Black + }; + lblResDelaySec.GradientAnimation = false; + lblResDelaySec.Location = new System.Drawing.Point(412, 127); + lblResDelaySec.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblResDelaySec.Name = "lblResDelaySec"; + lblResDelaySec.Size = new System.Drawing.Size(30, 20); + lblResDelaySec.TabIndex = 12; + lblResDelaySec.Text = "sec"; + // + // lblResDelay + // + lblResDelay.ApplyGradient = false; + lblResDelay.AutoSize = true; + lblResDelay.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + lblResDelay.Gradient = new System.Drawing.Color[] + { + System.Drawing.Color.Gray, + System.Drawing.Color.Black + }; + lblResDelay.GradientAnimation = false; + lblResDelay.Location = new System.Drawing.Point(25, 127); + lblResDelay.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblResDelay.Name = "lblResDelay"; + lblResDelay.Size = new System.Drawing.Size(231, 20); + lblResDelay.TabIndex = 11; + lblResDelay.Text = "Don't resurrect char again within "; + // + // numResDelay + // + numResDelay.BackColor = System.Drawing.Color.Transparent; + numResDelay.Font = new System.Drawing.Font("Segoe UI", 9.25F); + numResDelay.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + numResDelay.Location = new System.Drawing.Point(304, 121); + numResDelay.Margin = new System.Windows.Forms.Padding(4); + numResDelay.Maximum = new decimal(new int[] { 300, 0, 0, 0 }); + numResDelay.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numResDelay.MinimumSize = new System.Drawing.Size(100, 31); + numResDelay.Name = "numResDelay"; + numResDelay.Size = new System.Drawing.Size(100, 31); + numResDelay.TabIndex = 10; + numResDelay.Value = new decimal(new int[] { 120, 0, 0, 0 }); + numResDelay.ValueChanged += numSettings_ValueChanged; + // // comboResurrectionSkill // comboResurrectionSkill.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; @@ -642,8 +583,8 @@ private void InitializeComponent() comboResurrectionSkill.FormattingEnabled = true; comboResurrectionSkill.IntegralHeight = false; comboResurrectionSkill.ItemHeight = 17; - comboResurrectionSkill.Location = new System.Drawing.Point(108, 40); - comboResurrectionSkill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + comboResurrectionSkill.Location = new System.Drawing.Point(114, 36); + comboResurrectionSkill.Margin = new System.Windows.Forms.Padding(4); comboResurrectionSkill.Name = "comboResurrectionSkill"; comboResurrectionSkill.Radius = 5; comboResurrectionSkill.ShadowDepth = 4F; @@ -658,7 +599,7 @@ private void InitializeComponent() checkAcceptResurrection.Checked = true; checkAcceptResurrection.CheckState = System.Windows.Forms.CheckState.Checked; checkAcceptResurrection.Depth = 0; - checkAcceptResurrection.Location = new System.Drawing.Point(108, 105); + checkAcceptResurrection.Location = new System.Drawing.Point(19, 63); checkAcceptResurrection.Margin = new System.Windows.Forms.Padding(0); checkAcceptResurrection.MouseLocation = new System.Drawing.Point(-1, -1); checkAcceptResurrection.Name = "checkAcceptResurrection"; @@ -680,7 +621,7 @@ private void InitializeComponent() System.Drawing.Color.Black }; label3.GradientAnimation = false; - label3.Location = new System.Drawing.Point(32, 44); + label3.Location = new System.Drawing.Point(38, 40); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(67, 20); @@ -692,7 +633,7 @@ private void InitializeComponent() checkResurrectParty.AutoSize = true; checkResurrectParty.BackColor = System.Drawing.Color.Transparent; checkResurrectParty.Depth = 0; - checkResurrectParty.Location = new System.Drawing.Point(108, 74); + checkResurrectParty.Location = new System.Drawing.Point(19, 90); checkResurrectParty.Margin = new System.Windows.Forms.Padding(0); checkResurrectParty.MouseLocation = new System.Drawing.Point(-1, -1); checkResurrectParty.Name = "checkResurrectParty"; @@ -709,7 +650,7 @@ private void InitializeComponent() groupBoxAdvancedBuff.Controls.Add(checkCastBuffsBetweenAttacks); groupBoxAdvancedBuff.Controls.Add(checkCastBuffsDuringWalkBack); groupBoxAdvancedBuff.Controls.Add(checkCastBuffsInTowns); - groupBoxAdvancedBuff.Location = new System.Drawing.Point(7, 159); + groupBoxAdvancedBuff.Location = new System.Drawing.Point(7, 203); groupBoxAdvancedBuff.Margin = new System.Windows.Forms.Padding(7, 5, 0, 0); groupBoxAdvancedBuff.Name = "groupBoxAdvancedBuff"; groupBoxAdvancedBuff.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); @@ -725,7 +666,7 @@ private void InitializeComponent() checkCastBuffsBetweenAttacks.AutoSize = true; checkCastBuffsBetweenAttacks.BackColor = System.Drawing.Color.Transparent; checkCastBuffsBetweenAttacks.Depth = 0; - checkCastBuffsBetweenAttacks.Location = new System.Drawing.Point(19, 86); + checkCastBuffsBetweenAttacks.Location = new System.Drawing.Point(19, 80); checkCastBuffsBetweenAttacks.Margin = new System.Windows.Forms.Padding(0); checkCastBuffsBetweenAttacks.MouseLocation = new System.Drawing.Point(-1, -1); checkCastBuffsBetweenAttacks.Name = "checkCastBuffsBetweenAttacks"; @@ -743,7 +684,7 @@ private void InitializeComponent() checkCastBuffsDuringWalkBack.Checked = true; checkCastBuffsDuringWalkBack.CheckState = System.Windows.Forms.CheckState.Checked; checkCastBuffsDuringWalkBack.Depth = 0; - checkCastBuffsDuringWalkBack.Location = new System.Drawing.Point(19, 60); + checkCastBuffsDuringWalkBack.Location = new System.Drawing.Point(19, 55); checkCastBuffsDuringWalkBack.Margin = new System.Windows.Forms.Padding(0); checkCastBuffsDuringWalkBack.MouseLocation = new System.Drawing.Point(-1, -1); checkCastBuffsDuringWalkBack.Name = "checkCastBuffsDuringWalkBack"; @@ -759,7 +700,7 @@ private void InitializeComponent() checkCastBuffsInTowns.AutoSize = true; checkCastBuffsInTowns.BackColor = System.Drawing.Color.Transparent; checkCastBuffsInTowns.Depth = 0; - checkCastBuffsInTowns.Location = new System.Drawing.Point(19, 32); + checkCastBuffsInTowns.Location = new System.Drawing.Point(19, 30); checkCastBuffsInTowns.Margin = new System.Windows.Forms.Padding(0); checkCastBuffsInTowns.MouseLocation = new System.Drawing.Point(-1, -1); checkCastBuffsInTowns.Name = "checkCastBuffsInTowns"; @@ -770,6 +711,193 @@ private void InitializeComponent() checkCastBuffsInTowns.UseVisualStyleBackColor = false; checkCastBuffsInTowns.CheckedChanged += settings_CheckedChanged; // + // grpMasteryUpdate + // + grpMasteryUpdate.BackColor = System.Drawing.Color.Transparent; + grpMasteryUpdate.Controls.Add(checkLearnMasteryBotStopped); + grpMasteryUpdate.Controls.Add(label4); + grpMasteryUpdate.Controls.Add(numMasteryGap); + grpMasteryUpdate.Controls.Add(comboLearnMastery); + grpMasteryUpdate.Controls.Add(checkLearnMastery); + grpMasteryUpdate.Location = new System.Drawing.Point(7, 322); + grpMasteryUpdate.Margin = new System.Windows.Forms.Padding(7, 5, 0, 0); + grpMasteryUpdate.Name = "grpMasteryUpdate"; + grpMasteryUpdate.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); + grpMasteryUpdate.Radius = 10; + grpMasteryUpdate.ShadowDepth = 4; + grpMasteryUpdate.Size = new System.Drawing.Size(465, 95); + grpMasteryUpdate.TabIndex = 13; + grpMasteryUpdate.TabStop = false; + grpMasteryUpdate.Text = "Mastery update"; + // + // checkLearnMasteryBotStopped + // + checkLearnMasteryBotStopped.AutoSize = true; + checkLearnMasteryBotStopped.BackColor = System.Drawing.Color.Transparent; + checkLearnMasteryBotStopped.Depth = 0; + checkLearnMasteryBotStopped.Location = new System.Drawing.Point(19, 62); + checkLearnMasteryBotStopped.Margin = new System.Windows.Forms.Padding(0); + checkLearnMasteryBotStopped.MouseLocation = new System.Drawing.Point(-1, -1); + checkLearnMasteryBotStopped.Name = "checkLearnMasteryBotStopped"; + checkLearnMasteryBotStopped.Ripple = true; + checkLearnMasteryBotStopped.Size = new System.Drawing.Size(237, 30); + checkLearnMasteryBotStopped.TabIndex = 25; + checkLearnMasteryBotStopped.Text = "Increase even if bot is stopped"; + checkLearnMasteryBotStopped.UseVisualStyleBackColor = false; + checkLearnMasteryBotStopped.CheckedChanged += settings_CheckedChanged; + // + // label4 + // + label4.ApplyGradient = false; + label4.AutoSize = true; + label4.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + label4.Gradient = new System.Drawing.Color[] + { + System.Drawing.Color.Gray, + System.Drawing.Color.Black + }; + label4.GradientAnimation = false; + label4.Location = new System.Drawing.Point(304, 41); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(36, 20); + label4.TabIndex = 3; + label4.Text = "Gap"; + // + // numMasteryGap + // + numMasteryGap.BackColor = System.Drawing.Color.Transparent; + numMasteryGap.Font = new System.Drawing.Font("Segoe UI", 9.25F); + numMasteryGap.ForeColor = System.Drawing.Color.FromArgb(0, 0, 0); + numMasteryGap.Location = new System.Drawing.Point(346, 36); + numMasteryGap.Margin = new System.Windows.Forms.Padding(4); + numMasteryGap.Maximum = new decimal(new int[] { 9, 0, 0, 0 }); + numMasteryGap.Minimum = new decimal(new int[] { 0, 0, 0, 0 }); + numMasteryGap.MinimumSize = new System.Drawing.Size(100, 31); + numMasteryGap.Name = "numMasteryGap"; + numMasteryGap.Size = new System.Drawing.Size(100, 31); + numMasteryGap.TabIndex = 2; + numMasteryGap.Value = new decimal(new int[] { 0, 0, 0, 0 }); + numMasteryGap.ValueChanged += numSettings_ValueChanged; + // + // comboLearnMastery + // + comboLearnMastery.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + comboLearnMastery.DropDownHeight = 100; + comboLearnMastery.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboLearnMastery.FormattingEnabled = true; + comboLearnMastery.IntegralHeight = false; + comboLearnMastery.ItemHeight = 17; + comboLearnMastery.Location = new System.Drawing.Point(114, 37); + comboLearnMastery.Margin = new System.Windows.Forms.Padding(4); + comboLearnMastery.Name = "comboLearnMastery"; + comboLearnMastery.Radius = 5; + comboLearnMastery.ShadowDepth = 4F; + comboLearnMastery.Size = new System.Drawing.Size(175, 23); + comboLearnMastery.TabIndex = 1; + comboLearnMastery.SelectedIndexChanged += comboLearnMastery_SelectedIndexChanged; + // + // checkLearnMastery + // + checkLearnMastery.AutoSize = true; + checkLearnMastery.BackColor = System.Drawing.Color.Transparent; + checkLearnMastery.Depth = 0; + checkLearnMastery.Location = new System.Drawing.Point(19, 32); + checkLearnMastery.Margin = new System.Windows.Forms.Padding(0); + checkLearnMastery.MouseLocation = new System.Drawing.Point(-1, -1); + checkLearnMastery.Name = "checkLearnMastery"; + checkLearnMastery.Ripple = true; + checkLearnMastery.Size = new System.Drawing.Size(87, 30); + checkLearnMastery.TabIndex = 0; + checkLearnMastery.Text = "Mastery"; + checkLearnMastery.UseVisualStyleBackColor = false; + checkLearnMastery.CheckedChanged += settings_CheckedChanged; + // + // groupAdvancedSetup + // + groupAdvancedSetup.BackColor = System.Drawing.Color.Transparent; + groupAdvancedSetup.Controls.Add(comboTeleportSkill); + groupAdvancedSetup.Controls.Add(checkUseTeleportSkill); + groupAdvancedSetup.Controls.Add(checkUseDefaultAttack); + groupAdvancedSetup.Controls.Add(checkWarlockMode); + groupAdvancedSetup.Location = new System.Drawing.Point(7, 422); + groupAdvancedSetup.Margin = new System.Windows.Forms.Padding(7, 5, 0, 0); + groupAdvancedSetup.Name = "groupAdvancedSetup"; + groupAdvancedSetup.Padding = new System.Windows.Forms.Padding(4, 12, 4, 4); + groupAdvancedSetup.Radius = 10; + groupAdvancedSetup.ShadowDepth = 4; + groupAdvancedSetup.Size = new System.Drawing.Size(465, 130); + groupAdvancedSetup.TabIndex = 14; + groupAdvancedSetup.TabStop = false; + groupAdvancedSetup.Text = "Advanced setup"; + // + // comboTeleportSkill + // + comboTeleportSkill.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + comboTeleportSkill.DropDownHeight = 100; + comboTeleportSkill.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + comboTeleportSkill.FormattingEnabled = true; + comboTeleportSkill.IntegralHeight = false; + comboTeleportSkill.ItemHeight = 16; + comboTeleportSkill.Location = new System.Drawing.Point(176, 97); + comboTeleportSkill.Margin = new System.Windows.Forms.Padding(4); + comboTeleportSkill.Name = "comboTeleportSkill"; + comboTeleportSkill.Radius = 5; + comboTeleportSkill.ShadowDepth = 4F; + comboTeleportSkill.Size = new System.Drawing.Size(259, 22); + comboTeleportSkill.TabIndex = 9; + comboTeleportSkill.SelectedIndexChanged += comboTeleportSkill_SelectedIndexChanged; + // + // checkUseTeleportSkill + // + checkUseTeleportSkill.AutoSize = true; + checkUseTeleportSkill.BackColor = System.Drawing.Color.Transparent; + checkUseTeleportSkill.Depth = 0; + checkUseTeleportSkill.Location = new System.Drawing.Point(19, 92); + checkUseTeleportSkill.Margin = new System.Windows.Forms.Padding(0); + checkUseTeleportSkill.MouseLocation = new System.Drawing.Point(-1, -1); + checkUseTeleportSkill.Name = "checkUseTeleportSkill"; + checkUseTeleportSkill.Ripple = true; + checkUseTeleportSkill.Size = new System.Drawing.Size(148, 30); + checkUseTeleportSkill.TabIndex = 2; + checkUseTeleportSkill.Text = "Use teleport skill:"; + checkUseTeleportSkill.UseVisualStyleBackColor = false; + checkUseTeleportSkill.CheckedChanged += settings_CheckedChanged; + // + // checkUseDefaultAttack + // + checkUseDefaultAttack.AutoSize = true; + checkUseDefaultAttack.BackColor = System.Drawing.Color.Transparent; + checkUseDefaultAttack.Checked = true; + checkUseDefaultAttack.CheckState = System.Windows.Forms.CheckState.Checked; + checkUseDefaultAttack.Depth = 0; + checkUseDefaultAttack.Location = new System.Drawing.Point(19, 62); + checkUseDefaultAttack.Margin = new System.Windows.Forms.Padding(0); + checkUseDefaultAttack.MouseLocation = new System.Drawing.Point(-1, -1); + checkUseDefaultAttack.Name = "checkUseDefaultAttack"; + checkUseDefaultAttack.Ripple = true; + checkUseDefaultAttack.Size = new System.Drawing.Size(295, 30); + checkUseDefaultAttack.TabIndex = 1; + checkUseDefaultAttack.Text = "Use normal attack if no skill is available"; + checkUseDefaultAttack.UseVisualStyleBackColor = false; + checkUseDefaultAttack.CheckedChanged += settings_CheckedChanged; + // + // checkWarlockMode + // + checkWarlockMode.AutoSize = true; + checkWarlockMode.BackColor = System.Drawing.Color.Transparent; + checkWarlockMode.Depth = 0; + checkWarlockMode.Location = new System.Drawing.Point(19, 32); + checkWarlockMode.Margin = new System.Windows.Forms.Padding(0); + checkWarlockMode.MouseLocation = new System.Drawing.Point(-1, -1); + checkWarlockMode.Name = "checkWarlockMode"; + checkWarlockMode.Ripple = true; + checkWarlockMode.Size = new System.Drawing.Size(213, 30); + checkWarlockMode.TabIndex = 0; + checkWarlockMode.Text = "Change target after 2 DoTs"; + checkWarlockMode.UseVisualStyleBackColor = false; + checkWarlockMode.CheckedChanged += settings_CheckedChanged; + // // tabControl2 // tabControl2.Controls.Add(tabPage3); @@ -777,7 +905,7 @@ private void InitializeComponent() tabControl2.Dock = System.Windows.Forms.DockStyle.Fill; tabControl2.ItemSize = new System.Drawing.Size(80, 24); tabControl2.Location = new System.Drawing.Point(0, 0); - tabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabControl2.Margin = new System.Windows.Forms.Padding(4); tabControl2.Name = "tabControl2"; tabControl2.Radius = new System.Windows.Forms.Padding(4); tabControl2.SelectedIndex = 0; @@ -790,9 +918,9 @@ private void InitializeComponent() tabPage3.Controls.Add(listSkills); tabPage3.Controls.Add(panelPlayerSkills); tabPage3.Location = new System.Drawing.Point(4, 28); - tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabPage3.Margin = new System.Windows.Forms.Padding(4); tabPage3.Name = "tabPage3"; - tabPage3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabPage3.Padding = new System.Windows.Forms.Padding(4); tabPage3.Size = new System.Drawing.Size(444, 552); tabPage3.TabIndex = 0; tabPage3.Text = "Player skills"; @@ -808,7 +936,7 @@ private void InitializeComponent() listSkills.FullRowSelect = true; listSkills.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; listSkills.Location = new System.Drawing.Point(4, 4); - listSkills.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + listSkills.Margin = new System.Windows.Forms.Padding(4); listSkills.Name = "listSkills"; listSkills.Size = new System.Drawing.Size(436, 498); listSkills.TabIndex = 5; @@ -887,7 +1015,7 @@ private void InitializeComponent() panelPlayerSkills.Controls.Add(checkShowBuffs); panelPlayerSkills.Dock = System.Windows.Forms.DockStyle.Bottom; panelPlayerSkills.Location = new System.Drawing.Point(4, 502); - panelPlayerSkills.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + panelPlayerSkills.Margin = new System.Windows.Forms.Padding(4); panelPlayerSkills.Name = "panelPlayerSkills"; panelPlayerSkills.Radius = 0; panelPlayerSkills.ShadowDepth = 4F; @@ -901,7 +1029,7 @@ private void InitializeComponent() panel2.BorderColor = System.Drawing.Color.Transparent; panel2.Dock = System.Windows.Forms.DockStyle.Top; panel2.Location = new System.Drawing.Point(0, 0); - panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + panel2.Margin = new System.Windows.Forms.Padding(4); panel2.Name = "panel2"; panel2.Radius = 1; panel2.ShadowDepth = 4F; @@ -965,9 +1093,9 @@ private void InitializeComponent() tabPage4.BackColor = System.Drawing.Color.White; tabPage4.Controls.Add(listActiveBuffs); tabPage4.Location = new System.Drawing.Point(4, 28); - tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabPage4.Margin = new System.Windows.Forms.Padding(4); tabPage4.Name = "tabPage4"; - tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + tabPage4.Padding = new System.Windows.Forms.Padding(4); tabPage4.Size = new System.Drawing.Size(444, 552); tabPage4.TabIndex = 1; tabPage4.Text = "Active buffs"; @@ -982,7 +1110,7 @@ private void InitializeComponent() listActiveBuffs.FullRowSelect = true; listActiveBuffs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; listActiveBuffs.Location = new System.Drawing.Point(4, 4); - listActiveBuffs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + listActiveBuffs.Margin = new System.Windows.Forms.Padding(4); listActiveBuffs.Name = "listActiveBuffs"; listActiveBuffs.Size = new System.Drawing.Size(436, 544); listActiveBuffs.TabIndex = 6; @@ -1000,38 +1128,6 @@ private void InitializeComponent() colActiveLevel.Text = ""; colActiveLevel.Width = 69; // - // flowLayoutPanel1 - // - flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; - flowLayoutPanel1.Border = new System.Windows.Forms.Padding(0, 0, 0, 0); - flowLayoutPanel1.BorderColor = System.Drawing.Color.Transparent; - flowLayoutPanel1.Controls.Add(groupBoxAttackingSkills); - flowLayoutPanel1.Controls.Add(groupBox2); - flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); - flowLayoutPanel1.Name = "flowLayoutPanel1"; - flowLayoutPanel1.Radius = 10; - flowLayoutPanel1.ShadowDepth = 4F; - flowLayoutPanel1.Size = new System.Drawing.Size(482, 552); - flowLayoutPanel1.TabIndex = 3; - // - // flowLayoutPanel2 - // - flowLayoutPanel2.BackColor = System.Drawing.Color.Transparent; - flowLayoutPanel2.Border = new System.Windows.Forms.Padding(0, 0, 0, 0); - flowLayoutPanel2.BorderColor = System.Drawing.Color.Transparent; - flowLayoutPanel2.Controls.Add(groupBoxAutomatedResurrection); - flowLayoutPanel2.Controls.Add(groupBoxAdvancedBuff); - flowLayoutPanel2.Controls.Add(grpMasteryUpdate); - flowLayoutPanel2.Controls.Add(groupAdvancedSetup); - flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - flowLayoutPanel2.Location = new System.Drawing.Point(0, 0); - flowLayoutPanel2.Name = "flowLayoutPanel2"; - flowLayoutPanel2.Radius = 10; - flowLayoutPanel2.ShadowDepth = 4F; - flowLayoutPanel2.Size = new System.Drawing.Size(482, 552); - flowLayoutPanel2.TabIndex = 15; - // // Main // AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); @@ -1039,7 +1135,7 @@ private void InitializeComponent() Controls.Add(tabControl2); Controls.Add(tabControl1); Font = new System.Drawing.Font("Segoe UI", 9F); - Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + Margin = new System.Windows.Forms.Padding(4); Name = "Main"; Size = new System.Drawing.Size(942, 584); Load += Main_Load; @@ -1049,23 +1145,23 @@ private void InitializeComponent() groupBox2.PerformLayout(); tabControl1.ResumeLayout(false); tabPage1.ResumeLayout(false); + flowLayoutPanel1.ResumeLayout(false); tabPage2.ResumeLayout(false); - groupAdvancedSetup.ResumeLayout(false); - groupAdvancedSetup.PerformLayout(); - grpMasteryUpdate.ResumeLayout(false); - grpMasteryUpdate.PerformLayout(); + flowLayoutPanel2.ResumeLayout(false); groupBoxAutomatedResurrection.ResumeLayout(false); groupBoxAutomatedResurrection.PerformLayout(); groupBoxAdvancedBuff.ResumeLayout(false); groupBoxAdvancedBuff.PerformLayout(); + grpMasteryUpdate.ResumeLayout(false); + grpMasteryUpdate.PerformLayout(); + groupAdvancedSetup.ResumeLayout(false); + groupAdvancedSetup.PerformLayout(); tabControl2.ResumeLayout(false); tabPage3.ResumeLayout(false); skillContextMenu.ResumeLayout(false); panelPlayerSkills.ResumeLayout(false); panelPlayerSkills.PerformLayout(); tabPage4.ResumeLayout(false); - flowLayoutPanel1.ResumeLayout(false); - flowLayoutPanel2.ResumeLayout(false); ResumeLayout(false); } @@ -1136,5 +1232,10 @@ private void InitializeComponent() private SDUI.Controls.CheckBox checkCastBuffsBetweenAttacks; private SDUI.Controls.FlowLayoutPanel flowLayoutPanel1; private SDUI.Controls.FlowLayoutPanel flowLayoutPanel2; + private SDUI.Controls.Label lblResDelay; + private SDUI.Controls.NumUpDown numResDelay; + private SDUI.Controls.Label lblResDelaySec; + private SDUI.Controls.Label lblResRadius; + private SDUI.Controls.NumUpDown numResRadius; } } diff --git a/Plugins/RSBot.Skills/Views/Main.cs b/Plugins/RSBot.Skills/Views/Main.cs index 14e6a52f..d1312672 100644 --- a/Plugins/RSBot.Skills/Views/Main.cs +++ b/Plugins/RSBot.Skills/Views/Main.cs @@ -151,6 +151,9 @@ private void LoadSettings() foreach (var num in grpMasteryUpdate.Controls.OfType()) num.Value = PlayerConfig.Get(key + num.Name, num.Value); + foreach (var num in groupBoxAutomatedResurrection.Controls.OfType()) + num.Value = PlayerConfig.Get(key + num.Name, num.Value); + foreach (var checkbox in groupAdvancedSetup.Controls.OfType()) checkbox.Checked = PlayerConfig.Get(key + checkbox.Name, checkbox.Checked); } @@ -179,6 +182,9 @@ private void ApplySettings() foreach (var num in grpMasteryUpdate.Controls.OfType()) PlayerConfig.Set(key + num.Name, num.Value); + foreach (var num in groupBoxAutomatedResurrection.Controls.OfType()) + PlayerConfig.Set(key + num.Name, num.Value); + foreach (var checkbox in groupAdvancedSetup.Controls.OfType()) PlayerConfig.Set(key + checkbox.Name, checkbox.Checked); } diff --git a/Plugins/RSBot.Skills/Views/Main.resx b/Plugins/RSBot.Skills/Views/Main.resx index 83199b80..fedaa2d7 100644 --- a/Plugins/RSBot.Skills/Views/Main.resx +++ b/Plugins/RSBot.Skills/Views/Main.resx @@ -121,6 +121,6 @@ 13, 15 - 71 + 60 \ No newline at end of file