Skip to content

Commit

Permalink
Merge pull request #6 from danielyxie/dev
Browse files Browse the repository at this point in the history
Dev 0.3
  • Loading branch information
danielyxie authored May 15, 2017
2 parents 243f256 + 24eda61 commit 12085c3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
11 changes: 8 additions & 3 deletions css/popupboxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Constants.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Crimes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down
4 changes: 4 additions & 0 deletions src/Prestige.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,5 +186,9 @@ function prestigeAugmentation() {
initAugmentations();
initCompanies();

//Clear terminal
$("#terminal tr:not(:last)").remove();
postNetburnerText();

Engine.loadTerminalContent();
}

0 comments on commit 12085c3

Please sign in to comment.