dburr/SIFTools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Events were being calculated even if not selected

Browse source
This commit is contained in:
Donald Burr 2015-10-21 16:04:47 -07:00
parent 654fa9ffce
commit 3ab33e8624
1 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

112
web_app/js/sif_tools.js
View file

@ -644,35 +644,37 @@ function calculate_gems() {
if (calc_daily_quest_gems) { if (calc_daily_quest_gems) {
gems++; gems++;
} }
// account for event if (calc_event_gems) {
// format of returned tuple: // account for event
// tuple[0] - was this an event day? (boolean, duh) // format of returned tuple:
// tuple[1] - name of event, or "" if none (string) // tuple[0] - was this an event day? (boolean, duh)
// tuple[2] - amount of gems spent (int) // tuple[1] - name of event, or "" if none (string)
// tuple[3] - amount of gems gained (int) // tuple[2] - amount of gems spent (int)
var event_results = handle_event(day(now), game_version, tier); // tuple[3] - amount of gems gained (int)
var is_event = event_results[0]; var event_results = handle_event(day(now), game_version, tier);
var event_name = ""; var is_event = event_results[0];
var spent_gems = 0; var event_name = "";
var won_gems = 0; var spent_gems = 0;
if (is_event) { var won_gems = 0;
event_name = event_results[1]; if (is_event) {
spent_gems = event_results[2]; event_name = event_results[1];
won_gems = event_results[3]; spent_gems = event_results[2];
// did any gems get spent? won_gems = event_results[3];
if (spent_gems > 0) { // did any gems get spent?
// do we have enough to cover it? if (spent_gems > 0) {
if (gems >= spent_gems) { // do we have enough to cover it?
// spend the gems if (gems >= spent_gems) {
gems -= spent_gems; // spend the gems
// now reap the winnings gems -= spent_gems;
gems += won_gems; // now reap the winnings
gems += won_gems;
} else {
// flag to indicate that we didn't have the gems
spent_gems = -1;
}
} else { } else {
// flag to indicate that we didn't have the gems gems += won_gems;
spent_gems = -1;
} }
} else {
gems += won_gems;
} }
} }
// record verbose output if desired // record verbose output if desired
@ -747,35 +749,37 @@ function calculate_gems() {
if (calc_daily_quest_gems) { if (calc_daily_quest_gems) {
gems++; gems++;
} }
// account for event if (calc_event_gems) {
// format of returned tuple: // account for event
// tuple[0] - was this an event day? (boolean, duh) // format of returned tuple:
// tuple[1] - name of event, or "" if none (string) // tuple[0] - was this an event day? (boolean, duh)
// tuple[2] - amount of gems spent (int) // tuple[1] - name of event, or "" if none (string)
// tuple[3] - amount of gems gained (int) // tuple[2] - amount of gems spent (int)
var event_results = handle_event(day(now), game_version, tier); // tuple[3] - amount of gems gained (int)
var is_event = event_results[0]; var event_results = handle_event(day(now), game_version, tier);
var event_name = ""; var is_event = event_results[0];
var spent_gems = 0; var event_name = "";
var won_gems = 0; var spent_gems = 0;
if (is_event) { var won_gems = 0;
event_name = event_results[1]; if (is_event) {
spent_gems = event_results[2]; event_name = event_results[1];
won_gems = event_results[3]; spent_gems = event_results[2];
// did any gems get spent? won_gems = event_results[3];
if (spent_gems > 0) { // did any gems get spent?
// do we have enough to cover it? if (spent_gems > 0) {
if (gems >= spent_gems) { // do we have enough to cover it?
// spend the gems if (gems >= spent_gems) {
gems -= spent_gems; // spend the gems
// now reap the winnings gems -= spent_gems;
gems += won_gems; // now reap the winnings
gems += won_gems;
} else {
// flag to indicate that we didn't have the gems
spent_gems = -1;
}
} else { } else {
// flag to indicate that we didn't have the gems gems += won_gems;
spent_gems = -1;
} }
} else {
gems += won_gems;
} }
} }
// record verbose output if desired // record verbose output if desired