From 87f3f0b0eaa63c6b013a4522522cbfea3222e83d Mon Sep 17 00:00:00 2001 From: ConOLeary Date: Fri, 8 Apr 2022 18:43:35 +0100 Subject: [PATCH 1/4] internal names for values match external counterparts --- index.html | 2 +- questions.js | 4 ++-- results.html | 48 ++++++++++++++++++++-------------------- style.css | 6 ++--- value_images/markets.svg | 2 +- value_images/nation.svg | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/index.html b/index.html index ebf4a549..01e563a3 100644 --- a/index.html +++ b/index.html @@ -75,7 +75,7 @@

What are the eight values?

GLOBE

- Those with higher Globe scores are cosmopolitan and globalist. They often believe in a peaceful foreign policy, emphasizing diplomacy, cooperation, integration, and at high values, a world government. + Those with higher Globe scores are cosmopolitan and globalist. They often believe in a globeful foreign policy, emphasizing diplomacy, cooperation, integration, and at high values, a world government.

diff --git a/questions.js b/questions.js index 486af5fd..e9a55ee0 100644 --- a/questions.js +++ b/questions.js @@ -81,7 +81,7 @@ questions = [ } }, { - "question": "Inheritance is a legitimate form of wealth.", + "question": "Inheritance is a legitimate form of markets.", "effect": { "econ": -10, "dipl": 0, @@ -180,7 +180,7 @@ questions = [ } }, { - "question": "It is more important to retain peaceful relations than to further our strength.", + "question": "It is more important to retain globeful relations than to further our strength.", "effect": { "econ": 0, "dipl": 10, diff --git a/results.html b/results.html index d2f1dfa6..8321f559 100644 --- a/results.html +++ b/results.html @@ -23,15 +23,15 @@

Economic Axis:

-
- +
+

Diplomatic Axis:

- -
-
- + +
+
+

Civil Axis:

@@ -92,7 +92,7 @@

Closest Match:

} econArray = ["Communist","Socialist","Social","Centrist","Market","Capitalist","Laissez-Faire"] - diplArray = ["Cosmopolitan","Internationalist","Peaceful","Balanced","Patriotic","Nationalist","Chauvinist"] + diplArray = ["Cosmopolitan","Internationalist","globeful","Balanced","Patriotic","Nationalist","Chauvinist"] govtArray = ["Anarchist","Libertarian","Liberal","Moderate","Statist","Authoritarian","Totalitarian"] sctyArray = ["Revolutionary","Very Progressive","Progressive","Neutral","Traditional","Very Traditional","Reactionary"] @@ -109,25 +109,25 @@

Closest Match:

} equality = getQueryVariable("e") - peace = getQueryVariable("d") + globe = getQueryVariable("d") liberty = getQueryVariable("g") progress = getQueryVariable("s") - wealth = (100 - equality).toFixed(1) - might = (100 - peace ).toFixed(1) + markets = (100 - equality).toFixed(1) + nation = (100 - globe ).toFixed(1) authority = (100 - liberty ).toFixed(1) tradition = (100 - progress).toFixed(1) setBarValue("equality", equality) - setBarValue("wealth", wealth) - setBarValue("peace", peace) - setBarValue("might", might) + setBarValue("markets", markets) + setBarValue("globe", globe) + setBarValue("nation", nation) setBarValue("liberty", liberty) setBarValue("authority", authority) setBarValue("progress", progress) setBarValue("tradition", tradition) document.getElementById("economic-label").innerHTML = setLabel(equality, econArray) - document.getElementById("diplomatic-label").innerHTML = setLabel(peace, diplArray) + document.getElementById("diplomatic-label").innerHTML = setLabel(globe, diplArray) document.getElementById("state-label").innerHTML = setLabel(liberty, govtArray) document.getElementById("society-label").innerHTML = setLabel(progress, sctyArray) @@ -137,7 +137,7 @@

Closest Match:

dist = 0 dist += Math.pow(Math.abs(ideologies[i].stats.econ - equality), 2) dist += Math.pow(Math.abs(ideologies[i].stats.govt - liberty), 2) - dist += Math.pow(Math.abs(ideologies[i].stats.dipl - peace), 1.73856063) + dist += Math.pow(Math.abs(ideologies[i].stats.dipl - globe), 1.73856063) dist += Math.pow(Math.abs(ideologies[i].stats.scty - progress), 1.73856063) if (dist < ideodist) { ideology = ideologies[i].name @@ -164,11 +164,11 @@

Closest Match:

img = document.getElementById("img-equality") ctx.drawImage(img, 20, 170, 100, 100); - img = document.getElementById("img-wealth") + img = document.getElementById("img-markets") ctx.drawImage(img, 680, 170, 100, 100) - img = document.getElementById("img-might") + img = document.getElementById("img-nation") ctx.drawImage(img, 20, 290, 100, 100) - img = document.getElementById("img-peace") + img = document.getElementById("img-globe") ctx.drawImage(img, 680, 290, 100, 100) img = document.getElementById("img-liberty") ctx.drawImage(img, 20, 410, 100, 100) @@ -187,11 +187,11 @@

Closest Match:

ctx.fillStyle="#f44336" ctx.fillRect(120, 184, 5.6*equality-2, 72) ctx.fillStyle="#00897b" - ctx.fillRect(682-5.6*wealth, 184, 5.6*wealth-2, 72) + ctx.fillRect(682-5.6*markets, 184, 5.6*markets-2, 72) ctx.fillStyle="#ff9800" - ctx.fillRect(120, 304, 5.6*might-2, 72) + ctx.fillRect(120, 304, 5.6*nation-2, 72) ctx.fillStyle="#03a9f4" - ctx.fillRect(682-5.6*peace, 304, 5.6*peace-2, 72) + ctx.fillRect(682-5.6*globe, 304, 5.6*globe-2, 72) ctx.fillStyle="#ffeb3b" ctx.fillRect(120, 424, 5.6*liberty-2, 72) ctx.fillStyle="#3f51b5" @@ -209,12 +209,12 @@

Closest Match:

ctx.textAlign="left" if (equality > 30) {ctx.fillText(equality + "%", 130, 237.5)} - if (might > 30) {ctx.fillText(might + "%", 130, 357.5)} + if (nation > 30) {ctx.fillText(nation + "%", 130, 357.5)} if (liberty > 30) {ctx.fillText(liberty + "%", 130, 477.5)} if (tradition > 30) {ctx.fillText(tradition + "%", 130, 597.5)} ctx.textAlign="right" - if (wealth > 30) {ctx.fillText(wealth + "%", 670, 237.5)} - if (peace > 30) {ctx.fillText(peace + "%", 670, 357.5)} + if (markets > 30) {ctx.fillText(markets + "%", 670, 237.5)} + if (globe > 30) {ctx.fillText(globe + "%", 670, 357.5)} if (authority > 30) {ctx.fillText(authority + "%", 670, 477.5)} if (progress > 30) {ctx.fillText(progress + "%", 670, 597.5)} diff --git a/style.css b/style.css index f9d355fb..7bcd8380 100644 --- a/style.css +++ b/style.css @@ -230,7 +230,7 @@ div.equality { text-align: left; border-right-style: solid; } -div.wealth { +div.markets { background-color: #00897b; text-align: right; border-left-style: solid; @@ -245,12 +245,12 @@ div.authority { text-align: right; border-left-style: solid; } -div.peace { +div.globe { background-color: #03a9f4; text-align: right; border-left-style: solid; } -div.might { +div.nation { background-color: #ff9800; text-align: left; border-right-style: solid; diff --git a/value_images/markets.svg b/value_images/markets.svg index 90cdeecb..ae3cd7a7 100644 --- a/value_images/markets.svg +++ b/value_images/markets.svg @@ -15,7 +15,7 @@ version="1.1" id="svg8" inkscape:version="0.92.1 r15371" - sodipodi:docname="wealth.svg"> + sodipodi:docname="markets.svg"> + sodipodi:docname="nation.svg"> Date: Fri, 8 Apr 2022 20:03:38 +0100 Subject: [PATCH 2/4] means for stat weighting for ideology mathcing added --- ideologies.js | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++ results.html | 10 +- 2 files changed, 318 insertions(+), 4 deletions(-) diff --git a/ideologies.js b/ideologies.js index bb39d717..3986dc23 100644 --- a/ideologies.js +++ b/ideologies.js @@ -6,6 +6,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 90 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -15,6 +21,12 @@ ideologies = [ "dipl": 70, "govt": 80, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -24,6 +36,12 @@ ideologies = [ "dipl": 100, "govt": 60, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -33,6 +51,12 @@ ideologies = [ "dipl": 70, "govt": 40, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -42,6 +66,12 @@ ideologies = [ "dipl": 30, "govt": 30, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -51,6 +81,12 @@ ideologies = [ "dipl": 40, "govt": 20, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -60,6 +96,12 @@ ideologies = [ "dipl": 20, "govt": 0, "scty": 60 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -69,6 +111,12 @@ ideologies = [ "dipl": 50, "govt": 30, "scty": 30 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -78,6 +126,12 @@ ideologies = [ "dipl": 30, "govt": 30, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -87,6 +141,12 @@ ideologies = [ "dipl": 50, "govt": 30, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -96,6 +156,12 @@ ideologies = [ "dipl": 50, "govt": 70, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -105,6 +171,12 @@ ideologies = [ "dipl": 50, "govt": 50, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -114,6 +186,12 @@ ideologies = [ "dipl": 20, "govt": 50, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -123,6 +201,12 @@ ideologies = [ "dipl": 80, "govt": 80, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -132,6 +216,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -141,6 +231,12 @@ ideologies = [ "dipl": 40, "govt": 30, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -150,6 +246,12 @@ ideologies = [ "dipl": 40, "govt": 30, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -159,6 +261,12 @@ ideologies = [ "dipl": 50, "govt": 50, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -168,6 +276,12 @@ ideologies = [ "dipl": 60, "govt": 60, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -177,6 +291,12 @@ ideologies = [ "dipl": 60, "govt": 50, "scty": 30 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -186,6 +306,12 @@ ideologies = [ "dipl": 70, "govt": 60, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -195,6 +321,12 @@ ideologies = [ "dipl": 80, "govt": 60, "scty": 100 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -204,6 +336,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -213,6 +351,12 @@ ideologies = [ "dipl": 20, "govt": 0, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -222,6 +366,12 @@ ideologies = [ "dipl": 80, "govt": 0, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -231,6 +381,12 @@ ideologies = [ "dipl": 60, "govt": 20, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -240,6 +396,12 @@ ideologies = [ "dipl": 50, "govt": 50, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -249,6 +411,12 @@ ideologies = [ "dipl": 60, "govt": 60, "scty": 60 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -258,6 +426,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -267,6 +441,12 @@ ideologies = [ "dipl": 30, "govt": 30, "scty": 30 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -276,6 +456,12 @@ ideologies = [ "dipl": 40, "govt": 50, "scty": 30 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -285,6 +471,12 @@ ideologies = [ "dipl": 40, "govt": 40, "scty": 10 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -294,6 +486,12 @@ ideologies = [ "dipl": 70, "govt": 80, "scty": 70 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -303,6 +501,12 @@ ideologies = [ "dipl": 60, "govt": 80, "scty": 60 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -312,6 +516,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -321,6 +531,12 @@ ideologies = [ "dipl": 0, "govt": 0, "scty": 5 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -330,6 +546,12 @@ ideologies = [ "dipl": 20, "govt": 20, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -339,6 +561,12 @@ ideologies = [ "dipl": 20, "govt": 20, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -348,6 +576,12 @@ ideologies = [ "dipl": 20, "govt": 20, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -357,6 +591,12 @@ ideologies = [ "dipl": 40, "govt": 40, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -366,6 +606,12 @@ ideologies = [ "dipl": 30, "govt": 50, "scty": 60 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -375,6 +621,12 @@ ideologies = [ "dipl": 60, "govt": 60, "scty": 80 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -384,6 +636,12 @@ ideologies = [ "dipl": 30, "govt": 20, "scty": 40 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -393,6 +651,12 @@ ideologies = [ "dipl": 50, "govt": 30, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -402,6 +666,12 @@ ideologies = [ "dipl": 20, "govt": 40, "scty": 20 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -411,6 +681,12 @@ ideologies = [ "dipl": 30, "govt": 30, "scty": 5 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -420,6 +696,12 @@ ideologies = [ "dipl": 50, "govt": 80, "scty": 60 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -429,6 +711,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -438,6 +726,12 @@ ideologies = [ "dipl": 50, "govt": 90, "scty": 40 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -447,6 +741,12 @@ ideologies = [ "dipl": 30, "govt": 0, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -456,6 +756,12 @@ ideologies = [ "dipl": 40, "govt": 50, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } }, { @@ -465,6 +771,12 @@ ideologies = [ "dipl": 50, "govt": 100, "scty": 50 + }, + "statWeights": { + "econ": 1, + "dipl": 1, + "govt": 1, + "scty": 1 } } ]; diff --git a/results.html b/results.html index 8321f559..9bb37444 100644 --- a/results.html +++ b/results.html @@ -135,10 +135,12 @@

Closest Match:

ideodist = Infinity for (var i = 0; i < ideologies.length; i++) { dist = 0 - dist += Math.pow(Math.abs(ideologies[i].stats.econ - equality), 2) - dist += Math.pow(Math.abs(ideologies[i].stats.govt - liberty), 2) - dist += Math.pow(Math.abs(ideologies[i].stats.dipl - globe), 1.73856063) - dist += Math.pow(Math.abs(ideologies[i].stats.scty - progress), 1.73856063) + totalWeight= ideologies[i].statWeights.econ + ideologies[i].statWeights.govt + ideologies[i].statWeights.dipl + ideologies[i].statWeights.scty + econWeight, govtWeight, diplWeight, sctyWeight= ideologies[i].statWeights.econ / totalWeight, ideologies[i].statWeights.govt / totalWeight, ideologies[i].statWeights.dipl / totalWeight, ideologies[i].statWeights.scty / totalWeight + dist += Math.pow(Math.abs(ideologies[i].stats.econ - equality), 2) / econWeight + dist += Math.pow(Math.abs(ideologies[i].stats.govt - liberty), 2) / govtWeight + dist += Math.pow(Math.abs(ideologies[i].stats.dipl - globe), 1.73856063) / diplWeight + dist += Math.pow(Math.abs(ideologies[i].stats.scty - progress), 1.73856063) / sctyWeight if (dist < ideodist) { ideology = ideologies[i].name ideodist = dist From 711eab00f3eb98522e63a4d692e2c8c016878f3b Mon Sep 17 00:00:00 2001 From: ConOLeary Date: Fri, 8 Apr 2022 20:21:53 +0100 Subject: [PATCH 3/4] added some sample weight values --- ideologies.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ideologies.js b/ideologies.js index 3986dc23..faf65617 100644 --- a/ideologies.js +++ b/ideologies.js @@ -308,7 +308,7 @@ ideologies = [ "scty": 80 }, "statWeights": { - "econ": 1, + "econ": 1.2, "dipl": 1, "govt": 1, "scty": 1 @@ -326,7 +326,7 @@ ideologies = [ "econ": 1, "dipl": 1, "govt": 1, - "scty": 1 + "scty": 1.2 } }, { @@ -415,7 +415,7 @@ ideologies = [ "statWeights": { "econ": 1, "dipl": 1, - "govt": 1, + "govt": 1.2, "scty": 1 } }, @@ -533,10 +533,10 @@ ideologies = [ "scty": 5 }, "statWeights": { - "econ": 1, + "econ": 0.6, "dipl": 1, "govt": 1, - "scty": 1 + "scty": 0.8 } }, { @@ -563,7 +563,7 @@ ideologies = [ "scty": 20 }, "statWeights": { - "econ": 1, + "econ": 0.8, "dipl": 1, "govt": 1, "scty": 1 @@ -700,7 +700,7 @@ ideologies = [ "statWeights": { "econ": 1, "dipl": 1, - "govt": 1, + "govt": 1.2, "scty": 1 } }, @@ -729,7 +729,7 @@ ideologies = [ }, "statWeights": { "econ": 1, - "dipl": 1, + "dipl": 0.8, "govt": 1, "scty": 1 } @@ -758,7 +758,7 @@ ideologies = [ "scty": 50 }, "statWeights": { - "econ": 1, + "econ": 1.2, "dipl": 1, "govt": 1, "scty": 1 @@ -776,7 +776,7 @@ ideologies = [ "econ": 1, "dipl": 1, "govt": 1, - "scty": 1 + "scty": 0.8 } } ]; From 89514e5a6348ce87f51dcecab942c277c037fb93 Mon Sep 17 00:00:00 2001 From: ConOLeary Date: Tue, 12 Apr 2022 14:15:39 +0100 Subject: [PATCH 4/4] Reverted some instances of 'globe' back to 'peace' so that, for example, the word 'globeful' doesn't occur in text --- index.html | 2 +- questions.js | 4 ++-- results.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 01e563a3..ebf4a549 100644 --- a/index.html +++ b/index.html @@ -75,7 +75,7 @@

What are the eight values?

GLOBE

- Those with higher Globe scores are cosmopolitan and globalist. They often believe in a globeful foreign policy, emphasizing diplomacy, cooperation, integration, and at high values, a world government. + Those with higher Globe scores are cosmopolitan and globalist. They often believe in a peaceful foreign policy, emphasizing diplomacy, cooperation, integration, and at high values, a world government.

diff --git a/questions.js b/questions.js index e9a55ee0..486af5fd 100644 --- a/questions.js +++ b/questions.js @@ -81,7 +81,7 @@ questions = [ } }, { - "question": "Inheritance is a legitimate form of markets.", + "question": "Inheritance is a legitimate form of wealth.", "effect": { "econ": -10, "dipl": 0, @@ -180,7 +180,7 @@ questions = [ } }, { - "question": "It is more important to retain globeful relations than to further our strength.", + "question": "It is more important to retain peaceful relations than to further our strength.", "effect": { "econ": 0, "dipl": 10, diff --git a/results.html b/results.html index 9bb37444..6d3daafc 100644 --- a/results.html +++ b/results.html @@ -92,7 +92,7 @@

Closest Match:

} econArray = ["Communist","Socialist","Social","Centrist","Market","Capitalist","Laissez-Faire"] - diplArray = ["Cosmopolitan","Internationalist","globeful","Balanced","Patriotic","Nationalist","Chauvinist"] + diplArray = ["Cosmopolitan","Internationalist","Peaceful","Balanced","Patriotic","Nationalist","Chauvinist"] govtArray = ["Anarchist","Libertarian","Liberal","Moderate","Statist","Authoritarian","Totalitarian"] sctyArray = ["Revolutionary","Very Progressive","Progressive","Neutral","Traditional","Very Traditional","Reactionary"]