Skip to content
Snippets Groups Projects
Commit b0004380 authored by mcmlxxix's avatar mcmlxxix
Browse files

What's a major change

without some major errors?
parent f812e129
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@ enablelogging= false
pointstowin= 100
minscore= -2
maxgames= 100
maxperplayer= 30
maxperplayer= 40
minplayers= 3
maxplayers= 7
maxdice= 8
......
......@@ -254,7 +254,6 @@ function deliverMessage(nextTurnPlayer,gameNumber)
}
function deliverKillMessage(killer,eliminated,gameNumber)
{
var killer=system.username(killer);
var message="\1r\1h" + killer + " has eliminated you in \1yDice\1r-\1yWarz\1r game #\1y" + gameNumber + "\1r!\r\n\r\n";
if(!storeMessage(eliminated,message)) system.put_telegram(eliminated, message);
}
......@@ -265,7 +264,7 @@ function deliverSkipMessage(unum,gameNumber)
}
function storeMessage(unum,msg)
{
var ufname=game_dir + system.username(unum);
var ufname=game_dir + system.username(unum) + ".usr";
if(!file_exists(ufname)) return false;
else {
var user_online=false;
......@@ -418,7 +417,7 @@ function chooseGame()
{
if(game_data.singlePlayer)
{
if(games.gameData[game_num].users[user.number]>0);
if(games.gameData[game_num].users[user.number]>=0);
else
{
putMessage("\1r\1hGame #" + game_num + " is private.",x,y);
......@@ -775,7 +774,7 @@ function getVote()
}
function getUserName(playerData,playerNumber)
{
if(playerData.user>=0)
if(playerData.user>0)
return(system.username(playerData.user));
if(playerData.AI.name.length > 0)
return(playerData.AI.name);
......@@ -1195,7 +1194,7 @@ function GameSettings()
{
//hardcoded defaults (in case of missing settings file)
this.pointsToWin=100;
this.minPoints=-2;
this.minScore=-2;
this.maxGames=100;
this.maxPerPlayer=30;
this.maxDice=8;
......@@ -1221,7 +1220,7 @@ function GameSettings()
sfile.open('r',true);
this.logEnabled= sfile.iniGetValue(null,"enablelogging");
this.pointsToWin= parseInt(sfile.iniGetValue(null,"pointstowin"),10);
this.minPoints= parseInt(sfile.iniGetValue(null,"minpoints"),10);
this.minScore= parseInt(sfile.iniGetValue(null,"minscore"),10);
this.maxGames= parseInt(sfile.iniGetValue(null,"maxgames"),10);
this.maxPerPlayer= parseInt(sfile.iniGetValue(null,"maxperplayer"),10);
this.minPlayers= parseInt(sfile.iniGetValue(null,"minplayers"),10);
......@@ -1267,7 +1266,8 @@ function GameStatusInfo()
for(s in scores)
{
var score=scores[s];
sfile.iniSetValue(s,"score",score.score);
var points=score.score>=settings.minScore?score.score:settings.minScore;
sfile.iniSetValue(s,"score",points);
sfile.iniSetValue(s,"kills",score.kills);
sfile.iniSetValue(s,"wins",score.wins);
sfile.iniSetValue(s,"losses",score.losses);
......
......@@ -146,7 +146,7 @@ function Map(c,r,p,gn)
if(numEliminated==(this.maxPlayers-1) || humans==0)
{
this.winner=this.lastEliminator;
if(this.lastEliminator>=0)
if(this.lastEliminator>0)
{
this.assignPoints();
}
......@@ -194,15 +194,15 @@ function Map(c,r,p,gn)
dead.eliminated=true;
this.eliminated.push(playerNum1);
this.lastEliminator=playerNum2;
this.lastEliminator=killer.user;
var updaterankings=false;
if(killer.user>=0)
if(killer.user>0)
{
games.loadRankings();
if(this.singlePlayer) scores[killer.user].score+=settings.killPointsSolo;
else scores[killer.user].score+=settings.killPointsMulti;
scores[killer.user].kills++;
scores[killer.user].kills+=1;
updaterankings=true;
}
if(dead.user>0)
......@@ -211,7 +211,7 @@ function Map(c,r,p,gn)
games.loadRankings();
updaterankings=true;
}
var kname= (killer.user<0?this.players[playerNum2].AI.name:system.username(killer.user));
var kname= (killer.user<1?this.players[playerNum2].AI.name:system.username(killer.user));
deliverKillMessage(kname,dead.user,this.gameNumber);
scores[dead.user].losses+=1;
if(this.singlePlayer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment