From ffdcef9b8b914cd205acd9a4ef1e298f3cda6c98 Mon Sep 17 00:00:00 2001 From: Josh Mudge Date: Tue, 19 Sep 2017 13:48:41 -0600 Subject: [PATCH] Update with new percents. --- calculate.js | 9 ++++++--- index.html | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/calculate.js b/calculate.js index 258adf1..c205bae 100644 --- a/calculate.js +++ b/calculate.js @@ -1,6 +1,6 @@ "use strict"; //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 // Ad Mejorem Dei Glorium @@ -35,7 +35,7 @@ function calculate() { var gold = +blocks / 1000 * 100 console.log(gold) - var infra = +infra / 1000 * 0.005 + var infra = +infra / 1000 * 0.001 console.log(infra) var one = +one / 1000 * 0.01 console.log(one) @@ -57,7 +57,10 @@ function calculate() { console.log(metro) var percent = +one + +design + +gov + +embassies + +capital + +infra + +chain + +town + +city + +metro 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); console.log(total) var date = Date(); diff --git a/index.html b/index.html index a78f9d4..32f965a 100644 --- a/index.html +++ b/index.html @@ -10,11 +10,11 @@

Enter the number of blocks eligable for rent excluding one "base of operations" you change. (1000 blocks = 1 emerald)





-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)





-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)