From 286656de4e5469777dc690a6ee666cb0350c3acd Mon Sep 17 00:00:00 2001
From: Josh Mudge <josh.m@daplie.com>
Date: Fri, 15 Sep 2017 21:40:20 -0600
Subject: [PATCH] Added towns/cities/metropolises

---
 Ardon-income.html | 12 ++++++++++++
 calculate.js      | 11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Ardon-income.html b/Ardon-income.html
index cc8bc08..7359292 100644
--- a/Ardon-income.html
+++ b/Ardon-income.html
@@ -33,6 +33,18 @@ Enter 1 if you have a capital. (2.5% bonus)
 <br><br>
 <input type="number" id="capital"></input>
 <br><br>
+Enter the number of towns in your empire. (See: https://ltlto.com/josh/mcserver/wiki/Rent for the definition of a town.) (0.5% bonus)
+<br><br>
+<input type="number" id="town"></input>
+<br><br>
+Enter the number of cities in your empire. (See: https://ltlto.com/josh/mcserver/wiki/Rent for the definition of a city.) (1.0% bonus)
+<br><br>
+<input type="number" id="city"></input>
+<br><br>
+Enter the number of metropolises in your empire. (See: https://ltlto.com/josh/mcserver/wiki/Rent for the definition of a metropolis.) (1.5% bonus)
+<br><br>
+<input type="number" id="metro"></input>
+<br><br>
 
 <input type="button" value="Calculate Income" onclick="calculate()" />
 <p id="Answer"></p>
diff --git a/calculate.js b/calculate.js
index 48c416c..381757d 100644
--- a/calculate.js
+++ b/calculate.js
@@ -18,6 +18,9 @@ function calculate() {
   var embassies = document.getElementById("embassies").value;
   var capital = document.getElementById("capital").value;
   var infra = document.getElementById("infra").value;
+  var town = document.getElementById("town").value;
+  var city = document.getElementById("city").value;
+  var metro = document.getElementById("metro").value;
 
   if (blocks.match(numReg))
   {
@@ -44,7 +47,13 @@ function calculate() {
   console.log(capital)
   var infra = +infra * 0.005
   console.log(infra)
-  var percent = +one + +two + +design + +embassies + +capital
+  var town = +town * 0.005
+  console.log(town)
+  var city = +city * 0.01
+  console.log(city)
+  var metro = +metro * 0.01
+  console.log(metro)
+  var percent = +one + +design + +gov + +embassies + +capital + +infra
   console.log(percent)
   var total = +emeralds * +percent +emeralds
   var total = total.toFixed(4);