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

Added First Login help + Glow

This commit is contained in:
MasterGordon 2018-07-19 15:47:16 +02:00
parent 425932ca60
commit ca8f9bb9ad
9 changed files with 527 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
php/mysqldata.php php/mysqldata.php
/nbproject/private/

10
index.html
View File

@ -20,16 +20,16 @@
<body id="body"> <body id="body">
<div id="login"> <div id="login">
<img class="logo" draggable="false" src="images/logo.svg"><br><br> <img class="logo" draggable="false" src="images/logo.svg"><br><br>
<p>Username:</p><input class="form" id="login_username"></input><br><br> <p>Username:</p><input class="form" id="login_username"><br><br>
<p>Password:</p><input class="form" id="login_password" type="password"></input><br><br> <p>Password:</p><input class="form" id="login_password" type="password"><br><br>
<button class="form" id="login_button">Login</button> <button class="form" id="login_button">Login</button>
<p class="change">Register?</p> <p class="change">Register?</p>
</div> </div>
<div id="register"> <div id="register">
<img class="logo" draggable="false" src="images/logo.svg"><br><br> <img class="logo" draggable="false" src="images/logo.svg"><br><br>
<p>Username:</p><input class="form" id="register_username"></input><br><br> <p>Username:</p><input class="form" id="register_username"><br><br>
<p>Password:</p><input class="form" id="register_password1" type="password"></input><br><br> <p>Password:</p><input class="form" id="register_password1" type="password"><br><br>
<p>Repeat Password:</p><input class="form" id="register_password2" type="password"></input><br><br> <p>Repeat Password:</p><input class="form" id="register_password2" type="password"><br><br>
<button class="form" id="register_button">Register</button> <button class="form" id="register_button">Register</button>
<p class="change">Login?</p> <p class="change">Login?</p>
</div> </div>

12
js/game.js
View File

@ -44,8 +44,13 @@ $(document).ready(function() {
}) })
}) })
$.get("php/playerdata.php", function (data) { $.get("php/playerdata.php", function (data) {
try {
if (JSON.parse(data).status == "nologin") if (JSON.parse(data).status == "nologin")
window.location.replace("index.html") window.location.replace("index.html")
} catch (err) {
mode = "help"
$('#help').fadeIn(200)
}
}) })
loadGameData() loadGameData()
loadItems() loadItems()
@ -445,7 +450,8 @@ function prepairRender() {
if ($(this).attr("id").startsWith("itemBig_")) if ($(this).attr("id").startsWith("itemBig_"))
if (id < itemId.length) { if (id < itemId.length) {
id = itemId[id] id = itemId[id]
} else return } else
return
hoverTooltip = true hoverTooltip = true
$('#tooltip').text(lang.items[id] + " (" + formatCount(items[id].value) + " " + lang.money + ")") $('#tooltip').text(lang.items[id] + " (" + formatCount(items[id].value) + " " + lang.money + ")")
$('#tooltip').show() $('#tooltip').show()
@ -504,6 +510,10 @@ function drawInfoBar() {
selectedX = 3 selectedX = 3
} else if (mode == "selectFactory") { } else if (mode == "selectFactory") {
selectedX = 8 selectedX = 8
}else if (mode == "help") {
selectedX = 5
}else if (mode == "oretiers") {
selectedX = 6
} }
if (selectedX != -1) { if (selectedX != -1) {

64
js/minerals.json
View File

@ -1,32 +1,32 @@
"bauxite" ["bauxite",
"beryllium" "beryllium",
"lead" "lead",
"chrome" "chrome",
"diamonds" "diamonds",
"iron" "iron",
"naturalgas" "naturalgas",
"oil" "oil",
"gold" "gold",
"kaolin" "kaolin",
"cobalt" "cobalt",
"coal" "coal",
"copper" "copper",
"lithium" "lithium",
"magnesium" "magnesium",
"manganese" "manganese",
"molybdenum" "molybdenum",
"nickel" "nickel",
"phosphate" "phosphate",
"platinum" "platinum",
"potash" "potash",
"rubies" "rubies",
"silver" "silver",
"soda" "soda",
"tantalum" "tantalum",
"titanium" "titanium",
"uranium" "uranium",
"vanadium" "vanadium",
"tungsten" "tungsten",
"zinc" "zinc",
"tin" "tin",
"salt" "salt"]

6
js/tiles.js
View File

@ -980,7 +980,7 @@ class TeleporterInput extends Tile {
this.frequency = 0 this.frequency = 0
this.cost = [{ this.cost = [{
"id": 0, "id": 0,
"count": 50 "count": 50000
}] }]
this.texture = { this.texture = {
"0": ["teleporter00", "teleporter01", "teleporter02", "teleporter03", "teleporter04", "teleporter06", "teleporter07", "teleporter08", "teleporter09"], "0": ["teleporter00", "teleporter01", "teleporter02", "teleporter03", "teleporter04", "teleporter06", "teleporter07", "teleporter08", "teleporter09"],
@ -1028,10 +1028,10 @@ class TeleporterOutput extends Tile {
this.frequency = 0 this.frequency = 0
this.cost = [{ this.cost = [{
"id": 0, "id": 0,
"count": 50 "count": 100000
}] }]
this.texture = { this.texture = {
"0": ["teleporterout01", "teleporterout02", "teleporterout03", "teleporterout04", "teleporterout05", "teleporterout06", "teleporterout07", "teleporterout08", "teleporterout09"], "0": ["teleporterout09", "teleporterout01", "teleporterout02", "teleporterout03", "teleporterout04", "teleporterout05", "teleporterout06", "teleporterout07", "teleporterout08"],
"1": [] "1": []
} }
this.options = [{ this.options = [{

8
lang/en.json
View File

@ -104,15 +104,15 @@
} }
}, },
"teleporterinput": { "teleporterinput": {
"name": "teleporterinput", "name": "Teleporter (input)",
"description": "Puts a selected Item to the left and all other straight.", "description": "Teleports items to a Teleporter (output) with the same frequency.",
"options": { "options": {
"frequency": "Frequency" "frequency": "Frequency"
} }
}, },
"teleporteroutput": { "teleporteroutput": {
"name": "teleporteroutput", "name": "Teleporter (output)",
"description": "Puts a selected Item to the left and all other straight.", "description": "Recieves items from a Teleporter (input) with the same frequency.",
"options": { "options": {
"frequency": "Frequency" "frequency": "Frequency"
} }

3
nbproject/project.properties Normal file
View File

@ -0,0 +1,3 @@
file.reference.factory-Factory=.
files.encoding=UTF-8
site.root.folder=${file.reference.factory-Factory}

9
nbproject/project.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.web.clientproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/clientside-project/1">
<name>Factory</name>
</data>
</configuration>
</project>

6
php/database.php Normal file
View File

@ -0,0 +1,6 @@
CREATE TABLE `users` (
`username` text NOT NULL,
`password` text NOT NULL,
`gamedata` mediumtext,
`gametime` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;