Added 3 New Tiles

This commit is contained in:
MasterGordon 2018-04-22 22:55:43 +02:00
parent 7d4ec26f34
commit 89a6e88dd1
39 changed files with 228 additions and 8 deletions

BIN
images/items/woodshovel.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

BIN
images/tiles/cokery10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
images/tiles/cokery11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/tiles/cokery12.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/tiles/cokery13.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

View File

@ -38,6 +38,7 @@
$(document).ready(function() {
style();
$("#register").hide()
style()
})
function style() {

View File

@ -494,10 +494,13 @@ function drawInfoBar() {
}
if (selectedTile != 0) {
$('#infoDesc h1').text(lang.tiles[selectedTile.name].name)
if (selectedTile.maxwork != 0)
$('#infoDesc p').text((selectedTile.maxwork / 48) + " Sec | " + lang.tiles[selectedTile.name].description)
else
$('#infoDesc p').text(lang.tiles[selectedTile.name].description)
} else {
$('#infoDesc h1').text("Factory " + currentFactory)
$('#infoDesc p').html("<br>"+lang.mineralslable + "<br><br> - " + lang.minerals[factorys[currentFactory].ores[0]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[1]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[2]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[3]])
$('#infoDesc p').html("<br>" + lang.mineralslable + "<br><br> - " + lang.minerals[factorys[currentFactory].ores[0]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[1]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[2]] + "<br> - " + lang.minerals[factorys[currentFactory].ores[3]])
}
if (selectedTile.maxwork != 0 && mode != "selectbuilding" && mode != "building") {
$('#infoDesc p').css("height", 154)

View File

@ -18,7 +18,7 @@
},{
"id": 4,
"name": "charcoal",
"value": 14
"value": 15
},{
"id": 5,
"name": "sawdust",
@ -46,10 +46,10 @@
},{
"id": 11,
"name": "koks",
"value": 14
"value": 20
},{
"id": 12,
"name": "briquettes",
"value": 14
"value": 16
}]
}

View File

@ -133,12 +133,24 @@ class Weaver extends Tile {
if (this.input.countOf(2) >= requieredCount) {
if (this.currentwork == this.maxwork) {
this.currentwork = 0
this.input.take(2, requieredCount, this.factory)
var item = new Item(9, this.x * 48, this.y * 48)
this.factory.items.push(item)
item.setDFromDirection(this.direction)
} else {
this.currentwork++
}
} else if (this.input.countOf(9) >= 1 && this.input.countOf(7) >= 1) {
if (this.currentwork == this.maxwork) {
this.currentwork = 0
this.input.take(9, 1, this.factory)
this.input.take(7, 1, this.factory)
var item = new Item(10, this.x * 48, this.y * 48)
this.factory.items.push(item)
item.setDFromDirection(this.direction)
} else {
this.currentwork++
}
} else {
this.currentwork = 0
}
@ -177,6 +189,8 @@ class Papermanufactory extends Tile {
var requieredCount = 5
if (this.input.countOf(9) >= 10 && this.input.countOf(5) >= 100) {
if (this.currentwork == this.maxwork) {
this.input.take(9, 10, this.factory)
this.input.take(5, 100, this.factory)
this.currentwork = 0
for (var i = 0; i < 10; i++) {
var item = new Item(7, this.x * 48, this.y * 48)
@ -243,6 +257,184 @@ class Charcoalmeiler extends Tile {
}
}
class AdvancedCharcoalmeiler extends Tile {
constructor(x, y, factory) {
super(x, y, factory)
this.maxwork = 96 * 10
this.currentwork = 0
this.name = "advancedcharcoalmeiler"
this.i = 12
this.dust = 0
this.cost = [{
"id": 0,
"count": 50000
},
{
"id": 3,
"count": 1000
},
{
"id": 10,
"count": 200
}
]
this.texture = {
"0": [],
"1": ["advancedcharcoalmeiler10", "advancedcharcoalmeiler10", "advancedcharcoalmeiler10", "advancedcharcoalmeiler11", "advancedcharcoalmeiler11", "advancedcharcoalmeiler11", "advancedcharcoalmeiler12", "advancedcharcoalmeiler12", "advancedcharcoalmeiler12", "advancedcharcoalmeiler13", "advancedcharcoalmeiler13", "advancedcharcoalmeiler13", "advancedcharcoalmeiler14", "advancedcharcoalmeiler14", "advancedcharcoalmeiler14", "advancedcharcoalmeiler15", "advancedcharcoalmeiler15", "advancedcharcoalmeiler15", "advancedcharcoalmeiler16", "advancedcharcoalmeiler16", "advancedcharcoalmeiler16", "advancedcharcoalmeiler17", "advancedcharcoalmeiler17", "advancedcharcoalmeiler17", "advancedcharcoalmeiler18", "advancedcharcoalmeiler18", "advancedcharcoalmeiler18", "advancedcharcoalmeiler19", "advancedcharcoalmeiler19", "advancedcharcoalmeiler19", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler110", "advancedcharcoalmeiler111", "advancedcharcoalmeiler112", "advancedcharcoalmeiler112", "advancedcharcoalmeiler112", "advancedcharcoalmeiler112", "advancedcharcoalmeiler112", "advancedcharcoalmeiler113", "advancedcharcoalmeiler113", "advancedcharcoalmeiler113", "advancedcharcoalmeiler113", "advancedcharcoalmeiler113", "advancedcharcoalmeiler114", "advancedcharcoalmeiler114", "advancedcharcoalmeiler114", "advancedcharcoalmeiler114", "advancedcharcoalmeiler114"]
}
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.dust++
if (this.dust == 4) {
var item = new Item(6, this.x * 48, this.y * 48)
this.factory.items.push(item)
item.setDFromDirection(this.direction)
this.dust = 0
}
this.currentwork = 0
} else {
this.currentwork++
}
} else {
this.currentwork = 0
}
}
}
class Briquettepress extends Tile {
constructor(x, y, factory) {
super(x, y, factory)
this.maxwork = 96
this.currentwork = 0
this.name = "briquettepress"
this.i = 13
this.dust = 0
this.cost = [{
"id": 0,
"count": 100000
}]
this.texture = {
"0": [],
"1": ["briquettepress10", "briquettepress11", "briquettepress12", "briquettepress13", "briquettepress14", "briquettepress15", "briquettepress16", "briquettepress17", "briquettepress18", "briquettepress17", "briquettepress16", "briquettepress15", "briquettepress14", "briquettepress13", "briquettepress12", "briquettepress11", "briquettepress10", "briquettepress10", "briquettepress10"]
}
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 = 5
if (this.input.countOf(6) >= requieredCount) {
if (this.currentwork == this.maxwork) {
this.input.take(6, requieredCount, this.factory)
var item = new Item(12, 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
}
}
}
class Cokery extends Tile {
constructor(x, y, factory) {
super(x, y, factory)
this.maxwork = 96 * 10
this.currentwork = 0
this.name = "cokery"
this.i = 14
this.dust = 0
this.cost = [{
"id": 0,
"count": 60000
},
{
"id": 3,
"count": 1400
},
{
"id": 6,
"count": 20
}
]
this.texture = {
"0": [],
"1": ["cokery10", "cokery11", "cokery12", "cokery13"]
}
this.loadImages()
}
getImage(fulltime, layer) {
fulltime = Math.round(fulltime / 6)
if (this.images[layer].length == 0)
return "0"
return this.images[layer][(fulltime % this.images[layer].length)]
}
work() {
//Items für ein Pank
if (this.input.countOf(4) >= 15 && this.input.countOf(12) >= 2) {
if (this.currentwork == this.maxwork) {
this.input.take(12, 2, this.factory)
this.input.take(4, 15, this.factory)
for (var i = 0; i < 15; i++) {
var item = new Item(11, this.x * 48, this.y * 48)
this.factory.items.push(item)
item.setDFromDirection(this.direction)
}
this.currentwork = 0
} else {
this.currentwork++
}
} else if (this.input.countOf(4) >= 15 && this.input.countOf(11) >= 2) {
if (this.currentwork == this.maxwork) {
this.input.take(11, 2, this.factory)
this.input.take(4, 15, this.factory)
for (var i = 0; i < 15; i++) {
var item = new Item(11, 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
}
}
}
class Quarry extends Tile {
constructor(x, y, factory) {
super(x, y, factory)
@ -287,7 +479,7 @@ class Collector extends Tile {
}]
this.texture = {
"0": [],
"1": ["collector10"]
"1": ["collector13", "collector10", "collector11", "collector12", "collector13", "collector13", "collector13"]
}
this.loadImages()
}
@ -299,6 +491,13 @@ class Collector extends Tile {
this.factory.deleteItem(item)
}
}
getImage(fulltime, layer) {
fulltime = Math.round(fulltime / 6)
if (this.images[layer].length == 0)
return "0"
return this.images[layer][(fulltime % this.images[layer].length)]
}
}
class Spliter extends Tile {
@ -512,3 +711,6 @@ tileClasses.push(FilterLeft)
tileClasses.push(FilterRight)
tileClasses.push(Weaver)
tileClasses.push(Papermanufactory)
tileClasses.push(AdvancedCharcoalmeiler)
tileClasses.push(Briquettepress)
tileClasses.push(Cokery)

View File

@ -40,13 +40,25 @@
"name": "Charcoal Meiler",
"description": "Requieres 10 Planks to burn them down to 5 Charcoal."
},
"advancedcharcoalmeiler": {
"name": "Advanced Charcoal Meiler",
"description": "Requieres 10 Planks to burn them down to 5 Charcoal. Creates Charcoaldust every 4th time."
},
"briquettepress": {
"name": "Briquettepress",
"description": "Requieres 5 Charcoaldust to press them into Briquettes."
},
"cokery": {
"name": "Cokery",
"description": "Burns 15 Charcoal into 15 Coke. Requieres 2 Briquettes or 2 Coke."
},
"papermanufactory": {
"name": "Paper Manufactory",
"description": "Uses 10 Sive and 100 Sawdust to create 10 Rawpaper"
},
"weaver": {
"name": "Weaver",
"description": "Makes a Siev out of 5 Planks."
"description": "Makes a Siev out of 5 Planks. Puts together Sievs and Paper/Rawpaper to make filter"
},
"filterleft": {
"name": "Item Filter (left)",
@ -96,7 +108,7 @@
"tin",
"salt"
],
"items": ["None", "Log", "Planks", "Stone", "Charcoal", "Sawdust", "Charcoal Dust", "Raw Paper", "Paper", "Siev", "Filter", "Koks", "Briquettes"],
"items": ["None", "Log", "Planks", "Stone", "Charcoal", "Sawdust", "Charcoal Dust", "Raw Paper", "Paper", "Siev", "Filter", "Coke", "Briquettes"],
"more": "Show Inventory / Sell Items",
"inventory": "Inventory",
"player": "Player",

View File

@ -15,6 +15,8 @@ if(isset($_SESSION["login"])){
while($row = $result->fetch_assoc()) {
echo $row["gamedata"];
}
}else{
echo '{}';
}
}
}else{