Skip to content

Improvements for attack, resurrect, protection modules #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SDClowen merged 3 commits into from
Jan 24, 2026
Merged

Improvements for attack, resurrect, protection modules #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fee4591
Improvements for attack and resurrect modules
kis1yi Jan 23, 2026
444add3
Fixed translation for Protection tab
kis1yi Jan 23, 2026
56db158
Fixed saving new configs
kis1yi Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Botbases/RSBot.Training/Bundle/Attack/AttackBundle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void Invoke()
return;
}

var dontFollowMobs = PlayerConfig.Get<bool>("RSBot.Training.checkBoxDontFollowMobs");
bool dontFollowMobs = PlayerConfig.Get<bool>("RSBot.Training.checkBoxDontFollowMobs");
if (dontFollowMobs && !Kernel.Bot.Botbase.Area.IsInSight(Game.SelectedEntity))
{
Log.Debug("Deselecting entity because it moved far away from training area!");
Expand All @@ -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;
}

Expand Down
7 changes: 5 additions & 2 deletions Botbases/RSBot.Training/Bundle/Resurrect/ResurrectBundle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,22 @@ public void Invoke()
if (!PlayerConfig.Get<bool>("RSBot.Skills.checkResurrectParty"))
return;

ushort resDelay = PlayerConfig.Get<ushort?>("RSBot.Skills.numResDelay") ?? 120;
ushort resRadius = PlayerConfig.Get<ushort?>("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;

if (
(
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)
Expand Down
6 changes: 3 additions & 3 deletions Botbases/RSBot.Training/Bundle/Target/TargetBundle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
60 changes: 30 additions & 30 deletions Dependencies/Languages/RSBot.Protection/ar_AR.rsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="العودة إلى المدينة: لا توجد جرعات مانا في مخزون اللاعبين."
Expand Down
68 changes: 34 additions & 34 deletions Dependencies/Languages/RSBot.Protection/de_DE.rsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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"
Loading
Loading