From 2fc0fd6c5581babe3bfab0d07700a64d6100dd54 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Thu, 24 Jul 2014 10:01:52 +0700
Subject: [PATCH] Core engine fix and game advancing

---
 js/game.coffee | 17 ++++++++++-------
 js/undum.js    |  4 +++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/js/game.coffee b/js/game.coffee
index 8236d2e..3f3254d 100644
--- a/js/game.coffee
+++ b/js/game.coffee
@@ -18,11 +18,12 @@ undum.game.situations =
     Вася наклоняется и срывает фиолетовый цветочек. Мама любит васильки.
     """),
     {
-      tags: ["flowers"],
+      tags: "flowers",
+      choices: "#flowers",
       optionText: "Василёк"
       enter: (character, system, from) ->
         character.qualities.chose_flowers = character.qualities.chose_flowers + 1
-        if character.qualities.chose_flowers > 2
+        if character.qualities.chose_flowers == 2
           system.setQuality("flower_chosen", "cornflower")
           system.doLink("tourist")
     }
@@ -30,14 +31,15 @@ undum.game.situations =
 
   camomile: new undum.SimpleSituation(
     converter.makeHtml("""
-    Вася наклоняется и срывает фиолетовый цветочек. Мама любит васильки.
+    Теперь в букетике есть ромашка.
     """),
     {
-      tags: ["flowers"],
+      tags: "flowers",
+      choices: "#flowers",
       optionText: "Ромашка"
       enter: (character, system, from) ->
         character.qualities.chose_flowers = character.qualities.chose_flowers + 1
-        if character.qualities.chose_flowers > 2
+        if character.qualities.chose_flowers == 2
           system.setQuality("flower_chosen", "camomile")
           system.doLink("tourist")
     }
@@ -48,11 +50,12 @@ undum.game.situations =
     Жёлтый одуванчик &mdash; ничего необычного, но он сделает букетик ярче.
     """),
     {
-      tags: ["flowers"],
+      tags: "flowers",
+      choices: "#flowers",
       optionText: "Одуванчик"
       enter: (character, system, from) ->
         character.qualities.chose_flowers = character.qualities.chose_flowers + 1
-        if character.qualities.chose_flowers > 2
+        if character.qualities.chose_flowers == 2
           system.setQuality("flower_chosen", "dandelion")
           system.doLink("tourist")
     }
diff --git a/js/undum.js b/js/undum.js
index 74be14c..cd51303 100644
--- a/js/undum.js
+++ b/js/undum.js
@@ -884,7 +884,9 @@
         var qualityBlock = $("#q_"+quality);
         if (qualityBlock.size() <= 0) {
             if (newDisplay === null) return;
-            qualityBlock = addQualityBlock(quality).hide().fadeIn(500);
+            qualityBlock = addQualityBlock(quality);
+            if (qualityBlock === null) return;
+            qualityBlock.hide().fadeIn(500);
         } else {
             // Do nothing if there's nothing to do.
             if (oldValue == newValue) return;