r53 Build on Curse

Adds more sounds, some bug fixes etc.
Softrix · Oct 11, 2023 · 2aadbfa · 2aadbfa
1 parent 3506078
commit 2aadbfa
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 35 deletions.
diff --git a/SmartBuff.buffs.lua b/SmartBuff.buffs.lua
@@ -82,8 +82,8 @@ function SMARTBUFF_InitItemList()
   _,SMARTBUFF_SPELLSMASTER                  = GetItemInfo(41194);       --"Master Spellstone"
   _,SMARTBUFF_SPELLSDEMONIC                 = GetItemInfo(41195);       --"Demonic Spellstone"
   _,SMARTBUFF_SPELLSGRAND                   = GetItemInfo(41196);       --"Grand Spellstone"  
-  _,SMARTBUFF_MANAGEM                       = GetItemInfo(36799);       --"Mana Gem"
-  _,SMARTBUFF_BRILLIANTMANAGEM              = GetItemInfo(81901);       --"Brilliant Mana Gem"
+--  _,SMARTBUFF_MANAGEM                       = GetItemInfo(36799);       --"Mana Gem"
+--  _,SMARTBUFF_BRILLIANTMANAGEM              = GetItemInfo(81901);       --"Brilliant Mana Gem"
   _,SMARTBUFF_SSROUGH                       = GetItemInfo(2862);        --"Rough Sharpening Stone"
   _,SMARTBUFF_SSCOARSE                      = GetItemInfo(2863);        --"Coarse Sharpening Stone"
   _,SMARTBUFF_SSHEAVY                       = GetItemInfo(2871);        --"Heavy Sharpening Stone"
@@ -217,6 +217,12 @@ function SMARTBUFF_InitItemList()
   _,SMARTBUFF_ANESTHETICPOISON1			    = GetItemInfo(21835);	    -- Anesthetic Poison  
   _,SMARTBUFF_ANESTHETICPOISON2			    = GetItemInfo(43237);	    -- Anesthetic Poison II 
 
+  -- ignored under wotlk
+  SMARTBUFF_MANAAGATE			            = GetItemInfo(5514);	    -- Mana Agate 
+  SMARTBUFF_MANACITRINE		                = GetItemInfo(8007);	    -- Mana Citrine 
+  SMARTBUFF_MANAJADE			            = GetItemInfo(5513);	    -- Mana Jade
+  SMARTBUFF_MANARUBY			            = GetItemInfo(8008);	    -- Mana Ruby 
+
   -- Food item IDs
   S.FoodItems = GetItems({39691, 34125, 42997, 42998, 42999, 43000, 43015, 34767, 42995, 34769, 34753, 34754, 
                         34758, 34766, 42994, 42996, 34756, 34768, 42993, 34755, 43001, 34757, 34752, 34751, 
@@ -321,7 +327,7 @@ function SMARTBUFF_InitItemList()
   _,SMARTBUFF_ELIXIR15            = GetItemInfo(9187);   --"Elixir of Greater Agility"
   _,SMARTBUFF_ELIXIR16            = GetItemInfo(28103);  --"Adept's Elixir"
   _,SMARTBUFF_ELIXIR17            = GetItemInfo(40070);  --"Spellpower Elixir"
-
+ 
   -- fishing pole
   _, _, _, _, _, _, S.FishingPole = GetItemInfo(6256);  --"Fishing Pole"
   SMARTBUFF_AddMsgD("Item list initialized");
@@ -407,7 +413,14 @@ function SMARTBUFF_InitSpellIDs()
   SMARTBUFF_CONJWATER           = GetSpellInfo(5504);       --"Conjure Water"
   SMARTBUFF_CONJREFRESHMENT     = GetSpellInfo(42955);      --"Conjure Refreshment"
   SMARTBUFF_RITUALREFRESHMENT   = GetSpellInfo(43987);      --"Ritual Refreshment"
-  SMARTBUFF_CREATEMGEM		    = GetSpellInfo(759);        --"Conjure Mana Gem"
+
+  -- separated for the purpose of classic era where multiple gems can be created,
+  -- but under wrath the highest is always created.
+  SMARTBUFF_CREATEMGEM_AGATE    = GetSpellInfo(759);        --"Conjure Mana Agate under classic era but Conjure Mana Gem in WOTLK"
+  SMARTBUFF_CREATEMGEM_CITRINE  = GetSpellInfo(10053);      --"Conjure Mana Citrine - ignored in Wrath"
+  SMARTBUFF_CREATEMGEM_JADE     = GetSpellInfo(3552);       --"Conjure Mana Jade - ignored in wrath"
+  SMARTBUFF_CREATEMGEM_RUBY     = GetSpellInfo(10054);      --"Conjure Mana Ruby - ignored in wrath"
+
   -- Mage buff links
   S.ChainMageArmor = { SMARTBUFF_ICEARMOR, SMARTBUFF_FROSTARMOR, SMARTBUFF_MAGEARMOR, SMARTBUFF_MOLTENARMOR };
   S.ChainMageBuffs = { SMARTBUFF_AI, SMARTBUFF_AB, SMARTBUFF_DALI, SMARTBUFF_DALARANB }
@@ -861,8 +874,11 @@ function SMARTBUFF_InitSpellList()
       {SMARTBUFF_CONJFOOD, -1, SMARTBUFF_CONST_SELF},
       {SMARTBUFF_CONJWATER, -1, SMARTBUFF_CONST_SELF},
       {SMARTBUFF_CONJREFRESHMENT, -1, SMARTBUFF_CONST_SELF},
-      {SMARTBUFF_RITUALREFRESHMENT, -1, SMARTBUFF_CONST_SELF},
-      {SMARTBUFF_CREATEMGEM, -1, SMARTBUFF_CONST_SELF},
+      {SMARTBUFF_RITUALREFRESHMENT, -1, SMARTBUFF_CONST_SELF},	  
+      {SMARTBUFF_CREATEMGEM_AGATE, -1, SMARTBUFF_CONST_SELF},
+      {SMARTBUFF_CREATEMGEM_CITRINE, -1, SMARTBUFF_CONST_SELF},
+      {SMARTBUFF_CREATEMGEM_JADE, -1, SMARTBUFF_CONST_SELF},
+      {SMARTBUFF_CREATEMGEM_RUBY, -1, SMARTBUFF_CONST_SELF},
     };
   end
 

diff --git a/SmartBuff.lua b/SmartBuff.lua
@@ -7,10 +7,10 @@
 -- Cast the most important buffs on you, tanks or party/raid members/pets.
 -------------------------------------------------------------------------------
 
-SMARTBUFF_DATE          = "091023";
+SMARTBUFF_DATE          = "111023";
 
-SMARTBUFF_VERSION       = "r52."..SMARTBUFF_DATE;
-SMARTBUFF_VERSIONNR     = 30402;
+SMARTBUFF_VERSION       = "r53."..SMARTBUFF_DATE;
+SMARTBUFF_VERSIONNR     = 30403;
 SMARTBUFF_VERWOTLK      = false;
 SMARTBUFF_TITLE         = "SmartBuff";
 SMARTBUFF_SUBTITLE      = "Supports you in casting buffs";
@@ -26,7 +26,7 @@ local SmartbuffCommands = { "SBCVER", "SBCCMD", "SBCSYC" }
 local SmartbuffSession = true;
 local SmartbuffVerCheck = false;					-- for my use when checking guild users/testers versions  :)
 local buildInfo = select(4, GetBuildInfo())
-local SmartbuffRevision = 51;
+local SmartbuffRevision = 53;
 local SmartbuffVerNotifyList = {}
 
 -- Using LibRangeCheck-2.0 by Mitchnull
@@ -169,7 +169,7 @@ local Icons = {
 
 local tracker = ""
 
--- available sounds (20)
+-- available sounds (39)
 local soundPath = "Interface\\AddOns\\SmartBuff\\Sounds\\";
 local Sounds = {
     "igPlayerBind.ogg",
@@ -180,9 +180,25 @@ local Sounds = {
     "FX_SONIC_SPHEREPULSE_01.ogg",
     "EyeOfKilroggDeath.ogg",
     "GM_ChatWarning.ogg",
+    "Bloodlust_player_cast_head.ogg",
+    "collectfruit.ogg",
+    "collectgold.ogg",
+    "collectspud.ogg",
+    "collectwings.ogg",
+    "EnlargeCast.ogg",
+    "exitlevelunlocked.ogg",
+    "GO_7LF_Lightforged_Barrier_Death.ogg",
+    "RTC_80_ARD_Anvil_Strike.ogg",
+    "RTC_80_KAG_TransitionFX_In.ogg",
+    "SPELL_MK_BREW_DRINK01.ogg",
+    "SPELL_ShadowStrike_Cast.ogg",
+    "witchflyaway.ogg",
     "gruntling_horn_bb.ogg",
     "WispPissed3.ogg",
-    "UR_Kologarn_Slay02.ogg",
+    "FluteRun.ogg",                     -- just for you Emmalee  ;-)
+    "GnomeFemaleMainJump.ogg",
+    "ShaysBell.ogg",
+	"UR_Kologarn_Slay02.ogg",
     "UI_PetBattle_Victory02.ogg",
     "PVPWarning.ogg",
     "PVPFlagTakenHordeMono.ogg",
@@ -1932,24 +1948,56 @@ function SMARTBUFF_BuffUnit(unit, subgroup, mode, spell)
 
       -- check for mage conjured items
       if (bUsable and sPlayerClass == "MAGE") then
-	    local lookupData
-        if (buffnS == SMARTBUFF_CONJFOOD or buffnS == SMARTBUFF_CONJREFRESHMENT) then lookupData = ConjuredMageFood
-		elseif (buffnS == SMARTBUFF_CONJWATER or buffnS == SMARTBUFF_CONJREFRESHMENT) then lookupData = ConjuredMageWater
-		elseif buffnS == SMARTBUFF_CREATEMGEM then lookupData = ConjuredMageGems end
-        if lookupData and isPlayerMoving == false then
-	        for count, value in next, lookupData do  
-		        if value then 
-                    itemInfo = GetItemInfo(value)
-                    if SMARTBUFF_CheckBagItem(itemInfo) then
-				        bUsable = false;
-				    end
+        if SMARTBUFF_VERWOTLK then
+	        local lookupData
+            if (buffnS == SMARTBUFF_CONJFOOD or buffnS == SMARTBUFF_CONJREFRESHMENT) then lookupData = ConjuredMageFood
+		    elseif (buffnS == SMARTBUFF_CONJWATER or buffnS == SMARTBUFF_CONJREFRESHMENT) then lookupData = ConjuredMageWater
+		    elseif buffnS == SMARTBUFF_CREATEMGEM_AGATE then lookupData = ConjuredMageGems end
+            if lookupData and isPlayerMoving == false then
+	            for count, value in next, lookupData do  
+		            if value then             
+                        itemInfo = GetItemInfo(value)
+                        if SMARTBUFF_CheckBagItem(itemInfo) then
+				            bUsable = false;
+                            break
+				        end
+		            end
+	            end
+            elseif lookupData and isPlayerMoving then
+                bUsable = false;
+		    end
+        else            
+            -- classic era / hardcore mana gems & food check, a little dirty but it works for now,
+            -- i'll come back to this later and tidy it up :)
+            if not isPlayerMoving then
+                local lookupData
+                if (buffnS == SMARTBUFF_CONJFOOD) then 
+					lookupData = ConjuredMageFood
+		        elseif (buffnS == SMARTBUFF_CONJWATER) then 
+					lookupData = ConjuredMageWater 
+				end
+                if lookupData then
+	                for count, value in next, lookupData do  
+		                if value then 
+                            itemInfo = GetItemInfo(value)
+                            if SMARTBUFF_CheckBagItem(itemInfo) then
+				                bUsable = false;
+				            end
+		                end
+	                end
 		        end
-	        end
-        elseif lookupData and isPlayerMoving then
-            bUsable = false;
+                if (buffnS == SMARTBUFF_CREATEMGEM_AGATE and SMARTBUFF_CheckBagItem(SMARTBUFF_MANAAGATE)) or
+                    (buffnS == SMARTBUFF_CREATEMGEM_CITRINE and SMARTBUFF_CheckBagItem(SMARTBUFF_MANACITRINE)) or
+                    (buffnS == SMARTBUFF_CREATEMGEM_JADE and SMARTBUFF_CheckBagItem(SMARTBUFF_MANAJADE)) or
+                    (buffnS == SMARTBUFF_CREATEMGEM_RUBY and SMARTBUFF_CheckBagItem(SMARTBUFF_MANARUBY)) then
+			        bUsable = false;
+			    end
+			else
+			    bUsable = false;
+			end
 		end
 	  end
-      
+
       -- check for warlock conjured items
       if (bUsable and sPlayerClass == "WARLOCK") then
           local itemInfo, bag, slot, count, maxHealth, currentHealth, lookupData

diff --git a/SmartBuff.toc b/SmartBuff.toc
@@ -1,6 +1,6 @@
-## Interface: 30402
+## Interface: 30403
 ## Title: |TInterface\Addons\Smartbuff\Icons\IconEnabled:0|t SmartBuff |cffffffff(WOTLK)|r
-## Version: 52.30402
+## Version: 53.30403
 ## Author: |cff20d2ffCodermik & Aeldra|r (EU-Proudmoore)
 ## Contributing Author: |cff20d2ffSpeedwaystar
 ## Notes: Automatically cast buffs on yourself, your party or raid members and their pets. Use /sbm for the options menu.

diff --git a/SmartBuff.xml b/SmartBuff.xml
@@ -1578,7 +1578,7 @@
 						end
 					</OnShow>
 					<OnLoad>
-						SmartBuffOptionsFrameSlider_OnLoad(self, 1, 23, 1);
+						SmartBuffOptionsFrameSlider_OnLoad(self, 1, 39, 1);
 						BackdropTemplateMixin.OnBackdropLoaded(self);
 					</OnLoad>
 					<OnEnter>

diff --git a/Sounds/Bloodlust_player_cast_head.ogg b/Sounds/Bloodlust_player_cast_head.ogg
diff --git a/Sounds/EnlargeCast.ogg b/Sounds/EnlargeCast.ogg
diff --git a/Sounds/FluteRun.ogg b/Sounds/FluteRun.ogg
diff --git a/Sounds/GO_7LF_Lightforged_Barrier_Death.ogg b/Sounds/GO_7LF_Lightforged_Barrier_Death.ogg
diff --git a/Sounds/GnomeFemaleMainJump.ogg b/Sounds/GnomeFemaleMainJump.ogg
diff --git a/Sounds/RTC_80_ARD_Anvil_Strike.ogg b/Sounds/RTC_80_ARD_Anvil_Strike.ogg
diff --git a/Sounds/RTC_80_KAG_TransitionFX_In.ogg b/Sounds/RTC_80_KAG_TransitionFX_In.ogg
diff --git a/Sounds/SPELL_MK_BREW_DRINK01.ogg b/Sounds/SPELL_MK_BREW_DRINK01.ogg
diff --git a/Sounds/SPELL_ShadowStrike_Cast.ogg b/Sounds/SPELL_ShadowStrike_Cast.ogg
diff --git a/Sounds/ShaysBell.ogg b/Sounds/ShaysBell.ogg
diff --git a/Sounds/collectfruit.ogg b/Sounds/collectfruit.ogg
diff --git a/Sounds/collectgold.ogg b/Sounds/collectgold.ogg
diff --git a/Sounds/collectspud.ogg b/Sounds/collectspud.ogg
diff --git a/Sounds/collectwings.ogg b/Sounds/collectwings.ogg
diff --git a/Sounds/exitlevelunlocked.ogg b/Sounds/exitlevelunlocked.ogg
diff --git a/Sounds/witchflyaway.ogg b/Sounds/witchflyaway.ogg
diff --git a/localization.en.lua b/localization.en.lua
@@ -6,12 +6,16 @@
 SMARTBUFF_WHATSNEW = "\n\n"
   .."          |cff00e0ffClassic & Retail versions by Codermik with additional\n"
   .."          retail coding by Speedwaystar.\n\n"
-  .."          |cffffffffChanges in r52.091023 (Classic):\n\n"
+  .."          |cffffffffChanges in r53.111023 (Classic):\n\n"
   .."             * Classic Era, Hardcore and WOTLK now share \n"
-  .."               the same codebase, this will make my life\n"
-  .."               so much easier moving forward :)\n"
+  .."                the same codebase, this will make my life\n"
+  .."                so much easier moving forward :)\n\n"
+  .."             * WOTLK TOC Updated to 30403 \n\n"
   .."             * Sounds are now local, this allows me to provide \n"
-  .."               retail or custom sounds for splash prompts.\n"
+  .."                retail or custom sounds for splash prompts.\n\n"
+  .."             * Under classic era and hardcore Mage Mana Gems \n"
+  .."                are separated and can now all be created.\n\n"
+  .."             * Added some missing sounds originally in ERA. \n\n"
   .."\n\n"
   .."          |cffffff00I currently play on the Mirage Raceway EU classic\n"
   .."          WOTLK server as Alliance, I play on Mik, Gabella,\n"
@@ -180,7 +184,7 @@ SMARTBUFF_OFTT_CHECKCHARGES  = "Displays low amount of\ncharges on a buff.\n0 =
 SMARTBUFF_OFTT_BUFFINCITIES  = "Buffs also if you are in capital cities.\nIf you are PvP flagged, it buffs in any case.";
 SMARTBUFF_OFTT_BLDURATION    = "How many seconds, players will be blacklisted.\n0 = Deactivated";
 SMARTBUFF_OFTT_ANTIDAZE      = "Automatically cancels the\naspect of the cheetah/pack\nif someone gets dazed\n(self or group).";
-SMARTBUFF_OFTT_SPLASHSTYLE   = "Changes the fontstyle of\nthe buff messages.";
+SMARTBUFF_OFTT_SPLASHSTYLE   = "Changes the font style of\nthe buff messages.";
 SMARTBUFF_OFTT_HIDESABUTTON  = "Hides the SmartBuff action button.";
 SMARTBUFF_OFTT_INCOMBAT      = "At the moment it only works on yourself.\nThe first buff you mark as in combat,\nwill set on the button before combat\nand you can use it in combat.\n!!! Warning !!!\nAll logic is disabled in combat!";
 SMARTBUFF_OFTT_SMARTDEBUFF   = "Shows the SmartDebuff frame.";