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

Some refactoring and some bug fixes.

Browse Source
This commit is contained in:
Michael
2013-11-01 23:00:51 -04:00
parent d8f6e73c6b
commit 994f01c78c
8 changed files with 177 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/main.css
+1 -1
View File
@@ -57,7 +57,7 @@ div#header {
.manualSave {
position: absolute;
right: 120px;
right: 125px;
bottom: 10px;
cursor: pointer;
}
script/engine.js
+6 -3
View File
@@ -274,13 +274,16 @@ var Engine = {
});
},
deleteSave: function() {
if (!Engine.GAME_OVER) {
deleteSave: function(noReload) {
if(typeof Storage != 'undefined' && localStorage) {
var prestige = Prestige.get();
window.State = {};
localStorage.clear();
Prestige.set(prestige);
}
}
if(!noReload) {
location.reload();
}
},
share: function() {
script/events/setpieces.js
+1 -1
View File
@@ -3433,7 +3433,7 @@ Events.Setpieces = {
],
onLoad: function() {
World.markVisited(World.curPos[0], World.curPos[1]);
Prestige.load();
Prestige.collectStores();
},
buttons: {
'leave': {
script/prestige.js
+69 -87
View File
@@ -8,106 +8,88 @@ var Prestige = {
this.options = $.extend(this.options, options);
},
saveStores: function(saveBool) {
var prevStores = [ //g = goods, w = weapons, a = ammo
Math.floor($SM.get('stores["wood"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["fur"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["meat"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["iron"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["coal"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["sulphur"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["steel"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["cured meat"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["scales"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["teeth"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["leather"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["bait"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["torch"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["cloth"]') / Prestige.randGen('g')),
Math.floor($SM.get('stores["bone spear"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["iron sword"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["steel sword"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["bayonet"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["rifle"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["laser rifle"]') / Prestige.randGen('w')),
Math.floor($SM.get('stores["bullets"]') / Prestige.randGen('a')),
Math.floor($SM.get('stores["energy cell"]') / Prestige.randGen('a')),
Math.floor($SM.get('stores["grenade"]') / Prestige.randGen('a')),
Math.floor($SM.get('stores["bolas"]') / Prestige.randGen('a'))
];
for (var n = 0; n <= 23; n++) {
if (isNaN(prevStores[n])) {
prevStores[n] = 0;
storesMap: [
{ store: 'wood', type: 'g' },
{ store: 'fur', type: 'g' },
{ store: 'meat', type: 'g' },
{ store: 'iron', type: 'g' },
{ store: 'coal', type: 'g' },
{ store: 'sulphur', type: 'g' },
{ store: 'steel', type: 'g' },
{ store: 'cured meat', type: 'g' },
{ store: 'scales', type: 'g' },
{ store: 'teeth', type: 'g' },
{ store: 'leather', type: 'g' },
{ store: 'bait', type: 'g' },
{ store: 'torch', type: 'g' },
{ store: 'cloth', type: 'g' },
{ store: 'bone spear', type: 'w' },
{ store: 'iron sword', type: 'w' },
{ store: 'steel sword', type: 'w' },
{ store: 'bayonet', type: 'w' },
{ store: 'rifle', type: 'w' },
{ store: 'laser rifle', type: 'w' },
{ store: 'bullets', type: 'a' },
{ store: 'energy cell', type: 'a' },
{ store: 'grenade', type: 'a' },
{ store: 'bolas', type: 'a' }
],
getStores: function(reduce) {
var stores = [];
for(var i in this.storesMap) {
var s = this.storesMap[i];
stores.push($SM.get('stores["' + s.store + '"]', true) /
(reduce ? this.randGen(s.type) : 1));
}
}
return prevStores;
return stores;
},
saveScore: function() {
var prevScore = Score.totalScore();
$SM.set('previous.score',prevScore);
return prevScore;
},
populateNewSave : function(newstate) {
State = {
previous : {
stores : newstate["stores"],
score : newstate["score"]
}
get: function() {
return {
stores: $SM.get('previous.stores'),
score: $SM.get('previous.score')
};
Engine.init({
state : State
});
},
load : function() {
set: function(prestige) {
$SM.set('previous.stores', prestige.stores);
$SM.set('previous.score', prestige.score);
},
save: function() {
$SM.set('previous.stores', this.getStores(true));
$SM.set('previous.score', Score.totalScore());
},
collectStores : function() {
var prevStores = $SM.get('previous.stores');
if(prevStores != null) {
$SM.add('stores["wood"]', prevStores[0]);
$SM.add('stores["fur"]', prevStores[1]);
$SM.add('stores["meat"]', prevStores[2]);
$SM.add('stores["iron"]', prevStores[3]);
$SM.add('stores["coal"]', prevStores[4]);
$SM.add('stores["sulphur"]', prevStores[5]);
$SM.add('stores["steel"]', prevStores[6]);
$SM.add('stores["cured meat"]', prevStores[7]);
$SM.add('stores["scales"]', prevStores[8]);
$SM.add('stores["teeth"]', prevStores[9]);
$SM.add('stores["leather"]', prevStores[10]);
$SM.add('stores["bait"]', prevStores[11]);
$SM.add('stores["torch"]', prevStores[12]);
$SM.add('stores["cloth"]', prevStores[13]);
$SM.add('stores["bone spear"]', prevStores[14]);
$SM.add('stores["iron sword"]', prevStores[15]);
$SM.add('stores["steel sword"]', prevStores[16]);
$SM.add('stores["bayonet"]', prevStores[17]);
$SM.add('stores["rifle"]', prevStores[18]);
$SM.add('stores["laser rifle"]', prevStores[19]);
$SM.add('stores["bullets"]', prevStores[20]);
$SM.add('stores["energy cell"]', prevStores[21]);
$SM.add('stores["grenade"]', prevStores[22]);
$SM.add('stores["bolas"]', prevStores[23]);
var toAdd = {};
for(var i in this.storesMap) {
var s = this.storesMap[i];
toAdd[s.store] = prevStores[i];
}
$SM.addM('stores', toAdd);
// Loading the stores clears em from the save
prevStores.length = 0;
}
return prevStores;
},
randGen : function(storeType) {
if (storeType == 'g') {
divisor = Math.floor(Math.random() * 10);
} else if (storeType == 'w') {
divisor = Math.floor(Math.floor(Math.random() * 10) / 2);
} else if (storeType == 'a') {
divisor = Math.ceil(Math.random() * 10
* Math.ceil(Math.random() * 10));
} else {
divisor = 1;
switch(storeType) {
case 'g':
return Math.floor(Math.random() * 10);
case 'w':
return Math.floor(Math.floor(Math.random() * 10) / 2);
case 'a':
return Math.ceil(Math.random() * 10 * Math.ceil(Math.random() * 10));
default:
return 1;
}
if (divisor === 0) {
divisor = 1;
}
return divisor;
}
};
script/room.js
+1 -1
View File
@@ -974,7 +974,7 @@ var Room = {
if(Room.buttons[thing]) {
return true;
} else if($SM.get('game.buildings["trading post"]', true) > 0) {
if(thing == 'compass' || $SM.get('stores["'+thing+'"]')) {
if(thing == 'compass' || typeof $SM.get('stores["'+thing+'"]') != 'undefined') {
// Allow the purchase of stuff once you've seen it
return true;
}
script/scoring.js
+12 -16
View File
@@ -1,15 +1,15 @@
var Score = {
name: 'Score',
name : 'Score',
options: {},
options : {},
init: function(options) {
init : function(options) {
this.options = $.extend(this.options, options);
},
calculateScore: function() {
var scoreUnadded = $SM.getStores();
calculateScore : function() {
var scoreUnadded = Prestige.getStores(false);
var fullScore = 0;
fullScore = fullScore + scoreUnadded[0] * 1;
fullScore = fullScore + scoreUnadded[1] * 1.5;
@@ -35,20 +35,16 @@ var Score = {
fullScore = fullScore + scoreUnadded[21] * 3;
fullScore = fullScore + scoreUnadded[22] * 5;
fullScore = fullScore + scoreUnadded[23] * 4;
fullScore = fullScore + $SM.get('stores["alien alloy"]') * 10;
fullScore = fullScore + $SM.get('stores["alien alloy"]', true) * 10;
fullScore = fullScore + Ship.getMaxHull() * 50;
return fullScore;
return Math.floor(fullScore);
},
saveScore: function() {
var score = Score.calculateScore();
$SM.set('playStats.score',score);
return score;
save: function() {
$SM.set('playStats.score', Score.calculateScore());
},
totalScore: function() {
var totScore = $SM.get('previous.score') + Score.saveScore(); //$SM.get('playStats.score');
if (!totScore) {totScore = $SM.get('playStats.score')};
return totScore;
totalScore : function() {
return $SM.get('previous.score', true) + Score.calculateScore();
}
}
};
script/space.js
+6 -17
View File
@@ -5,7 +5,7 @@ var Space = {
SHIP_SPEED: 3,
BASE_ASTEROID_DELAY: 500,
BASE_ASTEROID_SPEED: 1500,
FTB_SPEED: 60000,
FTB_SPEED: 1000,//60000,
STAR_WIDTH: 3000,
STAR_HEIGHT: 3000,
NUM_STARS: 200,
@@ -42,9 +42,6 @@ var Space = {
$('<div>').addClass('row_key').text('hull: ').appendTo(h);
$('<div>').addClass('row_val').appendTo(h);
//save current score
Score.saveScore();
//subscribe to stateUpdates
$.Dispatch('stateUpdate').subscribe(Space.handleStateUpdates);
},
@@ -390,11 +387,9 @@ var Space = {
},
complete: function() {
Engine.GAME_OVER = true;
var backup = new Object();
backup.score = null;
backup.stores = null;
Prestige.saveStores();
Prestige.saveScore();
Score.save();
Prestige.save();
$('<center>')
.addClass('centerCont')
@@ -408,7 +403,7 @@ var Space = {
.appendTo('.centerCont');
$('<span>')
.addClass('endGame')
.text('total score: ' + Score.totalScore())
.text('total score: ' + Prestige.get().score)
.appendTo('.centerCont')
.animate({opacity:1},1500);
$('<br />')
@@ -417,13 +412,6 @@ var Space = {
.appendTo('.centerCont');
$('#starsContainer').remove();
if(typeof Storage != 'undefined' && localStorage) {
backup.stores = $SM.getStores();
backup.score = Score.totalScore();
localStorage.clear();
}
delete window.State;
Prestige.populateNewSave(backup);
$('.deleteSave, .share, .manualSave').remove();
$('#content, #notifications').remove();
$('.deleteSave, .share, .manualSave').attr('style', 'color: white;').animate({opacity:0},1500);
@@ -434,6 +422,7 @@ var Space = {
.appendTo('.centerCont')
.animate({opacity:1},1500);
Engine.options = {};
Engine.deleteSave(true);
}
});
}, 2000);
script/state_manager.js
-35
View File
@@ -190,41 +190,6 @@ var StateManager = {
};
},
getStores: function() {
var stores = [
$SM.get('stores["wood"]'),
$SM.get('stores["fur"]'),
$SM.get('stores["meat"]'),
$SM.get('stores["iron"]'),
$SM.get('stores["coal"]'),
$SM.get('stores["sulphur"]'),
$SM.get('stores["steel"]'),
$SM.get('stores["cured meat"]'),
$SM.get('stores["scales"]'),
$SM.get('stores["teeth"]'),
$SM.get('stores["leather"]'),
$SM.get('stores["bait"]'),
$SM.get('stores["torch"]'),
$SM.get('stores["cloth"]'),
$SM.get('stores["bone spear"]'),
$SM.get('stores["iron sword"]'),
$SM.get('stores["steel sword"]'),
$SM.get('stores["bayonet"]'),
$SM.get('stores["rifle"]'),
$SM.get('stores["laser rifle"]'),
$SM.get('stores["bullets"]'),
$SM.get('stores["energy cell"]'),
$SM.get('stores["grenade"]'),
$SM.get('stores["bolas"]')
];
for (var n = 0; n <= 23; n++) {
if (isNaN(stores[n])) {
stores[n] = 0;
}
}
return stores;
},
//creates full reference from input
//hopefully this won't ever need to be more complicated
buildPath: function(input){