Update world.js (#739)

'disintigrate' -> 'disintegrate'

.gitattributes

@@ -0,0 +1,12 @@
+# Default
+* text=auto
+
+# Binary files so don't modify
+*.ico binary
+*.png binary
+*.jpg binary
+*.xlsx binary
+
+# Hide vendor and translation files from language statistics
+lang/* linguist-documentation
+lib/* linguist-vendored

.gitignore

@@ -1 +1,9 @@
 /.settings
+*.TODO
+*.mo
+*.swp
+.idea
+lang/.DS_Store
+.DS_Store
+node_modules
+img/Thumbs.db

.jshintrc

@@ -0,0 +1,5 @@
+{
+    "eqnull": true,
+    "sub": true,
+    "multistr": true
+}

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>A Dark Room</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

LICENSE.md

@@ -258,6 +258,8 @@ end user license agreements (excluding distributors and resellers) which
 have been validly granted by You or Your distributors under this License
 prior to termination shall survive termination.
 
+
+```
 ************************************************************************
 *                                                                      *
 *  6. Disclaimer of Warranty                                           *
@@ -299,6 +301,7 @@ prior to termination shall survive termination.
 *  limitation may not apply to You.                                    *
 *                                                                      *
 ************************************************************************
+```
 
 8. Litigation
 -------------

README.md

@@ -1,6 +1,47 @@
 A Dark Room
-=========
+===========
+> "awake. head throbbing. vision blurry. come light the fire."
 
-A Minimalist Text Adventure Game
+a minimalist text adventure game for your browser
 
-[Click to play](http://rawgithub.com/Continuities/adarkroom/master/index.html)
+[Click to play](http://adarkroom.doublespeakgames.com)
+
+<table>
+<tr><th colspan=4>Available Languages</tr>
+<tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=zh_cn">Chinese (Simplified)</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=zh_tw">Chinese (Traditional)</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=en">English</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=fr">French</a></td>
+</tr><tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=de">German</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=el">Greek</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=id">Indonesian</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=it">Italian</a></td>
+</tr><tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=ja">Japanese</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=ko">Korean</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=nb">Norwegian</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=pl">Polish</a></td>
+</tr><tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=pt">Portuguese</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=pt_br">Portuguese (Brazil)</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=ru">Russian</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=es">Spanish</a></td>
+</tr><tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=sv">Swedish</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=th">Thai</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=tr">Turkish</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=uk">Ukrainian</a></td>
+</tr><tr>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=vi">Vietnamese</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=lt_LT">Lithuanian</a></td>
+	<td><a href="http://adarkroom.doublespeakgames.com/?lang=gl">Galician</a></td>
+</tr>
+</table>
+
+or play the latest on [GitHub](http://doublespeakgames.github.io/adarkroom)
+
+<a href="https://itunes.apple.com/us/app/a-dark-room/id736683061"><img src="http://i.imgur.com/DMdnDYq.png" height="50"></a>
+<a href="https://play.google.com/store/apps/details?id=com.yourcompany.adarkroom"><img src="http://i.imgur.com/bLWWj4r.png" height="50"></a>
+<a href="https://store.steampowered.com/app/2460660/A_Dark_Room/"><img src="https://i.imgur.com/yz6cnU0.png" height="50"></a>

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.
+<br><hr>
+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."
+<br><br><br>
+
+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.
+<br>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!

css/dark.css

@@ -0,0 +1,199 @@
+body {
+	background-color: #272823;
+	color: #EEE;
+}
+
+div.headerButton {
+	border-left: 1px solid #EEE;
+}
+
+div#notifyGradient {
+	background-color: #272823;
+	background: -webkit-linear-gradient( rgba(39, 40, 35, 0) 0%, rgba(39, 40, 35, 1) 100% );
+	background: linear-gradient( rgba(39, 40, 35, 0) 0%, rgba(39, 40, 35, 1) 100% );
+	filter: alpha( Opacity=0, FinishOpacity=100, Style=1, StartX=0, StartY=0, FinishX=0, FinishY=500 );
+}
+
+div#saveNotify {
+	background: #272823;
+}
+
+.eventPanel:before {
+	background-color: #272823;
+}
+
+.eventTitle:after {
+	background-color: #272823;
+}
+
+div.tooltip {
+	background-color: #171813;
+	border: 1px solid black;
+	box-shadow: -1px 3px 2px #111;
+}
+
+div#population {
+	background-color: #272823;
+}
+
+div#village:before {
+	background: #272823;
+}
+
+div#village {
+	border: 1px solid #EEE;
+}
+
+div#stores:before {
+	background: #272823;
+}
+
+div#stores {
+	border: 1px solid #EEE;
+}
+
+div#blueprints:before {
+	background: #272823;
+}
+
+div#blueprints {
+	border: 1px solid #EEE;
+}
+
+div#weapons:before {
+	background: #272823;
+}
+
+div#weapons {
+	border: 1px solid #EEE;
+}
+
+div#bagspace {
+	background-color: #272823;
+}
+
+div#outfitting:before {
+	background: #272823;
+}
+
+div#perks {
+	border: 1px solid #EEE;
+}
+
+div#perks:before {
+	background-color: #272823;
+}
+
+div#outfitting {
+	border: 1px solid #EEE;
+}
+
+#bagspace-world {
+	border: 1px solid #EEE;
+}
+
+div.supplyItem {
+	border: 1px solid #EEE;
+}
+
+#backpackTitle {
+	background-color: #272823;
+}
+
+#backpackSpace {
+	background-color: #272823;
+}
+
+#healthCounter {
+	background-color: #272823;
+}
+
+#map {
+	border: 1px solid #EEE;
+}
+
+#map .landmark {
+	color: #EEE;
+}
+
+#dropMenu {
+	background: none repeat scroll 0 0 #272823;
+	box-shadow: -1px 3px 2px #111;
+}
+
+div.button {
+	border: 1px solid #EEE;
+}
+
+div.button.disabled, div.button.disabled:hover {
+	border-color: #444;
+	color: #444;
+}
+
+
+.upBtn:after, .upManyBtn:after {
+	border-color: transparent transparent #272823;
+}
+
+.upBtn:before, .upManyBtn:before {
+	border-color: transparent transparent #EEE;
+}
+
+.upBtn.disabled:before, .upManyBtn.disabled:before {
+	border-color: transparent transparent #555;
+}
+
+.dnBtn:after, .dnManyBtn:after {
+	border-color: #272823 transparent transparent;
+}
+
+.dnBtn:before, .dnManyBtn:before {
+	border-color: #EEE transparent transparent;
+}
+
+.dnBtn.disabled:before, .dnManyBtn.disabled:before {
+	border-color: #555 transparent transparent;
+}
+
+body.noMask .eventTitle {
+	background-color: #EEE;
+	color: #272823;
+}
+
+body.noMask .eventTitle:after {
+	background-color: #EEE;
+}
+
+body.noMask .eventPanel {
+	background-color: #EEE;
+}
+
+body.noMask #description {
+	color: #272823;
+}
+
+body.noMask #buttons > .button {
+	border: 1px solid #272823;
+	color: #272823;
+}
+
+#stars > div, #starsBack > div {
+	color: black;
+}
+
+.endGame, .outro {
+	color:#272823;
+}
+
+#wait-btn {
+	border-color: black;
+	color: black;
+}
+
+#theEnd {
+	color: #272823;
+}
+
+.logo-icon > path {
+  stroke: white;
+}

css/fabricator.css

@@ -0,0 +1,36 @@
+div#fabricateButtons {
+  position: relative;
+  top: 5px;
+	left: 0;
+}
+
+div#fabricateButtons::before {
+	content: attr(data-legend);
+	position: relative;
+	top: -5px;
+}
+
+div#blueprints::before {
+  content: attr(data-legend);
+	position: absolute;
+	top: -13px;
+	background-color: white;
+}
+
+div#blueprints {
+	position: absolute;
+	top: 0px;
+	right: 237px;
+	border: 1px solid black;
+	cursor: default;
+	padding: 5px 10px;
+	width: 200px;
+}
+
+div.blueprintRow {
+	position: relative;
+}
+
+div.blueprintRow .row_key {
+	float: none;
+}

css/main.css

@@ -1,5 +1,5 @@
 /* Fonts */
-body, .tooltip {
+body, .tooltip, select.menuBtn {
 	font-family: "Times New Roman", Times, serif;
 	font-size: 16px;
 	font-weight: normal;
@@ -16,6 +16,22 @@ body {
 	margin: 0;
 }
 
+::selection {
+	background-color: transparent;
+}
+
+::-moz-selection {
+	background-color: transparent;
+}
+
+#description textarea::selection {
+	background-color: gray;
+}
+
+#description textarea::-moz-selection {
+	background-color: gray;
+}
+
 /* Framework stuff */
 
 div.clear {
@@ -30,9 +46,9 @@ div#wrapper {
 }
 
 div#saveNotify {
-	position: absolute;
+	position: fixed;
-	top: 20px;
+	top: 10px;
-	right: 0px;
+	right: 20px;
 	background: white;
 	opacity: 0;
 }
@@ -48,33 +64,90 @@ div#header {
 	height: 20px;
 }
 
-.deleteSave {
+.logo {
-	position: absolute;
+  position: fixed;
+  left: 10px;
+  bottom: 0;
+  z-index: 10;
+}
+
+.logo-icon {
+  height: 40px;
+}
+
+.logo-icon > path {
+  stroke: black;
+}
+
+.menu {
+	position: fixed;
 	right: 10px;
 	bottom: 10px;
-	cursor: pointer;
+	color: #666;
+	z-index: 10;
 }
 
-.manualSave {
+.menu span {
+	cursor: pointer;
+	float: right;
+	margin-left: 20px;
+}
+
+.customSelect {
+	height: 20px;
+}
+
+span.customSelectOptions {
+	margin: 0;
+	width: 120px;
+}
+
+.customSelectOptions > ul {
+	max-height: 20px;
+	width: 120px;
+	overflow: hidden;
+	-webkit-transition: max-height 1s;
+	transition: max-height 1s;
+	padding: 0;
+	margin: 0;
+	bottom: 0;
 	position: absolute;
-	right: 120px;
+	right: 0;
-	bottom: 10px;
-	cursor: pointer;
 }
 
-.deleteSave:hover, .share:hover, .manualSave:hover {
+.customSelectOptions > ul:hover {
+	max-height: 600px;
+}
+
+.customSelectOptions > ul > li {
+	padding: 0 0 3px 0;
+	list-style-type: none;
+	height: 20px;
+}
+
+.customSelectOptions > ul > li:last-child {
+	padding: 0;
+}
+
+.customSelectOptions > ul > li:hover {
 	text-decoration: underline;
 }
 
-.share {
+.customSelectOptions > ul > li:first-child:hover {
-	position: absolute;
+	cursor: default;
-	right: 70px;
+	text-decoration: none;
-	bottom: 10px;
+}
-	cursor: pointer;
+
+.menu span:hover {
+	text-decoration: underline;
+}
+
+.menu .appStore {
+	font-weight: bold;
 }
 
 div.headerButton {
-	font-size: 18px;
+	font-size: 17px;
 	cursor: pointer;
 	float: left;
 	border-left: 1px solid black;
@@ -128,6 +201,10 @@ div.row_val {
 	float: right;
 }
 
+div.total {
+	font-weight: bold;
+}
+
 /* Notifications */
 
 div#notifications {
@@ -185,8 +262,8 @@ div.button:hover {
 
 div.button.disabled, div.button.disabled:hover {
 	cursor: default;
-	border-color: grey;
+	border-color: #b2b2b2;
-	color: grey;
+	color: #b2b2b2;
 	text-decoration: none;
 }
 
@@ -204,7 +281,7 @@ div.button div.cooldown {
 .upBtn, .dnBtn, .upManyBtn, .dnManyBtn {
 	position: absolute;
 	width: 14px;
-	height: 15px;
+	height: 12px;
 	cursor: pointer;
 }
 
@@ -213,7 +290,7 @@ div.button div.cooldown {
 }
 
 .upManyBtn, .dnManyBtn {
-    right: -11px;
+	right: -15px;
 }
 
 .upBtn.disabled, .dnBtn.disabled, .upManyBtn.disabled, .dnManyBtn.disabled {
@@ -221,11 +298,11 @@ div.button div.cooldown {
 }
 
 .upBtn {
-	top: -2px;
+	top: -3px;
 }
 
 .upManyBtn {
-    top: -2px;
+	top: -3px;
 }
 
 .upBtn:after, .upBtn:before, .upManyBtn:after, .upManyBtn:before {
@@ -234,7 +311,7 @@ div.button div.cooldown {
 	content: " ";
 	height: 0;
 	width: 0;
-	bottom: 4px;
+	bottom: 2px;
 }
 
 .upBtn:after, .upManyBtn:after {
@@ -264,27 +341,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;
 }
@@ -435,6 +518,11 @@ body.noMask .eventTitle:after {
 	min-height: 100px;
 }
 
+#description textarea {
+	width: 100%;
+	height: 225px;
+}
+
 body.noMask #description {
 	color: white;
 }
@@ -443,6 +531,10 @@ body.noMask #description {
 	padding-bottom: 20px;
 }
 
+.take-all-button {
+	float: none;
+}
+
 #buttons > .button {
 	margin: 0 5px 5px;
 	margin-right: 15px;
@@ -469,6 +561,53 @@ body.noMask #description {
 	margin-left: -50%;
 }
 
+.fighter.shield > .label::before {
+	content: '(';
+	position: absolute;
+	left: -8px;
+}
+
+.fighter.shield > .label::after {
+	content: ')';
+	position: absolute;
+	right: -8px;
+}
+
+.fighter.energised > .label {
+	font-size: 2em;
+	font-style: bold;
+}
+
+.fighter.meditation > .label {
+	font-size: 1.5em;
+	opacity: 0.3;
+}
+
+@keyframes exploding {
+	0% { transform: translate(0, 0); }
+	25% { transform: translate(-10px, 0); }
+	75% { transform: translate(10px, 0); }
+	100% { transform: translate(0, 0); }
+}
+
+.fighter.exploding > .label {
+	animation: exploding 200ms linear infinite;
+}
+
+.fighter.venomous > .label {
+	font-size: 1.5em;
+	font-style: bold;
+}
+
+.fighter.enraged > .label {
+	font-size: 1.5em;
+	font-style: italic;
+}
+
+.fighter.boost > .label {
+	font-style: italic;
+}
+
 #description .bullet {
 	padding: 0px 20px 0px 20px;
 	bottom: 25px;
@@ -486,12 +625,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;
@@ -509,7 +648,7 @@ body.noMask #description {
 }
 
 #dropMenu:before {
-	content: "drop:";
+	content: attr(data-legend);
 	border-bottom: 1px solid black;
 	display: block;
 	margin-bottom: 5px;

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;

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,13 +50,6 @@ div#perks {
 	width: 200px;
 }
 
-div#perks:before {
-	position: absolute;
-	content: "perks";
-	top: -13px;
-	background-color: white;
-}
-
 div.perkRow {
 	position: relative;
 }
@@ -64,3 +57,12 @@ div.perkRow {
 div.perkRow .row_key {
 	float: none;
 }
+
+#pathScroller {
+	padding-top: 10px;
+	position: relative;
+	top: -10px;
+	max-height: 660px;
+	width: 475px;
+	overflow-y: auto;
+}

css/room.css

@@ -4,8 +4,8 @@ div#buildBtns {
 	left: 0px;
 }
 
-div#buildBtns:before {
+div#buildBtns:before, div#craftBtns:before, div#buyBtns:before {
-	content: "build:";
+	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;	
-}

css/ship.css

@@ -5,3 +5,4 @@ div#hullRow {
 div#engineRow {
 	width: 70px;
 	margin-bottom: 20px;
+}