Skip to content

feat: emptying potions & vials #486

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
Collin-M wants to merge 2 commits into
base: 274
Choose a base branch
from
Open

feat: emptying potions & vials #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84bccb5
feat: emptying potions & vials
Collin-M Mar 27, 2026
89809c6
rename file
Collin-M Mar 27, 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
2 changes: 1 addition & 1 deletion scripts/areas/area_seers/configs/stankers.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ iop1=Drink
weight=2oz
members=yes
cost=20
category=category_69
category=potion
2 changes: 1 addition & 1 deletion scripts/areas/area_varrock/configs/apothecary.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ recol1d=9965
2dyan=1996
2dxan=84
weight=25g
category=category_69
category=potion
4 changes: 2 additions & 2 deletions scripts/minigames/game_duelarena/scripts/duel_arena_settings.rs2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ return(true);
if (~in_duel_arena(coord) = false) {
return(true);
}
if (oc_category($obj) = category_69 & testbit(%dueloptions, ^no_potions) = ^true) {
if (oc_category($obj) = potion & testbit(%dueloptions, ^no_potions) = ^true) {
mes("Use of potions has been turned off for this duel."); // guess based on no food
return(false);
}
if (oc_category($obj) ! category_69 & testbit(%dueloptions, ^no_food) = ^true) {
if (oc_category($obj) ! potion & testbit(%dueloptions, ^no_food) = ^true) {
mes("Use of food has been turned off for this duel."); // https://imgur.com/E0l52P2
return(false);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/player/scripts/consumption/consume.rs2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (oc_param(last_item, next_obj_stage) = null) {
[opheld1,jangerberries]@player_consume_item(consume_effect_stat, 2, 3);
[opheld1,poison_chalice]@player_consume_item(consume_effect_poison_chalice, null, null);
[opheld1,cup_of_tea]@player_consume_item(consume_effect_stat_say, 2, 3);
[opheld1,_category_69]
[opheld1,_potion]
switch_obj(last_item) {
// anti dragon
case 1dose1antidragon, 2dose1antidragon, 3dose1antidragon, 4dose1antidragon :
Expand Down
2 changes: 1 addition & 1 deletion scripts/player/scripts/consumption/effects/scripts/consume_effects.rs2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ if ($message_data ! null) {
}

// if potion then display doses left instead of consume_message2
if ($consumable ! null & oc_category($consumable) = category_69) {
if ($consumable ! null & oc_category($consumable) = potion) {
$consumable = oc_param($consumable, next_obj_stage);
if (compare($consume_message1, "0") ! 0) {
if (string_length($consume_message1) > 0) {
Expand Down
Loading
Loading