Update world.js (#739)

'disintigrate' -> 'disintegrate'

.gitignore

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

.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

@@ -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,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

@@ -35,9 +35,13 @@ a minimalist text adventure game for your browser
 	<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)
 
-[![app store](http://i.imgur.com/M6jlJQH.png)](https://itunes.apple.com/us/app/a-dark-room/id736683061)
+<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/dark.css

@@ -52,6 +52,14 @@ div#stores {
 	border: 1px solid #EEE;
 }
 
+div#blueprints:before {
+	background: #272823;
+}
+
+div#blueprints {
+	border: 1px solid #EEE;
+}
+
 div#weapons:before {
 	background: #272823;
 }
@@ -173,10 +181,19 @@ body.noMask #buttons > .button {
 	color: black;
 }
 
-.endGame {
+.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

@@ -46,9 +46,9 @@ div#wrapper {
 }
 
 div#saveNotify {
-	position: absolute;
-	top: 20px;
-	right: 0px;
+	position: fixed;
+	top: 10px;
+	right: 20px;
 	background: white;
 	opacity: 0;
 }
@@ -64,6 +64,21 @@ 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;
@@ -132,7 +147,7 @@ span.customSelectOptions {
 }
 
 div.headerButton {
-	font-size: 18px;
+	font-size: 17px;
 	cursor: pointer;
 	float: left;
 	border-left: 1px solid black;
@@ -546,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;
@@ -563,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;
@@ -586,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/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,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/space.css

@@ -137,6 +137,19 @@
 	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;
@@ -152,3 +165,10 @@
 .endGameOption:hover {
 	text-decoration: underline;
 }
+
+#wait-btn {
+	border-color: #fff;
+	color: #fff;
+	margin: 0 auto;
+	opacity: 0;
+}

dev-server.js

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

index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html itemscope itemtype="http://schema.org/CreativeWork">
+<html itemscope itemtype="https://schema.org/CreativeWork">
 <head>
 	<meta charset="UTF-8"/>
 	<!--  
@@ -7,7 +7,7 @@
 		==================
 		
 		A minimalist text adventure by Michael Townsend and all his friends.
-		Inspired by Candy Box (http://candies.aniwey.net/)
+		Inspired by Candy Box (https://candybox2.github.io/candybox)
 		Contribute on GitHub! (https://github.com/doublespeakgames/adarkroom/)
 	-->
 	<title>A Dark Room</title>
@@ -16,8 +16,7 @@
 	<meta itemprop="name" property="og:title" content="A Dark Room" />
 	<link rel="shortcut icon" href="favicon.ico" />
 	<link rel="image_src" href="img/adr.png" />
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-	<script src="https://www.dropbox.com/static/api/dropbox-datastores-1.1-latest.js" type="text/javascript"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
 	<script>
 		if(!window.jQuery) {
 			document.write('<script src="lib/jquery.min.js"><\/script>')
@@ -48,18 +47,20 @@
 	</script>
 	
 	<script src="script/Button.js"></script>
+	<script src="script/audioLibrary.js"></script>
+	<script src="script/audio.js"></script>
 	<script src="script/engine.js"></script>
 	<script src="script/state_manager.js"></script>
 	<script src="script/header.js"></script>
 	<script src="script/notifications.js"></script>
 	<script src="script/events.js"></script>
-	<script src="script/dropbox.js"></script>
 	<script src="script/room.js"></script>
 	<script src="script/outside.js"></script>
 	<script src="script/world.js"></script>
 	<script src="script/path.js"></script>
 	<script src="script/ship.js"></script>
-	<script src="script/space.js"></script>
+  <script src="script/space.js"></script>
+  <script src="script/fabricator.js"></script>
 	<script src="script/prestige.js"></script>
 	<script src="script/scoring.js"></script>
 	<!-- Event modules -->
@@ -67,7 +68,9 @@
 	<script src="script/events/room.js"></script>
 	<script src="script/events/outside.js"></script>
 	<script src="script/events/encounters.js"></script>
-	<script src="script/events/setpieces.js"></script>
+  <script src="script/events/setpieces.js"></script>
+  <script src="script/events/marketing.js"></script>
+	<script src="script/events/executioner.js"></script>
 	
 	<script type='text/javascript'>
 		var oldIE = false;
@@ -82,18 +85,18 @@
 	<link rel="stylesheet" type="text/css" href="css/path.css" />
 	<link rel="stylesheet" type="text/css" href="css/world.css" />
 	<link rel="stylesheet" type="text/css" href="css/ship.css" />
-	<link rel="stylesheet" type="text/css" href="css/space.css" />
+  <link rel="stylesheet" type="text/css" href="css/space.css" />
+  <link rel="stylesheet" type="text/css" href="css/fabricator.css" />
 	
 	<script src="script/localization.js"></script>
-	<!-- Google Analytics -->
+	<!-- Google tag (gtag.js) -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id=G-606P6J79WH"></script>
 	<script>
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','http://www.google-analytics.com/analytics.js','ga');
+		window.dataLayer = window.dataLayer || [];
+		function gtag(){dataLayer.push(arguments);}
+		gtag('js', new Date());
 
-		ga('create', 'UA-41314886-1', 'doublespeakgames.com');
-		ga('send', 'pageview');
+		gtag('config', 'G-606P6J79WH');
 	</script>
 	
 </head>
@@ -107,6 +110,11 @@
 				</div>
 			</div>
 		</div>
-	</div>
+  </div>
+  <a class="logo" href="https://www.doublespeakgames.com" alt="doublespeak games" target="_blank">
+    <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 41.75 32.84375" class="logo-icon">
+      <path d="m 18.024533,28.5722 c 2.532365,-2.243 5.064679,-4.4861 7.596993,-6.7292 4.907813,0 9.815625,0 14.723438,0 0,-6.8136 0,-13.6272 0,-20.4408 -12.976656,0 -25.953312,0 -38.9299676,0 0,6.8136 0,13.6272 0,20.4408 3.2917905,0 6.5835811,0 9.8753716,0 -0.643311,2.2431 -1.286622,4.4861 -1.9299604,6.7292 2.5323644,-2.243 5.0646784,-4.4861 7.5969924,-6.7292 0.999066,0 1.998131,0 2.997197,0 -0.643345,2.2431 -1.286691,4.4861 -1.930064,6.7292 z" style="stroke-width:1.0;fill:none;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"></path>
+    </svg>
+  </a>
 </body>
 </html>

lang/cs/main.css

@@ -0,0 +1,3 @@
+.button{width: 100px !important;}
+#outsidePanel .button{width: 115px !important;}
+.eventPanel .button {width: 122px !important;}