GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-30 01:02:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor Outside to use $SM + Room bugfix, \' to "

Browse Source 
Refactoring of Outside.js to take better advantage of $SM and simplify
the code.

Includes a small bug fix to Room update handler

Also changed instances of escaped single quote (\') to double (") for
readability and simplicity.

====state changes====
//these were changed for the opposite reason the Room states were. These
seem like states that other locations and events may very well want to
interact with and possibly alter themselves
game.outside.buildings >> game.buildings 
game.outside.population >> game.population
game.outside.workders >> game.workers


====functions removed====
Outside.numBuilding // just a $SM.get, no shortcut really needed since
Outside.numBuilding is a pretty long name
Outside.getPopulation // same here
Outside.addBuilding // just an add
Outside.addBuildings // just addM, but wasn't even actually used


====functions refactored====
Outside.killVillagers //moved updates to handler
Outside.updateWorkersView //added local to reduce gets
Outside.increasePopulation //updates moved to handler
Outside.increaseWorker // updates moved to handler
Outside.decreaseWorkder // updates moved to handler
This commit is contained in:
LucidCrux
2013-07-26 19:21:12 -06:00
parent f4d2e8deae
commit 99800f1abd
9 changed files with 122 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/world.js
+14 -14
View File
@@ -404,11 +404,11 @@ var World = {
checkDanger: function() {
World.danger = typeof World.danger == 'undefined' ? false: World.danger;
if(!World.danger) {
if(!$SM.get('stores[\'i armour\']', true) > 0 && World.getDistance() >= 8) {
if(!$SM.get('stores["i armour"]', true) > 0 && World.getDistance() >= 8) {
World.danger = true;
return true;
}
if(!$SM.get('stores[\'s armour\']', true) > 0 && World.getDistance() >= 18) {
if(!$SM.get('stores["s armour"]', true) > 0 && World.getDistance() >= 18) {
World.danger = true;
return true;
}
@@ -417,7 +417,7 @@ var World = {
World.danger = false;
return true;
}
if(World.getDistance < 18 && $SM.get('stores[\'i armour\']', true) > 0) {
if(World.getDistance < 18 && $SM.get('stores["i armour"]', true) > 0) {
World.danger = false;
return true;
}
@@ -827,16 +827,16 @@ var World = {
goHome: function() {
// Home safe! Commit the changes.
$SM.setM('game.world', World.state);
if(World.state.sulphurmine && Outside.numBuilding('sulphur mine') == 0) {
Outside.addBuilding('sulphur mine', 1);
if(World.state.sulphurmine && $SM.get('game.buildings["sulphur mine"]', true) == 0) {
$SM.add('game.buildings["sulphur mine"]', 1);
Engine.event('progress', 'sulphur mine');
}
if(World.state.ironmine && Outside.numBuilding('iron mine') == 0) {
Outside.addBuilding('iron mine', 1);
if(World.state.ironmine && $SM.get('game.buildings["iron mine"]', true) == 0) {
$SM.add('game.buildings["iron mine"]', 1);
Engine.event('progress', 'iron mine');
}
if(World.state.coalmine && Outside.numBuilding('coal mine') == 0) {
Outside.addBuilding('coal mine', 1);
if(World.state.coalmine && $SM.get('game.buildings["coal mine"]', true) == 0) {
$SM.add('game.buildings["coal mine"]', 1);
Engine.event('progress', 'coal mine');
}
if(World.state.ship && !$SM.get('features.location.spaceShip')) {
@@ -852,7 +852,7 @@ var World = {
}
for(var k in Path.outfit) {
$SM.add('stores[\''+k+'\']', Path.outfit[k]);
$SM.add('stores["'+k+'"]', Path.outfit[k]);
if(World.leaveItAtHome(k)) {
Path.outfit[k] = 0;
}
@@ -869,11 +869,11 @@ var World = {
},
getMaxHealth: function() {
if($SM.get('stores[\'s armour\']', true) > 0) {
if($SM.get('stores["s armour"]', true) > 0) {
return World.BASE_HEALTH + 35;
} else if($SM.get('stores[\'i armour\']', true) > 0) {
} else if($SM.get('stores["i armour"]', true) > 0) {
return World.BASE_HEALTH + 15;
} else if($SM.get('stores[\'l armour\']', true) > 0) {
} else if($SM.get('stores["l armour"]', true) > 0) {
return World.BASE_HEALTH + 5;
}
return World.BASE_HEALTH;
@@ -887,7 +887,7 @@ var World = {
},
getMaxWater: function() {
if($SM.get('stores[\'water tank\']', true) > 0) {
if($SM.get('stores["water tank"]', true) > 0) {
return World.BASE_WATER + 50;
} else if($SM.get('stores.cask', true) > 0) {
return World.BASE_WATER + 20;