From df057ccaab2925f059cada85cf589a530328a52f Mon Sep 17 00:00:00 2001 From: Daniel Xie Date: Sun, 14 May 2017 19:14:13 -0500 Subject: [PATCH] Minor UI improvements, bug fix in Crime.js --- css/popupboxes.css | 11 ++++++++--- src/Constants.js | 2 +- src/Crimes.js | 2 +- src/Prestige.js | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/css/popupboxes.css b/css/popupboxes.css index 5b6e6d1fe..c6ced2ff6 100644 --- a/css/popupboxes.css +++ b/css/popupboxes.css @@ -123,7 +123,7 @@ margin: 15% auto; /* 15% from the top and centered */ padding: 12px; border: 5px solid #FFFFFF; - width: 80%; /* Could be more or less, depending on screen size */ + width: 50%; /* Could be more or less, depending on screen size */ color: #66ff33; } @@ -281,14 +281,19 @@ margin: 15% auto; /* 15% from the top and centered */ padding: 10px; border: 5px solid #FFFFFF; - width: 80%; /* Could be more or less, depending on screen size */ + width: 50%; /* Could be more or less, depending on screen size */ color: #66ff33; } +#trave-l-box-text { + margin: 8px; +} + #travel-box-confirm, #travel-box-cancel { color: #aaa; - font-size: 20px; + float: right; + font-size: 16px; font-weight: bold; padding: 2px; margin: 6px; diff --git a/src/Constants.js b/src/Constants.js index 1862b7835..3dd231ea6 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -1,5 +1,5 @@ CONSTANTS = { - Version: "0.2", + Version: "0.3", //Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then diff --git a/src/Crimes.js b/src/Crimes.js index 726beb4f7..8b66557ba 100644 --- a/src/Crimes.js +++ b/src/Crimes.js @@ -142,7 +142,7 @@ function determineCrimeChanceGrandTheftAuto() { } function determineCrimeChanceKidnap() { - return ((Player.charisma / CONSTANTS.MaxSkillLevel + + var chance = ((Player.charisma / CONSTANTS.MaxSkillLevel + Player.strength / CONSTANTS.MaxSkillLevel + Player.defense / CONSTANTS.MaxSkillLevel + Player.dexterity / CONSTANTS.MaxSkillLevel + diff --git a/src/Prestige.js b/src/Prestige.js index f8a867204..9d3951741 100644 --- a/src/Prestige.js +++ b/src/Prestige.js @@ -186,5 +186,9 @@ function prestigeAugmentation() { initAugmentations(); initCompanies(); + //Clear terminal + $("#terminal tr:not(:last)").remove(); + postNetburnerText(); + Engine.loadTerminalContent(); } \ No newline at end of file