diff --git a/images/items/charcoal.png b/images/items/charcoal.png new file mode 100644 index 0000000..73ec3a8 Binary files /dev/null and b/images/items/charcoal.png differ diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..6d8ca98 Binary files /dev/null and b/images/logo.png differ diff --git a/images/tiles/charcoalmeiler10.png b/images/tiles/charcoalmeiler10.png new file mode 100644 index 0000000..e3ecfaf Binary files /dev/null and b/images/tiles/charcoalmeiler10.png differ diff --git a/images/tiles/charcoalmeiler11.png b/images/tiles/charcoalmeiler11.png new file mode 100644 index 0000000..7a5fd52 Binary files /dev/null and b/images/tiles/charcoalmeiler11.png differ diff --git a/images/tiles/charcoalmeiler110.png b/images/tiles/charcoalmeiler110.png new file mode 100644 index 0000000..15cca63 Binary files /dev/null and b/images/tiles/charcoalmeiler110.png differ diff --git a/images/tiles/charcoalmeiler111.png b/images/tiles/charcoalmeiler111.png new file mode 100644 index 0000000..6c1d14c Binary files /dev/null and b/images/tiles/charcoalmeiler111.png differ diff --git a/images/tiles/charcoalmeiler112.png b/images/tiles/charcoalmeiler112.png new file mode 100644 index 0000000..7b938f6 Binary files /dev/null and b/images/tiles/charcoalmeiler112.png differ diff --git a/images/tiles/charcoalmeiler113.png b/images/tiles/charcoalmeiler113.png new file mode 100644 index 0000000..1d9deb7 Binary files /dev/null and b/images/tiles/charcoalmeiler113.png differ diff --git a/images/tiles/charcoalmeiler114.png b/images/tiles/charcoalmeiler114.png new file mode 100644 index 0000000..6a6a2c0 Binary files /dev/null and b/images/tiles/charcoalmeiler114.png differ diff --git a/images/tiles/charcoalmeiler12.png b/images/tiles/charcoalmeiler12.png new file mode 100644 index 0000000..fb8b573 Binary files /dev/null and b/images/tiles/charcoalmeiler12.png differ diff --git a/images/tiles/charcoalmeiler13.png b/images/tiles/charcoalmeiler13.png new file mode 100644 index 0000000..0e999d3 Binary files /dev/null and b/images/tiles/charcoalmeiler13.png differ diff --git a/images/tiles/charcoalmeiler14.png b/images/tiles/charcoalmeiler14.png new file mode 100644 index 0000000..38853c9 Binary files /dev/null and b/images/tiles/charcoalmeiler14.png differ diff --git a/images/tiles/charcoalmeiler15.png b/images/tiles/charcoalmeiler15.png new file mode 100644 index 0000000..067855a Binary files /dev/null and b/images/tiles/charcoalmeiler15.png differ diff --git a/images/tiles/charcoalmeiler16.png b/images/tiles/charcoalmeiler16.png new file mode 100644 index 0000000..da0c4d1 Binary files /dev/null and b/images/tiles/charcoalmeiler16.png differ diff --git a/images/tiles/charcoalmeiler17.png b/images/tiles/charcoalmeiler17.png new file mode 100644 index 0000000..e7f59cb Binary files /dev/null and b/images/tiles/charcoalmeiler17.png differ diff --git a/images/tiles/charcoalmeiler18.png b/images/tiles/charcoalmeiler18.png new file mode 100644 index 0000000..1f657eb Binary files /dev/null and b/images/tiles/charcoalmeiler18.png differ diff --git a/images/tiles/charcoalmeiler19.png b/images/tiles/charcoalmeiler19.png new file mode 100644 index 0000000..08f73a7 Binary files /dev/null and b/images/tiles/charcoalmeiler19.png differ diff --git a/js/baseclasses.js b/js/baseclasses.js index 899a45c..bf88309 100644 --- a/js/baseclasses.js +++ b/js/baseclasses.js @@ -1,3 +1,4 @@ +var noPay = false class Tile { constructor(x, y, factory) { this.x = x @@ -36,6 +37,8 @@ class Tile { } pay() { + if (noPay) + return true var items = 0 for (var i = 0; i < this.cost.length; i++) { if (this.cost[i].id == 0) { diff --git a/js/hotkeys.js b/js/hotkeys.js index dbbc1de..79914cb 100644 --- a/js/hotkeys.js +++ b/js/hotkeys.js @@ -1,6 +1,5 @@ $(document).ready(function() { $(document).keypress(function(e) { - console.log(e.originalEvent) switch (e.originalEvent.key) { case "1": //BUILD diff --git a/js/items.json b/js/items.json index a17de17..1e9f659 100644 --- a/js/items.json +++ b/js/items.json @@ -6,7 +6,7 @@ },{ "id": 1, "name": "log", - "value": 1 + "value": 4 },{ "id": 2, "name": "planks", @@ -15,5 +15,9 @@ "id": 3, "name": "stone", "value": 2 + },{ + "id": 4, + "name": "charcoal", + "value": 14 }] } diff --git a/js/tiles.js b/js/tiles.js index 5342cdd..050338a 100644 --- a/js/tiles.js +++ b/js/tiles.js @@ -23,7 +23,7 @@ tileClasses.push(Conveyorbelt) class Treefarm extends Tile { constructor(x, y, factory) { super(x, y, factory) - this.maxwork = 96 + this.maxwork = 96 * 5 this.currentwork = 0 this.name = "treefarm" this.hasNoInventory = true @@ -52,12 +52,12 @@ tileClasses.push(Treefarm) class Saw extends Tile { constructor(x, y, factory) { super(x, y, factory) - this.maxwork = 96 + this.maxwork = 48 this.currentwork = 0 this.name = "saw" this.cost = [{ "id": 0, - "count": 50 + "count": 750 }, { "id": 1, @@ -75,11 +75,13 @@ class Saw extends Tile { //Items für ein Pank var requieredCount = 5 if (this.input.countOf(1) >= requieredCount) { - if (this.currentwork == 96) { + if (this.currentwork == this.maxwork) { this.input.take(1, requieredCount, this.factory) - var item = new Item(2, this.x * 48, this.y * 48) - this.factory.items.push(item) - item.setDFromDirection(this.direction) + for (var i = 0; i < 4; i++) { + var item = new Item(2, this.x * 48, this.y * 48) + this.factory.items.push(item) + item.setDFromDirection(this.direction) + } this.currentwork = 0 } else { this.currentwork++ @@ -91,6 +93,57 @@ class Saw extends Tile { } tileClasses.push(Saw) +class Charcoalmeiler extends Tile { + constructor(x, y, factory) { + super(x, y, factory) + this.maxwork = 96 * 10 + this.currentwork = 0 + this.name = "charcoalmeiler" + this.cost = [{ + "id": 0, + "count": 1000 + }, + { + "id": 3, + "count": 30 + } + ] + this.texture = { + "0": [], + "1": ["charcoalmeiler10", "charcoalmeiler10", "charcoalmeiler10", "charcoalmeiler11", "charcoalmeiler11", "charcoalmeiler11", "charcoalmeiler12", "charcoalmeiler12", "charcoalmeiler12", "charcoalmeiler13", "charcoalmeiler13", "charcoalmeiler13", "charcoalmeiler14", "charcoalmeiler14", "charcoalmeiler14", "charcoalmeiler15", "charcoalmeiler15", "charcoalmeiler15", "charcoalmeiler16", "charcoalmeiler16", "charcoalmeiler16", "charcoalmeiler17", "charcoalmeiler17", "charcoalmeiler17", "charcoalmeiler18", "charcoalmeiler18", "charcoalmeiler18", "charcoalmeiler19", "charcoalmeiler19", "charcoalmeiler19", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler110", "charcoalmeiler111", "charcoalmeiler112", "charcoalmeiler112", "charcoalmeiler112", "charcoalmeiler112", "charcoalmeiler112", "charcoalmeiler113", "charcoalmeiler113", "charcoalmeiler113", "charcoalmeiler113", "charcoalmeiler113", "charcoalmeiler114", "charcoalmeiler114", "charcoalmeiler114", "charcoalmeiler114", "charcoalmeiler114"] + } + this.loadImages() + } + + getImage(fulltime, layer) { + fulltime = Math.round(fulltime/4) + if (this.images[layer].length == 0) + return "0" + return this.images[layer][(fulltime % this.images[layer].length)] + } + + work() { + //Items für ein Pank + var requieredCount = 10 + if (this.input.countOf(2) >= requieredCount) { + if (this.currentwork == this.maxwork) { + this.input.take(2, requieredCount, this.factory) + for (var i = 0; i < 5; i++) { + var item = new Item(4, this.x * 48, this.y * 48) + this.factory.items.push(item) + item.setDFromDirection(this.direction) + } + this.currentwork = 0 + } else { + this.currentwork++ + } + } else { + this.currentwork = 0 + } + } +} +tileClasses.push(Charcoalmeiler) + class Quarry extends Tile { constructor(x, y, factory) { super(x, y, factory) @@ -100,8 +153,8 @@ class Quarry extends Tile { this.hasNoInventory = true this.cost = [{ "id": 0, - "count": 100 - },{ + "count": 10000 + }, { "id": 2, "count": 50 }] diff --git a/lang/en.json b/lang/en.json index 6836e60..c258279 100644 --- a/lang/en.json +++ b/lang/en.json @@ -2,19 +2,19 @@ "tiles": { "conveyorbelt": { "name": "Conveyorbelt", - "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "description": "The easyest and most common way to transport Items." }, "treefarm": { "name": "Treefarm", - "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "description": "Slowly Produces Log." }, "collector": { "name": "Collector", - "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "description": "Puts any Items it gets into your Inventory so you can sell them." }, "saw": { "name": "Saw", - "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "description": "Cuts 5 Logs in to 4 Planks. Works only if it contains 5 Log. It works fast!" }, "spliter": { "name": "Spliter", @@ -31,9 +31,17 @@ "quarry": { "name": "Quarry", "description": "Mines stone slowly but safely." + }, + "quarry": { + "name": "Quarry", + "description": "Mines stone slowly but safely." + }, + "charcoalmeiler": { + "name": "Charcoal Meiler", + "description": "Requieres 10 Planks to burn them down to 5 Charcoal." } }, - "items": ["None", "Log", "Planks", "Stone"], + "items": ["None", "Log", "Planks", "Stone","Charcoal"], "more": "Show Inventory / Sell Items", "inventory": "Inventory", "player": "Player",