Merge pull request #592 from doublespeakgames/master

merge pull

.gitignore

@@ -3,7 +3,3 @@
 *.mo
 *.swp
 .idea
-lang/.DS_Store
-.DS_Store
-node_modules
-img/Thumbs.db

LICENSE.md

@@ -35,7 +35,7 @@ Mozilla Public License Version 2.0
     means any form of the work other than Source Code Form.
 
 1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in
+    means a work that combines Covered Software with other material, in 
     a separate file or files, that is not Covered Software.
 
 1.8. "License"
@@ -258,8 +258,6 @@ 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                                           *
@@ -301,7 +299,6 @@ prior to termination shall survive termination.
 *  limitation may not apply to You.                                    *
 *                                                                      *
 ************************************************************************
-```
 
 8. Litigation
 -------------

README.md

@@ -36,7 +36,6 @@ a minimalist text adventure game for your browser
 </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>
 
@@ -44,4 +43,3 @@ 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>

css/april.css

@@ -0,0 +1,275 @@
+/***  dark.css + APRIL FOOLS!  ***/
+
+* {
+	cursor: wait!important;
+}
+
+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: #111;
+	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#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 {
+	color:#272823;
+}
+
+#theEnd {
+	color: #272823;
+}
+
+
+
+
+body {
+	background: url('../img/tile-background.jpg');
+	color: yellow!important;
+}
+
+.menu {
+	color: yellow!important;
+}
+
+.button {
+	background: url('../img/wefd.gif');
+}
+
+#bagspace-world,
+#map,
+.eventPanel {
+	background: url('../img/Rainbow.gif');
+}
+
+.construction {
+	background: url('../img/jZSGX.gif');
+	width: 390px;
+  	height: 351px;
+  	bottom: 0;
+}
+
+.paws {
+	background: url('../img/paws.gif')
+}
+
+.cute {
+	width: 288px;
+  height: 243px;
+	-webkit-transition: all 3s linear;
+  -moz-transition: all 3s linear;
+  -o-transition: all 3s linear;
+  -ms-transition: all 3s linear;
+  transition: all 3s linear;
+  position: absolute;
+  top: 30px;
+  left: 0;
+	background: url('../img/cute.gif')
+
+}
+
+.cute.move {
+  left: 100%;
+  margin-left: -288px; /*.animate width*/
+}
+
+.construction,
+.paws,
+.cute,
+.counter {
+	pointer-events: none;
+	position: fixed;
+}
+
+div#notifyGradient {
+	background-color: transparent!important;
+	background: none!important;
+}
+
+.eventPanel:before {
+	background-color: transparent;
+}
+
+#starsBack {
+	background: url('../img/Rainbow.gif');
+}
+
+iframe {
+	position: fixed;
+	height: 315px;
+	width:420px;
+	bottom: 0;
+	right: 0;
+}
+
+.counter {
+	top: 0;
+	right: 0;
+}

css/dark.css

@@ -52,14 +52,6 @@ div#stores {
 	border: 1px solid #EEE;
 }
 
-div#blueprints:before {
-	background: #272823;
-}
-
-div#blueprints {
-	border: 1px solid #EEE;
-}
-
 div#weapons:before {
 	background: #272823;
 }
@@ -181,19 +173,10 @@ body.noMask #buttons > .button {
 	color: black;
 }
 
-.endGame, .outro {
+.endGame {
 	color:#272823;
 }
 
-#wait-btn {
-	border-color: black;
-	color: black;
-}
-
 #theEnd {
 	color: #272823;
 }
-
-.logo-icon > path {
-  stroke: white;
-}

css/fabricator.css

@@ -1,36 +0,0 @@
-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

@@ -46,9 +46,9 @@ div#wrapper {
 }
 
 div#saveNotify {
-	position: fixed;
-	top: 10px;
-	right: 20px;
+	position: absolute;
+	top: 20px;
+	right: 0px;
 	background: white;
 	opacity: 0;
 }
@@ -64,21 +64,6 @@ div#header {
 	height: 20px;
 }
 
-.logo {
-  position: fixed;
-  left: 10px;
-  bottom: 0;
-  z-index: 10;
-}
-
-.logo-icon {
-  height: 40px;
-}
-
-.logo-icon > path {
-  stroke: black;
-}
-
 .menu {
 	position: fixed;
 	right: 10px;
@@ -147,7 +132,7 @@ span.customSelectOptions {
 }
 
 div.headerButton {
-	font-size: 17px;
+	font-size: 18px;
 	cursor: pointer;
 	float: left;
 	border-left: 1px solid black;
@@ -561,53 +546,6 @@ 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;

css/path.css

@@ -6,7 +6,7 @@
 	padding: 5px 10px;
 }
 
-div#outfitting:before, div#perks:before {
+div#outfitting:before ,div#perks:before {
 	content: attr(data-legend);
 	position: absolute;
 	top: -13px;
@@ -57,12 +57,3 @@ 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/space.css

@@ -137,19 +137,6 @@
 	padding-top:10%;
 }
 
-.outroContainer {
-	padding-top:10%;
-	width: 800px;
-	margin: 0 auto;
-}
-
-.outro {
-	font-size: 1.5rem;
-	color: #FFF;
-	opacity: 0;
-	margin-bottom: 40px;
-}
-
 .endGame {
 	font-size:48px;
 	color:#FFFFFF;
@@ -165,10 +152,3 @@
 .endGameOption:hover {
 	text-decoration: underline;
 }
-
-#wait-btn {
-	border-color: #fff;
-	color: #fff;
-	margin: 0 auto;
-	opacity: 0;
-}

dev-server.js

@@ -1,8 +0,0 @@
-import express from 'express';
-
-const PORT = 8080;
-
-const app = express();
-app.use(express.static('.'));
-
-app.listen(PORT, () => console.log(`Listening on port ${PORT}`));