Skip to content

Commit

Permalink
Basic metrics tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
pmotschmann committed Apr 9, 2021
1 parent 1bd12a2 commit afd1885
Show file tree
Hide file tree
Showing 14 changed files with 113 additions and 11 deletions.
2 changes: 1 addition & 1 deletion evolve/main.js

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,13 @@
}
</style>
<div class="loading"><div class="lds-dual-ring"></div></div>

<script async src="https://www.googletagmanager.com/gtag/js?id=G-CPC46V71CB"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-CPC46V71CB');
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evolveidle",
"version": "1.0.38",
"version": "1.0.39",
"description": "Evolve Idle",
"private": true,
"scripts": {
Expand Down
8 changes: 7 additions & 1 deletion save.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@
else {
document.getElementById('save').innerHTML = 'No Save data detected';
}

</script>
<script async src="https://www.googletagmanager.com/gtag/js?id=G-CPC46V71CB"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-CPC46V71CB');
</script>
</body>
</html>
21 changes: 19 additions & 2 deletions src/actions.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { global, save, poppers, webWorker, keyMultiplier, clearStates, keyMap, srSpeak, sizeApproximation, p_on, moon_on, gal_on, quantum_level } from './vars.js';
import { loc } from './locale.js';
import { timeCheck, timeFormat, vBind, popover, flib, clearElement, costMultiplier, darkEffect, genCivName, powerModifier, powerCostMod, calcPrestige, adjustCosts, modRes, messageQueue, buildQueue, format_emblem, calc_mastery, calcPillar, updateResetStats, calcGenomeScore, getShrineBonus, eventActive, easterEgg, getHalloween, trickOrTreat } from './functions.js';
import { unlockAchieve, unlockFeat, challengeIcon, checkAchievements } from './achieve.js';
import { timeCheck, timeFormat, vBind, popover, flib, tagEvent, clearElement, costMultiplier, darkEffect, genCivName, powerModifier, powerCostMod, calcPrestige, adjustCosts, modRes, messageQueue, buildQueue, format_emblem, calc_mastery, calcPillar, updateResetStats, calcGenomeScore, getShrineBonus, eventActive, easterEgg, getHalloween, trickOrTreat } from './functions.js';
import { unlockAchieve, unlockFeat, challengeIcon, checkAchievements, alevel } from './achieve.js';
import { races, traits, genus_traits, randomMinorTrait, cleanAddTrait, biomes, planetTraits, setJType } from './races.js';
import { defineResources, galacticTrade, spatialReasoning } from './resources.js';
import { loadFoundry, defineJobs } from './jobs.js';
Expand Down Expand Up @@ -7539,6 +7539,11 @@ function sentience(){
loadTab('mTabCivil');
}

tagEvent('sentience',{
'species': global.race.species,
'challenge': alevel() - 1
});

if (global.race['cataclysm']){
cataclysm();
}
Expand Down Expand Up @@ -8021,6 +8026,10 @@ function bioseed(){
save.setItem('evolveBak',LZString.compressToUTF16(JSON.stringify(global)));
global.lastMsg = false;

tagEvent('reset',{
'end': 'bioseed'
});

let god = global.race.species;
let old_god = global.race.gods;
let genus = races[god].type;
Expand Down Expand Up @@ -8158,6 +8167,10 @@ export function cataclysm_end(){
}
save.setItem('evolveBak',LZString.compressToUTF16(JSON.stringify(global)));

tagEvent('reset',{
'end': 'cataclysm'
});

global.lastMsg = false;

let plasmid = global.race.Plasmid.count;
Expand Down Expand Up @@ -8255,6 +8268,10 @@ export function big_bang(){
save.setItem('evolveBak',LZString.compressToUTF16(JSON.stringify(global)));
global.lastMsg = false;

tagEvent('reset',{
'end': 'blackhole'
});

unlockAchieve(`extinct_${global.race.species}`);
switch (global.race.universe){
case 'heavy':
Expand Down
6 changes: 5 additions & 1 deletion src/civics.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { global, poppers, clearStates, save, keyMultiplier, sizeApproximation } from './vars.js';
import { loc } from './locale.js';
import { calcPrestige, clearElement, popover, vBind, modRes, messageQueue, genCivName, darkEffect, eventActive, easterEgg, trickOrTreat } from './functions.js';
import { calcPrestige, clearElement, popover, vBind, tagEvent, modRes, messageQueue, genCivName, darkEffect, eventActive, easterEgg, trickOrTreat } from './functions.js';
import { unlockAchieve, unlockFeat, checkAchievements, universeAffix } from './achieve.js';
import { races, racialTrait, traits, planetTraits } from './races.js';
import { loadIndustry } from './industry.js';
Expand Down Expand Up @@ -1853,6 +1853,10 @@ function warhead(){
save.setItem('evolveBak',LZString.compressToUTF16(JSON.stringify(global)));
global.lastMsg = false;

tagEvent('reset',{
'end': 'mad'
});

let god = global.race.species;
let old_god = global.race.gods;
let orbit = global.city.calendar.orbit;
Expand Down
12 changes: 12 additions & 0 deletions src/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,14 @@ export function cleanBuildPopOver(id){
clearElement($(`#pop${id}`),true);
}

const tagDebug = false;
export function tagEvent(event, data){
try {
data['debug_mode'] = tagDebug;
gtag('event', event, data);
} catch (err){}
}

export function modRes(res,val,notrack,buffer){
let count = global.resource[res].amount + val;
let success = true;
Expand Down Expand Up @@ -1628,6 +1636,10 @@ export function vacuumCollapse(){
save.setItem('evolveBak',LZString.compressToUTF16(JSON.stringify(global)));
global.lastMsg = false;

tagEvent('reset',{
'end': 'vacuum'
});

unlockAchieve(`extinct_${global.race.species}`);
unlockAchieve(`pw_apocalypse`);

Expand Down
33 changes: 32 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { global, tmp_vars, save, webWorker } from './vars.js';
import { loc, locales } from './locale.js';
import { setupStats } from './achieve.js';
import { vBind, clearElement, flib, gameLoop, popover, powerGrid, easterEgg, trickOrTreat } from './functions.js';
import { vBind, clearElement, flib, tagEvent, gameLoop, popover, powerGrid, easterEgg, trickOrTreat } from './functions.js';
import { tradeRatio, atomic_mass, supplyValue, marketItem, containerItem, loadEjector, loadSupply, loadAlchemy, initResourceTabs, tradeSummery } from './resources.js';
import { defineJobs, } from './jobs.js';
import { setPowerGrid, gridDefs, clearGrids } from './industry.js';
Expand Down Expand Up @@ -211,10 +211,21 @@ export function loadTab(tab){
clearElement($(`#mTabArpa`));
clearElement($(`#mTabStats`));
}
else {
tagEvent('page_view',{ page_title: `Evolve - All Tabs` });
}
switch (tab){
case 0:
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Evolution` });
}
break;
case 1:
case 'mTabCivil':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Civilization` });
}
$(`#mTabCivil`).append(`<b-tabs class="resTabs" v-model="s.spaceTabs" :animated="s.animated" @input="swapTab">
<b-tab-item id="city" :visible="s.showCity">
<template slot="header">
Expand Down Expand Up @@ -293,6 +304,9 @@ export function loadTab(tab){
case 2:
case 'mTabCivic':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Civics` });
}
$(`#mTabCivic`).append(`<b-tabs class="resTabs" v-model="s.govTabs" :animated="s.animated" @input="swapTab">
<b-tab-item id="civic">
<template slot="header">
Expand Down Expand Up @@ -410,6 +424,9 @@ export function loadTab(tab){
case 3:
case 'mTabResearch':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Research` });
}
$(`#mTabResearch`).append(`<div id="resQueue" class="resQueue" v-show="rq.display"></div>
<b-tabs class="resTabs" v-model="s.resTabs" :animated="s.animated">
<b-tab-item id="tech">
Expand Down Expand Up @@ -446,6 +463,9 @@ export function loadTab(tab){
case 4:
case 'mTabResource':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Resources` });
}
$(`#mTabResource`).append(`<b-tabs class="resTabs" v-model="s.marketTabs" :animated="s.animated" @input="swapTab">
<b-tab-item id="market" :visible="s.showMarket">
<template slot="header">
Expand Down Expand Up @@ -613,6 +633,9 @@ export function loadTab(tab){
case 5:
case 'mTabArpa':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Arpa` });
}
$(`#mTabArpa`).append(`<div id="apra" class="arpa">
<b-tabs class="resTabs" v-model="s.arpa.arpaTabs" :animated="s.animated">
<b-tab-item id="arpaPhysics" :visible="s.arpa.physics" label="${loc('tab_arpa_projects')}"></b-tab-item>
Expand Down Expand Up @@ -641,6 +664,9 @@ export function loadTab(tab){
case 6:
case 'mTabStats':
{
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Stats` });
}
$(`#mTabStats`).append(`<b-tabs class="resTabs" v-model="s.statsTabs" :animated="s.animated">
<b-tab-item id="stats">
<template slot="header">
Expand Down Expand Up @@ -672,6 +698,11 @@ export function loadTab(tab){
setupStats();
}
break;
case 7:
if (!global.settings.tabLoad){
tagEvent('page_view',{ page_title: `Evolve - Settings` });
}
break;
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/portal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { global, save, webWorker, keyMultiplier, p_on, gal_on, spire_on, quantum_level, poppers, sizeApproximation, clearStates } from './vars.js';
import { vBind, clearElement, popover, powerCostMod, spaceCostMultiplier, messageQueue, powerModifier, calcPillar, updateResetStats, deepClone } from './functions.js';
import { vBind, clearElement, popover, tagEvent, powerCostMod, spaceCostMultiplier, messageQueue, powerModifier, calcPillar, updateResetStats, deepClone } from './functions.js';
import { unlockAchieve, unlockFeat, alevel, universeAffix, checkAchievements } from './achieve.js';
import { traits, races } from './races.js';
import { defineResources, spatialReasoning } from './resources.js';
Expand Down Expand Up @@ -3967,6 +3967,10 @@ export function descension(){
}
global.lastMsg = false;

tagEvent('reset',{
'end': 'descension'
});

unlockAchieve(`squished`,true);
unlockAchieve(`extinct_${global.race.species}`);
unlockAchieve(`corrupted`);
Expand Down
4 changes: 4 additions & 0 deletions src/space.js
Original file line number Diff line number Diff line change
Expand Up @@ -5875,6 +5875,10 @@ function ascendLab(){
function ascend(){
global.lastMsg = false;

tagEvent('reset',{
'end': 'ascend'
});

let god = global.race.species;
let old_god = global.race.gods;
let orbit = global.city.calendar.orbit;
Expand Down
9 changes: 8 additions & 1 deletion src/vars.js
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ if (convertVersion(global['version']) < 100035){
}
}

global['version'] = '1.0.38';
global['version'] = '1.0.39';
delete global['beta'];

if (!global.hasOwnProperty('power')){
Expand Down Expand Up @@ -1654,6 +1654,10 @@ export function srSpeak(text, priority) {

// executes a soft reset
window.soft_reset = function reset(){
try {
gtag('event', 'reset', { 'end': 'soft'});
} catch (err){}

let replace = {
species : 'protoplasm',
Plasmid: { count: global.race.Plasmid.count },
Expand Down Expand Up @@ -1876,6 +1880,9 @@ export function clearStates(){

// executes a hard reset
window.reset = function reset(){
try {
gtag('event', 'reset', { 'end': 'hard'});
} catch (err){}
localStorage.removeItem('evolved');
global = null;
if (webWorker.w){
Expand Down
4 changes: 3 additions & 1 deletion src/wiki/wiki.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { global, setGlobal, save } from './../vars.js';
import { loc } from './../locale.js';
import {} from './../achieve.js';
import { vBind, clearElement } from './../functions.js';
import { vBind, clearElement, tagEvent } from './../functions.js';
import { faqPage } from './faq.js';
import { racesPage, traitsPage } from './species.js';
import { planetsPage } from './planets.js';
Expand Down Expand Up @@ -158,6 +158,8 @@ function menuDispatch(main,sub,frag){
setGlobal(JSON.parse(LZString.decompressFromUTF16(global_data)));
}

tagEvent('page_view',{ page_title: `Evolve Wiki - ${main}` });

switch (main){
case 'intro':
mainPage();
Expand Down
7 changes: 7 additions & 0 deletions wiki.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,12 @@
}
</style>
<div class="loading"><div class="lds-dual-ring"></div></div>
<script async src="https://www.googletagmanager.com/gtag/js?id=G-CPC46V71CB"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-CPC46V71CB');
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion wiki/wiki.js

Large diffs are not rendered by default.

0 comments on commit afd1885

Please sign in to comment.