the game loads now

Gulpfile.coffee

@@ -70,6 +70,7 @@ gulp.task('concatCoffee', () ->
     ## additional functions
     "./lib/oneOf.coffee"
     "./lib/phrase.coffee"
+    "./lib/dialogue.coffee"
     ## the actual game
     './game/begin.coffee'
     './game/story.coffee'

game/language/en.coffee

@@ -21,18 +21,18 @@ en_lang =
 
       It is a small compartment for four people.
     """
-  alexey: (Improv, state) ->
+  alexey: (ImprovEngine, state) ->
     """
       On the top shelf in front of you sits {{#{if salet.character.knows_alexey then "Alex" else "an unshaven man in a dark tracksuit"}.}}
-      #{Improv.gen("alexey", state)}
+      #{ImprovEngine.gen("alexey", state)}
     """
   alexey_end: """
     The man in a dark tracksuit rummages through the lower shelves.
   """
-  margo: (Improv, state) ->
+  margo: (ImprovEngine, state) ->
     """
       On the bottom shelf near you rests {{#{if salet.character.knows_margo then "Margo" else "a beautiful lady with a hand ferret and cynical eyes"}.}}
-      #{Improv.gen("margo", state)}
+      #{ImprovEngine.gen("margo", state)}
     """
   margo_end: """
     The girl is looking for a ferret in his luggage.
@@ -72,15 +72,15 @@ en_lang =
 
     You think that's enough for the introductions.
   """
-  alexey_dsc: (Improv, state) -> """
+  alexey_dsc: (ImprovEngine, state) -> """
     He is a simple little scruffy guy in a dark jumpsuit.
     His hair is dyed in blond, but you already can see the dark ends.
     Under the suit he wears a T-shirt with the inscription: "Green Dragon".
 
-    #{Improv.gen("alexey", state)}
+    #{ImprovEngine.gen("alexey", state)}
   """
-  margo_dsc: (Improv, state) -> """
+  margo_dsc: (ImprovEngine, state) -> """
-    #{Improv.gen("margo", state)}
+    #{ImprovEngine.gen("margo", state)}
   """
   margo_bye: """
      — Ok I will not distract you anymore.

game/language/ru.coffee

@@ -23,18 +23,18 @@ ru_lang =
 
       Это маленькое купе на четырёх человек.
     """
-  alexey: (Improv, state) ->
+  alexey: (ImprovEngine, state) ->
     """
       На верхней полке напротив вас сидит {{#{if salet.character.knows_alexey then "Лёша" else "небритый парень в тёмном спортивном костюме"}.}}
-      #{Improv.gen("alexey", state)}
+      #{ImprovEngine.gen("alexey", state)}
     """
   alexey_end: """
     Парень в спортивном костюме обыскивает нижние полки.
   """
-  margo: (Improv, state) ->
+  margo: (ImprovEngine, state) ->
     """
       На нижней полке рядом с вами отдыхает {{#{if salet.character.knows_margo then "Марго" else "красивая дама с ручным хорьком и циничным взглядом"}.}}
-      #{Improv.gen("margo", state)}
+      #{ImprovEngine.gen("margo", state)}
     """
   margo_end: """
     Девушка ищет хорька в своём багаже.
@@ -74,15 +74,15 @@ ru_lang =
 
     Вы считаете, что знакомство состоялось.
   """
-  alexey_dsc: (Improv, state) -> """
+  alexey_dsc: (ImprovEngine, state) -> """
     Это простой немного неряшливый парень в тёмном спортивном костюме.
     Его волосы покрашены в блонд, но уже видны тёмные концы.
     Под костюмом он носит майку с надписью: „Зелёный Дракон”.
 
-    #{Improv.gen("alexey", state)}
+    #{ImprovEngine.gen("alexey", state)}
   """
-  margo_dsc: (Improv, state) -> """
+  margo_dsc: (ImprovEngine, state) -> """
-    #{Improv.gen("margo", state)}
+    #{ImprovEngine.gen("margo", state)}
   """
   margo_bye: """
     — Ладно, не буду отвлекать.

html/index.html

@@ -37,10 +37,11 @@
     </div> <!-- End of div.page -->
 
     <!-- CDN JS Libraries -->
-    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js" integrity="sha384-QXBtGc4014gU26HdCwzgy8TVO+FHSSE4+EvPPiSTpdE9w0KyJy1ocfiIbBl1HLq7" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js" integrity="sha384-QXBtGc4014gU26HdCwzgy8TVO+FHSSE4+EvPPiSTpdE9w0KyJy1ocfiIbBl1HLq7" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
+    <script src="game/salet.min.js"></script>
 
-    <script type="text/javascript" src="game/main.js"></script>
+    <script defer src="game/main.js"></script>
 <!-- Piwik -->
 <script type="text/javascript">
   var _paq = _paq || [];

html/ru.html

@@ -38,11 +38,11 @@
     </div> <!-- End of div.page -->
 
     <!-- CDN JS Libraries -->
-    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js" integrity="sha384-QXBtGc4014gU26HdCwzgy8TVO+FHSSE4+EvPPiSTpdE9w0KyJy1ocfiIbBl1HLq7" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js" integrity="sha384-QXBtGc4014gU26HdCwzgy8TVO+FHSSE4+EvPPiSTpdE9w0KyJy1ocfiIbBl1HLq7" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
-    <!-- <audio id="bgsound" preload="auto" loop="loop"><source src="audio/bgr.mp3" type='audio/mpeg; codecs="mp3"'></audio> -->
+    <script src="game/salet.min.js"></script>
 
-    <script type="text/javascript" src="game/main.js"></script>
+    <script defer src="game/main.js"></script>
 <!-- Piwik -->
 <script type="text/javascript">
   var _paq = _paq || [];