Merge branch 'dev' into dev

This commit is contained in:
DanielNoord
2021-01-31 20:51:54 +01:00
committed by GitHub
3 changed files with 63 additions and 1 deletions

View File

@@ -1226,6 +1226,63 @@ CM.Disp.ReplaceTooltipUpgrade = function() {
}
};
/**
* This function replaces the original Game.crate and Game.crateTooltip functions of stats page
*/
CM.Disp.ReplaceCrateTooltipAchievements = function() {
CM.Disp.CrateTooltipAchievementsBackup = [Game.crate, Game.crateTooltip];
Game.crate = function(me,context,forceClickStr,id) {
let output;
if (me.type === 'achievement') {
let options = {normal: false, shadow: false};
switch (CM.Options.MissingAchievements) {
case 0: options.normal = false; options.shadow = false; break;
case 1: options.normal = true; options.shadow = false; break;
case 2: options.normal = false; options.shadow = true; break;
case 3: options.normal = true; options.shadow = true; break;
}
let icon = me.icon;
if (options.shadow && me.pool === 'shadow') {
me.pool = 'normal';
me.isShadow = true;
}
output = CM.Disp.CrateTooltipAchievementsBackup[0](me,context,forceClickStr,id);
if (options.normal && me.pool === 'normal' && !me.isShadow) output = output.replace('background-position:0px -336px', 'background-position:'+(-icon[0]*48)+'px '+(-icon[1]*48)+'px');
if (options.shadow && me.isShadow) {
me.pool = 'shadow';
output = output.replace('background-position:0px -336px', 'background-position:'+(-icon[0]*48)+'px '+(-icon[1]*48)+'px');
}
} else {
output = CM.Disp.CrateTooltipAchievementsBackup[0](me,context,forceClickStr,id);
}
return output;
}
Game.crateTooltip = function(me,context) {
let output;
if (me.type === 'achievement') {
let options = {normal: false, shadow: false};
switch (CM.Options.MissingAchievements) {
case 0: options.normal = false; options.shadow = false; break;
case 1: options.normal = true; options.shadow = false; break;
case 2: options.normal = false; options.shadow = true; break;
case 3: options.normal = true; options.shadow = true; break;
}
output = CM.Disp.CrateTooltipAchievementsBackup[1](me,context);
if (options.normal && me.pool === 'normal') {
output = output.replace('<div class="name">???</div>', '<div class="name">'+me.name+'</div>');
output = output.replace('<div class="description">???</div>', '<div class="description">'+me.desc+'</div>');
}
if (options.shadow && me.pool === 'shadow') {
output = output.replace('<div class="name">???</div>', '<div class="name">'+me.name+'</div>');
output = output.replace('<div class="description">???</div>', '<div class="description">'+me.desc+'</div>');
}
} else {
output = CM.Disp.CrateTooltipAchievementsBackup[1](me,context);
}
return output;
}
}
/**
* This function enhance the standard tooltips by creating and changing l('tooltip')
* The function is called by .onmouseover events that have replaced original code to use CM.Disp.Tooltip()