Skip to content

Commit 4098f25

Browse files
TorwentTorwent
committed
feat: antiban
- The core of antiban is now completed. - Added every antiban tasks from SRL-T and WaspLib that would compile already. - Added biometrics, the successor of BioHash - changed the file importing to simpler version inspired in Olly's osrs lib
1 parent 549035f commit 4098f25

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1402
-318
lines changed

‎osrs.simba‎

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,91 @@
1-
{$DEFINE SRLT_OSRS}
2-
{$IFNDEF SRLT_UTILS}
3-
{$I utils.simba}
4-
{$ENDIF}
5-
1+
{$include_once utils.simba}
62

7-
// The following allows individual include files to compile on their own with just having {$I SRLT/osr.simba}
3+
// The following allows individual include files to compile on their own with just having {$include_once SRLT/osr.simba}
84
// Summary: It includes this file until the current file is reached.
5+
{$IFNDEF SRLT_ACCOUNT_INCLUDED} {$include_once osrs/account.simba}
6+
{$IFNDEF SRLT_BIOMETRICS_INCLUDED} {$include_once osrs/antiban/biometrics.simba}
97

10-
{$IFNDEF SRLT_OCR_INCLUDED} {$I osrs/ocr/ocr.simba}
11-
{$IFNDEF SRLT_REMOTEINPUT_INCLUDED} {$I osrs/remoteinput.simba}
12-
{$IFNDEF SRLT_RSCLIENT_INCLUDED} {$I osrs/rsclient.simba}
8+
{$IFNDEF SRLT_OCR_INCLUDED} {$include_once osrs/ocr/ocr.simba}
9+
{$IFNDEF SRLT_REMOTEINPUT_INCLUDED} {$include_once osrs/remoteinput.simba}
10+
{$IFNDEF SRLT_RSCLIENT_INCLUDED} {$include_once osrs/rsclient.simba}
1311

14-
{$IFNDEF SRLT_ITEMFINDER_INCLUDED} {$I osrs/finders/items/itemfinder.simba}
15-
{$IFNDEF SRLT_SPELLFINDER_INCLUDED} {$I osrs/finders/spells/spellfinder.simba}
16-
{$IFNDEF SRLT_PRAYERFINDER_INCLUDED} {$I osrs/finders/prayer/prayerfinder.simba}
12+
{$IFNDEF SRLT_ITEMFINDER_INCLUDED} {$include_once osrs/finders/items/itemfinder.simba}
13+
{$IFNDEF SRLT_SPELLFINDER_INCLUDED} {$include_once osrs/finders/spells/spellfinder.simba}
14+
{$IFNDEF SRLT_PRAYERFINDER_INCLUDED} {$include_once osrs/finders/prayer/prayerfinder.simba}
1715

18-
{$IFNDEF SRLT_INTERFACE_CORE_INCLUDED} {$I osrs/interfaces/interface.simba}
19-
{$IFNDEF SRLT_ACCOUNT_INCLUDED} {$I osrs/account.simba}
20-
{$IFNDEF SRLT_LOGIN_INCLUDED} {$I osrs/interfaces/login.simba}
21-
{$IFNDEF SRLT_INTERFACE_CONTROLS_INCLUDED} {$I osrs/interfaces/interfacecontrols.simba}
22-
{$IFNDEF SRLT_CHOOSEOPTION_INCLUDED} {$I osrs/interfaces/chooseoption.simba}
23-
{$IFNDEF SRLT_MINIMAP_INCLUDED} {$I osrs/interfaces/minimap.simba}
16+
{$IFNDEF SRLT_INTERFACE_CORE_INCLUDED} {$include_once osrs/interfaces/interface.simba}
17+
{$IFNDEF SRLT_LOGIN_INCLUDED} {$include_once osrs/interfaces/login.simba}
18+
{$IFNDEF SRLT_INTERFACE_CONTROLS_INCLUDED} {$include_once osrs/interfaces/interfacecontrols.simba}
19+
{$IFNDEF SRLT_CHOOSEOPTION_INCLUDED} {$include_once osrs/interfaces/chooseoption.simba}
20+
{$IFNDEF SRLT_MINIMAP_INCLUDED} {$include_once osrs/interfaces/minimap.simba}
2421

25-
{$IFNDEF SRLT_GAMETABS_INCLUDED} {$I osrs/interfaces/gametabs/gametabs.simba}
26-
{$IFNDEF SRLT_GAMETAB_INCLUDED} {$I osrs/interfaces/gametabs/gametab.simba}
27-
{$IFNDEF SRLT_CHAT_TABS_INCLUDED} {$I osrs/interfaces/chat/chattabs.simba}
28-
{$IFNDEF SRLT_CHAT_INCLUDED} {$I osrs/interfaces/chat/chat.simba}
29-
{$IFNDEF SRLT_MAINSCREEN_INCLUDED} {$I osrs/interfaces/mainscreen/mainscreen.simba}
30-
{$IFNDEF SRLT_INTERFACE_AREA_INCLUDED} {$I osrs/interfaces/interfacearea.simba}
22+
{$IFNDEF SRLT_GAMETABS_INCLUDED} {$include_once osrs/interfaces/gametabs/gametabs.simba}
23+
{$IFNDEF SRLT_GAMETAB_INCLUDED} {$include_once osrs/interfaces/gametabs/gametab.simba}
24+
{$IFNDEF SRLT_CHAT_TABS_INCLUDED} {$include_once osrs/interfaces/chat/chattabs.simba}
25+
{$IFNDEF SRLT_CHAT_INCLUDED} {$include_once osrs/interfaces/chat/chat.simba}
26+
{$IFNDEF SRLT_MAINSCREEN_INCLUDED} {$include_once osrs/interfaces/mainscreen/mainscreen.simba}
27+
{$IFNDEF SRLT_INTERFACE_AREA_INCLUDED} {$include_once osrs/interfaces/interfacearea.simba}
3128

32-
{$IFNDEF SRLT_SLOT_INTERFACE_INCLUDED} {$I osrs/interfaces/slotinterface.simba}
33-
{$IFNDEF SRLT_ITEM_INTERFACE_INCLUDED} {$I osrs/interfaces/iteminterface.simba}
29+
{$IFNDEF SRLT_SLOT_INTERFACE_INCLUDED} {$include_once osrs/interfaces/slotinterface.simba}
30+
{$IFNDEF SRLT_ITEM_INTERFACE_INCLUDED} {$include_once osrs/interfaces/iteminterface.simba}
3431

35-
{$IFNDEF SRLT_INVENTORY_INCLUDED} {$I osrs/interfaces/gametabs/inventory.simba}
36-
{$IFNDEF SRLT_MAGIC_INCLUDED} {$I osrs/interfaces/gametabs/magic.simba}
37-
{$IFNDEF SRLT_OPTIONS_INCLUDED} {$I osrs/interfaces/gametabs/options.simba}
38-
{$IFNDEF SRLT_PRAYER_INCLUDED} {$I osrs/interfaces/gametabs/prayer.simba}
32+
{$IFNDEF SRLT_INVENTORY_INCLUDED} {$include_once osrs/interfaces/gametabs/inventory.simba}
33+
{$IFNDEF SRLT_MAGIC_INCLUDED} {$include_once osrs/interfaces/gametabs/magic.simba}
34+
{$IFNDEF SRLT_OPTIONS_INCLUDED} {$include_once osrs/interfaces/gametabs/options.simba}
35+
{$IFNDEF SRLT_PRAYER_INCLUDED} {$include_once osrs/interfaces/gametabs/prayer.simba}
3936

37+
{$IFNDEF SRLT_MM2MS_PROJECTOR_INCLUDED} {$include_once osrs/interfaces/mm2ms_projector.simba}
38+
{$IFNDEF SRLT_MM2MS_INCLUDED} {$include_once osrs/interfaces/mm2ms.simba}
39+
{$IFNDEF SRLT_XPBAR_INCLUDED} {$include_once osrs/interfaces/xpbar.simba}
40+
{$IFNDEF SRLT_STATS_INCLUDED} {$include_once osrs/interfaces/gametabs/stats.simba}
41+
{$IFNDEF SRLT_ANTIBAN_INCLUDED} {$include_once osrs/antiban/antiban.simba}
4042

41-
{$IFNDEF SRLT_MM2MS_PROJECTOR_INCLUDED} {$I osrs/interfaces/mm2ms_projector.simba}
42-
{$IFNDEF SRLT_MM2MS_INCLUDED} {$I osrs/interfaces/mm2ms.simba}
43-
{$IFNDEF SRLT_XPBAR_INCLUDED} {$I osrs/interfaces/xpbar.simba}
44-
{$IFNDEF SRLT_STATS_INCLUDED} {$I osrs/interfaces/gametabs/stats.simba}
45-
{$IFNDEF SRLT_WALKER_INCLUDED} {$I osrs/walker.simba}
46-
{$IFNDEF SRLT_MAPLOADER_INCLUDED} {$I osrs/map/maploader.simba}
47-
{$IFNDEF SRLT_MAP_INCLUDED} {$I osrs/map/map.simba}
48-
{$IFNDEF SRLT_MAPDEBUGGER_INCLUDED} {$I osrs/map/mapdebugger.simba}
49-
{$IFNDEF SRLT_BANK_INCLUDED} {$I osrs/interfaces/mainscreen/bank.simba}
43+
{$IFNDEF SRLT_WALKER_INCLUDED} {$include_once osrs/walker.simba}
44+
{$IFNDEF SRLT_MAPLOADER_INCLUDED} {$include_once osrs/map/maploader.simba}
45+
{$IFNDEF SRLT_MAP_INCLUDED} {$include_once osrs/map/map.simba}
46+
{$IFNDEF SRLT_MAPDEBUGGER_INCLUDED} {$include_once osrs/map/mapdebugger.simba}
47+
{$IFNDEF SRLT_BANK_INCLUDED} {$include_once osrs/interfaces/mainscreen/bank.simba}
5048

5149

50+
{$IFNDEF SRLT_ANTIBAN_TASKS_INCLUDED} {$include_once osrs/antiban/antibantasks.simba}
5251

53-
{$IFNDEF SRLT_SETUP_INCLUDED}
54-
{$I osrs/interfaces/setup.simba}
55-
{$ELSE}{$ENDIF}
52+
{$IFNDEF SRLT_SETUP_INCLUDED} {$include_once osrs/interfaces/setup.simba}
5653

5754

58-
{$ELSE}{$ENDIF}
59-
{$ELSE}{$ENDIF}
60-
{$ELSE}{$ENDIF}
61-
{$ELSE}{$ENDIF}
62-
{$ELSE}{$ENDIF}
63-
{$ELSE}{$ENDIF}
64-
{$ELSE}{$ENDIF}
65-
{$ELSE}{$ENDIF}
66-
{$ELSE}{$ENDIF}
67-
{$ELSE}{$ENDIF}
68-
{$ELSE}{$ENDIF}
69-
{$ELSE}{$ENDIF}
70-
{$ELSE}{$ENDIF}
71-
{$ELSE}{$ENDIF}
72-
{$ELSE}{$ENDIF}
73-
{$ELSE}{$ENDIF}
74-
{$ELSE}{$ENDIF}
75-
{$ELSE}{$ENDIF}
76-
{$ELSE}{$ENDIF}
77-
{$ELSE}{$ENDIF}
78-
{$ELSE}{$ENDIF}
79-
{$ELSE}{$ENDIF}
80-
{$ELSE}{$ENDIF}
81-
{$ELSE}{$ENDIF}
82-
{$ELSE}{$ENDIF}
83-
{$ELSE}{$ENDIF}
84-
{$ELSE}{$ENDIF}
85-
{$ELSE}{$ENDIF}
86-
{$ELSE}{$ENDIF}
87-
{$ELSE}{$ENDIF}
88-
{$ELSE}{$ENDIF}
89-
{$ELSE}{$ENDIF}
90-
{$ELSE}{$ENDIF}
55+
{$ENDIF}
56+
{$ENDIF}
57+
{$ENDIF}
58+
{$ENDIF}
59+
{$ENDIF}
60+
{$ENDIF}
61+
{$ENDIF}
62+
{$ENDIF}
63+
{$ENDIF}
64+
{$ENDIF}
65+
{$ENDIF}
66+
{$ENDIF}
67+
{$ENDIF}
68+
{$ENDIF}
69+
{$ENDIF}
70+
{$ENDIF}
71+
{$ENDIF}
72+
{$ENDIF}
73+
{$ENDIF}
74+
{$ENDIF}
75+
{$ENDIF}
76+
{$ENDIF}
77+
{$ENDIF}
78+
{$ENDIF}
79+
{$ENDIF}
80+
{$ENDIF}
81+
{$ENDIF}
82+
{$ENDIF}
83+
{$ENDIF}
84+
{$ENDIF}
85+
{$ENDIF}
86+
{$ENDIF}
87+
{$ENDIF}
88+
{$ENDIF}
89+
{$ENDIF}
90+
{$ENDIF}
91+
{$ENDIF}

‎osrs/account.simba‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{$DEFINE SRLT_ACCOUNT_INCLUDED}
2-
{$IFNDEF SRLT_OSRS}
3-
{$I SRLT/osrs.simba}
4-
{$ENDIF}
2+
{$include_once SRLT/osrs.simba}
53

64
var
75
AccountIndex: Integer;
@@ -11,7 +9,6 @@ type
119
Username, Password, Pin: String;
1210
Worlds: TIntegerArray;
1311
Active: Boolean;
14-
Seed: TIntegerArray;
1512
end;
1613

1714
TRSAccountArray = array of TRSAccount;
@@ -30,7 +27,7 @@ Example:
3027
*)
3128
procedure TRSAccountArray.Add(user, pass: String; pin: String = ''; worlds: TIntegerArray = []);
3229
begin
33-
Self += [user, pass, pin, worlds, true, []];
30+
Self += [user, pass, pin, worlds, true];
3431
end;
3532

3633
procedure TRSAccountArray.NextAccount(disableCurrent: Boolean);
@@ -102,33 +99,9 @@ begin
10299
raise GetDebugLn('Accounts', 'Invalid bank pin.');
103100
end;
104101

105-
106-
(*
107-
## Accounts.GetSeed
108-
```pascal
109-
function TRSAccountArray.GetSeed(): Double;
110-
```
111-
Get the current player unique seed.
112-
113-
Example:
114-
```pascal
115-
WriteLn Accounts.GetSeed();
116-
```
117-
*)
118-
function TRSAccountArray.GetSeed(): TIntegerArray;
119-
begin
120-
if Self = [] then
121-
raise GetDebugLn('Accounts', 'No accounts declared: Add an account if you want scripts to handle login.');
122-
if not InRange(AccountIndex, 0, High(Self)) then
123-
raise GetDebugLn('Accounts', 'Account is out of range: Account number selected in script does not exist.');
124-
125-
if Self[AccountIndex].Seed <> [] then
126-
Exit(Self[AccountIndex].Seed);
127-
128-
Move(Self[AccountIndex].Username[1], Self[AccountIndex].Seed, Length(Self[AccountIndex].Username));
129-
WriteLn GetDebugLn('Accounts', 'Current account seed: ' + ToStr(Self[AccountIndex].Seed), EErrorLevel.SUCCESS);
130-
Result := Self[AccountIndex].Seed;
131-
end;
132-
133102
var
134103
Accounts: TRSAccountArray;
104+
105+
{$IF FILEEXISTS(Configs/credentials.simba)}
106+
{$include_once Configs/credentials.simba}
107+
{$ENDIF}

osrs/antiban.simba renamed to osrs/antiban/antiban.simba

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,3 +542,7 @@ var
542542
Global {ref}`TAntiban` variable.
543543
*)
544544
Antiban: TAntiban;
545+
546+
begin
547+
Antiban.Zoom.Max := 100;
548+
end;

0 commit comments

Comments
 (0)