diff --git a/js/functions.js b/js/functions.js index f06b212..5cc9d96 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1242,9 +1242,9 @@ function inventory_click(num,event) else if(character.items[num]) { if(character.items[num].name=="placeholder") return; - if(character.items[num].name=="computer") // gameplay=="hardcore" && + if(character.items[num].name=="computer" || character.items[num].name=="supercomputer") // gameplay=="hardcore" && { - return render_computer_network(".inventory-item"); + return render_computer_network(".inventory-item",character.items[num].name,num); } render_item(".inventory-item",{id:"citem"+num,item:G.items[character.items[num].name],name:character.items[num].name,actual:character.items[num],num:num,inventory_ui:num}); last_invclick=num+iname; @@ -2848,6 +2848,15 @@ function close_merchant() return push_deferred("merchant"); } +function toggle_merchant(num) { + if(character.stand) { + socket.emit("merchant",{close:1}); + } else { + socket.emit("merchant",{num:num}); + } + return push_deferred("merchant"); +} + function donate(gold) { if(gold===undefined) @@ -7006,4 +7015,4 @@ function electron_add_webview(url) { if(!url) url="http://thegame.com/character/GG/in/EU/I/"; $("body").append(""); -} \ No newline at end of file +} diff --git a/js/html.js b/js/html.js index 3edb9e5..c9a4e65 100644 --- a/js/html.js +++ b/js/html.js @@ -2154,10 +2154,16 @@ function render_tracker() show_modal(html,{wwidth:578,hideinbackground:true}); } -function render_computer($element) +function render_computer($element,type="computer",slot=0) { var html=""; html+="
CONNECTED.
"; + html+="
> TRADE HISTORY
"; + html+="
> TOGGLE STAND
"; + if(type == "supercomputer") { + html+="
> TRACKER
"; + } + html+="
> UPGRADE
"; // style='color: #C3C3C3' style='color: #D6D6D6' html+="
> COMPOUND
"; html+="
> EXCHANGE
"; @@ -2228,11 +2234,11 @@ function render_skill(selector,skill_name,args) else $(selector).html(html); } -function render_computer_network(selector) +function render_computer_network(selector,type,num) { var html="
"; $(selector).html(html); - render_computer($(".computernx")); + render_computer($(".computernx"),type,num); } function render_secondhands(type)