Gu3st...
2009-12-31 11:13:34
I fixed a lot of functions some days ago and though that I should post them.
I will update this post with more fixes.
Currently working on misc/GrandExchange.scar
Diff:
Amount.scar:
BuySell.scar:
FindXP.scar:
Friends.scar:
GrandExchange.scar:
Before the edit:
http://fatality.axspace.com/ed10001
I will update this post with more fixes.
Currently working on misc/GrandExchange.scar
Diff:
Amount.scar:
@@ -37,13 +37,12 @@
{*******************************************************************************
function ShopScreen: Boolean;
-By: ZephyrsFury
+By: ZephyrsFury and Zyt3x
Description: Returns true if a shop interface is opened.
*******************************************************************************}
-
function ShopScreen: Boolean;
begin
- Result := FindTextTpa(2070783, 0, 226, 305, 340, 320, 'Player', StatChars, Nothing);
+ Result := CountColor(2070783, 199, 304, 223, 316) = 47;
end;
{*******************************************************************************
BuySell.scar:
@@ -15,7 +15,7 @@
{*******************************************************************************
Function ShopItemCoords(I: Integer): TPoint;
-By: N1ke!
+By: N1ke! and Zyt3x
Description: Results the coords for shop item. (Left to right).
*******************************************************************************}
Function ShopItemCoords(I: Integer): TPoint;
@@ -23,35 +23,34 @@
row, col: Integer;
begin
row := i div 10;
- col := i - (row * 10) - 1;
- if (col < 0) then
+ col := i - (row * 9) - 1;
+ if (col > 8) then
begin
- col := 9;
- row := row - 1;
+ col := 0;
+ row := row + 1;
end;
- Result := Point(78+(col * 39), 107+(row * 55));
+ if i = 29 then col := 1;
+ Result := Point(28+(col * 52), 52+(row * 65));
end;
{*******************************************************************************
Function ExistsShopItem(i: Integer): Boolean;
-By: N1ke!
+By: N1ke! and Zyt3x
Description: Checks if the shop item exists. (Left to right).
*******************************************************************************}
function ExistsShopItem(i: Integer): Boolean;
var
Cords: TPoint;
- X, Y: Integer;
begin
Result := False;
- If Not ShopScreen then
- Exit;
+ If Not ShopScreen then Exit;
Cords := ShopItemCoords(I);
- Result := FindColor(X, Y, 65536, Cords.X-20, Cords.Y-20, Cords.X+20, Cords.Y+20);
+ Result := GetColor(Cords.X+4, Cords.Y+42) = 1874626;
end;
{*******************************************************************************
Function BuyCoords(x, y, Amount: Integer): Boolean;
-By: RSN re-done by N1ke!
+By: RSN re-done by N1ke! Fixed by Zyt3x
Description: Buys the specified amout of the Item at x, y
*******************************************************************************}
Function BuyCoords(x, y, Amount: Integer): Boolean;
@@ -72,7 +71,7 @@
While AmountLeft > 0 do
begin
MMouse(x, y, 5, 5);
- If Not WaitUpText('alue', 300)then
+ If Not WaitUpText('nfo', 300)then
Exit;
GetMousePos(xz, yz);
Mouse(xz, yz, 0, 0, False);
@@ -81,6 +80,8 @@
1: S := '1';
5: S := '5';
10: S := '10';
+ 50: S := '50';
+ 500: S := '500';
else S := 'Buy X';
end;
If Not WaitOption(S, 400)then
@@ -121,7 +122,7 @@
{*******************************************************************************
Function BuyColor(UpText: String; Color, Amount: Integer): Boolean;
-By: RSN Modified by N1ke!
+By: RSN Modified by N1ke! and Zyt3x
Description: Buys all items with that color
*******************************************************************************}
Function BuyColor(UpText: String; Color, Tol, Amount: Integer): Boolean;
@@ -129,15 +130,17 @@
x, y: Integer;
begin
Result := False;
- If Not(FindItem(x, y, 'color', Color, 19, 27, 499, 325, [Tol, 4]))then
+ If Not(FindItem(x, y, 'color', Color, 15{MWX1}, 33{MWY1}, 498{MWX2}, 317{MWY2}, [Tol, 4]))then
Exit;
+ MMouse(X, Y, 0, 0);
+ if not WaitUpText(UpText, 200) then Exit;
Result := BuyCoords(X, Y, Amount);
end;
{*******************************************************************************
Function SellCoords(x, y, Amount: Integer): boolean;
-By: RSN redone by N1ke!
+By: RSN redone by N1ke! and Zyt3x
Description: Sells Item at x, y
*******************************************************************************}
Function SellCoords(x, y, Amount: Integer): boolean;
@@ -164,10 +167,10 @@
Mouse(xz, yz, 0, 0, False);
Case AmountLeft of
- 1..4: S := '1';
- 5..9: S := '5';
- 10..49: S := '10';
- else
+ 1..4: S := '5';
+ 5..9: S := '10';
+ 10..49: S := '50';
+ else
If (Random(20) = 0)then
S := '10' else
S := '50';
FindXP.scar:
@@ -45,7 +45,7 @@
{*******************************************************************************
function FindXP(Skill, sType: string): Extended;
-By: Abyssal, Smartzkid and Bobarkinator, shortened by NaumanAkhlaQ
+By: Abyssal, Smartzkid, Bobarkinator and Zyt3x, shortened by NaumanAkhlaQ
Description: Returns any XP for any item in any skill.
Confusing uses:
Take out any apostrophes.
@@ -106,7 +106,7 @@
'rogue' : Result := 35.5;
'cave goblin' : Result := 40;
'master farmer' : Result := 43;
- 'guard' : Result := 46.8;
+ 'guard' : Result := 46.5;
'fremennik' : Result := 65;
'bearded pollivnian bandit': Result := 65;
'desert bandit' : Result := 79.4;
@@ -114,26 +114,26 @@
'pollivian bandit' : Result := 84.3;
'yanille watchman' : Result := 137.5;
'menaphite thug' : Result := 137.5;
- 'paladin' : Result := 151.8;
- 'gnome' : Result := 198.3;
- 'hero' : Result := 275.3;
- 'elf' : Result := 353.3;
+ 'paladin' : Result := 151.75;
+ 'gnome' : Result := 198.5;
+ 'hero' : Result := 275;
+ 'elf' : Result := 353;
'vegetable' : Result := 10; //STALLS
'cake' : Result := 16;
- 'tea' : Result := 16;
- 'crafting' : Result := 10;
+ 'tea' : Result := 16.5;
+ 'crafting' : Result := 16;
'monkey food' : Result := 16;
'silk' : Result := 24;
'wine' : Result := 27;
'seed' : Result := 10;
'fur' : Result := 36;
'fish' : Result := 42;
- 'crossbow' : Result := 52;
+ 'crossbow' : Result := 54;
'silver' : Result := 54;
- 'magic' : Result := 31;
- 'scimitar' : Result := 160;
- 'spice' : Result := 81.6;
+ 'magic' : Result := 100;
+ 'scimitar' : Result := 100;
+ 'spice' : Result := 81;
'gem' : Result := 16;
'gp 10' : Result := 7.5; //CHESTS
@@ -155,77 +155,82 @@
'magic': case sType of // MAGIC
- 'wind strike' : Result:=5.5; //MODERN MAGICKS
- 'confuse' : Result:=13;
- 'enchant opal bolts' : Result:=9;
- 'water strike' : Result:=7.5;
- 'enchant lvl-1 jewelry' : Result:=17.5;
- 'enchant sapphire bolts' : Result:=17.6;
- 'earth strike' : Result:=9.5;
- 'weaken' : Result:=21;
- 'fire strike' : Result:=11.5;
- 'enchant jade bolts' : Result:=19;
- 'bones to bannanas' : Result:=25;
- 'wind bolt' : Result:=13.5;
- 'curse' : Result:=29;
- 'bind' : Result:=30;
- 'low level alchemy' : Result:=31;
- 'water bolt' : Result:=16.5;
- 'enchant pearl bolts' : Result:=29.5;
- 'varrock teleport' : Result:=35;
- 'enchant lvl-2 jewelry' : Result:=37;
- 'enchant emerald bolts' : Result:=37;
- 'earth bolt' : Result:=19.5;
- 'enchant red topaz bolts' : Result:=33.5;
- 'lumbridge teleport' : Result:=41;
- 'telekinetic grab' : Result:=43;
- 'fire bolt' : Result:=22.5;
- 'falador teleport' : Result:=48;
- 'crumble undead' : Result:=24.5;
- 'teleport to house' : Result:=30;
- 'wind blast' : Result:=22.5;
- 'superheat item' : Result:=53;
- 'camelot teleport' : Result:=55.5;
- 'water blast' : Result:=28.5;
- 'enchant lvl-3 jewelry' : Result:=59;
- 'enchant ruby bolts' : Result:=59;
- 'iban blast' : Result:=30;
- 'snare' : Result:=60;
- 'magic dart' : Result:=30;
- 'ardougne teleport' : Result:=61;
- 'earth blast' : Result:=31.5;
- 'high level alchemy' : Result:=65;
- 'charge water orb' : Result:=66;
- 'enchant lvl-4 jewelry' : Result:=67;
- 'enchant diamond bolts' : Result:=67;
- 'watchtower teleport' : Result:=68;
- 'fire blast' : Result:=34.5;
- 'charge earth orb' : Result:=70;
- 'bones to peaches' : Result:=35.5;
- 'saradomin strike' : Result:=35;
- 'claws of guthix' : Result:=35;
- 'flames of zamorak' : Result:=35;
- 'trollheim teleport' : Result:=68;
- 'wind wave' : Result:=36;
- 'charge fire orb' : Result:=73;
- 'ape atoll teleport' : Result:=74;
- 'water wave' : Result:=37.5;
- 'charge air orb' : Result:=76;
- 'vulnerability' : Result:=76;
- 'enchant lvl-5 jewelry' : Result:=78;
- 'enchant dragonstone bolts': Result:=78;
- 'earth wave' : Result:=40;
- 'enfeeble' : Result:=83;
- 'teleother lumbridge' : Result:=84;
- 'fire wave' : Result:=42.5;
- 'entangle' : Result:=89;
- 'stun' : Result:=90;
- 'charge' : Result:=180;
- 'teleother falador' : Result:=92;
- 'tele block' : Result:=95;
- 'enchant lvl-6 jewelry' : Result:=97;
- 'enchant onyx bolts' : Result:=97;
- 'teleother camelot' : Result:=100;
+ 'wind strike' : Result:=5.5; //MODERN MAGICKS
+ 'confuse' : Result:=13;
+ 'enchant opal bolts' : Result:=9;
+ 'water strike' : Result:=7.5;
+ 'enchant lvl-1 jewelry' : Result:=17.5;
+ 'enchant sapphire bolts' : Result:=17.6;
+ 'earth strike' : Result:=9.5;
+ 'mobilising armues teleport': Result:=19;
+ 'weaken' : Result:=21;
+ 'fire strike' : Result:=11.5;
+ 'enchant jade bolts' : Result:=19;
+ 'bones to bannanas' : Result:=25;
+ 'wind bolt' : Result:=13.5;
+ 'curse' : Result:=29;
+ 'bind' : Result:=30;
+ 'low level alchemy' : Result:=31;
+ 'water bolt' : Result:=16.5;
+ 'enchant pearl bolts' : Result:=29.5;
+ 'varrock teleport' : Result:=35;
+ 'enchant lvl-2 jewelry' : Result:=37;
+ 'enchant emerald bolts' : Result:=37;
+ 'earth bolt' : Result:=19.5;
+ 'enchant red topaz bolts' : Result:=33.5;
+ 'lumbridge teleport' : Result:=41;
+ 'telekinetic grab' : Result:=43;
+ 'fire bolt' : Result:=22.5;
+ 'falador teleport' : Result:=48;
+ 'crumble undead' : Result:=24.5;
+ 'teleport to house' : Result:=30;
+ 'wind blast' : Result:=25.5;
+ 'superheat item' : Result:=53;
+ 'camelot teleport' : Result:=55.5;
+ 'water blast' : Result:=28.5;
+ 'enchant lvl-3 jewelry' : Result:=59;
+ 'enchant ruby bolts' : Result:=59;
+ 'iban blast' : Result:=30;
+ 'snare' : Result:=60;
+ 'magic dart' : Result:=30;
+ 'ardougne teleport' : Result:=61;
+ 'earth blast' : Result:=31.5;
+ 'high level alchemy' : Result:=65;
+ 'charge water orb' : Result:=66;
+ 'enchant lvl-4 jewelry' : Result:=67;
+ 'enchant diamond bolts' : Result:=67;
+ 'watchtower teleport' : Result:=68;
+ 'fire blast' : Result:=34.5;
+ 'charge earth orb' : Result:=70;
+ 'bones to peaches' : Result:=35.5;
+ 'saradomin strike' : Result:=35;
+ 'claws of guthix' : Result:=35;
+ 'flames of zamorak' : Result:=35;
+ 'trollheim teleport' : Result:=68;
+ 'wind wave' : Result:=36;
+ 'charge fire orb' : Result:=73;
+ 'ape atoll teleport' : Result:=74;
+ 'water wave' : Result:=37.5;
+ 'charge air orb' : Result:=76;
+ 'vulnerability' : Result:=76;
+ 'enchant lvl-5 jewelry' : Result:=78;
+ 'enchant dragonstone bolts' : Result:=78;
+ 'earth wave' : Result:=40;
+ 'enfeeble' : Result:=83;
+ 'teleother lumbridge' : Result:=84;
+ 'fire wave' : Result:=42.5;
+ 'entangle' : Result:=89;
+ 'stun' : Result:=90;
+ 'charge' : Result:=180;
+ 'wind surge' : Result:=80;
+ 'teleother falador' : Result:=92;
+ 'tele block' : Result:=80;
+ 'water surge' : Result:=80;
+ 'enchant lvl-6 jewelry' : Result:=97;
+ 'enchant onyx bolts' : Result:=97;
+ 'teleother camelot' : Result:=100;
+ 'earth surge' : Result:=85;
+ 'fire surge' : Result:=90;
'smoke rush' : Result:=30; //ANCIENT MAGICKS
'shadow rush' : Result:=31;
@@ -252,37 +257,45 @@
'ice barrage' : Result:=52;
'ghorrock teleport' : Result:=106;
- 'bake pie' : Result:=26; //LUNAR MAGICKS
- 'cure plant' : Result:=26;
- 'npc contact' : Result:=30;
- 'cure other' : Result:=48;
- 'moonclan teleport' : Result:=50;
- 'tele group moonclan' : Result:=51;
- 'cure me' : Result:=46;
- 'waterbirth teleport' : Result:=51;
- 'tele group waterbirth' : Result:=53;
- 'cure group' : Result:=59;
- 'barbarian teleport' : Result:=53;
- 'tele group barbarian' : Result:=55;
- 'superglass make' : Result:=41;
- 'khazard teleport' : Result:=54;
- 'tele group khazard' : Result:=56;
- 'string jewellery' : Result:=44;
- 'stat restore pot share' : Result:=49;
- 'magic imbue' : Result:=51;
- 'fertile soil' : Result:=61;
- 'boost potion share' : Result:=62;
- 'fishing guild teleport' : Result:=65;
- 'tele group fishing guild': Result:=70;
- 'catherby teleport' : Result:=78;
- 'tele group catherby' : Result:=80;
+ 'bake pie' : Result:=60; //LUNAR MAGICKS
+ 'cure plant' : Result:=60;
+ 'monster examine' : Result:=61;
+ 'npc contact' : Result:=63;
+ 'cure other' : Result:=65;
+ 'humidify' : Result:=65;
+ 'moonclan teleport' : Result:=66;
+ 'tele group moonclan' : Result:=67;
+ 'cure me' : Result:=9;
+ 'ourania teleport' : Result:=69;
+ 'hunter kit' : Result:=70;
+ 'waterbirth teleport' : Result:=71;
+ 'tele group waterbirth' : Result:=72;
+ 'cure group' : Result:=74;
+ 'stat spy' : Result:=76;
+ 'barbarian teleport' : Result:=76;
+ 'tele group barbarian' : Result:=77;
+ 'superglass make' : Result:=78;
+ 'khazard teleport' : Result:=80;
+ 'tele group khazard' : Result:=81;
+ 'dream' : Result:=82;
+ 'string jewellery' : Result:=83;
+ 'stat restore pot share' : Result:=84;
+ 'magic imbue' : Result:=86;
+ 'fertile soil' : Result:=87;
+ 'boost potion share' : Result:=88;
+ 'fishing guild teleport' : Result:=89;
+ 'tele group fishing guild': Result:=90;
+ 'plank make' : Result:=90;
+ 'catherby teleport' : Result:=92;
+ 'tele group catherby' : Result:=93;
'ice plateau teleport' : Result:=96;
'tele group ice plateau' : Result:=99;
- 'energy transfer' : Result:=68;
- 'heal other' : Result:=86;
- 'vengeance other' : Result:=73;
- 'vengeance' : Result:=75;
+ 'energy transfer' : Result:=100;
+ 'heal other' : Result:=101;
+ 'vengeance other' : Result:=108;
+ 'vengeance' : Result:=112;
'heal group' : Result:=124;
+ 'spellbook swap' : Result:=130;
end;
'prayer': case sType of // PRAYER
@@ -290,9 +303,11 @@
'burnt bones' : Result:= 4.5;
'wolf bones' : Result:= 4.5;
'monkey bones' : Result:= 5;
- 'bat bones' : Result:= 5.3;
+ 'bat bones' : Result:= 5.25;
'big bones' : Result:= 15;
'jogre bones' : Result:= 15;
+ 'long bones' : Result:= 15;
+ 'curved bones' : Result:= 15;
'shaikahan bones' : Result:= 25;
'baby dragon bones': Result:= 30;
'wyvern bones' : Result:= 50;
@@ -339,30 +354,40 @@
end;
'fishing': case sType of // FISHING
- 'shrimp' : Result:= 10;
- 'karambwanji' : Result:= 5;
- 'sardine' : Result:= 20;
- 'herring' : Result:= 30;
- 'anchovies' : Result:= 40;
- 'mackerel' : Result:= 20;
- 'trout' : Result:= 50;
- 'cod' : Result:= 45;
- 'pike' : Result:= 60;
- 'slimey eel' : Result:= 65;
- 'salmon' : Result:= 70;
- 'giant frogspawn': Result:= 75;
- 'tuna' : Result:= 80;
- 'cave eel' : Result:= 80;
- 'rainbow fish' : Result:= 80;
- 'lobster' : Result:= 90;
- 'bass' : Result:= 100;
- 'swordfish' : Result:= 100;
- 'lava eel' : Result:= 60;
- 'monkfish' : Result:= 120;
- 'karambwan' : Result:= 105;
- 'shark' : Result:= 110;
- 'sea turtle' : Result:= 38;
- 'manta ray' : Result:= 46;
+ 'shrimp' : Result:= 10; //NORMAL FISHING
+ 'crayfsh' : Result:= 10;
+ 'karambwanji' : Result:= 10;
+ 'sardine' : Result:= 20;
+ 'herring' : Result:= 30;
+ 'anchovies' : Result:= 40;
+ 'mackerel' : Result:= 20;
+ 'trout' : Result:= 50;
+ 'cod' : Result:= 45;
+ 'pike' : Result:= 60;
+ 'slimey eel' : Result:= 65;
+ 'salmon' : Result:= 70;
+ 'giant frogspawn' : Result:= 75;
+ 'tuna' : Result:= 80;
+ 'cave eel' : Result:= 80;
+ 'rainbow fish' : Result:= 80;
+ 'lobster' : Result:= 90;
+ 'bass' : Result:= 100;
+ 'swordfish' : Result:= 100;
+ 'lava eel' : Result:= 60;
+ 'monkfish' : Result:= 120;
+ 'karambwan' : Result:= 105;
+ 'shark' : Result:= 110;
+ 'sea turtle' : Result:= 38;
+ 'manta ray' : Result:= 46;
+ 'cavefish' : Result:= 300;
+ 'rocktail' : Result:= 380;
+
+ 'b tuna' : Result:= 80; //BARBARIAN FISHING
+ 'b swordfish' : Result:= 100;
+ 'b shark' : Result:= 110;
+ 'b leaping trout' : Result:= 50;
+ 'b leaping salmon' : Result:= 70;
+ 'b leaping sturgeon': Result:= 80;
end;
'fletching': case sType of // FLETCHING
@@ -375,7 +400,7 @@
'maple shortbow' : Result:= 100;
'maple longbow' : Result:= 116.6;
'yew shortbow' : Result:= 133;
- 'yew longbow' : Result:= 133;
+ 'yew longbow' : Result:= 150;
'magic shortbow' : Result:= 166.6;
'magic longbow' : Result:= 183;
'ogre bow' : Result:= 90;
@@ -395,18 +420,20 @@
'half ogre bow' : Result:= 45;
'bronze darts' : Result:= 1.8; // DARTS
- 'iron darts' : Result:= 3.8;
+ 'iron darts' : Result:= 3.2;
'steel darts' : Result:= 7.5;
'mithril darts' : Result:= 11.2;
'adamant darts' : Result:= 15;
'rune darts' : Result:= 18.8;
+ 'dragon darts' : Result:= 25;
'bronze arrows' : Result:= 2.63; // FULL ARROWS
'iron arrows' : Result:= 3.83;
'steel arrows' : Result:= 6.33;
'mithril arrows' : Result:= 8.83;
'adamant arrows' : Result:= 11;
- 'rune arrows' : Result:= 15;
+ 'rune arrows' : Result:= 13.83;
+ 'dragon arrows' : Result:= 15;
'arrowshaft' : Result:= 5; //PARTIAL ARROWS
'headless arrow' : Result:= 1;
@@ -419,8 +446,7 @@
'ogre arrowshafts' : Result:= 1.6; // OGRE ITEMS
'headless ogre arrows' : Result:= 0.9;
- 'ogre arrowheads' : Result:= 1;
- 'ogre arrows' : Result:= 3.5;
+ 'ogre arrows' : Result:= 1;
'b brutal arrowheads' : Result:= 1.4;
'i brutal arrowheads' : Result:= 2.6;
's brutal arrowheads' : Result:= 5.1;
@@ -429,8 +455,8 @@
'adamant brutal arrowheads': Result:= 10.1;
'rune brutal arrowheads' : Result:= 12.6;
- 'bronze crossbow' : Result:= 24; // X BOWS
- 'blurite crossbow' : Result:= 66;
+ 'bronze crossbow' : Result:= 18; // X BOWS
+ 'blurite crossbow' : Result:= 64;
'iron crossbow' : Result:= 88;
'steel crossbow' : Result:= 108;
'mithril crossbow' : Result:= 128;
@@ -438,21 +464,21 @@
'runite crossbow' : Result:= 200;
'wooden stock' : Result:= 6; // X BOW STOCKS
- 'oak stock' : Result:= 18;
+ 'oak stock' : Result:= 16;
'willow stock' : Result:= 22;
'teak stock' : Result:= 27;
'maple stock' : Result:= 32;
'mahogany stock' : Result:= 41;
'yew stock' : Result:= 50;
- 'bronze bolts' : Result:= 5; // X BOW BOLTS
- 'blurite bolts' : Result:= 10;
- 'iron bolts' : Result:= 15;
- 'steel bolts' : Result:= 35;
- 'silver bolts' : Result:= 25;
- 'mithril bolts' : Result:= 50;
- 'adamantite bolts': Result:= 70;
- 'runite bolts' : Result:= 100;
+ 'bronze bolts' : Result:= 0.5; // X BOW BOLTS
+ 'blurite bolts' : Result:= 1;
+ 'iron bolts' : Result:= 1.5;
+ 'steel bolts' : Result:= 3.5;
+ 'silver bolts' : Result:= 2.5;
+ 'mithril bolts' : Result:= 5;
+ 'adamantite bolts': Result:= 7;
+ 'runite bolts' : Result:= 10;
'opal tip bronze' : Result:= 1.6; //BOLTS (TIPPED)
'jade tip blurite' : Result:= 2.4;
@@ -489,17 +515,30 @@
'b short sword' : Result:=12.5;
'b dart tips' : Result:=12.5;
'b nails' : Result:=12.5;
+ 'b wire' : Result:=12.5;
'b scimitar' : Result:=25;
'b arrowheads' : Result:=12.5;
+ 'b pickaxe' : Result:=16;
'b longsword' : Result:=25;
'b crossbow limbs' : Result:=12.5;
'b full helm' : Result:=25;
'b throwing knives': Result:=12.5;
+ 'b sq shield' : Result:=25;
+ 'b warhammer' : Result:=37.5;
+ 'b battleaxe' : Result:=37.5;
+ 'b chainbody' : Result:=37.5;
+ 'b kiteshield' : Result:=37.5;
+ 'b claws' : Result:=25;
+ 'b 2h sword' : Result:=37.5;
+ 'b plateskirt' : Result:=37.5;
+ 'b platelegs' : Result:=37.5;
+ 'b platebody' : Result:=62.5;
'i bars' : Result:=12.5; //IRON
'i dagger' : Result:=25;
'i hatchet' : Result:=25;
'i mace' : Result:=25;
+ 'i spit' : Result:=25;
'i medium helm' : Result:=25;
'i crossbow bolts' : Result:=25;
'i short sword' : Result:=25;
@@ -507,10 +546,23 @@
'i nails' : Result:=25;
'i scimitar' : Result:=50;
'i arrowheads' : Result:=25;
+ 'i pickaxe' : Result:=50;
'i longsword' : Result:=50;
'i crossbow limbs' : Result:=25;
'i full helm' : Result:=50;
'i throwing knives': Result:=25;
+ 'oil lantern frame': Result:=25;
+ 'i sq shield' : Result:=50;
+ 'i warhammer' : Result:=75;
+ 'i battleaxe' : Result:=75;
+ 'i chainbody' : Result:=75;
+ 'i kiteshield' : Result:=75;
+ 'i claws' : Result:=50;
+ 'i 2h sword' : Result:=75;
+ 'i plateskirt' : Result:=75;
+ 'i platelegs' : Result:=75;
+ 'i platebody' : Result:=125;
+ 'i sheet' : Result:=20;
's bars' : Result:=17.5; //STEEL
's dagger' : Result:=37.5;
@@ -520,13 +572,27 @@
's crossbow bolts' : Result:=37.5;
's short sword' : Result:=37.5;
's dart tips' : Result:=37.5;
+ 's cannonball' : Result:=25.5;
's nails' : Result:=37.5;
's scimitar' : Result:=75;
's arrowheads' : Result:=37.5;
+ 's pickaxe' : Result:=75;
's longsword' : Result:=75;
+ 's studs' : Result:=25;
's crossbow limbs' : Result:=37.5;
's full helm' : Result:=75;
's throwing knives': Result:=37.5;
+ 's sq shield' : Result:=75;
+ 's warhammer' : Result:=112.5;
+ 's battleaxe' : Result:=112.5;
+ 's chainbody' : Result:=112.5;
+ 's kiteshield' : Result:=112.5;
+ 's claws' : Result:=75;
+ 's 2h sword' : Result:=112.5;
+ 's plateskirt' : Result:=112.5;
+ 's platelegs' : Result:=112.5;
+ 's platebody' : Result:=187.5;
+ 'bullseye lantern': Result:=37.5;
'm bars' : Result:=30; //MITHRIL
'm dagger' : Result:=50;
@@ -539,10 +605,21 @@
'm nails' : Result:=50;
'm scimitar' : Result:=100;
'm arrowheads' : Result:=50;
+ 'm pickaxe' : Result:=100;
'm longsword' : Result:=100;
'm crossbow limbs' : Result:=50;
'm full helm' : Result:=100;
'm throwing knives': Result:=50;
+ 'm sq shield' : Result:=100;
+ 'm warhammer' : Result:=150;
+ 'm battleaxe' : Result:=150;
+ 'm chainbody' : Result:=150;
+ 'm kiteshield' : Result:=150;
+ 'm claws' : Result:=100;
+ 'm 2h sword' : Result:=150;
+ 'm plateskirt' : Result:=150;
+ 'm platelegs' : Result:=150;
+ 'm platebody' : Result:=250;
'a bars' : Result:=37.5; //ADAMANTITE
'a dagger' : Result:=62.5;
@@ -555,10 +632,21 @@
'a nails' : Result:=62.5;
'a scimitar' : Result:=125;
'a arrowheads' : Result:=62.5;
+ 'a pickaxe' : Result:=125;
'a longsword' : Result:=125;
'a crossbow limbs' : Result:=62.5;
'a full helm' : Result:=125;
'a throwing knives': Result:=62.5;
+ 'a sq shield' : Result:=125;
+ 'a warhammer' : Result:=187.5;
+ 'a battleaxe' : Result:=187.5;
+ 'a chainbody' : Result:=187.5;
+ 'a kiteshield' : Result:=187.5;
+ 'a claws' : Result:=125;
+ 'a 2h sword' : Result:=187.5;
+ 'a plateskirt' : Result:=187.5;
+ 'a platelegs' : Result:=187.5;
+ 'a platebody' : Result:=312.5;
'r bars' : Result:=50; //RUNITE
'r dagger' : Result:=75;
@@ -571,10 +659,24 @@
'r nails' : Result:=75;
'r scimitar' : Result:=150;
'r arrowheads' : Result:=75;
+ 'r pickaxe' : Result:=150;
'r longsword' : Result:=150;
'r crossbow limbs' : Result:=75;
'r full helm' : Result:=150;
'r throwing knives': Result:=75;
+ 'r sq shield' : Result:=150;
+ 'r warhammer' : Result:=225;
+ 'r battleaxe' : Result:=225;
+ 'r chainbody' : Result:=225;
+ 'r kiteshield' : Result:=225;
+ 'r claws' : Result:=150;
+ 'r 2h sword' : Result:=225;
+ 'r plateskirt' : Result:=225;
+ 'r platelegs' : Result:=225;
+ 'r platebody' : Result:=375;
+
+ 'd sq shield' : Result:=75; // DRAGON
+ 'd platebody' : Result:=2000;
'elemental bars' : Result:=7.5; //OTHER METALS
'elemental shield' : Result:=20;
@@ -589,19 +691,31 @@
'blurite bar' : Result:=8;
'blurite bolts' : Result:=17.5;
'blurite crossbow limbs': Result:=17.5;
+
+ 'dragonfire shield' : Result:=2000;
+ 'armadyl gs' : Result:=200;
+ 'bandos gs' : Result:=200;
+ 'saradomin gs' : Result:=200;
+ 'zamorak gs' : Result:=200;
+ 'arcane ss' : Result:=1800;
+ 'divine ss' : Result:=1800;
+ 'elysian ss' : Result:=1800;
+ 'spectral ss' : Result:=1800;
end;
'herblore': case sType of //HERBLORE
'guam leaf' : Result:= 2.5; //HERBS
- 'rogues purse' : Result:=2.5;
- 'snake weed' : Result:=2.5;
+ 'rogues purse' : Result:= 2.5;
+ 'snake weed' : Result:= 2.5;
'marrentill' : Result:= 3.8;
'tarromin' : Result:= 5;
'harralander' : Result:= 6.3;
'ranarr weed' : Result:= 7.5;
'toadflax' : Result:= 8;
+ 'spirit weed' : Result:= 7.8;
'irit leaf' : Result:= 8.8;
+ 'wergali' : Result:= 9.5;
'avantoe' : Result:= 10;
'kwuarm' : Result:= 11.3;
'snapdragon' : Result:= 11.8;
@@ -617,6 +731,7 @@
'serum 207' : Result:=50;
'guam tar' : Result:=30;
'stat restore potion' : Result:=62.5;
+ 'guthix balance' : Result:=112;
'energy potion' : Result:=67.5;
'defence potion' : Result:=75;
'marrentill tar' : Result:=42.5;
@@ -624,9 +739,10 @@
'combat potion' : Result:=84;
'prayer potion' : Result:=87.5;
'tarromin tar' : Result:=55;
+ 'summoning potion' : Result:= 92;
'harralander tar' : Result:=72.5;
'super attack potion' : Result:=100;
- 'super anti-poison potion' : Result:=106.3;
+ 'super anti-poison potion' : Result:=106;
'fishing potion' : Result:=112.5;
'super energy potion' : Result:=117.5;
'hunter potion' : Result:=120;
@@ -644,6 +760,41 @@
'super-strong anti-poison' : Result:=177.5;
'saradomin brew' : Result:=180;
'super-strong weapon poison': Result:=190;
+
+ 'recover special' : Result:=200; //EXTREME POTIONS
+ 'supr antifire' : Result:=210;
+ 'extreme attack' : Result:=220;
+ 'extreme strength' : Result:=230;
+ 'extreme defence' : Result:=240;
+ 'extreme magic' : Result:=250;
+ 'extreme ranging' : Result:=260;
+ 'super prayer restore' : Result:=270;
+ 'overload' : Result:=1000;
+
+ 'attack mix' : Result:=8; //BARBARIAN POTIONS
+ 'antipoison mix' : Result:=12;
+ 'relicyms mix' : Result:=14;
+ 'strength mix' : Result:=17;
+ 'restore mix' : Result:=21;
+ 'energy mix' : Result:=23;
+ 'defence mix' : Result:=25;
+ 'agility mix' : Result:=27;
+ 'combat mix' : Result:=28;
+ 'prayer mix' : Result:=29;
+ 'superattack mix' : Result:=33;
+ 'antip supermix' : Result:=35;
+ 'fishing mix' : Result:=38;
+ 'energy supermix' : Result:=39;
+ 'hunting mix' : Result:=40;
+ 'strength supermix' : Result:=42;
+ 'magic ess mix' : Result:=43;
+ 'restore supermix' : Result:=48;
+ 'defence supermix' : Result:=50;
+ 'extra strog antipoison mix': Result:=52;
+ 'antifire mix' : Result:=53;
+ 'ranging mix' : Result:=54;
+ 'magic mix' : Result:=57;
+ 'zamorak mix' : Result:=58;
end;
'hunter': case sType of //HUNTER
@@ -651,6 +802,7 @@
'common kebbit' : Result:=36;
'feldip weasel' : Result:=48;
'desert devil' : Result:=66;
+ 'penguin' : Result:=250;
'razor-backed kebbit' : Result:=348;
'crimson swift' : Result:=34; //BIRD CATCHING
@@ -658,23 +810,47 @@
'copper longtail' : Result:=61;
'cerulean twitch' : Result:=64.6;
'tropical wagtail' : Result:=95.2;
+ 'wimpy bird' : Result:=167;
'ruby harvest' : Result:=24; //BUTTERFLY CATCHING
'sapphire glacialis' : Result:=34;
'snowy knight' : Result:=44;
'black warlock' : Result:=45;
+
+ 'baby impling' : Result:=18; //IMPLING CREATURES
+ 'young impling' : Result:=20;
+ 'gourmet impling' : Result:=22;
+ 'earth impling' : Result:=25;
+ 'essence impling' : Result:=27;
+ 'eclectic impling' : Result:=30;
+ 'nature impling' : Result:=34;
+ 'magpie impling' : Result:=44;
+ 'ninja impling' : Result:=50;
+ 'pirate impling' : Result:=50;
+ 'dragon impling' : Result:=65;
'wild kebbit' : Result:=128; //DEADFALL TRAPS
'barb-tailed kebbit' : Result:=168;
'prickly kebbit' : Result:=204;
+ 'diseased kebbit' : Result:=225;
+ 'penguin' : Result:=210;
'sabre-toothed kebbit': Result:=200;
'ferret' : Result:=115.2; //BOX TRAPS
- 'chinchompa' : Result:=198.4;
+ 'gecko' : Result:=100;
+ 'raccoon' : Result:=100;
+ 'monkey' : Result:=100;
+ 'platypode' : Result:=205;
+ 'penguin' : Result:=150;
+ 'chinchompa' : Result:=198.5;
'red chinchompa' : Result:=265;
+ 'pawya' : Result:=400;
+ 'grenwall' : Result:=1100;
'swamp lizard' : Result:=152; //NET TRAPS
+ 'squirrel' : Result:=152;
'orange salamander' : Result:=224;
+ 'penguin' : Result:=250;
'red salamander' : Result:=272;
'black salamander' : Result:=304;
@@ -697,14 +873,17 @@
'copper' : Result:=17.5;
'tin' : Result:=17.5;
'blurite' : Result:=17.5;
+ 'daeyalt' : Result:=17.5;
'limestone' : Result:=26.5;
'iron' : Result:=35;
'silver' : Result:=40;
'coal' : Result:=50;
- 'sandstone' : Result:=45;
+ 'sandstone' : Result:=60;
'gold' : Result:=65;
'gem rocks' : Result:=65;
- 'granite' : Result:=60;
+ 'obsidian' : Result:=40;
+ 'granite' : Result:=75;
+ 'rubium' : Result:=17.5;
'mithril' : Result:=80;
'adamantite' : Result:=95;
'runite' : Result:=120;
@@ -712,6 +891,8 @@
'woodcutting': case sType of // WOODCUTTING
'normal' : Result:= 25; // TREES
+ 'dead' : Result:= 25;
+ 'evergreen' : Result:= 25;
'achey' : Result:= 25;
'oak' : Result:= 37.5;
'willow' : Result:= 67.5;
@@ -719,7 +900,8 @@
'maple' : Result:= 100;
'hollow' : Result:= 82.5;
'mahogany' : Result:= 125;
- 'arctic pine' : Result:= 40;
+ 'arctic pine' : Result:= 140.2;
+ 'eucalyptus' : Result:= 165;
'yew' : Result:= 175;
'ivy' : Result:= 322.5;
'magic' : Result:= 250;
@@ -749,6 +931,7 @@
'law' : Result:= 9.5;
'death' : Result:= 10;
'blood' : Result:= 10.5;
+ 'soul' : Result:= 0;
'a mist' : Result:= 8; // COMBO RUNES
'w mist' : Result:= 8.5;
'a dust' : Result:= 8.3;
@@ -785,18 +968,21 @@
'barbarian' : Result:= 153.2;
'ape atoll' : Result:= 580;
'wilderness' : Result:= 571.4;
- 'werewolf' : Result:= 540;
+ 'werewolf' : Result:= 350;
'dorgesh-kaan': Result:= 2750;
end;
'farming': case sType of //FARMING
- 'potato' : Result:= 8;
- 'onion' : Result:= 9.5;
- 'cabbage' : Result:= 10;
- 'tomato' : Result:= 12.5;
- 'sweetcorn' : Result:= 17;
- 'strawberry': Result:= 26;
- 'watermelon': Result:= 48.5;
+ 'potato' : Result:= 9;
+ 'onion' : Result:= 10.5;
+ 'cabbage' : Result:= 11.5;
+ 'tomato' : Result:= 14;
+ 'sweetcorn' : Result:= 19;
+ 'strawberry': Result:= 29;
+ 'watermelon': Result:= 54.5;
+ //TREES
+ //HERBS
+ //....
end;
'firemaking': case sType of //FIREMAKING
@@ -807,6 +993,7 @@
'arctic pine logs': Result:= 125;
'maple logs' : Result:= 135;
'mahogany logs' : Result:= 157.5;
+ 'eucalyptus logs' : Result:= 171.2;
'yew logs' : Result:= 202.5;
'magic logs' : Result:= 303.8;
end;
Friends.scar:
@@ -41,7 +41,7 @@
{*******************************************************************************
function FriendWorld(PlayerNumber: Integer; SameWorld: Boolean) : String;
-By: Wizzup? & N1ke!
+By: Wizzup? & N1ke! and Zyt3x
Description: Returns current world of a friend.
*******************************************************************************}
function FriendWorld(PlayerNumber: Integer) : String;
@@ -54,7 +54,7 @@
Colors := [65535, 65280];
For I:=0 to 1 do
- If FindColor(X, Y, Colors[I], 629, 216+(PlayerNumber*15), 709, 226+(PlayerNumber*15))then
+ If FindColor(X, Y, Colors[I], 634, 236+(PlayerNumber*10), 721, 236+((PlayerNumber+1)*10))then
begin
Result := GetNumbers(GetTextAtEx(X-1, Y-1, 0, FriendChars, True, False, 0, 2, Colors[I], 20, False, tr_NormalChars));
Exit;
@@ -64,7 +64,7 @@
{*******************************************************************************
procedure GetFriends;
-By: Wizzup? & N1ke!
+By: Wizzup? & N1ke! and Zyt3x
Description: Returns first 13 friends World/Status/Name into the Friends Record.
TFriends = Record
@@ -86,7 +86,7 @@
Begin
Friends[I].Name := FriendName(I);
Friends[I].World := FriendWorld(I);
- Friends[I].IsOnline := (Not Pos('Offline', Friends[I].World) > 0);
+ Friends[I].IsOnline := Not (Pos('Offline', Friends[I].World) > 0);
Friends[I].YourWorld := (C_World = StrToIntDef(Friends[I].World, -1));
end;
End;
@@ -139,8 +139,7 @@
{*******************************************************************************
function NumberOfOnlineFriends: Integer;
By: Wizzup?
-Description: Returns # of friends online from 0-11.
-Is actually 1-12, but the array only goes from 0 to 11 at the moment.
+Description: Returns # of friends online from 1-13.
*******************************************************************************}
Function NumberOfOnlineFriends: Integer;
@@ -150,7 +149,7 @@
GetFriends;
For I := 1 To 13 Do
If Friends[I].IsOnline Then
- Result := Result + 1;
+ Inc(Result);
End;
{*******************************************************************************
GrandExchange.scar:
@@ -28,37 +28,32 @@
{*******************************************************************************
Function InGE: boolean;
-By: Rasta Magician
+By: Rasta Magician and Zyt3x
Description: Checks if we are in GE
*******************************************************************************}
Function InGE: boolean;
-var
- x, y, GEIN: integer;
begin
- GEIN:=DTMFromString('78DA636C6360607067C00A1861F47422D4EC2' +
- '242CD3722D4F0311256A345580D00826F04BE');
- Result := FindDTM(GEIN,x,y,127, 61,393, 75);
- FreeDTM(GEIN);
+ Result := (GetColor(34, 47) = 8699383) and (GetColor(40, 39) = 48615);
end;
{*******************************************************************************
Function GEIsMember: boolean;
-By: Rasta Magician
+By: Rasta Magician and Zyt3x
Description: Checks if it is a member account using GE
*******************************************************************************}
Function GEIsMember: boolean;
begin
if not InGE then exit;
- if GetColor(411, 167) <> srl_outline_black then
- if GetColor(410, 155) <> 5199452 then
+ if GetColor(411, 167) <> 65536 then
+ if GetColor(410, 155) <> 5199196 then
begin
Result := true;
exit;
end;
- if GetColor(411, 167) <> 5199452 then //to avoid jagex moving 1px
- if GetColor(410, 155) <> srl_outline_black then
+ if GetColor(411, 167) <> 65536 then //to avoid jagex moving 1px
+ if GetColor(410, 155) <> 5199196 then
begin
Result := true;
exit;
@@ -94,7 +89,7 @@
{*******************************************************************************
Procedure GEMenuExit;
-By: Rasta Magician
+By: Rasta Magician tiny edit by Zyt3x
Description: Exits the Buy or Sell menu
*******************************************************************************}
Procedure GEMenuExit;
@@ -107,14 +102,8 @@
MMouse(40, 291, 18, 9);
- for i:= 0 to 5 do
+ if WaitUpText('ack', 500) then
begin
- wait(100);
- if IsUpText('ack') then break;
- end;
-
- if IsUpText('ack') then
- begin
GetMousePos(x, i);
Mouse(x, i, 0, 0, true);
for i:= 0 to 5 do
@@ -179,7 +168,6 @@
TB := GESpotToTBox(spot);
Result := (GetColor(TB.x1 + 9, TB.y2 - 30) <> 0);
- writeln('coords: '+IntToStr(TB.x1+9)+', '+ IntToStr(TB.y2 -30));
end;
@@ -205,7 +193,7 @@
{*******************************************************************************
Procedure GERecoverAtEx(spot: integer; abort:boolean);
-By: Rasta Magician
+By: Rasta Magician and Zyt3x
Description: Collects the items traded received at a certain spot
Aborts the trade is boolean abort is set to true
*******************************************************************************}
@@ -238,14 +226,8 @@
MMouse(364, 285, 5, 5); //moving to button
wait(100);
- for i:= 0 to 5 do // waiting text
+ if WaitUpText('bort', 500) then
begin
- if IsUpText('bort') then break;
- wait(100);
- end;
-
- if IsUpText('bort') then
- begin
GetMousePos(x, y);
Mouse(x, y, 0, 0, true);
end;
@@ -261,14 +243,8 @@
//collecting spot 1 //
MMouse(416, 299, 5, 5);
- for i:= 0 to 5 do // waiting text
+ if WaitUpText('ollect', 500) then
begin
- if IsUpText('ollect') then break;
- wait(100);
- end;
-
- if IsUpText('ollect') then
- begin
GetMousePos(x, y);
Mouse(x, y, 0, 0, true);
end;
@@ -277,18 +253,12 @@
//collecting spot 1 //
- if (GetColor(467, 298) <> 2176579) then // spot 2
+ if (GetColor(467, 297) <> 2176579) then // spot 2
begin
MMouse(467, 298, 5, 5);
- for i:= 0 to 5 do // waiting text
+ if WaitUpText('ollect', 500) then
begin
- if IsUpText('ollect') then break;
- wait(100);
- end;
-
- if IsUpText('ollect') then
- begin
GetMousePos(x, y);
Mouse(x, y, 0, 0, true);
end;
@@ -310,7 +280,7 @@
{*******************************************************************************
-Function Procedure GERecoverAt(spot: integer);
+Procedure GERecoverAt(spot: integer);
By: Rasta Magician
Description: Recovers items at spot: spot, does not abort the trade
*******************************************************************************}
@@ -475,7 +445,7 @@
{*******************************************************************************
Function GESetPrice(value: string): boolean;
-By: Rasta Magician
+By: Rasta Magician and Zyt3x
Description: Sets the price of an item.
'0', 'min' - Minimum Value
'1', 'med' - Market Value
@@ -497,9 +467,9 @@
wait(100+Random(50));
case value of
- 1: MouseBox(269, 208, 304, 232, 1); // min price
- 2: begin end; // market price
- 3: MouseBox(376, 210, 408, 233, 1); // max price
+ 0: MouseBox(269, 208, 304, 232, 1); // min price
+ 1: begin end; // market price
+ 2: MouseBox(376, 210, 408, 233, 1); // max price
else begin
MouseBox(429, 209, 462, 234, 1);
wait(100+Random(100));
@@ -569,12 +539,11 @@
Result := true;
MMouse(215, 284, 96, 21);
- wait(250+Random(100));
- if IsUpText('ffer') then
+ if WaitUpText('ffer', 400) then
begin
GetMousePos(x, y);
Mouse(x, y, 0, 0, true);
- wait(1000+Random(200));
+ wait(1500+Random(200));
end;
if GESellMenu or GEBuyMenu then
@@ -604,27 +573,27 @@
if GEBuyAt(free) then
begin
- wait(50+ Random(50));
+ wait(150+ Random(50));
if (GetColor(231, 362) <> 23200) then //checking for Item Search
begin
Mouse(125, 117, 7, 7, true);
- wait(200+random(50));
+ wait(200+random(100));
end;
TypeSend(lowercase(What));
- wait(150+Random(100));
+ wait(400+Random(200));
if FindColor(x, y, 23200, 66, 348, 120, 354) then //if it finds our thing
begin
Mouse(x, y, 5, 3, true);
- wait(100+Random(100));
+ wait(200+Random(100));
end else begin
writeln('Wrong object name');
exit;
end;
- wait(100+Random(100));
+ wait(200+Random(100));
if not GESetPrice(Price) then exit;
wait(200+Random(100));
GESetQuantity(Quantity);
Before the edit:
http://fatality.axspace.com/ed10001