diff --git a/scripts/areas/area_seers/configs/stankers.obj b/scripts/areas/area_seers/configs/stankers.obj index 79c10896a0..886135d0f4 100644 --- a/scripts/areas/area_seers/configs/stankers.obj +++ b/scripts/areas/area_seers/configs/stankers.obj @@ -12,4 +12,4 @@ iop1=Drink weight=2oz members=yes cost=20 -category=category_69 +category=potion diff --git a/scripts/areas/area_varrock/configs/apothecary.obj b/scripts/areas/area_varrock/configs/apothecary.obj index d29f339a25..5c5898f0b9 100644 --- a/scripts/areas/area_varrock/configs/apothecary.obj +++ b/scripts/areas/area_varrock/configs/apothecary.obj @@ -9,4 +9,4 @@ recol1d=9965 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion diff --git a/scripts/minigames/game_duelarena/scripts/duel_arena_settings.rs2 b/scripts/minigames/game_duelarena/scripts/duel_arena_settings.rs2 index 6d21ad7277..d452ca68db 100644 --- a/scripts/minigames/game_duelarena/scripts/duel_arena_settings.rs2 +++ b/scripts/minigames/game_duelarena/scripts/duel_arena_settings.rs2 @@ -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); } diff --git a/scripts/player/scripts/consumption/consume.rs2 b/scripts/player/scripts/consumption/consume.rs2 index 501bbdf5a4..792a6e8730 100644 --- a/scripts/player/scripts/consumption/consume.rs2 +++ b/scripts/player/scripts/consumption/consume.rs2 @@ -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 : diff --git a/scripts/player/scripts/consumption/effects/scripts/consume_effects.rs2 b/scripts/player/scripts/consumption/effects/scripts/consume_effects.rs2 index 7c9a925289..de822765b4 100644 --- a/scripts/player/scripts/consumption/effects/scripts/consume_effects.rs2 +++ b/scripts/player/scripts/consumption/effects/scripts/consume_effects.rs2 @@ -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) { diff --git a/scripts/skill_herblore/configs/brewing/potions.obj b/scripts/skill_herblore/configs/brewing/potions.obj index 63c6262e5a..c0c4cad0e7 100644 --- a/scripts/skill_herblore/configs/brewing/potions.obj +++ b/scripts/skill_herblore/configs/brewing/potions.obj @@ -14,7 +14,7 @@ recol1d=29543 2dxan=84 iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose1strength param=decant_potion_enum,potion_1strength param=dose_count,4 @@ -34,14 +34,14 @@ recol1d=29543 2dxan=84 iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose1strength param=decant_potion_enum,potion_1strength param=dose_count,3 // jagex name [2dose1strength] -category=category_69 +category=potion name=Strength potion(2) desc=2 doses of strength potion. iop1=Drink @@ -61,7 +61,7 @@ param=dose_count,2 // jagex name [1dose1strength] -category=category_69 +category=potion name=Strength potion(1) desc=1 dose of strength potion. iop1=Drink @@ -93,7 +93,7 @@ recol1d=7037 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose1attack @@ -114,7 +114,7 @@ recol1d=7037 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose1attack @@ -135,7 +135,7 @@ recol1d=7037 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -156,7 +156,7 @@ recol1d=28903 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dosestatrestore @@ -177,7 +177,7 @@ recol1d=28903 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dosestatrestore @@ -198,7 +198,7 @@ recol1d=28903 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -219,7 +219,7 @@ recol1d=7078 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose1defense @@ -240,7 +240,7 @@ recol1d=7078 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose1defense @@ -261,7 +261,7 @@ recol1d=7078 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -282,7 +282,7 @@ recol1d=7091 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2doseprayerrestore @@ -303,7 +303,7 @@ recol1d=7091 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1doseprayerrestore @@ -324,7 +324,7 @@ recol1d=7091 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -345,7 +345,7 @@ recol1d=6365 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose2attack @@ -366,7 +366,7 @@ recol1d=6365 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose2attack @@ -387,7 +387,7 @@ recol1d=6365 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -408,7 +408,7 @@ recol1d=6342 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dosefisherspotion @@ -429,7 +429,7 @@ recol1d=6342 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dosefisherspotion @@ -450,7 +450,7 @@ recol1d=6342 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -471,7 +471,7 @@ recol1d=30653 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose2strength @@ -492,7 +492,7 @@ recol1d=30653 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose2strength @@ -513,7 +513,7 @@ recol1d=30653 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -534,7 +534,7 @@ recol1d=29351 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose2defense @@ -555,7 +555,7 @@ recol1d=29351 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose2defense @@ -576,7 +576,7 @@ recol1d=29351 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -597,7 +597,7 @@ recol1d=6845 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2doserangerspotion @@ -618,7 +618,7 @@ recol1d=6845 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1doserangerspotion @@ -639,7 +639,7 @@ recol1d=6845 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -660,7 +660,7 @@ recol1d=13251 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -682,7 +682,7 @@ recol1d=13251 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -704,7 +704,7 @@ recol1d=13251 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -726,7 +726,7 @@ recol1d=30828 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -748,7 +748,7 @@ recol1d=30828 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -770,7 +770,7 @@ recol1d=30828 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -791,7 +791,7 @@ recol1d=2463 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty // jagex name @@ -809,7 +809,7 @@ recol1d=29217 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dosepotionofzamorak @@ -830,7 +830,7 @@ recol1d=29217 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dosepotionofzamorak @@ -851,7 +851,7 @@ recol1d=29217 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -862,7 +862,7 @@ param=dose_count,1 [4dose1attack] name=Attack potion(4) desc=4 doses of attack potion. -category=category_69 +category=potion iop1=Drink cost=15 model=model_2789_obj @@ -893,7 +893,7 @@ recol1d=28903 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dosestatrestore @@ -914,7 +914,7 @@ recol1d=7078 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dose1defense @@ -935,7 +935,7 @@ recol1d=7091 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3doseprayerrestore @@ -956,7 +956,7 @@ recol1d=6365 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dose2attack @@ -977,7 +977,7 @@ recol1d=6342 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dosefisherspotion @@ -998,7 +998,7 @@ recol1d=30653 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dose2strength @@ -1019,7 +1019,7 @@ recol1d=29351 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dose2defense @@ -1040,7 +1040,7 @@ recol1d=6845 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3doserangerspotion @@ -1061,7 +1061,7 @@ recol1d=13251 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -1083,7 +1083,7 @@ recol1d=30828 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=cures_poison,yes @@ -1105,7 +1105,7 @@ recol1d=29217 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dosepotionofzamorak @@ -1126,7 +1126,7 @@ recol1d=11282 2dyan=1996 2dxan=84 weight=35g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,3dose1antidragon @@ -1147,7 +1147,7 @@ recol1d=11282 2dyan=1996 2dxan=84 weight=30g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,2dose1antidragon @@ -1168,7 +1168,7 @@ recol1d=11282 2dyan=1996 2dxan=84 weight=25g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,1dose1antidragon @@ -1189,7 +1189,7 @@ recol1d=11282 2dyan=1996 2dxan=84 weight=20g -category=category_69 +category=potion members=yes iop4=Empty param=next_obj_stage,vial_empty @@ -1228,6 +1228,7 @@ op4=hidden op5=Light iop4=Empty weight=35g +category=potion [4dose1energy] name=Energy potion(4) @@ -1244,7 +1245,7 @@ model=model_2789_obj members=yes iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose1energy param=decant_potion_enum,potion_1energy param=dose_count,4 @@ -1264,7 +1265,7 @@ model=model_2697_obj members=yes iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose1energy param=decant_potion_enum,potion_1energy param=dose_count,3 @@ -1284,7 +1285,7 @@ model=model_2384_obj members=yes iop4=Empty weight=25g -category=category_69 +category=potion param=next_obj_stage,1dose1energy param=decant_potion_enum,potion_1energy param=dose_count,2 @@ -1304,7 +1305,7 @@ model=model_2621_obj members=yes iop4=Empty weight=20g -category=category_69 +category=potion param=next_obj_stage,vial_empty param=decant_potion_enum,potion_1energy param=dose_count,1 @@ -1324,7 +1325,7 @@ model=model_2789_obj members=yes iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose2energy param=decant_potion_enum,potion_2energy param=dose_count,4 @@ -1344,7 +1345,7 @@ model=model_2697_obj members=yes iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose2energy param=decant_potion_enum,potion_2energy param=dose_count,3 @@ -1364,7 +1365,7 @@ model=model_2384_obj members=yes iop4=Empty weight=25g -category=category_69 +category=potion param=next_obj_stage,1dose2energy param=decant_potion_enum,potion_2energy param=dose_count,2 @@ -1384,7 +1385,7 @@ model=model_2621_obj members=yes iop4=Empty weight=20g -category=category_69 +category=potion param=next_obj_stage,vial_empty param=decant_potion_enum,potion_2energy param=dose_count,1 @@ -1404,7 +1405,7 @@ model=model_2789_obj members=yes iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose2restore param=decant_potion_enum,potion_2restore param=dose_count,4 @@ -1424,7 +1425,7 @@ model=model_2697_obj members=yes iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose2restore param=decant_potion_enum,potion_2restore param=dose_count,3 @@ -1444,7 +1445,7 @@ model=model_2384_obj members=yes iop4=Empty weight=25g -category=category_69 +category=potion param=next_obj_stage,1dose2restore param=decant_potion_enum,potion_2restore param=dose_count,2 @@ -1464,7 +1465,7 @@ model=model_2621_obj members=yes iop4=Empty weight=20g -category=category_69 +category=potion param=next_obj_stage,vial_empty param=decant_potion_enum,potion_2restore param=dose_count,1 @@ -1484,7 +1485,7 @@ model=model_2789_obj members=yes iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose1agility param=decant_potion_enum,potion_1agility param=dose_count,4 @@ -1504,7 +1505,7 @@ model=model_2697_obj members=yes iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose1agility param=decant_potion_enum,potion_1agility param=dose_count,3 @@ -1524,7 +1525,7 @@ model=model_2384_obj members=yes iop4=Empty weight=25g -category=category_69 +category=potion param=next_obj_stage,1dose1agility param=decant_potion_enum,potion_1agility param=dose_count,2 @@ -1544,7 +1545,7 @@ model=model_2621_obj members=yes iop4=Empty weight=20g -category=category_69 +category=potion param=next_obj_stage,vial_empty param=decant_potion_enum,potion_1agility param=dose_count,1 @@ -1564,7 +1565,7 @@ model=model_2789_obj members=yes iop4=Empty weight=35g -category=category_69 +category=potion param=next_obj_stage,3dose1magic param=decant_potion_enum,potion_1magic param=dose_count,4 @@ -1584,7 +1585,7 @@ model=model_2697_obj members=yes iop4=Empty weight=30g -category=category_69 +category=potion param=next_obj_stage,2dose1magic param=decant_potion_enum,potion_1magic param=dose_count,3 @@ -1604,7 +1605,7 @@ model=model_2384_obj members=yes iop4=Empty weight=25g -category=category_69 +category=potion param=next_obj_stage,1dose1magic param=decant_potion_enum,potion_1magic param=dose_count,2 @@ -1624,7 +1625,7 @@ model=model_2621_obj members=yes iop4=Empty weight=20g -category=category_69 +category=potion param=next_obj_stage,vial_empty param=decant_potion_enum,potion_1magic param=dose_count,1 diff --git a/scripts/skill_herblore/configs/brewing/potions_unfinished.obj b/scripts/skill_herblore/configs/brewing/potions_unfinished.obj index 4aa88e3eef..a7f3a49032 100644 --- a/scripts/skill_herblore/configs/brewing/potions_unfinished.obj +++ b/scripts/skill_herblore/configs/brewing/potions_unfinished.obj @@ -12,7 +12,7 @@ recol1d=19191 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -29,7 +29,7 @@ recol1d=23158 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -46,7 +46,7 @@ recol1d=23251 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -63,7 +63,7 @@ recol1d=23155 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -80,7 +80,7 @@ recol1d=19186 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -97,7 +97,7 @@ recol1d=21147 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -114,7 +114,7 @@ recol1d=20083 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -131,7 +131,7 @@ recol1d=23254 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -148,7 +148,7 @@ recol1d=26324 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -165,7 +165,7 @@ recol1d=20186 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -182,7 +182,7 @@ recol1d=29427 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty // guessed name @@ -199,7 +199,7 @@ recol1d=26324 2dyan=1996 2dxan=84 weight=2oz -category=category_69 +category=potion members=yes iop4=Empty @@ -217,6 +217,7 @@ model=model_2697_obj members=yes iop4=Empty weight=2oz +category=potion [snapdragonvial] name=Unfinished potion @@ -232,3 +233,4 @@ model=model_2697_obj members=yes iop4=Empty weight=2oz +category=potion diff --git a/scripts/skill_herblore/configs/brewing/vials.obj b/scripts/skill_herblore/configs/brewing/vials.obj index 223aeface3..eddb458b92 100644 --- a/scripts/skill_herblore/configs/brewing/vials.obj +++ b/scripts/skill_herblore/configs/brewing/vials.obj @@ -14,6 +14,7 @@ weight=20g cost=2 iop4=Empty param=next_obj_stage,vial_empty +category=potion // jagex name [vial_empty] diff --git a/scripts/skill_herblore/scripts/decanting/decant_potion.rs2 b/scripts/skill_herblore/scripts/decanting/decant_potion.rs2 index bb6aa5d44e..46417d5819 100644 --- a/scripts/skill_herblore/scripts/decanting/decant_potion.rs2 +++ b/scripts/skill_herblore/scripts/decanting/decant_potion.rs2 @@ -1,5 +1,5 @@ -[opheldu,_category_69] -if(oc_category(last_useitem) = category_69) { +[opheldu,_potion] +if(oc_category(last_useitem) = potion) { @decant_potion(last_item, last_useitem); } ~displaymessage(^dm_default); diff --git a/scripts/skill_herblore/scripts/emptying/empty_vial.rs2 b/scripts/skill_herblore/scripts/emptying/empty_vial.rs2 new file mode 100644 index 0000000000..4fea71a643 --- /dev/null +++ b/scripts/skill_herblore/scripts/emptying/empty_vial.rs2 @@ -0,0 +1,8 @@ +[opheld4,_potion] @empty_vial(last_slot); +[opheld4,vial_water] @empty_vial(last_slot); + +[label,empty_vial](int $last_slot) +inv_setslot(inv, $last_slot, vial_empty, 1); + +// osrs: https://youtu.be/fYh1pbk7Gt4?si=ZCgi-Pi2Q9SD4IDi&t=47 +mes("You empty the contents of the vial on the floor.");