Skip to content

arpa notifications #1593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaahay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

arpa notifications #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/arpa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2164,6 +2164,9 @@ function genetics(){
global.resource.Genes.amount -= cost;
global.race.minor[t] ? global.race.minor[t]++ : global.race.minor[t] = 1;
global.race[t] ? global.race[t]++ : global.race[t] = 1;
if (global.settings.arpaMsg){
messageQueue(loc('arpa_notify_minor_gene',[sizeApproximation(cost),traitSkin('name',t),global.race.minor[t]]),'success',false,['arpa']);
}
redraw = true;
}
else {
Expand Down Expand Up @@ -2193,6 +2196,9 @@ function genetics(){
global.prestige.Phage.count -= cost;
global.genes.minor[t] ? global.genes.minor[t]++ : global.genes.minor[t] = 1;
global.race[t] ? global.race[t]++ : global.race[t] = 1;
if (global.settings.arpaMsg){
messageQueue(loc('arpa_notify_minor_phage',[sizeApproximation(cost),traitSkin('name',t),global.genes.minor[t]]),'success',false,['arpa']);
}
redraw = true;
}
else {
Expand All @@ -2218,6 +2224,9 @@ function genetics(){
let res = global.race.universe === 'antimatter' ? 'AntiPlasmid' : 'Plasmid';
if (global.prestige[res].count >= cost){
global.prestige[res].count -= cost;
if (global.settings.arpaMsg){
messageQueue(loc('arpa_notify_trait_remove',[cost,loc(res === 'AntiPlasmid' ? 'resource_AntiPlasmid_plural_name' : 'resource_Plasmid_plural_name'),traitSkin('name',t)]),'warning',false,['arpa']);
}
let rank = global.race[t];
delete global.race[t];
if (!global.race['modified']){
Expand Down Expand Up @@ -2257,6 +2266,9 @@ function genetics(){
let res = global.race.universe === 'antimatter' ? 'AntiPlasmid' : 'Plasmid';
if (global.prestige[res].count >= cost){
global.prestige[res].count -= cost;
if (global.settings.arpaMsg){
messageQueue(loc('arpa_notify_trait_gain',[cost,loc(res === 'AntiPlasmid' ? 'resource_AntiPlasmid_plural_name' : 'resource_Plasmid_plural_name'),traitSkin('name',t)]),'success',false,['arpa']);
}
global.race[t] = 1;
if (!global.race.hasOwnProperty('modified')){
global.race['modified'] = {
Expand Down
3 changes: 2 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export function mainVue(){
}
});

['1','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17'].forEach(function(k){
['1','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18'].forEach(function(k){
popover(`settings${k}`, function(){
return loc(`settings${k}`);
},
Expand Down Expand Up @@ -1406,6 +1406,7 @@ export function index(){
<b-switch class="setting" v-model="s.mKeys"><span class="settings1" aria-label="${loc('settings1')}">{{ 'm_keys' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.cLabels"><span class="settings5" aria-label="${loc('settings5')}">{{ 'c_cat' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.alwaysPower"><span class="settings17" aria-label="${loc('settings17')}">{{ 'always_power' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.arpaMsg"><span class="settings18" aria-label="${loc('settings18')}">{{ 'arpa_messages' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.qKey"><span class="settings6" aria-label="${loc('settings6')}">{{ 'q_key' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.qAny"><span class="settings7" aria-label="${loc('settings7')}">{{ 'q_any' | label }}</span></b-switch>
<b-switch class="setting" v-model="s.qAny_res"><span class="settings14" aria-label="${loc('settings14')}">{{ 'q_any_res' | label }}</span></b-switch>
Expand Down
5 changes: 4 additions & 1 deletion src/vars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export var hell_graphs = {};
export var message_logs = {
view: 'all'
};
export const message_filters = ['all','progress','queue','building_queue','research_queue','combat','spy','events','major_events','minor_events','achievements','hell'];
export const message_filters = ['all','progress','queue','building_queue','research_queue','combat','spy','events','major_events','minor_events','achievements','hell','arpa'];
export var callback_queue = new Map();
export var active_rituals = {};

Expand Down Expand Up @@ -1532,6 +1532,9 @@ if (typeof global.settings.expose === 'undefined'){
if (typeof global.settings.alwaysPower === 'undefined'){
global.settings['alwaysPower'] = false;
}
if (typeof global.settings.arpaMsg === 'undefined'){
global.settings['arpaMsg'] = true;
}
if (typeof global.settings.tabLoad === 'undefined'){
global.settings['tabLoad'] = false;
}
Expand Down
7 changes: 7 additions & 0 deletions strings/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"settings15": "How the Building Queue manages merging similar items in the queue. It can merge similar items if they're nearby each other in the queue, regardless of where they are in the queue, or never merge them at all.",
"settings16": "Enable Experimental Touch Device enhancements",
"settings17": "Always power on new structures, even when remaining electricity or support is insufficient.",
"settings18": "Show ARPA trait manipulation messages in the message queue.",
"enable_reset": "Enable Reset Buttons",
"reset_warn": "Warning: This completely resets all your progress and cannot be undone. This is NOT a prestige mechanic; you are wiping out your game data. Keep this button disabled.",
"reset_soft": "Soft Reset Game",
Expand All @@ -164,6 +165,7 @@
"touch": "Touch Device",
"tabLoad": "Preload Tab Content",
"always_power": "Always Power On New Buildings",
"arpa_messages": "ARPA Messages",
"load_string_pack": "Load String Pack",
"clear_string_pack": "Clear String Pack",
"string_pack_none": "No string pack chosen",
Expand All @@ -177,6 +179,11 @@
"restore_warning": "Are you sure you want to Restore Backup? This will load a backup save that was saved to your browser's local storage right before the last time you prestiged. If no save is found, this option will not do anything.",
"update_avail": "Update Available",
"building_queue": "Building Queue",
"message_log_arpa": "ARPA",
"arpa_notify_minor_gene": "You have spent %0 genes on improving minor trait %1 to rank %2.",
"arpa_notify_minor_phage": "You have spent %0 phage on improving minor trait %1 to rank %2.",
"arpa_notify_trait_remove": "You have spent %0 %1 on removing genetic trait %2.",
"arpa_notify_trait_gain": "You have spent %0 %1 on gaining genetic trait %2.",
"queue_play": "Start the Building Queue",
"queue_pause": "Pause the Building Queue",
"research_queue": "Research Queue",
Expand Down