diff --git a/js/game.js b/js/game.js index c10cfc7..2341574 100644 --- a/js/game.js +++ b/js/game.js @@ -1613,6 +1613,10 @@ function init_socket(args) ui_error("Item combination failed"); if(!data.stale) resolve_deferred("compound",{success:false,level:data.level,num:data.num}); } + else if(response=="compound_no_scroll") + { + reject_deferred("compound",{reason:"no_scroll"}); + } else if(response=="compound_in_progress") { ui_log("Another combination in progress","gray"); @@ -6182,4 +6186,4 @@ function draw(arg1,manual_draw) { catch(e){console.log(e);} } in_draw=false; -} \ No newline at end of file +} diff --git a/node/server.js b/node/server.js index 9efe6d6..e5dbde7 100644 --- a/node/server.js +++ b/node/server.js @@ -5692,6 +5692,9 @@ function init_io() { if (offering && G.items[offering.name].type != "offering") { return socket.emit("game_response", "compound_invalid_offering"); } + if (!scroll) { + return socket.emit("game_response", "compound_no_scroll"); + } if (!item0 || (item0.level || 0) != data.clevel) { return fail_response("no_item"); }