diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/app.js ./app.js | |
--- ../trunk/app.js 2012-04-15 14:50:00.582063198 +1000 | |
+++ ./app.js 2012-04-15 14:38:20.902040986 +1000 | |
@@ -49,7 +49,6 @@ | |
toUserid = toId; | |
BattlePokedex = require('./pokedex.js').BattlePokedex; | |
-BattleTiers = require('./tiers.js').BattleTiers; | |
BattleMovedex = require('./movedex.js').BattleMovedex; | |
BattleStatuses = require('./statuses.js').BattleStatuses; | |
BattleTypeChart = require('./typechart.js').BattleTypeChart; | |
@@ -57,6 +56,7 @@ | |
BattleItems = require('./items.js').BattleItems; | |
BattleAbilities = require('./abilities.js').BattleAbilities; | |
BattleFormats = require('./formats.js').BattleFormats; | |
+BattleFormatsData = require('./formats-data.js').BattleFormatsData; | |
BattleLearnsets = require('./learnsets.js').BattleLearnsets; | |
try | |
{ | |
@@ -90,7 +90,6 @@ | |
delete require.cache[i]; | |
} | |
BattlePokedex = require('./pokedex.js').BattlePokedex; | |
- BattleTiers = require('./tiers.js').BattleTiers; | |
BattleMovedex = require('./movedex.js').BattleMovedex; | |
BattleStatuses = require('./statuses.js').BattleStatuses; | |
BattleTypeChart = require('./typechart.js').BattleTypeChart; | |
@@ -98,6 +97,7 @@ | |
BattleItems = require('./items.js').BattleItems; | |
BattleAbilities = require('./abilities.js').BattleAbilities; | |
BattleFormats = require('./formats.js').BattleFormats; | |
+ BattleFormatsData = require('./formats-data.js').BattleFormatsData; | |
BattleLearnsets = require('./learnsets.js').BattleLearnsets; | |
sim = require('./simulator.js'); | |
@@ -792,7 +792,7 @@ | |
} | |
catch (e) | |
{ | |
- selfR.battle.add('chat', user.name, '<< error: '+e.message); | |
+ selfR.battle.add('chat', user.name, '<< error: '+e); | |
var stack = (""+e.stack).split("\n"); | |
for (var i=0; i<stack.length; i++) | |
{ | |
@@ -1298,7 +1298,7 @@ | |
{ | |
selfR.log.push({ | |
name: user.getIdentity(), | |
- message: '<< error: '+e.message | |
+ message: '<< error: '+e | |
}); | |
var stack = (""+e.stack).split("\n"); | |
for (var i=0; i<stack.length; i++) | |
Only in .: app.js~ | |
diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/chat-commands.js ./chat-commands.js | |
--- ../trunk/chat-commands.js 2012-04-15 14:50:00.582063198 +1000 | |
+++ ./chat-commands.js 2012-04-15 14:38:20.902040986 +1000 | |
@@ -726,11 +726,8 @@ | |
room.add(''+targetUser.name+' was demoted to voice by '+user.name+'.'); | |
- if (targetUser.group === '%') | |
- { | |
targetUser.setGroup('+'); | |
rooms.lobby.usersChanged = true; | |
- } | |
return false; | |
} | |
socket.emit('console', '/demod - Access denied.'); | |
@@ -917,7 +914,6 @@ | |
{ | |
for (var i in require.cache) delete require.cache[i]; | |
BattlePokedex = require('./pokedex.js').BattlePokedex; | |
- BattleTiers = require('./tiers.js').BattleTiers; | |
BattleMovedex = require('./movedex.js').BattleMovedex; | |
BattleStatuses = require('./statuses.js').BattleStatuses; | |
BattleTypeChart = require('./typechart.js').BattleTypeChart; | |
@@ -925,6 +921,7 @@ | |
BattleItems = require('./items.js').BattleItems; | |
BattleAbilities = require('./abilities.js').BattleAbilities; | |
BattleFormats = require('./formats.js').BattleFormats; | |
+ BattleFormatsData = require('./formats-data.js').BattleFormatsData; | |
BattleLearnsets = require('./learnsets.js').BattleLearnsets; | |
BattleTools = require('./tools.js').BattleTools; | |
Tools = new BattleTools(); | |
@@ -942,7 +939,6 @@ | |
{ | |
for (var i in require.cache) delete require.cache[i]; | |
BattlePokedex = require('./pokedex.js').BattlePokedex; | |
- BattleTiers = require('./tiers.js').BattleTiers; | |
BattleMovedex = require('./movedex.js').BattleMovedex; | |
BattleStatuses = require('./statuses.js').BattleStatuses; | |
BattleTypeChart = require('./typechart.js').BattleTypeChart; | |
@@ -950,6 +946,7 @@ | |
BattleItems = require('./items.js').BattleItems; | |
BattleAbilities = require('./abilities.js').BattleAbilities; | |
BattleFormats = require('./formats.js').BattleFormats; | |
+ BattleFormatsData = require('./formats-data.js').BattleFormatsData; | |
BattleLearnsets = require('./learnsets.js').BattleLearnsets; | |
BattleTools = require('./tools.js').BattleTools; | |
Tools = new BattleTools(); | |
Only in .: chat-commands.js~ | |
Only in .: data | |
Only in .: diff.diff | |
diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/logs/lastbattle.txt ./logs/lastbattle.txt | |
--- ../trunk/logs/lastbattle.txt 2012-04-13 12:45:28.840788296 +1000 | |
+++ ./logs/lastbattle.txt 2012-04-14 19:46:52.479330800 +1000 | |
@@ -1 +1 @@ | |
-12 | |
\ No newline at end of file | |
+1 | |
\ No newline at end of file | |
diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/package.json ./package.json | |
--- ../trunk/package.json 2012-04-08 14:32:35.235123085 +1000 | |
+++ ./package.json 2012-04-13 19:35:02.037568532 +1000 | |
@@ -4,7 +4,12 @@ | |
"dependencies": { | |
"long-stack-traces": ">=0.1.2", | |
"request": ">=2.1.1", | |
- "socket.io": ">=0.8.7" | |
+ "socket.io": ">=0.8.7", | |
+ "url": "0.x.x", | |
+ "libxmljs": "0.x.x", | |
+ "sqlite-fts": "0.x.x", | |
+ "streamline": "0.x.x", | |
+ "zlib": "1.x.x" | |
}, | |
"scripts": {"start": "node app.js"}, | |
"bin": "./app.js", | |
diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/scripts.js ./scripts.js | |
--- ../trunk/scripts.js 2012-04-13 18:58:52.013499631 +1000 | |
+++ ./scripts.js 2012-04-15 13:43:59.965937441 +1000 | |
@@ -473,7 +473,7 @@ | |
var pokemonLeft = 0; | |
var pokemon = []; | |
for (var prop in BattlePokedex) { | |
- if (BattlePokedex.hasOwnProperty(prop) && BattlePokedex[prop].viable) { | |
+ if (BattlePokedex.hasOwnProperty(prop) && BattleFormatsData.hasOwnProperty(prop) && BattleFormatsData[prop].viable) { | |
keys.push(prop); | |
} | |
} | |
Only in ../trunk: tiers.js | |
Only in .: tools | |
diff '-ruwx.*' '-xconfig*' -xpokedex.js -xlearnsets.js -xformats-data.js '-xnode_modules*' ../trunk/tools.js ./tools.js | |
--- ../trunk/tools.js 2012-04-15 14:50:00.586063195 +1000 | |
+++ ./tools.js 2012-04-15 13:43:59.965937441 +1000 | |
@@ -65,10 +65,12 @@ | |
template = BattlePokedex[id]; | |
template.exists = true; | |
} | |
- if (BattleTiers[id]) | |
+ if (BattleFormatsData[id]) | |
{ | |
- template.tier = BattleTiers[id].tier; | |
- template.isNonstandard = BattleTiers[id].isNonstandard; | |
+ template.tier = BattleFormatsData[id].tier; | |
+ template.isNonstandard = BattleFormatsData[id].isNonstandard; | |
+ template.viable = BattleFormatsData[id].viable; | |
+ template.viablemoves = BattleFormatsData[id].viablemoves; | |
} | |
if (BattleLearnsets[id]) | |
{ | |
Only in .: typechart.js~ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment