mirror of
https://github.com/doublespeakgames/adarkroom.git
synced 2026-06-25 22:02:30 +08:00
Made scoring.js, space.js and world.js jshint compliant
This commit is contained in:
+1
-1
@@ -13,7 +13,7 @@ var Score = {
|
|||||||
var fullScore = 0;
|
var fullScore = 0;
|
||||||
|
|
||||||
var factor = [1, 1.5, 1, 2, 2, 3, 3, 2, 2, 2, 2, 1.5, 1,
|
var factor = [1, 1.5, 1, 2, 2, 3, 3, 2, 2, 2, 2, 1.5, 1,
|
||||||
1, 10, 30, 50, 100, 150, 150, 3, 3, 5, 4]
|
1, 10, 30, 50, 100, 150, 150, 3, 3, 5, 4];
|
||||||
for(var i = 0; i< factor.length; i++){
|
for(var i = 0; i< factor.length; i++){
|
||||||
fullScore += scoreUnadded[i] * factor[i];
|
fullScore += scoreUnadded[i] * factor[i];
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -372,8 +372,8 @@ var Space = {
|
|||||||
clearTimeout(Events._eventTimeout);
|
clearTimeout(Events._eventTimeout);
|
||||||
clearTimeout(Room._fireTimer);
|
clearTimeout(Room._fireTimer);
|
||||||
clearTimeout(Room._tempTimer);
|
clearTimeout(Room._tempTimer);
|
||||||
for(var k in Room.Craftables) {
|
for(var j in Room.Craftables) {
|
||||||
Room.Craftables[k].button = null;
|
Room.Craftables[j].button = null;
|
||||||
}
|
}
|
||||||
for(var k in Room.TradeGoods) {
|
for(var k in Room.TradeGoods) {
|
||||||
Room.TradeGoods[k].button = null;
|
Room.TradeGoods[k].button = null;
|
||||||
|
|||||||
+6
-6
@@ -685,7 +685,7 @@ var World = {
|
|||||||
// Place landmarks
|
// Place landmarks
|
||||||
for(var k in World.LANDMARKS) {
|
for(var k in World.LANDMARKS) {
|
||||||
var landmark = World.LANDMARKS[k];
|
var landmark = World.LANDMARKS[k];
|
||||||
for(var i = 0; i < landmark.num; i++) {
|
for(var l = 0; l < landmark.num; l++) {
|
||||||
var pos = World.placeLandmark(landmark.minRadius, landmark.maxRadius, k, map);
|
var pos = World.placeLandmark(landmark.minRadius, landmark.maxRadius, k, map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -713,7 +713,7 @@ var World = {
|
|||||||
targets[index] = {
|
targets[index] = {
|
||||||
x : i - World.RADIUS,
|
x : i - World.RADIUS,
|
||||||
y : j - World.RADIUS,
|
y : j - World.RADIUS,
|
||||||
}
|
};
|
||||||
index++;
|
index++;
|
||||||
if(index === max){
|
if(index === max){
|
||||||
// optimisation: stop the research if maximum number of items has been reached
|
// optimisation: stop the research if maximum number of items has been reached
|
||||||
@@ -796,8 +796,8 @@ var World = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var list = [];
|
var list = [];
|
||||||
for(var t in chances) {
|
for(var j in chances) {
|
||||||
list.push(chances[t] + '' + t);
|
list.push(chances[j] + '' + j);
|
||||||
}
|
}
|
||||||
list.sort(function(a, b) {
|
list.sort(function(a, b) {
|
||||||
var n1 = parseFloat(a.substring(0, a.length - 1));
|
var n1 = parseFloat(a.substring(0, a.length - 1));
|
||||||
@@ -807,8 +807,8 @@ var World = {
|
|||||||
|
|
||||||
var c = 0;
|
var c = 0;
|
||||||
var r = Math.random();
|
var r = Math.random();
|
||||||
for(var i in list) {
|
for(var l in list) {
|
||||||
var prob = list[i];
|
var prob = list[l];
|
||||||
c += parseFloat(prob.substring(0,prob.length - 1));
|
c += parseFloat(prob.substring(0,prob.length - 1));
|
||||||
if(r < c) {
|
if(r < c) {
|
||||||
return prob.charAt(prob.length - 1);
|
return prob.charAt(prob.length - 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user