oreolek/undum-flower
1
0
Fork 0
mirror of https://github.com/Oreolek/flower.git synced 2024-04-25 05:39:21 +03:00
Code Issues Releases Wiki Activity

Core engine fix and game advancing

Browse source
This commit is contained in:
Alexander Yakovlev 2014-07-24 10:01:52 +07:00
parent 55770d9b48
commit 2fc0fd6c55
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
js/game.coffee
View file

@ -18,11 +18,12 @@ undum.game.situations =
Вася наклоняется и срывает фиолетовый цветочек. Мама любит васильки. Вася наклоняется и срывает фиолетовый цветочек. Мама любит васильки.
"""), """),
{ {
tags: ["flowers"], tags: "flowers",
choices: "#flowers",
optionText: "Василёк" optionText: "Василёк"
enter: (character, system, from) -> enter: (character, system, from) ->
character.qualities.chose_flowers = character.qualities.chose_flowers + 1 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.setQuality("flower_chosen", "cornflower")
system.doLink("tourist") system.doLink("tourist")
} }
@ -30,14 +31,15 @@ undum.game.situations =
camomile: new undum.SimpleSituation( camomile: new undum.SimpleSituation(
converter.makeHtml(""" converter.makeHtml("""
Вася наклоняется и срывает фиолетовый цветочек. Мама любит васильки. Теперь в букетике есть ромашка.
"""), """),
{ {
tags: ["flowers"], tags: "flowers",
choices: "#flowers",
optionText: "Ромашка" optionText: "Ромашка"
enter: (character, system, from) -> enter: (character, system, from) ->
character.qualities.chose_flowers = character.qualities.chose_flowers + 1 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.setQuality("flower_chosen", "camomile")
system.doLink("tourist") system.doLink("tourist")
} }
@ -48,11 +50,12 @@ undum.game.situations =
Жёлтый одуванчик — ничего необычного, но он сделает букетик ярче. Жёлтый одуванчик — ничего необычного, но он сделает букетик ярче.
"""), """),
{ {
tags: ["flowers"], tags: "flowers",
choices: "#flowers",
optionText: "Одуванчик" optionText: "Одуванчик"
enter: (character, system, from) -> enter: (character, system, from) ->
character.qualities.chose_flowers = character.qualities.chose_flowers + 1 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.setQuality("flower_chosen", "dandelion")
system.doLink("tourist") system.doLink("tourist")
} }

4
js/undum.js
View file

@ -884,7 +884,9 @@
var qualityBlock = $("#q_"+quality); var qualityBlock = $("#q_"+quality);
if (qualityBlock.size() <= 0) { if (qualityBlock.size() <= 0) {
if (newDisplay === null) return; if (newDisplay === null) return;
qualityBlock = addQualityBlock(quality).hide().fadeIn(500); qualityBlock = addQualityBlock(quality);
if (qualityBlock === null) return;
qualityBlock.hide().fadeIn(500);
} else { } else {
// Do nothing if there's nothing to do. // Do nothing if there's nothing to do.
if (oldValue == newValue) return; if (oldValue == newValue) return;