david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix accidentally erasing data if a new building/upgrade/achievement is found

Browse Source 
Fix accidentally erasing data if a new building/upgrade/achievement is found
This commit is contained in:
DanielNoord
2020-11-28 15:43:42 +01:00
committed by GitHub
parent b6f19737cb 8f809cc093
commit a6863bc8e6
2 changed files with 96 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
CookieMonster.js
View File

@@ -3639,13 +3639,17 @@ CM.Sim.getCPSBuffMult = function() {
return mult;
}
CM.Sim.InitData = function() {
// Buildings
CM.Sim.Objects = [];
for (var i in Game.Objects) {
CM.Sim.Objects[i] = {};
var me = Game.Objects[i];
var you = CM.Sim.Objects[i];
/* Constructs an object with the static properties of a building,
* but with a 'cps' method changed to use 'CM.Sim.Has' instead of 'Game.Has'
* (and similar to 'hasAura', 'Objects', 'GetTieredCpsMult' and 'auraMult').
*
* The dynamic properties of the building,
* namely level and amount owned,
* are set by CM.Sim.CopyData.
*/
CM.Sim.InitialBuildingData = function(buildingName) {
var me = Game.Objects[buildingName];
var you = {};
eval('you.cps = ' + me.cps.toString()
.split('Game.Has').join('CM.Sim.Has')
.split('Game.hasAura').join('CM.Sim.hasAura')
@@ -3656,18 +3660,42 @@ CM.Sim.InitData = function() {
// Below is needed for above eval!
you.baseCps = me.baseCps;
you.name = me.name;
return you;
}
/* Similar to the previous function, but for upgrades.
* Note: currently no static data is used by Cookie Monster,
* so this function just returns an empty object.
*/
CM.Sim.InitUpgrade = function(upgradeName) {
return {};
}
/* Similar to the previous function, but for achievements.
* Note: currently no static data is used by Cookie Monster,
* so this function just returns an empty object.
*/
CM.Sim.InitAchievement = function(achievementName) {
return {};
}
CM.Sim.InitData = function() {
// Buildings
CM.Sim.Objects = [];
for (var i in Game.Objects) {
CM.Sim.Objects[i] = CM.Sim.InitialBuildingData(i);
}
// Upgrades
CM.Sim.Upgrades = [];
for (var i in Game.Upgrades) {
CM.Sim.Upgrades[i] = {};
CM.Sim.Upgrades[i] = CM.Sim.InitUpgrade(i);
}
// Achievements
CM.Sim.Achievements = [];
for (var i in Game.Achievements) {
CM.Sim.Achievements[i] = {};
CM.Sim.Achievements[i] = CM.Sim.InitAchievement(i);
}
}
@@ -3685,10 +3713,9 @@ CM.Sim.CopyData = function() {
for (var i in Game.Objects) {
var me = Game.Objects[i];
var you = CM.Sim.Objects[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Objects[i]; // Not undefined anymore
CM.Disp.CreateBotBarBuildingColumn(i); // New building! Add it to the bottom bar
if (you == undefined) { // New building!
you = CM.Sim.Objects[i] = CM.Sim.InitialBuildingData(i);
CM.Disp.CreateBotBarBuildingColumn(i); // Add new building to the bottom bar
}
you.amount = me.amount;
you.level = me.level;
@@ -3700,8 +3727,7 @@ CM.Sim.CopyData = function() {
var me = Game.Upgrades[i];
var you = CM.Sim.Upgrades[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Upgrades[i];
you = CM.Sim.Upgrades[i] = CM.Sim.InitUpgrade(i);
}
you.bought = me.bought;
}
@@ -3711,14 +3737,12 @@ CM.Sim.CopyData = function() {
var me = Game.Achievements[i];
var you = CM.Sim.Achievements[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Achievements[i];
you = CM.Sim.Achievements[i] = CM.Sim.InitAchievement(i);
}
you.won = me.won;
}
};
CM.Sim.CalculateGains = function() {
CM.Sim.cookiesPs = 0;
var mult = 1;

60
src/Sim.js
View File

@@ -138,13 +138,17 @@ CM.Sim.getCPSBuffMult = function() {
return mult;
}
CM.Sim.InitData = function() {
// Buildings
CM.Sim.Objects = [];
for (var i in Game.Objects) {
CM.Sim.Objects[i] = {};
var me = Game.Objects[i];
var you = CM.Sim.Objects[i];
/* Constructs an object with the static properties of a building,
* but with a 'cps' method changed to use 'CM.Sim.Has' instead of 'Game.Has'
* (and similar to 'hasAura', 'Objects', 'GetTieredCpsMult' and 'auraMult').
*
* The dynamic properties of the building,
* namely level and amount owned,
* are set by CM.Sim.CopyData.
*/
CM.Sim.InitialBuildingData = function(buildingName) {
var me = Game.Objects[buildingName];
var you = {};
eval('you.cps = ' + me.cps.toString()
.split('Game.Has').join('CM.Sim.Has')
.split('Game.hasAura').join('CM.Sim.hasAura')
@@ -155,18 +159,42 @@ CM.Sim.InitData = function() {
// Below is needed for above eval!
you.baseCps = me.baseCps;
you.name = me.name;
return you;
}
/* Similar to the previous function, but for upgrades.
* Note: currently no static data is used by Cookie Monster,
* so this function just returns an empty object.
*/
CM.Sim.InitUpgrade = function(upgradeName) {
return {};
}
/* Similar to the previous function, but for achievements.
* Note: currently no static data is used by Cookie Monster,
* so this function just returns an empty object.
*/
CM.Sim.InitAchievement = function(achievementName) {
return {};
}
CM.Sim.InitData = function() {
// Buildings
CM.Sim.Objects = [];
for (var i in Game.Objects) {
CM.Sim.Objects[i] = CM.Sim.InitialBuildingData(i);
}
// Upgrades
CM.Sim.Upgrades = [];
for (var i in Game.Upgrades) {
CM.Sim.Upgrades[i] = {};
CM.Sim.Upgrades[i] = CM.Sim.InitUpgrade(i);
}
// Achievements
CM.Sim.Achievements = [];
for (var i in Game.Achievements) {
CM.Sim.Achievements[i] = {};
CM.Sim.Achievements[i] = CM.Sim.InitAchievement(i);
}
}
@@ -184,10 +212,9 @@ CM.Sim.CopyData = function() {
for (var i in Game.Objects) {
var me = Game.Objects[i];
var you = CM.Sim.Objects[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Objects[i]; // Not undefined anymore
CM.Disp.CreateBotBarBuildingColumn(i); // New building! Add it to the bottom bar
if (you == undefined) { // New building!
you = CM.Sim.Objects[i] = CM.Sim.InitialBuildingData(i);
CM.Disp.CreateBotBarBuildingColumn(i); // Add new building to the bottom bar
}
you.amount = me.amount;
you.level = me.level;
@@ -199,8 +226,7 @@ CM.Sim.CopyData = function() {
var me = Game.Upgrades[i];
var you = CM.Sim.Upgrades[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Upgrades[i];
you = CM.Sim.Upgrades[i] = CM.Sim.InitUpgrade(i);
}
you.bought = me.bought;
}
@@ -210,14 +236,12 @@ CM.Sim.CopyData = function() {
var me = Game.Achievements[i];
var you = CM.Sim.Achievements[i];
if (you == undefined) {
CM.Sim.InitData();
you = CM.Sim.Achievements[i];
you = CM.Sim.Achievements[i] = CM.Sim.InitAchievement(i);
}
you.won = me.won;
}
};
CM.Sim.CalculateGains = function() {
CM.Sim.cookiesPs = 0;
var mult = 1;