diff --git a/scripts/interface_bank/scripts/bank.rs2 b/scripts/interface_bank/scripts/bank.rs2 index 24aba4fee..39b0ff320 100644 --- a/scripts/interface_bank/scripts/bank.rs2 +++ b/scripts/interface_bank/scripts/bank.rs2 @@ -88,30 +88,31 @@ if ($withdraw > 0) { def_int $overflow = inv_itemspace2(bank, oc_uncert($obj), $amount, ^max_32bit_int); if (sub(^max_32bit_int, $amount) < inv_total(bank, oc_uncert($obj))) { if($mes = ^true) mes("You already have a full stack of that item in the bank."); // 2024 osrs - return (false); + return(false); } if ($overflow >= $amount) { // https://youtu.be/2BgXLZD-xgo?t=28 // https://youtu.be/Ep4gaI5ic1s?t=197 if($mes = ^true) mes("You don't have enough space in your bank account."); // osrs - return (false); + return(false); } def_int $deposit = sub($amount, $overflow); if ($deposit > 0) { session_log(^log_moderator, "Deposited x into bank"); inv_moveitem_uncert($inv, bank, $obj, $deposit); } +return(true); -[proc,bank_check_nobreak](obj $obj, int $send_mes)(boolean) +[proc,bank_check_allowed](obj $obj, int $send_mes)(boolean) if (oc_param($obj, unbankable) = ^true) { if($send_mes = ^true) mes("A magical force prevents you from banking this item!"); // osrs - return(true); + return(false); } // https://www.youtube.com/watch?v=W5iZgykts2A // No mes when creating boxes via actions if ($obj = macro_cube) { ~try_add_macro_cube; - return(true); + return(false); } if (playermember = ^false) { @@ -121,10 +122,10 @@ if (playermember = ^false) { // https://web.archive.org/web/20041126073829/http://img39.imageshack.us/img39/3412/firemaking.jpg (2004) mes("You need to subscribe for a members account if you want to"); mes("store any more items in the bank."); - return(true); + return(false); } } -return(false); +return(true); [label,insert_bank](int $start_slot, int $target_slot) def_int $src = $start_slot; diff --git a/scripts/interface_bank/scripts/bank_deposit.rs2 b/scripts/interface_bank/scripts/bank_deposit.rs2 index 54288a4c8..16573649c 100644 --- a/scripts/interface_bank/scripts/bank_deposit.rs2 +++ b/scripts/interface_bank/scripts/bank_deposit.rs2 @@ -19,7 +19,7 @@ def_int $number = inv_total(inv, $item); // How many should we deposit? if ($requested_number < $number) $number = $requested_number; // Is it actually bankable? -if (~bank_check_nobreak($item, ^true) = true) { +if (~bank_check_allowed($item, ^true) = false) { // custom handling here if needed. return; } diff --git a/scripts/music/configs/musicregion.dbrow b/scripts/music/configs/musicregion.dbrow index 7be39a166..afa956cc5 100644 --- a/scripts/music/configs/musicregion.dbrow +++ b/scripts/music/configs/musicregion.dbrow @@ -1263,7 +1263,7 @@ data=musicdata,music_Tiptoe [musicregion_48_153] table=musicregion data=mapsquare,0_48_153_0_0 -data=musicdata,music_Dark +data=musicdata,music_Barbarianism [musicregion_48_154] table=musicregion diff --git a/scripts/quests/quest_viking/scripts/viking_peer.rs2 b/scripts/quests/quest_viking/scripts/viking_peer.rs2 index b9d3530da..836eb52b0 100644 --- a/scripts/quests/quest_viking/scripts/viking_peer.rs2 +++ b/scripts/quests/quest_viking/scripts/viking_peer.rs2 @@ -191,7 +191,7 @@ def_int $fail = ^false; while ($i < $size) { $obj = inv_getobj(inv, $i); if ($obj ! null) { - if (~bank_check_nobreak($obj, ^false) = false) { + if (~bank_check_allowed($obj, ^false) = true) { if(~bank_deposit_request(inv, $obj, inv_total(inv, $obj), $i, ^false) = true) { $dep_count = add($dep_count, 1); } else { @@ -209,7 +209,7 @@ $i = 0; while ($i < $size) { $obj = inv_getobj(worn, $i); if ($obj ! null) { - if (~bank_check_nobreak($obj, ^false) = false) { + if (~bank_check_allowed($obj, ^false) = true) { if(~bank_deposit_request(worn, $obj, inv_total(worn, $obj), $i, ^false) = true) { $dep_count = add($dep_count, 1); } else { diff --git a/scripts/skill_crafting/scripts/gem/uncut_gem.rs2 b/scripts/skill_crafting/scripts/gem/uncut_gem.rs2 index 62f8332a3..6cb55d04d 100644 --- a/scripts/skill_crafting/scripts/gem/uncut_gem.rs2 +++ b/scripts/skill_crafting/scripts/gem/uncut_gem.rs2 @@ -7,7 +7,7 @@ switch_obj (last_useitem) case wolf_bones : @make_wolf_bone_tips; case zqbonebeads : @craft_ivorybeads; case default : - if(oc_category(last_useitem) = category_3) @craft_snelm; + if(oc_category(last_useitem) = category_3) @craft_snelm(last_useitem); ~displaymessage(^dm_default); } diff --git a/scripts/skill_crafting/scripts/snelm/snelm.rs2 b/scripts/skill_crafting/scripts/snelm/snelm.rs2 index c56c582f2..4de50ea40 100644 --- a/scripts/skill_crafting/scripts/snelm/snelm.rs2 +++ b/scripts/skill_crafting/scripts/snelm/snelm.rs2 @@ -1,15 +1,15 @@ [opheldu,_category_3] -if(last_useitem = chisel) @craft_snelm; +if(last_useitem = chisel) @craft_snelm(last_item); ~displaymessage(^dm_default); // weakqueued in osrs -[label,craft_snelm] +[label,craft_snelm](obj $shell) if(stat(crafting) < 15) { mes("You need a Crafting level of 15 to craft the shell into a helmet."); // osrs return; } -inv_del(inv, last_useitem, 1); -inv_add(inv, oc_param(last_useitem, next_obj_stage), 1); +inv_del(inv, $shell, 1); +inv_add(inv, oc_param($shell, next_obj_stage), 1); mes("You chisel the shell into a helmet."); anim(human_snailshellcutting, 0); stat_advance(crafting, 325);