Merge pull request #6 from danielyxie/dev

Dev 0.3
This commit is contained in:
danielyxie 2017-05-14 19:14:57 -05:00 committed by GitHub
commit 12085c35ff
4 changed files with 14 additions and 5 deletions

@ -123,7 +123,7 @@
margin: 15% auto; /* 15% from the top and centered */ margin: 15% auto; /* 15% from the top and centered */
padding: 12px; padding: 12px;
border: 5px solid #FFFFFF; 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; color: #66ff33;
} }
@ -281,14 +281,19 @@
margin: 15% auto; /* 15% from the top and centered */ margin: 15% auto; /* 15% from the top and centered */
padding: 10px; padding: 10px;
border: 5px solid #FFFFFF; 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; color: #66ff33;
} }
#trave-l-box-text {
margin: 8px;
}
#travel-box-confirm, #travel-box-confirm,
#travel-box-cancel { #travel-box-cancel {
color: #aaa; color: #aaa;
font-size: 20px; float: right;
font-size: 16px;
font-weight: bold; font-weight: bold;
padding: 2px; padding: 2px;
margin: 6px; margin: 6px;

@ -1,5 +1,5 @@
CONSTANTS = { CONSTANTS = {
Version: "0.2", Version: "0.3",
//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience //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 //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then

@ -142,7 +142,7 @@ function determineCrimeChanceGrandTheftAuto() {
} }
function determineCrimeChanceKidnap() { function determineCrimeChanceKidnap() {
return ((Player.charisma / CONSTANTS.MaxSkillLevel + var chance = ((Player.charisma / CONSTANTS.MaxSkillLevel +
Player.strength / CONSTANTS.MaxSkillLevel + Player.strength / CONSTANTS.MaxSkillLevel +
Player.defense / CONSTANTS.MaxSkillLevel + Player.defense / CONSTANTS.MaxSkillLevel +
Player.dexterity / CONSTANTS.MaxSkillLevel + Player.dexterity / CONSTANTS.MaxSkillLevel +

@ -186,5 +186,9 @@ function prestigeAugmentation() {
initAugmentations(); initAugmentations();
initCompanies(); initCompanies();
//Clear terminal
$("#terminal tr:not(:last)").remove();
postNetburnerText();
Engine.loadTerminalContent(); Engine.loadTerminalContent();
} }