From 1ffe8f8aeb50ee15f966922fc1a43328d1ba9594 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 16 Oct 2013 17:45:41 -0400 Subject: [PATCH] A bit of cleanup. --- script/events/setpieces.js | 9 +- script/prestige.js | 197 +++++++++++++++++++------------------ script/space.js | 16 +-- 3 files changed, 113 insertions(+), 109 deletions(-) diff --git a/script/events/setpieces.js b/script/events/setpieces.js index 57e2686..d3f1e25 100644 --- a/script/events/setpieces.js +++ b/script/events/setpieces.js @@ -3393,15 +3393,16 @@ Events.Setpieces = { } } }, - "cache": { /* Cache - contains some of supplies from previous game */ + + "cache": { /* Cache - contains some of supplies from previous game */ title: 'A Destroyed Village', scenes: { 'start': { text: [ - 'a destroyed village stands before you', - 'charred bodies littering the ground.' + 'a destroyed village lies in the dust.', + 'charred bodies litter the ground.' ], - notification: 'you smell the metallic tang of a wanderer afterburner.', + notification: 'the metallic tang of wanderer afterburner hangs in the air.', buttons: { 'enter': { text: 'enter', diff --git a/script/prestige.js b/script/prestige.js index a832ffd..34a5ec7 100644 --- a/script/prestige.js +++ b/script/prestige.js @@ -1,103 +1,106 @@ var Prestige = { - name: 'Prestige', - + + name: 'Prestige', + options: {}, - + init: function(options) { - this.options = $.extend( - this.options, - options - ); - }, + this.options = $.extend(this.options, options); + }, - save: function() { - 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}; - } - $SM.set('previous.stores', prevStores); - return prevStores; - }, + save: function() { + 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; + } + } + $SM.set('previous.stores', prevStores); + return prevStores; + }, - populateNewSave: function(newstate) { - State = { - previous: { - stores: newstate - } - }; - Engine.init({state: State}); - return State; - }, + + populateNewSave : function(newstate) { + State = { + previous : { + stores : newstate + } + }; + Engine.init({ + state : State + }); + return State; + }, - load: function() { - var prevStores = $SM.get('previous.stores'); - $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]) - 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 }; - if (divisor === 0) { - divisor = 1 - }; - return divisor; - } - -} \ No newline at end of file + load : function() { + var prevStores = $SM.get('previous.stores'); + $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]); + 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; + } + if (divisor === 0) { + divisor = 1; + } + return divisor; + } + +}; \ No newline at end of file diff --git a/script/space.js b/script/space.js index 76f3a0a..628a2b9 100644 --- a/script/space.js +++ b/script/space.js @@ -387,17 +387,17 @@ var Space = { }, complete: function() { Engine.GAME_OVER = true; - var backup; - $('#starsContainer').remove(); + var backup; + $('#starsContainer').remove(); if(typeof Storage != 'undefined' && localStorage) { - backup = Prestige.save(); - localStorage.clear(); + backup = Prestige.save(); + localStorage.clear(); } delete window.State; - $('.deleteSave, .share').remove(); - Prestige.populateNewSave(backup); - $('#content, #notifications').remove(); - $('.deleteSave, .share').attr('style', 'color: white;'); + $('.deleteSave, .share').remove(); + Prestige.populateNewSave(backup); + $('#content, #notifications').remove(); + $('.deleteSave, .share').attr('style', 'color: white;'); Engine.options = {}; } });