Fix #490
Fix #490
Conversation
|
Please fix merge conflicts Also, you appear to have added your AWS credentials to config.json, probably should remove those |
|
And please for god's sake, squash it. |
|
Fixed conflicts//Added comments to config// Removed my auth vals |
|
|
config.json
Outdated
| @@ -32,11 +32,12 @@ | |||
| "minMassLoss": 50, | |||
| "mergeTimer": 15, | |||
| "sqlinfo":{ | |||
| "connectionLimit": 100, | |||
| "connectionLimit": 100,//Higher values may cause lag | |||
There was a problem hiding this comment.
Comments are not valid JSON, please remove them
|
fixed |
package.json
Outdated
| @@ -59,6 +59,8 @@ | |||
| "sync-request": "^3.0.1", | |||
| "webpack": "^1.13.1", | |||
| "webpack-stream": "^3.2.0", | |||
| "mysql": "^2.5.5" | |||
| "mysql": "^2.5.5", | |||
There was a problem hiding this comment.
You're not using this module anymore
| "mysql": "^2.5.5" | ||
| "mysql": "^2.5.5", | ||
| "pg": "^6.1.0", | ||
| "node-localstorage": "^1.3.0" |
There was a problem hiding this comment.
You're not using this anywhere
| var localStorage = require ('node-localstorage'); | ||
|
|
||
| //Establish database connection | ||
| pg.defaults.ssl = true; |
There was a problem hiding this comment.
This seems quite arbitrary, why not make it a config option?
There was a problem hiding this comment.
Agreed !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
There was a problem hiding this comment.
Database. No database. Please.. Need another sollution,......... Please, make a test, and drop some mass at the field,,,, so you please leave the game, and join again. You need to find the mass you dropped at the field, so, the dropped mass is stored, and persists ... usually, websockets deals with information in a bidirecional concept, so it should not be stored, so, if its stored, how is it possible/ On the original game, the dropped masses, usually, desappiers when another user joins, the player borns from a dropped mass. And also, the Virus, usually, the virus desappiers after a explosion, (i think this is fixed already) but, after exploding, if one of the player masses is bigger another virus, and if explodes again, the mass from the virus is added to the player total mass, thats because it have a limitation of masses division for player. Also, if a player explodes again, just one of the balls, will explode.. if have not the total limit of division of masses balls. so, i tested a deployed version, and notice that all masses are been resized to explode again. I,,,,,,,,,,,, am not developing as as should, in my life, in this moment, but i am collaborating to this project, since i found, and its not for selling agario clone soft..... i just feel the passion to the code, and i just want to learn .......... i found some user talking about the changes aproovement time ....... let me know if i can help, maybe i can make tests, or a kind of pre-selection to the changes project receives. BUT, i had been heard and the changes i recommended had been made, and this makes me happy, bedcause i cannot collaborate a lot to the code, once that i am tring to learn websockets, but i can guarantee everyone, that @abalabahaha is making a great work for the concept development, and that happens for many years. If someone thinks its normal someone forgots their own changes after a coulpe weeks, i think abalabahaha would had forgotten this project when it started... Couple Years ago ...... Also, i think this project need to keep focus on the objectives, that is more related to the concept evollution, of specific technologies , and we must avoid any solluctions that goes out (or in the wrong hand) the main concepts we had been searching for .........................
|
|
||
| //Establish database connection | ||
| pg.defaults.ssl = true; | ||
| var client = new pg.Client(process.env.DATABASE_URL); |
There was a problem hiding this comment.
You should be using the config option here, not an environment variable
| //Establish database connection | ||
| pg.defaults.ssl = true; | ||
| var client = new pg.Client(process.env.DATABASE_URL); | ||
| client.connect (function (err){ |
There was a problem hiding this comment.
This still warns users even if they don't want to use a database.
Maybe set the default config.sqlinfo.host to an empty string, and only attempt to connect if the config host is not nothing
|
Resolved conflicts now ready to be deployed!! |
|
Needs to be merged to fix database issues introduced in last pull request |
|
And let's squash this pull request into a single commit :D |
|
When I find some free time I will work on adding a level up system perhaps based on a timeAlive/avgMass? |
Correct database intergration(wont interrupt game if one is not present)
Includes code to log incorrect passwords
Theres probably some other stuff i added in here but i cant remember(i mean it took 4 months for the first commit to be accepted)
Also, you appear to have added your AWS credentials to config.json, probably should remove those