Merge remote-tracking branch 'upstream/master'

README.md

@@ -35,6 +35,7 @@ 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>
 </tr>
 </table>
 

lang/langs.js

@@ -12,6 +12,7 @@ var langs = {
 	'ko':'한국어',
 	'nb':'norsk',
 	'pl':'polski',
+	'lt_LT':'lietuvių',
 	'pt':'português',
 	'pt_br':'português (brasil)',
 	'ru':'русский',

lang/lt_LT/main.css

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

lang/tr/strings.po

@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: adarkroom\n"
 "POT-Creation-Date: 2016-02-15 02:03+0100\n"
-"PO-Revision-Date: 2016-02-15 02:03+0100\n"
+"PO-Revision-Date: 2017-05-02 09:32+0200\n"
 "Last-Translator: Vanadar <vanadar.univers@gmail.com>\n"
 "Language-Team: \n"
-"Language: fr\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 2.0.1\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: s;\n"
@@ -247,11 +247,11 @@ msgstr "kaydet"
 
 #: ../../script/engine.js:177
 msgid "dropbox."
-msgstr ""
+msgstr "dropbox"
 
 #: ../../script/engine.js:184
 msgid "github."
-msgstr ""
+msgstr "github"
 
 #: ../../script/engine.js:268
 msgid "Export / Import"
@@ -424,8 +424,9 @@ msgid "all"
 msgstr ""
 
 #: ../../script/events.js:649
+#, fuzzy
 msgid "take everything"
-msgstr ""
+msgstr "hepsini al"
 
 #: ../../script/events.js:653 ../../script/outside.js:627
 msgid " and "
@@ -847,7 +848,7 @@ msgstr "köylüler geri çekildi ve ölenler için yas tutuyor."
 
 #: ../../script/events/outside.js:235
 msgid "wild beasts attack the villagers"
-msgstr ""
+msgstr "vahşi yaratıklar köylülere saldırdı"
 
 #: ../../script/events/outside.js:249
 msgid "predators become prey. price is unfair"
@@ -2034,7 +2035,7 @@ msgstr ""
 
 #: ../../script/events/setpieces.js:2934
 msgid "An Old House"
-msgstr ""
+msgstr "Eski bir ev"
 
 #: ../../script/events/setpieces.js:2938
 msgid "an old house remains here, once white siding yellowed and peeling."
@@ -2129,9 +2130,8 @@ msgid "salvage"
 msgstr ""
 
 #: ../../script/events/setpieces.js:3156
-#, fuzzy
 msgid "The Sulphur Mine"
-msgstr "sülfür madeni"
+msgstr "Sülfür madeni"
 
 #: ../../script/events/setpieces.js:3160
 msgid "the military is already set up at the mine's entrance."
@@ -2157,12 +2157,11 @@ msgstr ""
 #: ../../script/events/setpieces.js:3209 ../../script/events/setpieces.js:3249
 #: ../../script/events/setpieces.js:3352 ../../script/events/setpieces.js:3386
 msgid "run"
-msgstr ""
+msgstr "koş"
 
 #: ../../script/events/setpieces.js:3241
-#, fuzzy
 msgid "a second soldier joins the fight."
-msgstr "bir gözcü gecelemek için uğradı"
+msgstr "bir gözcü gecelemek için uğradı."
 
 #: ../../script/events/setpieces.js:3275
 msgid "a grizzled soldier attacks, waving a bayonet."
@@ -2174,18 +2173,16 @@ msgstr ""
 
 #: ../../script/events/setpieces.js:3287 ../../script/events/setpieces.js:3429
 #: ../../script/events/setpieces.js:3505
-#, fuzzy
 msgid "the mine is now safe for workers."
-msgstr "hiç su kalmadı"
+msgstr "maden işçiler için şimdi güvenli."
 
 #: ../../script/events/setpieces.js:3289
 msgid "the sulphur mine is clear of dangers"
 msgstr ""
 
 #: ../../script/events/setpieces.js:3305
-#, fuzzy
 msgid "The Coal Mine"
-msgstr "kömür madeni"
+msgstr "Kömür madeni"
 
 #: ../../script/events/setpieces.js:3309
 msgid "camp fires burn by the entrance to the mine."
@@ -3060,7 +3057,7 @@ msgstr "silahlar"
 
 #: ../../script/room.js:914
 msgid "total"
-msgstr ""
+msgstr "toplam"
 
 #: ../../script/room.js:935 ../../script/room.js:979
 msgid "not enough "

script/engine.js

@@ -423,6 +423,10 @@
 								onChoose: function() {
 									window.open('https://play.google.com/store/apps/details?id=com.yourcompany.adarkroom');
 								}
+							},
+							'close': {
+								text: _('close'),
+								nextScene: 'end'
 							}
 						}
 					}

script/events/outside.js

@@ -148,7 +148,7 @@ Events.Outside = [
 			}
 		}
 	},
-		
+
 	{ /* Plague */
 		title: _('Plague'),
 		isAvailable: function() {
@@ -275,7 +275,7 @@ Events.Outside = [
 					bullets: 10,
 					'cured meat': 50
 				},
-				
+
 				blink: true,
 				buttons: {
 					'end': {
@@ -287,4 +287,5 @@ Events.Outside = [
 			}
 		}
 	}
+
 ];

script/events/room.js

@@ -40,7 +40,7 @@ Events.Room = [
 						cost: { fur: 300, scales: 15, teeth: 5 },
 						reward: { 'compass': 1 },
 						notification: _('the old compass is dented and dusty, but it looks to work.')
-					}, 
+					},
 					'goodbye': {
 						text: _('say goodbye'),
 						nextScene: 'end'
@@ -48,7 +48,7 @@ Events.Room = [
 				}
 			}
 		}
-	}, 
+	},
 	{ /* Noises Outside  --  gain wood/fur */
 		title: _('Noises'),
 		isAvailable: function() {
@@ -257,7 +257,63 @@ Events.Room = [
 			}
 		}
 	},
-	
+	{/* The Shady Builder */
+		title: _('The Shady Builder'),
+		isAvailable: function() {
+			return Engine.activeModule == Room && $SM.get('game.buildings["hut"]', true) >= 5 && $SM.get('game.buildings["hut"]', true) < 20;
+		},
+		scenes: {
+			'start':{
+				text: [
+					_('a shady builder passes through'),
+					_('says he can build you a hut for less wood')
+				],
+				notification: _('a shady builder passes through'),
+				buttons: {
+					'build': {
+						text: _('300 wood'),
+						cost: { 'wood' : 300 },
+						nextScene: {0.6: 'steal', 1: 'build'}
+					},
+					'deny': {
+						text: _('say goodbye'),
+						nextScene: 'end'
+					}
+				}
+			},
+			'steal': {
+				text:[
+					_("the shady builder has made off with your wood")
+				],
+				notification: _('the shady builder has made off with your wood'),
+				buttons: {
+					'end': {
+						text: _('go home'),
+						nextScene: 'end'
+					}
+				}
+			},
+			'build': {
+				text:[
+					_("the shady builder builds a hut")
+				],
+				notification: _('the shady builder builds a hut'),
+				onLoad: function() {
+					var n = $SM.get('game.buildings["hut"]', true);
+					if(n < 20){
+						$SM.set('game.buildings["hut"]',n+1);
+					}
+				},
+				buttons: {
+					'end': {
+						text: _('go home'),
+						nextScene: 'end'
+					}
+				}
+			}
+		}
+	},
+
 	{ /* Mysterious Wanderer  --  wood gambling */
 		title: _('The Mysterious Wanderer'),
 		isAvailable: function() {
@@ -336,7 +392,7 @@ Events.Room = [
 			}
 		}
 	},
-	
+
 	{ /* Mysterious Wanderer  --  fur gambling */
 		title: _('The Mysterious Wanderer'),
 		isAvailable: function() {
@@ -415,7 +471,7 @@ Events.Room = [
 			}
 		}
 	},
-	
+
 	{ /* The Scout  --  Map Merchant */
 		title: _('The Scout'),
 		isAvailable: function() {
@@ -457,7 +513,7 @@ Events.Room = [
 			}
 		}
 	},
-	
+
 	{ /* The Wandering Master */
 		title: _('The Master'),
 		isAvailable: function() {
@@ -530,7 +586,7 @@ Events.Room = [
 			}
 		}
 	},
-		
+
 	{ /* The Sick Man */
 		title: _('The Sick Man'),
 		isAvailable: function() {