diff --git a/.gitignore b/.gitignore index bc4a396..42cb856 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.TODO *.mo *.swp +.idea diff --git a/.project b/.project deleted file mode 100644 index 4860616..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - A Dark Room - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/README.md b/README.md index effa2ca..8c12f2e 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,40 @@ a minimalist text adventure game for your browser [Click to play](http://adarkroom.doublespeakgames.com) -Available | Languages ---------- | --------- -[Chinese](http://adarkroom.doublespeakgames.com/?lang=zh_cn) | [English](http://adarkroom.doublespeakgames.com/?lang=en) -[French](http://adarkroom.doublespeakgames.com/?lang=fr) | [German](http://adarkroom.doublespeakgames.com/?lang=de) -[Italian](http://adarkroom.doublespeakgames.com/?lang=it) | [Japanese](http://adarkroom.doublespeakgames.com/?lang=ja) -[Korean](http://adarkroom.doublespeakgames.com/?lang=ko) | [Norwegian](http://adarkroom.doublespeakgames.com/?lang=nb) -[Polish](http://adarkroom.doublespeakgames.com/?lang=pl) | [Portuguese](http://adarkroom.doublespeakgames.com/?lang=pt) -[Russian](http://adarkroom.doublespeakgames.com/?lang=ru) | [Spanish](http://adarkroom.doublespeakgames.com/?lang=es) -[Swedish](http://adarkroom.doublespeakgames.com/?lang=sv) | [Turkish](http://adarkroom.doublespeakgames.com/?lang=tr) -[Ukrainian](http://adarkroom.doublespeakgames.com/?lang=uk) | [Vietnamese] (http://adarkroom.doublespeakgames.com/?lang=vi) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Available Languages
Chinese (Simplified)Chinese (Traditional)EnglishFrench
GermanGreekIndonesianItalian
JapaneseKoreanNorwegianPolish
PortuguesePortuguese (Brazil)RussianSpanish
SwedishThaiTurkishUkrainian
VietnameseLithuanian
-or play the latest on [GitHub](http://continuities.github.io/adarkroom) +or play the latest on [GitHub](http://doublespeakgames.github.io/adarkroom) -[![app store](http://i.imgur.com/M6jlJQH.png)](https://itunes.apple.com/us/app/a-dark-room/id736683061) + + diff --git a/contributing.md b/contributing.md new file mode 100644 index 0000000..7ff5fd3 --- /dev/null +++ b/contributing.md @@ -0,0 +1,19 @@ +Contributing to A Dark Room +=========== + +Hello and welcome, contributors both new, and old. + +Like most projects on GitHub, A Dark Room is open source, and thrives off contributions from members of the community. We appreciate any pull requests or issues that you may open in the project, no matter the size. +
+Before contributing to the project, there are a few things you should look over to ensure your contribution is done correctly. + +Most of the projects code is written in JavaScript. We would prefer all submitted JavaScript be [JSHint](http://jshint.com/) compliant. +> "JSHint is a community-driven tool to detect errors and potential problems in JavaScript code and to enforce your team's coding conventions." +


+ +Before opening a new issue, try to check the projects [issues](https://github.com/doublespeakgames/adarkroom/issues) or [wiki](https://github.com/doublespeakgames/adarkroom/wiki). +Doing so will help prevent needless double issues. +
Most of the time you will be able to find what you are looking for in one of those places. If not, please open an issue and describe your problem with as much detail as possible. + + +Lastly, be nice, patient, open to new ideas, and have some fun! diff --git a/css/dark.css b/css/dark.css index 9425b1a..2d04f7c 100644 --- a/css/dark.css +++ b/css/dark.css @@ -27,7 +27,7 @@ div#saveNotify { } div.tooltip { - background-color: #111; + background-color: #171813; border: 1px solid black; box-shadow: -1px 3px 2px #111; } diff --git a/css/main.css b/css/main.css index 26da054..3d41db0 100644 --- a/css/main.css +++ b/css/main.css @@ -69,6 +69,7 @@ div#header { right: 10px; bottom: 10px; color: #666; + z-index: 10; } .menu span { @@ -83,12 +84,12 @@ div#header { span.customSelectOptions { margin: 0; - width: 80px; + width: 120px; } .customSelectOptions > ul { max-height: 20px; - width: 80px; + width: 120px; overflow: hidden; -webkit-transition: max-height 1s; transition: max-height 1s; @@ -100,7 +101,7 @@ span.customSelectOptions { } .customSelectOptions > ul:hover { - max-height: 400px; + max-height: 600px; } .customSelectOptions > ul > li { @@ -126,6 +127,10 @@ span.customSelectOptions { text-decoration: underline; } +.menu .appStore { + font-weight: bold; +} + div.headerButton { font-size: 18px; cursor: pointer; @@ -181,6 +186,10 @@ div.row_val { float: right; } +div.total { + font-weight: bold; +} + /* Notifications */ div#notifications { @@ -257,7 +266,7 @@ div.button div.cooldown { .upBtn, .dnBtn, .upManyBtn, .dnManyBtn { position: absolute; width: 14px; - height: 15px; + height: 12px; cursor: pointer; } @@ -266,7 +275,7 @@ div.button div.cooldown { } .upManyBtn, .dnManyBtn { - right: -11px; + right: -15px; } .upBtn.disabled, .dnBtn.disabled, .upManyBtn.disabled, .dnManyBtn.disabled { @@ -274,11 +283,11 @@ div.button div.cooldown { } .upBtn { - top: -2px; + top: -3px; } .upManyBtn { - top: -2px; + top: -3px; } .upBtn:after, .upBtn:before, .upManyBtn:after, .upManyBtn:before { @@ -287,7 +296,7 @@ div.button div.cooldown { content: " "; height: 0; width: 0; - bottom: 4px; + bottom: 2px; } .upBtn:after, .upManyBtn:after { @@ -317,27 +326,33 @@ div.button div.cooldown { content: " "; height: 0; width: 0; - top: 4px; + top: 2px; } +/* Overall size of buttons controlled by this style + border-width and margin-left should be the same. */ +.upBtn:before, .dnBtn:before, .upManyBtn:before, .dnManyBtn:before { + border-width: 6px; + left: 50%; + margin-left: -6px; +} + +/* Thickness of up/down button lines controlled by this style. + border-width and margin-left should be the same. + Thickness = :before.border-width minus :after.border-width */ .upBtn:after, .dnBtn:after { + border-width: 4px; + left: 50%; + margin-left: -4px; +} + +/* See comment on .upBtn:after, .dnBtn:after */ +.upManyBtn:after, .dnManyBtn:after { border-width: 3px; left: 50%; margin-left: -3px; } -.upBtn:before, .dnBtn:before, .upManyBtn:before, .dnManyBtn:before { - border-width: 5px; - left: 50%; - margin-left: -5px; -} - -.upManyBtn:after, .dnManyBtn:after { - border-width: 2px; - left: 50%; - margin-left: -2px; -} - .dnBtn:after, .dnManyBtn:after { border-color: white transparent transparent; } @@ -501,6 +516,10 @@ body.noMask #description { padding-bottom: 20px; } +.take-all-button { + float: none; +} + #buttons > .button { margin: 0 5px 5px; margin-right: 15px; @@ -544,12 +563,12 @@ body.noMask #description { #lootButtons { padding-bottom: 0px !important; - margin: 20px 0 0 5px; + margin: 20px 0 5px 0; position: relative; } #lootButtons:before { - content: "take:"; + content: attr(data-legend); position: absolute; top: -25px; left: 0px; @@ -567,7 +586,7 @@ body.noMask #description { } #dropMenu:before { - content: "drop:"; + content: attr(data-legend); border-bottom: 1px solid black; display: block; margin-bottom: 5px; diff --git a/css/outside.css b/css/outside.css index 1e56a79..59c3cbd 100644 --- a/css/outside.css +++ b/css/outside.css @@ -22,15 +22,11 @@ div#population { div#village:before { position: absolute; background: white; - content: "village"; + content: attr(data-legend); left: 8px; top: -13px; } -div#village.noHuts:before { - content: "forest"; -} - div#workers { position:absolute; top: -4px; @@ -61,4 +57,4 @@ div#workers { div.storeRow div.tooltip { width: 160px; -} \ No newline at end of file +} diff --git a/css/path.css b/css/path.css index 9550492..7918738 100644 --- a/css/path.css +++ b/css/path.css @@ -6,9 +6,9 @@ padding: 5px 10px; } -div#outfitting:before { +div#outfitting:before ,div#perks:before { + content: attr(data-legend); position: absolute; - content: "supplies"; top: -13px; background-color: white; } @@ -50,17 +50,10 @@ div#perks { width: 200px; } -div#perks:before { - position: absolute; - content: "perks"; - top: -13px; - background-color: white; -} - div.perkRow { position: relative; } div.perkRow .row_key { float: none; -} \ No newline at end of file +} diff --git a/css/room.css b/css/room.css index 9d9b0db..ac256c2 100644 --- a/css/room.css +++ b/css/room.css @@ -4,8 +4,8 @@ div#buildBtns { left: 0px; } -div#buildBtns:before { - content: "build:"; +div#buildBtns:before, div#craftBtns:before, div#buyBtns:before { + content: attr(data-legend); position: relative; top: -5px; } @@ -16,32 +16,29 @@ div#craftBtns { left: 150px; } -div#craftBtns:before { - content: "craft:"; - position: relative; - top: -5px; -} - div#buyBtns { position: absolute; top: 50px; left: 300px; } -div#buyBtns:before { - content: "buy:"; - position: relative; - top: -5px; -} - div#storesContainer { position: absolute; top: 0px; right: 0px; } +div#stores:before, div#weapons:before { + position: absolute; + background: white; + content: attr(data-legend); + left: 8px; + top: -13px; +} + div#stores { position: relative; + z-index:10; border: 1px solid black; cursor: default; padding: 5px 10px; @@ -52,14 +49,6 @@ div.storeRow { position: relative; } -div#stores:before { - position: absolute; - background: white; - content: "stores"; - left: 8px; - top: -13px; -} - div#weapons { margin-top: 15px; position: relative; @@ -69,11 +58,3 @@ div#weapons { padding: 5px 10px; width: 200px; } - -div#weapons:before { - position: absolute; - background: white; - content: "weapons"; - left: 8px; - top: -13px; -} \ No newline at end of file diff --git a/css/space.css b/css/space.css index 61705e6..b044231 100644 --- a/css/space.css +++ b/css/space.css @@ -144,11 +144,11 @@ position:relative; } -.endGameRestart { +.endGameOption { font-size: 32px; cursor: pointer; } -.endGameRestart:hover { +.endGameOption:hover { text-decoration: underline; } diff --git a/img/Thumbs.db b/img/Thumbs.db new file mode 100644 index 0000000..bfc74cf Binary files /dev/null and b/img/Thumbs.db differ diff --git a/index.html b/index.html index 2e6f9dc..c72e9c0 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + A Dark Room @@ -16,7 +16,7 @@ - +