Skip to content

Commit

Permalink
bugfixes & raspberries
Browse files Browse the repository at this point in the history
- save/load bugfixes
- CSS corrections
- New items in the shop
  • Loading branch information
naoxink committed Nov 1, 2017
1 parent 6ba4034 commit c3c4dbd
Show file tree
Hide file tree
Showing 12 changed files with 235 additions and 193 deletions.
7 changes: 6 additions & 1 deletion css/terminal.css
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ul > li > button {
border: 1px solid #0F0;
width: 300px;
z-index: 2;
top: 10px;
bottom: 20px;
left: 50%;
margin-left: -150px;
}
Expand Down Expand Up @@ -401,6 +401,7 @@ ul > li > button {
float: left;
width: 95%;
border: 0;
font-family: monospace;
}
#command-prompt:before {
content: '>';
Expand Down Expand Up @@ -487,6 +488,10 @@ p.disabled {
font-weight: normal;
max-width: 400px;
}
#tooltip.hidden {
border-color: #FF0;
color: #FF0;
}
.wild-pixel {
position: fixed;
background-color: #0F0;
Expand Down
Binary file added img/items/rasp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/items/rasp2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/items/template.psd
Binary file not shown.
3 changes: 0 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DevLife</title>
<link id="css" rel="stylesheet" href="css/terminal.css">
<link rel="stylesheet" href="css/mediaqueries.css">
<!-- <link id="css-dark-side" rel="stylesheet" href=""> -->
<link id="css" rel="stylesheet" href="vendor/dragula/dragula.min.css">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
14 changes: 7 additions & 7 deletions js/achievements.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,21 @@ var achievements = [
'title': 'Command prompt addict',
'help': 'Press 200 keys in the command prompt',
'check': function(){
return Stats.commandPrompt.keysPressed >= 200
return Stats.commandPromptKeysPressed >= 200
},
'progress': function(){
return '' + Stats.commandPrompt.keysPressed + '/' + 200
return '' + Stats.commandPromptKeysPressed + '/' + 200
},
'done': false
},
{
'title': 'Key spammer',
'help': 'Make ' + Core.numberFormat(1000) + ' with the command prompt',
'check': function(){
return Stats.commandPrompt.moneyEarned >= 1000
return Stats.commandPromptMoneyEarned >= 1000
},
'progress': function(){
return '' + Core.numberFormat(Stats.commandPrompt.moneyEarned) + '/' + Core.numberFormat(1000)
return '' + Core.numberFormat(Stats.commandPromptMoneyEarned) + '/' + Core.numberFormat(1000)
},
'done': false
},
Expand Down Expand Up @@ -244,7 +244,7 @@ var achievements = [
'title': 'Keys on fire',
'help': 'Make ' + Core.numberFormat(10000) + ' with the command prompt',
'check': function(){
return Stats.commandPrompt.moneyEarned >= 10000
return Stats.commandPrompMoneyEarned >= 10000
},
'done': false,
'hidden': true
Expand All @@ -253,7 +253,7 @@ var achievements = [
'title': 'Key blender',
'help': 'Make ' + Core.numberFormat(100000) + ' with the command prompt',
'check': function(){
return Stats.commandPrompt.moneyEarned >= 100000
return Stats.commandPrompMoneyEarned >= 100000
},
'done': false,
'hidden': true
Expand All @@ -262,7 +262,7 @@ var achievements = [
'title': 'Command guru',
'help': 'Make ' + Core.numberFormat(1000000) + ' with the command prompt',
'check': function(){
return Stats.commandPrompt.moneyEarned >= 1000000
return Stats.commandPrompMoneyEarned >= 1000000
},
'done': false,
'hidden': true
Expand Down
Loading

0 comments on commit c3c4dbd

Please sign in to comment.