Skip to content

Commit

Permalink
feat: add new food and prayer items
Browse files Browse the repository at this point in the history
  • Loading branch information
Torwent committed Mar 31, 2024
1 parent f5f95b6 commit 38ec907
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 23 deletions.
2 changes: 1 addition & 1 deletion optional/handlers/combathandler.simba
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const
'Magic shortbow (i)', 'Armadyl crossbow', 'Dragon hunter crossbow',
'Venator bow', 'Dragon crossbow', 'Rune crossbow', 'Adamant dart',
'Mithril dart', 'Rune scimitar', 'Dorgeshuun crossbow',
'Leaf-bladed sword', 'Leaf-bladed battleaxe', 'Null'
'Leaf-bladed sword', 'Leaf-bladed battleaxe', 'Zombie axe', 'Null'
];

SHIELDS: TRSItemArray = [
Expand Down
50 changes: 28 additions & 22 deletions utils/items/consumables.simba
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
(*
# Consumables
This file contains types and arrays of consumable items that can be used as is or by the consumable handlers in wasplib.
*){$DEFINE WL_CONSUMABLES_INCLUDED}
*)
{$DEFINE WL_CONSUMABLES_INCLUDED}
{$IFNDEF WL_UTILS}
{$I WaspLib/utils.simba}
{$I WaspLib/utils.simba}
{$ENDIF}

type

(*
## type ERSConsumable
```pascal
ERSConsumable = (
FOOD,
PRAYER,
POISON,
VENOM,
ANTI_FIRE,
STRENGTH_BOOST,
ATTACK_BOOST,
DEFENCE_BOOST,
RANGING_BOOST,
MAGIC_BOOST,
BOOST,
ENERGY
FOOD,
PRAYER,
POISON,
VENOM,
ANTI_FIRE,
STRENGTH_BOOST,
ATTACK_BOOST,
DEFENCE_BOOST,
RANGING_BOOST,
MAGIC_BOOST,
BOOST,
ENERGY
);
```
Expand Down Expand Up @@ -61,8 +61,8 @@ They are in UPPERCASE because they are intended to be treated as constants but a
WriteLn CONSUMABLE_ARRAYS[ERSConsumable.ENERGY];
```
*)
FOOD_ARRAY: TRSItemArray = ['Shrimps', 'Cooked chicken', 'Cooked meat', 'Sardine', 'Bread', 'Herring', 'Mackerel', 'Choc-ice', 'Trout', 'Cod', 'Pike', 'Roast beast meat', 'Pineapple punch', 'Salmon', 'Tuna', 'Jug of wine', 'Rainbow fish', 'Stew', 'Banana stew', 'Cake(1..3)', 'Meat pie(1..2)', 'Bass', 'Plain pizza(1..2)', 'Lobster', 'Swordfish', 'Potato with butter', 'Apple pie(1..2)', 'Chocolate cake(1..3)', 'Tangled toad' 's legs', 'Chocolate bomb', 'Potato with cheese', 'Meat pizza(1..2)', 'Admiral pie(1..2)', 'Monkfish', 'Anchovy pizza(1..2)', 'Cooked karambwan', 'Curry', 'Ugthanki kebab', 'Guthix rest(1..4)', 'Dragonfruit pie(1..2)', 'Mushroom potato', 'Shark', 'Sea turtle', 'Pineapple pizza(1..2)', 'Summer pie(1..2)', 'Wild pie(1..2)', 'Manta ray', 'Tuna potato', 'Dark crab', 'Anglerfish', 'Saradomin brew(1..4)'];
PRAYER_ARRAY: TRSItemArray = ['Zamorak brew(1..4)', 'Sanfew serum(1..4)', 'Super restore(1..4)', 'Prayer potion(1..4)', 'Jangerberries'];
FOOD_ARRAY: TRSItemArray = ['Shrimps', 'Cooked chicken', 'Cooked meat', 'Sardine', 'Bread', 'Herring', 'Mackerel', 'Choc-ice', 'Trout', 'Cod', 'Pike', 'Cooked wild kebbit', 'Sunlight moth mix (1..2)', 'Sunlight moth', 'Roast beast meat', 'Pineapple punch', 'Salmon', 'Tuna', 'Jug of wine', 'Rainbow fish', 'Cooked larupia', 'Stew', 'Banana stew', 'Cake(1..3)', 'Meat pie(1..2)', 'Bass', 'Plain pizza(1..2)', 'Lobster', 'Cooked barb-tailed kebbit', 'Swordfish', 'Cooked graahk', 'Potato with butter', 'Apple pie(1..2)', 'Chocolate cake(1..3)', 'Tangled toad' 's legs', 'Chocolate bomb', 'Potato with cheese', 'Meat pizza(1..2)', 'Admiral pie(1..2)', 'Monkfish', 'Cooked kyatt', 'Anchovy pizza(1..2)', 'Cooked karambwan', 'Curry', 'Ugthanki kebab', 'Guthix rest(1..4)', 'Dragonfruit pie(1..2)', 'Mushroom potato', 'Shark', 'Cooked pyre fox', 'Sea turtle', 'Cooked sunlight antelope', 'Pineapple pizza(1..2)', 'Summer pie(1..2)', 'Wild pie(1..2)', 'Manta ray', 'Cooked dashing kebbit', 'Tuna potato', 'Dark crab', 'Anglerfish', 'Cooked moonlight antelope', 'Saradomin brew(1..4)', 'Cooked bream'];
PRAYER_ARRAY: TRSItemArray = ['Zamorak brew(1..4)', 'Sanfew serum(1..4)', 'Super restore(1..4)', 'Prayer potion(1..4)', 'Moonlight moth mix (1..2)', 'Moonlight moth', 'Jangerberries'];
ENERGY_ARRAY: TRSItemArray = ['White tree fruit', 'Winter sq' 'irkjuice', 'Spring sq' 'irkjuice', 'Autumn sq' 'irkjuice', 'Summer sq' 'irkjuice', 'Bandages', 'Guthix rest(1..4)', 'Papaya fruit', 'Energy potion(1..4)', 'Purple sweets', 'Summer pie(1..2)', 'Super energy(1..4)', 'Stamina potion(1..4)', 'Strange fruit', 'Mint cake', 'Gout tuber'];
ANTI_POISON_ARRAY: TRSItemArray = ['Sanfew serum(1..4)', 'Anti-venom+(1..4)', 'Anti-venom(1..4)', 'Antidote++(1..4)', 'Antidote+(1..4)', 'Superantipoison(1..4)', 'Antipoison(1..4)'];
ANTI_VENOM_ARRAY: TRSItemArray = ['Anti-venom+(1..4)', 'Anti-venom(1..4)'];
Expand Down Expand Up @@ -180,20 +180,23 @@ begin
'Bread', 'Herring', 'Chocolate cake(1..3)', 'Guthix rest(1..4)': Self.Points := 5;
'Mackerel', 'Choc-ice', 'Meat pie(2)', 'Meat pie(1)': Self.Points := 6;
'Trout', 'Cod', 'Plain pizza(1..2)', 'Apple pie(1..2)': Self.Points := 7;
'Pike', 'Roast beast meat', 'Meat pizza(1..2)', 'Admiral pie(1..2)': Self.Points := 8;
'Pike', 'Roast beast meat', 'Meat pizza(1..2)', 'Admiral pie(1..2)', 'Cooked wild kebbit', 'Sunlight moth mix (1..2)', 'Sunlight moth': Self.Points := 8;
'Pineapple punch', 'Salmon', 'Anchovy pizza(1..2)': Self.Points := 9;
'Tuna', 'Dragonfruit pie(1..2)': Self.Points := 10;
'Jug of wine', 'Rainbow fish', 'Stew', 'Banana stew', 'Pineapple pizza(1..2)', 'Summer pie(1..2)', 'Wild pie(1..2)': Self.Points := 11;
'Lobster': Self.Points := 12;
'Jug of wine', 'Rainbow fish', 'Cooked larupia', 'Stew', 'Banana stew', 'Pineapple pizza(1..2)', 'Summer pie(1..2)', 'Wild pie(1..2)': Self.Points := 11;
'Lobster', 'Cooked barb-tailed kebbit': Self.Points := 12;
'Bass': Self.Points := 13;
'Swordfish', 'Potato with butter': Self.Points := 14;
'Swordfish', 'Potato with butter', 'Cooked graahk': Self.Points := 14;
'Tangled toad' 's legs', 'Chocolate bomb': Self.Points := 15;
'Potato with cheese', 'Monkfish': Self.Points := 16;
'Cooked kyatt': Self.Points := 17;
'Cooked karambwan': Self.Points := 18;
'Cooked pyre fox': Self.Points := 19;
'Curry', 'Ugthanki kebab': Self.Points := 19;
'Mushroom potato', 'Shark': Self.Points := 20;
'Sea turtle': Self.Points := 21;
'Sea turtle', 'Cooked sunlight antelope': Self.Points := 21;
'Manta ray', 'Tuna potato', 'Dark crab': Self.Points := 22;
'Cooked dashing kebbit': Self.Points := 23;
'Anglerfish':
begin
HPLevel := Stats.GetLevel(ERSSkill.HitPoints);
Expand All @@ -205,7 +208,9 @@ begin
93 .. 99: Self.Points := Floor(HPLevel * 0.1) + 13;
end;
end;
'Cooked moonlight antelope': Self.Points := 26;
'Saradomin brew(1..4)': Self.Points := Floor(Stats.GetLevel(ERSSkill.HitPoints) * 0.15) + 2;
'Cooked bream': Self.Points := Floor(Stats.GetLevel(ERSSkill.FISHING) * 0.33);
end;
Self._Setup();
end;
Expand All @@ -219,6 +224,7 @@ begin
'Super restore(1..4)': Self.Points := Floor((Stats.GetLevel(ERSSkill.PRAYER) * 0.25) + 8);
'Sanfew serum(1..4)': Self.Points := Floor((Stats.GetLevel(ERSSkill.PRAYER) * 0.3) + 4);
'Zamorak brew(1..4)': Self.Points := Floor(Stats.GetLevel(ERSSkill.PRAYER) * 0.1);
'Moonlight moth mix (1..2)', 'Moonlight moth': Self.Points := 22;
'Jangerberries': Self.Points := 1;
end;
Self._Setup();
Expand Down

0 comments on commit 38ec907

Please sign in to comment.