josh
/
ardon-income
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update with new percents.

This commit is contained in:
Josh Mudge 2017-09-19 13:48:41 -06:00
parent a0378ba3cd
commit ffdcef9b8b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calculate.js
View File

@ -1,6 +1,6 @@
"use strict"; "use strict";
//Licensed under the Apache License 2.0. See license file for information. //Licensed under the Apache License 2.0. See license file for information.
// Ardon Income Calculator v3.0 stable. // Ardon Income Calculator v3.1 stable.
// Written by Josh Mudge // Written by Josh Mudge
// Ad Mejorem Dei Glorium // Ad Mejorem Dei Glorium
@ -35,7 +35,7 @@ function calculate() {
var gold = +blocks / 1000 * 100 var gold = +blocks / 1000 * 100
console.log(gold) console.log(gold)
var infra = +infra / 1000 * 0.005 var infra = +infra / 1000 * 0.001
console.log(infra) console.log(infra)
var one = +one / 1000 * 0.01 var one = +one / 1000 * 0.01
console.log(one) console.log(one)
@ -57,7 +57,10 @@ function calculate() {
console.log(metro) console.log(metro)
var percent = +one + +design + +gov + +embassies + +capital + +infra + +chain + +town + +city + +metro var percent = +one + +design + +gov + +embassies + +capital + +infra + +chain + +town + +city + +metro
console.log(percent) console.log(percent)
var total = +gold * +percent + +gold var total = +gold * +percent
console.log(total)
var total = +total + +gold
console.log(total)
var total = total.toFixed(0); var total = total.toFixed(0);
console.log(total) console.log(total)
var date = Date(); var date = Date();

4
index.html
View File

@ -10,11 +10,11 @@
<p>Enter the number of blocks eligable for rent excluding one "base of operations" you change. (1000 blocks = 1 emerald)</p> <p>Enter the number of blocks eligable for rent excluding one "base of operations" you change. (1000 blocks = 1 emerald)</p>
<input type="number" id="blocks"></input> <input type="number" id="blocks"></input>
<br><br><br><br> <br><br><br><br>
Enter the number of blocks used for transportation, recreational purposes, soft infrastructure or utilities that is not buildings. (0.5% bonus) Enter the number of blocks used for transportation, farmland, recreational purposes, soft infrastructure or utilities that is not buildings. (0.5% bonus)
<br><br> <br><br>
<input type="number" id="infra"></input> <input type="number" id="infra"></input>
<br><br><br><br> <br><br><br><br>
Enter the number of those blocks that qualify as housing, farmland, transportation buildings, buildings for recreational purposes, soft infrastructure buildings, utility buildings, business buildings, government buildings (including your capital building) or military bases. (1.0% bonus) Enter the number of those blocks that qualify as housing, transportation buildings, buildings for recreational purposes, soft infrastructure buildings, utility buildings, business buildings, government buildings (including your capital building) or military bases. (1.0% bonus)
<br><br> <br><br>
<input type="number" id="one"></input> <input type="number" id="one"></input>
<br><br><br><br> <br><br><br><br>