API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 9th, 2013
116
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.79 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/html/settings-pane.html b/html/settings-pane.html
  2. index cfe38b1..9435c0a 100644
  3. --- a/html/settings-pane.html
  4. +++ b/html/settings-pane.html
  5. @@ -7,6 +7,7 @@
  6.  <tr><td><input type="checkbox" name="isChangePageTitle" /></td>        <td>Change HentaiVerse page title: <input type="text" name="customPageTitle" size="40" /></td></tr>
  7.  <tr><td><input type="checkbox" name="isShowEquippedSet" /></td>        <td>Show equipped set number at left panel (<span style="color: red;">Downloadable/Custom Local Fonts only!</span>)</td></tr>
  8.  <tr><td><input type="checkbox" name="isShowSidebarProfs" /></td>   <td>Show proficiencies in sidebar</td></tr>
  9. +<tr><td><input type="checkbox" name="isCondenseAlerts" /></td>     <td>Show multiple battle alerts in a single alert box</td></tr>
  10.  <tr><td><input type="checkbox" name="isStartAlert" /></td>
  11.     <td>Warnings before starting Challenges when
  12.     HP is below <input type="text" name="StartAlertHP" size="1" maxLength="2" style="text-align: right;" />%,
  13. diff --git a/hvstat.user.js b/hvstat.user.js
  14. index 29960ee..c3ea850 100644
  15. --- a/hvstat.user.js
  16. +++ b/hvstat.user.js
  17. @@ -629,6 +629,7 @@ hvStat.storage.initialValue = {
  18.         customPageTitle: "HV",
  19.         isShowEquippedSet: false,
  20.         isShowSidebarProfs: false,
  21. +       isCondenseAlerts: false,
  22.         isStartAlert: false,
  23.         StartAlertHP: 95,
  24.         StartAlertMP: 95,
  25. @@ -2340,9 +2341,16 @@ HVStat.enqueueAlert = function (message) {
  26.  }
  27.  
  28.  HVStat.AlertAllFromQueue = function () {
  29. -   var i, len = HVStat.alertQueue.length;
  30. -   for (i = 0; i < len; i++) {
  31. -       alert(HVStat.alertQueue.shift());
  32. +   if (hvStat.settings.isCondenseAlerts) {
  33. +       if (HVStat.alertQueue.length!==0) {
  34. +           alert(HVStat.alertQueue.join("\n\n"));
  35. +           HVStat.alertQueue.length=0;
  36. +       }
  37. +   } else {
  38. +       var i, len = HVStat.alertQueue.length;
  39. +       for (i = 0; i < len; i++) {
  40. +           alert(HVStat.alertQueue.shift());
  41. +       }
  42.     }
  43.  }
  44.  
  45. @@ -4133,23 +4141,23 @@ HVStat.warnHealthStatus = function () {
  46.     if (!hv.battle.round.finished) {
  47.         if (hvStat.settings.isShowPopup) {
  48.             if (hv.character.healthPercent <= hpWarningLevel && (!hpAlertAlreadyShown || hvStat.settings.isNagHP)) {
  49. -               alert("Your health is dangerously low!");
  50. +               HVStat.enqueueAlert("Your health is dangerously low!");
  51.                 hpAlertAlreadyShown = true;
  52.                 localStorage.setItem(HVStat.key_hpAlertAlreadyShown, "true");
  53.             }
  54.             if (hv.character.magicPercent <= mpWarningLevel && (!mpAlertAlreadyShown || hvStat.settings.isNagMP)) {
  55. -               alert("Your mana is dangerously low!");
  56. +               HVStat.enqueueAlert("Your mana is dangerously low!");
  57.                 mpAlertAlreadyShown = true;
  58.                 localStorage.setItem(HVStat.key_mpAlertAlreadyShown, "true");
  59.             }
  60.             if (hv.character.spiritPercent <= spWarningLevel && (!spAlertAlreadyShown || hvStat.settings.isNagSP)) {
  61. -               alert("Your spirit is dangerously low!");
  62. +               HVStat.enqueueAlert("Your spirit is dangerously low!");
  63.                 spAlertAlreadyShown = true;
  64.                 localStorage.setItem(HVStat.key_spAlertAlreadyShown, "true");
  65.             }
  66.         }
  67.         if (hvStat.settings.isAlertOverchargeFull && hv.character.overchargeRate >= 1.0 && !ocAlertAlreadyShown) {
  68. -           alert("Your overcharge is full.");
  69. +           HVStat.enqueueAlert("Your overcharge is full.");
  70.             ocAlertAlreadyShown = true;
  71.             localStorage.setItem(HVStat.key_ocAlertAlreadyShown, "true");
  72.         }
  73. @@ -4262,9 +4270,9 @@ function collectRoundInfo() {
  74.                     (hvStat.roundInfo.currRound === hvStat.roundInfo.maxRound - hvStat.settings.reminderBeforeEnd) &&
  75.                     !b) {
  76.                 if (hvStat.settings.reminderBeforeEnd === 0) {
  77. -                   alert("This is final round");
  78. +                   HVStat.enqueueAlert("This is final round");
  79.                 } else {
  80. -                   alert("The final round is approaching.");
  81. +                   HVStat.enqueueAlert("The final round is approaching.");
  82.                 }
  83.                 b = true;
  84.             }
  85. @@ -5540,6 +5548,7 @@ function initSettingsPane() {
  86.     $("input[name=customPageTitle]").attr("value", hvStat.settings.customPageTitle);
  87.     if (hvStat.settings.isShowEquippedSet) $("input[name=isShowEquippedSet]").attr("checked", "checked");
  88.     if (hvStat.settings.isShowSidebarProfs) $("input[name=isShowSidebarProfs]").attr("checked", "checked");
  89. +   if (hvStat.settings.isCondenseAlerts) $("input[name=isCondenseAlerts]").attr("checked", "checked");
  90.     if (hvStat.settings.isStartAlert) $("input[name=isStartAlert]").attr("checked", "checked");
  91.     $("input[name=StartAlertHP]").attr("value", hvStat.settings.StartAlertHP);
  92.     $("input[name=StartAlertMP]").attr("value", hvStat.settings.StartAlertMP);
  93. @@ -5730,6 +5739,7 @@ function initSettingsPane() {
  94.     $("input[name=customPageTitle]").change(saveSettings);
  95.     $("input[name=isShowEquippedSet]").click(saveSettings);
  96.     $("input[name=isShowSidebarProfs]").click(reminderAndSaveSettings);
  97. +   $("input[name=isCondenseAlerts]").click(saveSettings);
  98.     $("input[name=isStartAlert]").click(saveSettings);
  99.     $("input[name=StartAlertHP]").change(saveSettings);
  100.     $("input[name=StartAlertMP]").change(saveSettings);
  101. @@ -5869,6 +5879,7 @@ function saveSettings() {
  102.     hvStat.settings.customPageTitle = $("input[name=customPageTitle]").get(0).value;
  103.     hvStat.settings.isShowEquippedSet = $("input[name=isShowEquippedSet]").get(0).checked;
  104.     hvStat.settings.isShowSidebarProfs = $("input[name=isShowSidebarProfs]").get(0).checked;
  105. +   hvStat.settings.isCondenseAlerts = $("input[name=isCondenseAlerts]").get(0).checked;
  106.     hvStat.settings.isStartAlert = $("input[name=isStartAlert]").get(0).checked;
  107.     hvStat.settings.StartAlertHP = $("input[name=StartAlertHP]").get(0).value;
  108.     hvStat.settings.StartAlertMP = $("input[name=StartAlertMP]").get(0).value;
  109. @@ -6302,7 +6313,7 @@ function AlertEffectsSelf() {
  110.             if (hvStat.settings.isEffectsAlertSelf[i]
  111.                     && (effectName + " ").indexOf(effectNames[i] + " ") >= 0    // To match "Regen" and "Regen II", not "Regeneration"
  112.                     && String(hvStat.settings.EffectsAlertSelfRounds[i]) === duration) {
  113. -               alert(effectName + " is expiring");
  114. +               HVStat.enqueueAlert(effectName + " is expiring");
  115.             }
  116.         }
  117.     });
  118. @@ -6332,7 +6343,7 @@ function AlertEffectsMonsters() {
  119.                 }
  120.                 if (!base) continue;
  121.                 monsterNumber = base.id.replace("mkey_", "");
  122. -               alert(effectName + '\n on monster number "' + monsterNumber + '" is expiring');
  123. +               HVStat.enqueueAlert(effectName + '\n on monster number "' + monsterNumber + '" is expiring');
  124.             }
  125.         }
  126.     });
  127. @@ -6507,7 +6518,6 @@ hvStat.startup = {
  128.                 registerEventHandlersForMonsterPopup();
  129.             }
  130.             // Show warnings
  131. -           HVStat.AlertAllFromQueue();
  132.             if (!hv.battle.round.finished) {
  133.                 if (hvStat.settings.warnMode[hvStat.roundInfo.battleType]) {
  134.                     HVStat.warnHealthStatus();
  135. @@ -6529,6 +6539,7 @@ hvStat.startup = {
  136.                     hvStat.battle.advanceRound();
  137.                 }
  138.             }
  139. +           HVStat.AlertAllFromQueue();
  140.         } else {
  141.             hvStat.storage.roundInfo.remove();
  142.             if ((hvStat.settings.isStartAlert || hvStat.settings.isShowEquippedSet) && !hv.settings.useHVFontEngine) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!