MasterGordon
/
Draconic-Calculator
mirror of https://github.com/MasterGordon/Draconic-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix

This commit is contained in:
GordonDaFreeman 2018-01-17 10:57:46 +01:00
parent e1a7c248b8
commit 3d021a9d13
14 changed files with 209 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/main.css
View File

@ -26,14 +26,8 @@
} }
#bottom-right {
right: 0;
bottom: 0;
position: absolute;
}
#bottom-left { #bottom-left {
left: 5px; right: 5px;
bottom: 0; bottom: 0;
position: absolute; position: fixed;
} }

2
index.html
View File

@ -58,6 +58,6 @@
</div> </div>
</body> </body>
<div id="container"> <div id="container">
<div class="ui-widget" id="bottom-left">Inspiration Pyramidalist<br>© MasterGordon & Ph3nix</div> <div class="ui-widget" id="bottom-left">Thanks to Pyramidalist and his community<br>© MasterGordon & Ph3nix</div>
</div> </div>
</html> </html>

321
js/main.js
View File

@ -17,45 +17,60 @@ itemsRequest.onload = function() {
for (var i = 0; i < items.length && !(items[i] in window); i++) { for (var i = 0; i < items.length && !(items[i] in window); i++) {
loadJSON(items[i]) loadJSON(items[i])
} }
} }
itemsRequest.send() itemsRequest.send()
function loadHTML() { function loadHTML() {
$("#menu li ul").empty() $("#menu li ul").empty()
$("#k_other").empty() $("#k_other").empty()
for (var i = 0; i < allItemsArray.length; i++) { for (var i = 0; i < allItemsArray.length; i++) {
if (!('disabled' in allItemsArray[i])){ if (!('disabled' in allItemsArray[i])) {
//$("#itemtoadd").append("<option value=\""+allItemsArray[i].id+"\">" + allItemsArray[i].name + "</option>") // $("#itemtoadd").append("<option
$("#k_"+allItemsArray[i].type).append("<li><div class=\"additem\" id=\"add"+ allItemsArray[i].id +"\">" + allItemsArray[i].name + "</div></li>") // value=\""+allItemsArray[i].id+"\">" + allItemsArray[i].name +
// "</option>")
$("#k_" + allItemsArray[i].type).append(
"<li><div class=\"additem\" id=\"add" + allItemsArray[i].id
+ "\">" + allItemsArray[i].name + "</div></li>")
} else { } else {
//console.log(allItemsArray[i].name+" disabled. Not loading") // console.log(allItemsArray[i].name+" disabled. Not loading")
} }
} }
$(".additem").click(function() { $(".additem")
var id = parseInt($(this).attr("id").substring(3,99)) .click(
console.log(id) function() {
var tagid = 'item_'+id var id = parseInt($(this).attr("id").substring(3, 99))
if($('#'+tagid).length){ console.log(id)
console.log(id+" allready exists!") var tagid = 'item_' + id
return if ($('#' + tagid).length) {
} console.log(id + " allready exists!")
$("#tocraft").append('<input id="'+tagid+'" name="value"><label id="lable_'+tagid+'" style="margin-top: 3px;" class="ui-widget" for="'+tagid+'"> '+getItemFromId(id).name+'<br></label>') return
$("#"+tagid).spinner({
min: 0, }
numberFormat: "n", $("#tocraft")
change: function( event, ui ) { .append(
if($("#"+tagid).spinner( "value" )==0){ '<input id="'
$("#"+tagid).spinner( "destroy" ) + tagid
$("#"+tagid).remove() + '" name="value"><label id="lable_'
$("#lable_"+tagid).remove() + tagid
} + '" style="margin-top: 3px;" class="ui-widget" for="'
} + tagid + '"> '
}); + getItemFromId(id).name
$("#"+tagid).val(1) + '<br></label>')
}) $("#" + tagid).spinner({
min : 0,
numberFormat : "n",
change : function(event, ui) {
if ($("#" + tagid).spinner("value") == 0) {
$("#" + tagid).spinner("destroy")
$("#" + tagid).remove()
$("#lable_" + tagid).remove()
}
}
});
$("#" + tagid).val(1)
})
} }
function loadJSON(itemname) { function loadJSON(itemname) {
@ -65,9 +80,9 @@ function loadJSON(itemname) {
itemRequest.onload = function() { itemRequest.onload = function() {
itemname = itemname.replace(/\s/g, "") itemname = itemname.replace(/\s/g, "")
var item = JSON.parse(itemRequest.responseText) var item = JSON.parse(itemRequest.responseText)
if (!('name' in item)){ if (!('name' in item)) {
item.name = itemname item.name = itemname
console.warn("missing key \"name\" in "+itemname) console.warn("missing key \"name\" in " + itemname)
} }
item.id = newid item.id = newid
allItems[itemname] = item allItems[itemname] = item
@ -75,114 +90,168 @@ function loadJSON(itemname) {
console.log(item) console.log(item)
loadHTML() loadHTML()
newid++ newid++
if(newid==items.length) if (newid == items.length)
$( "#menu" ).menu( "refresh" ); $("#menu").menu("refresh");
} }
itemRequest.send() itemRequest.send()
} }
function getItemFromId(index){ function getItemFromId(index) {
for(var i=0;i<allItemsArray.length;i++){ for (var i = 0; i < allItemsArray.length; i++) {
if(allItemsArray[i].id == index) if (allItemsArray[i].id == index)
return allItemsArray[i] return allItemsArray[i]
} }
return null return null
} }
$( document ).ready(function() { $(document)
// SEITE HAT GELADEN .ready(
function() {
$("#itemtoadd").selectmenu() // SEITE HAT GELADEN
$("#additem").button()
$("#calc").button() $("#itemtoadd").selectmenu()
$("#additem").button()
// BUTTONS $("#calc").button()
$(".additem").click(function() {
var id = $("#itemtoadd").val() // BUTTONS
console.log("Adding "+id+"...") $(".additem")
var tagid = 'item_'+id .click(
if($('#'+tagid).length){ function() {
console.log(id+" allready exists!") var id = $("#itemtoadd").val()
return console.log("Adding " + id + "...")
} var tagid = 'item_' + id
$("#tocraft").append('<input id="'+tagid+'" name="value"><label id="lable_'+tagid+'" style="margin-top: 3px;" class="ui-widget" for="'+tagid+'"> '+getItemFromId(id).name+'<br></label>') if ($('#' + tagid).length) {
$("#"+tagid).spinner({ console.log(id
min: 0, + " allready exists!")
numberFormat: "n", return
change: function( event, ui ) {
if($("#"+tagid).spinner( "value" )==0){ }
$("#"+tagid).spinner( "destroy" ) $("#tocraft")
$("#"+tagid).remove() .append(
$("#lable_"+tagid).remove() '<input id="'
} + tagid
} + '" name="value"><label id="lable_'
}); + tagid
$("#"+tagid).val(1) + '" style="margin-top: 3px;" class="ui-widget" for="'
}) + tagid
+ '"> '
$("#calc").click(function() { + getItemFromId(id).name
requieredCount = [] + '<br></label>')
requieredItems = [] $("#" + tagid)
for(var i=0;i<newid;i++){ .spinner(
var tag = "#item_"+i; {
if($(tag).length){ min : 0,
var item = allItemsArray[i] numberFormat : "n",
for(var n=0;n<$(tag).spinner("value");n++){ change : function(
for(var j=0;j<item.crafting.length;j++){ event, ui) {
if(requieredItems.indexOf(item.crafting[j])==-1){ if ($(
requieredCount[requieredItems.length] = 1 "#"
requieredItems[requieredItems.length] = item.crafting[j] + tagid)
}else{ .spinner(
requieredCount[requieredItems.indexOf(item.crafting[j])]++ "value") == 0) {
} $(
} "#"
} + tagid)
} .spinner(
} "destroy")
updateoutput() $(
}) "#"
+ tagid)
}) .remove()
$(
"#lable_"
+ tagid)
.remove()
}
}
});
$("#" + tagid).val(1)
})
$("#calc")
.click(
function() {
requieredCount = []
requieredItems = []
for (var i = 0; i < newid; i++) {
var tag = "#item_" + i;
if ($(tag).length) {
var item = allItemsArray[i]
for (var n = 0; n < $(tag)
.spinner("value"); n++) {
for (var j = 0; j < item.crafting.length; j++) {
if (requieredItems
.indexOf(item.crafting[j]) == -1) {
requieredCount[requieredItems.length] = 1
requieredItems[requieredItems.length] = item.crafting[j]
} else {
requieredCount[requieredItems
.indexOf(item.crafting[j])]++
}
}
}
}
}
updateoutput()
})
})
function updateoutput() { function updateoutput() {
$("#output").empty() $("#output").empty()
for (var i = 0; i < requieredItems.length; i++) { for (var i = 0; i < requieredItems.length; i++) {
if(allItems[requieredItems[i]]){ if (allItems[requieredItems[i]]) {
$("#output").append("<span id=\""+i+"\" class=\"ui-widget outputitem splitable\">" +requieredCount[i]+"x "+allItems[requieredItems[i]].name+ "</span><br>") $("#output").append(
}else{ "<span id=\"" + i
$("#output").append("<span id=\""+i+"\" class=\"ui-widget outputitem notsplitable\">" +requieredCount[i]+"x "+requieredItems[i]+ "</span><br>") + "\" class=\"ui-widget outputitem splitable\">"
+ requieredCount[i] + "x "
+ allItems[requieredItems[i]].name + "</span><br>")
} else {
$("#output").append(
"<span id=\"" + i
+ "\" class=\"ui-widget outputitem notsplitable\">"
+ requieredCount[i] + "x " + requieredItems[i]
+ "</span><br>")
} }
} }
$(".outputitem").click(function() { $(".outputitem")
console.log($(this).attr('id')) .click(
var index = parseInt($(this).attr('id')) function() {
var itemid = requieredItems[index] console.log($(this).attr('id'))
var itemcount = requieredCount[index] var index = parseInt($(this).attr('id'))
if(allItems[itemid]){ var itemid = requieredItems[index]
var item = allItems[itemid] var itemcount = requieredCount[index]
requieredCount.splice(index,1) if (allItems[itemid]) {
requieredItems.splice(index,1) var item = allItems[itemid]
for(var i=0;i<itemcount;i++){ requieredCount.splice(index, 1)
for(var j=0;j<item.crafting.length;j++){ requieredItems.splice(index, 1)
for (var i = 0; i < itemcount; i++) {
var count = 1 for (var j = 0; j < item.crafting.length; j++) {
if(item.count)
count = 1/item.count var count = 1
if (item.count)
if(requieredItems.indexOf(item.crafting[j])==-1){ count = 1 / item.count
requieredCount[requieredItems.length] = count
requieredItems[requieredItems.length] = item.crafting[j] if (requieredItems
console.log("-1") .indexOf(item.crafting[j]) == -1) {
}else{ requieredCount[requieredItems.length] = count
requieredCount[requieredItems.indexOf(item.crafting[j])] += count requieredItems[requieredItems.length] = item.crafting[j]
} console.log("-1")
} } else {
} requieredCount[requieredItems
for(var i=0;i<requieredCount.length;i++){ .indexOf(item.crafting[j])] += count
requieredCount[i]=Math.ceil(requieredCount[i]) }
} }
} }
updateoutput() for (var i = 0; i < requieredCount.length; i++) {
}) requieredCount[i] = Math
.ceil(requieredCount[i])
}
$('#' + index).fadeOut(300)
setTimeout(function() {
updateoutput()
}, 300)
}
})
} }

2
resources/items/axe_of_the_wyvern.txt
View File

@ -2,5 +2,5 @@
"type":"tools", "type":"tools",
"name": "Axe of the Wyvern", "name": "Axe of the Wyvern",
"crafting": ["Diamond_axe", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"] "crafting": ["diamond_axe", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"]
} }

2
resources/items/block_of_emerald.txt
View File

@ -3,5 +3,5 @@
"type":"other", "type":"other",
"name": "Block of Emerald", "name": "Block of Emerald",
"disabled": true, "disabled": true,
"crafting": ["emerald", "emerald", "emerald", "emerald", "emerald", "emerald", "emerald", "emerald", "emerald"] "crafting": ["Emerald", "Emerald", "Emerald", "Emerald", "Emerald", "Emerald", "Emerald", "Emerald", "Emerald"]
} }

2
resources/items/draconic_hoe.txt
View File

@ -2,5 +2,5 @@
"type":"tools", "type":"tools",
"name": "Draconic Hoe", "name": "Draconic Hoe",
"crafting": ["Diamond_hoe", "awakened_draconium_ingot", "awakened_draconium_ingot", "awakened_core", "draconic_energy_core"] "crafting": ["diamond_hoe", "awakened_draconium_ingot", "awakened_draconium_ingot", "awakened_core", "draconic_energy_core"]
} }

2
resources/items/eye_of_ender.txt
View File

@ -3,5 +3,5 @@
"type":"other", "type":"other",
"name": "Eye of Ender", "name": "Eye of Ender",
"disabled": true, "disabled": true,
"crafting": ["ender_pearl", "blaze_powder"] "crafting": ["Ender Pearl", "blaze_powder"]
} }

2
resources/items/golden_apple.txt
View File

@ -3,5 +3,5 @@
"type":"other", "type":"other",
"name": "Golden Apple", "name": "Golden Apple",
"disabled": true, "disabled": true,
"crafting": ["apple", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot"] "crafting": ["Apple", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot", "Gold Ingot"]
} }

2
resources/items/pickaxe_of_the_wyvern.txt
View File

@ -2,5 +2,5 @@
"type":"tools", "type":"tools",
"name": "Pickaxe of the Wyvern", "name": "Pickaxe of the Wyvern",
"crafting": ["Diamond_pickaxe", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"] "crafting": ["diamond_pickaxe", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"]
} }

2
resources/items/shovel_of_the_wyvern.txt
View File

@ -2,5 +2,5 @@
"type":"tools", "type":"tools",
"name": "Shovel of the Wyvern", "name": "Shovel of the Wyvern",
"crafting": ["Diamond_shovel", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"] "crafting": ["diamond_shovel", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"]
} }

2
resources/items/sword_of_the_wyvern.txt
View File

@ -2,5 +2,5 @@
"type":"tools", "type":"tools",
"name": "Sword of the Wyvern", "name": "Sword of the Wyvern",
"crafting": ["Diamond_sword", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"] "crafting": ["diamond_sword", "Draconium Ingot", "Draconium Ingot", "wyvern_core", "wyvern_energy_core"]
} }

2
resources/upgrades/tier_basic.txt
View File

@ -1,5 +1,5 @@
{ {
"type": "upgrades", "type": "upgrades",
"name": "Upgrade Tier Basic", "name": "Upgrade Tier Basic",
"crafting": ["diamond", "diamond", "draconic_core", "golden_apple", "golden_apple", "eye_of_ender", "eye_of_ender"] "crafting": ["Diamond", "Diamond", "draconic_core", "golden_apple", "golden_apple", "eye_of_ender", "eye_of_ender"]
} }

2
resources/upgrades/tier_chaotic.txt
View File

@ -1,5 +1,5 @@
{ {
"type": "upgrades", "type": "upgrades",
"name": "Upgrade Tier Chaotic", "name": "Upgrade Tier Chaotic",
"crafting": ["wyvern_core", "wyvern_core", "awakened_core", "awakened_core", "dragon_egg", "dragon_egg", "chaotic_core"] "crafting": ["wyvern_core", "wyvern_core", "awakened_core", "awakened_core", "Dragon Egg", "Dragon Egg", "chaotic_core"]
} }

2
resources/upgrades/tier_wyvern.txt
View File

@ -1,5 +1,5 @@
{ {
"type": "upgrades", "type": "upgrades",
"name": "Upgrade Tier Wyvern", "name": "Upgrade Tier Wyvern",
"crafting": ["nether_star", "nether_star", "draconic_core", "draconic_core", "emerald", "emerald", "wyvern_core"] "crafting": ["nether_star", "nether_star", "draconic_core", "draconic_core", "Emerald", "Emerald", "wyvern_core"]
} }