Skip to content

feat: [377] [Farming] Watering can support. Add category and param, make fillable #704

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

Open
Macs-Account wants to merge 3 commits into
base: 377-wip
Choose a base branch
from
Open

feat: [377] [Farming] Watering can support. Add category and param, make fillable #704

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
ce5eeab
Add category and param for watering cans
Macs-Account Aug 1, 2026
15696ac
Lumbridge Sink is now a watersource
Macs-Account Aug 1, 2026
c44292b
You can now fill watering cans with water source locs, buckets of wat…
Macs-Account Aug 1, 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
1 change: 1 addition & 0 deletions scripts/_unpack/377/all.loc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94124,6 +94124,7 @@ recol2d=12548
length=2
blockrange=no
blockrange=no
category=watersource

[qip_cook_cookingshelves]
name=Shelves
Expand Down
17 changes: 17 additions & 0 deletions scripts/_unpack/377/all.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63699,6 +63699,7 @@ womanwear=obj_watering_can_0_manwear,0
members=yes
cost=8
weight=100g
category=watering_can

[cert_watering_can_0]
certlink=watering_can_0
Expand All @@ -63717,6 +63718,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=200g
category=watering_can
param=next_obj_stage,watering_can_0

[watering_can_2]
name=Watering can(2)
Expand All @@ -63731,6 +63734,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=300g
category=watering_can
param=next_obj_stage,watering_can_1

[watering_can_3]
name=Watering can(3)
Expand All @@ -63745,6 +63750,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=400g
category=watering_can
param=next_obj_stage,watering_can_2

[watering_can_4]
name=Watering can(4)
Expand All @@ -63759,6 +63766,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=500g
category=watering_can
param=next_obj_stage,watering_can_3

[watering_can_5]
name=Watering can(5)
Expand All @@ -63773,6 +63782,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=600g
category=watering_can
param=next_obj_stage,watering_can_4

[watering_can_6]
name=Watering can(6)
Expand All @@ -63787,6 +63798,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=700g
category=watering_can
param=next_obj_stage,watering_can_5

[watering_can_7]
name=Watering can(7)
Expand All @@ -63801,6 +63814,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=800g
category=watering_can
param=next_obj_stage,watering_can_6

[watering_can_8]
name=Watering can(8)
Expand All @@ -63815,6 +63830,8 @@ manwear=obj_watering_can_0_manwear,0
womanwear=obj_watering_can_0_manwear,0
members=yes
weight=900g
category=watering_can
param=next_obj_stage,watering_can_7

[rake]
name=Rake
Expand Down
15 changes: 15 additions & 0 deletions scripts/general_use/scripts/water_sources.rs2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ switch_obj (last_useitem)
case bucket_empty, jug_empty : @water_fill(last_useslot, last_slot);
case potato, cooked_meat, cooked_chicken : @make_incomplete_stew(last_useslot);
case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
case default : ~displaymessage(^dm_default);
};

Expand All @@ -17,6 +18,7 @@ switch_obj (last_useitem)
case clay : @make_softclay(bucket_water);
case jug_empty, bowl_empty : @water_fill(last_useslot, last_slot);
case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
case default : ~displaymessage(^dm_default);
};

Expand All @@ -28,6 +30,7 @@ switch_obj (last_useitem)
case clay : @make_softclay(jug_water);
case bucket_empty, bowl_empty : @water_fill(last_useslot, last_slot);
case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
case default : ~displaymessage(^dm_default);
};

Expand Down Expand Up @@ -63,6 +66,7 @@ inv_setslot(inv, $use_slot, oc_param($used_with, next_obj_stage), 1); //new empt
[oplocu,_watersource]
switch_obj (last_useitem) {
case bucket_empty, jug_empty, vial_empty, bowl_empty, goldbowl_empty, goldbowlbless_empty : @fill_container_water(last_useitem);
case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can(last_useitem);
case default : ~displaymessage(^dm_default);
}

Expand Down Expand Up @@ -91,3 +95,14 @@ sound_synth(well_fill, 0, 0);
mes("You fill the bucket from the well.");
// strongqueued in osrs but that was likely changed in Sept 2005
p_delay(0);

[label,fill_watering_can_with](int $canslot, int $itemslot)
def_obj $wateringcan = inv_getobj(inv, $canslot);
def_obj $wateritem = inv_getobj(inv, $itemslot);

inv_setslot(inv, $itemslot, oc_param($wateritem, next_obj_stage), 1);
@fill_watering_can($wateringcan);

[label,fill_watering_can](obj $watering_can)
inv_del(inv, $watering_can, 1);
inv_add(inv, watering_can_8, 1);
Loading