Merge pull request #608 from hun0975/patch-5

jshint warning ('cur' is already defined)
This commit is contained in:
Michael Townsend
2017-12-17 11:43:16 -05:00
committed by GitHub
+3 -2
View File
@@ -774,12 +774,13 @@ var World = {
var chances = {};
var nonSticky = 1;
var cur;
for(var i in adjacent) {
if(adjacent[i] == World.TILE.VILLAGE) {
// Village must be in a forest to maintain thematic consistency, yo.
return World.TILE.FOREST;
} else if(typeof adjacent[i] == 'string') {
var cur = chances[adjacent[i]];
cur = chances[adjacent[i]];
cur = typeof cur == 'number' ? cur : 0;
chances[adjacent[i]] = cur + World.STICKINESS;
nonSticky -= World.STICKINESS;
@@ -788,7 +789,7 @@ var World = {
for(var t in World.TILE) {
var tile = World.TILE[t];
if(World.isTerrain(tile)) {
var cur = chances[tile];
cur = chances[tile];
cur = typeof cur == 'number' ? cur : 0;
cur += World.TILE_PROBS[tile] * nonSticky;
chances[tile] = cur;