Skip to content

Commit

Permalink
Update to WoW ver 10.1
Browse files Browse the repository at this point in the history
Added new critters. Fixed bug pull error when loading
  • Loading branch information
Acidfrost59 committed Jul 10, 2023
1 parent e44b7e1 commit b42d473
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# BPCritterEmote

Version 1.10.10.07
Update to WOW version 10.1
fixed issue with loading events so only CritterEmote is mod.
Added new pets

Version 1.10.05.05
Unable to get .pkgmeta to play well with Curseforge. Removed to get uploaded to Curseforge.

Expand Down
15 changes: 8 additions & 7 deletions CritterEmote.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--Critter Emote

--Revision 1.10.05.04 (naming convention X=orig.X=WOW Xpac.XX=WoW xpac sub.XX=update revision)
--WOW version 10.0.5
--Revision 1.10.10.07 (naming convention X=orig.X=WOW Xpac.XX=WoW xpac sub.XX=update revision)
--WOW version 10.1


local CritterEmote_Cats = {
Expand All @@ -22,7 +22,7 @@ local CritterEmote_Tooltip = nil ;
local CritterEmote_enable = true;
local CritterEmote_randomEnable = true;
local CritterEmote_forceEmote = false;
local CritterEmote_version = "1.10.05.04";
local CritterEmote_version = "1.10.10.07";
local is5_0 = select(4, GetBuildInfo()) < 50100
local _G = _G
local C_PetJournal = _G.C_PetJournal
Expand Down Expand Up @@ -591,13 +591,14 @@ end
--This function returns real events
--This can be a way for pets to interact with the world more.
--TODO
--revised arg2 through arg5 with tostring so only CritterEmote is referenced. Was pulling other mods into arg1.
function CritterEmote_OnEvent(self, event, arg1, arg2, arg3, arg4, arg5, ...)
CritterEmote_printDebug("On Event Tripped with event : " .. event);
if(arg1) then CritterEmote_printDebug("\targ1 : " .. arg1) end;
if(arg2) then CritterEmote_printDebug("\targ2 : " .. arg2) end;
if(arg3) then CritterEmote_printDebug("\targ3 : " .. arg3) end;
if(arg4) then CritterEmote_printDebug("\targ4 : " .. arg4) end;
if(arg5) then CritterEmote_printDebug("\targ5 : " .. arg5) end;
if(arg2) then CritterEmote_printDebug("\targ2 : " .. tostring(arg2)) end;
if(arg3) then CritterEmote_printDebug("\targ3 : " .. tostring(arg3)) end;
if(arg4) then CritterEmote_printDebug("\targ4 : " .. tostring(arg4)) end;
if(arg5) then CritterEmote_printDebug("\targ5 : " .. tostring(arg5)) end;
if event == "ADDON_LOADED" then
CritterEmote_AddonLoaded();
end
Expand Down
8 changes: 4 additions & 4 deletions CritterEmote.toc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Interface: 100005
## Interface: 100100
## Title: Critter Emotes
## Author: Previous: Zompter, seegeen00 (Chinchilla Critter Emotes) Current: Acidfrost59 and Fysker
## Version: 1.10.05.04
## Author: Previous: Zompter, seegeen00 (Chinchilla Critter Emotes) Current: Acidfrost59 and Fysker
## Version: 1.10.10.07
## email: [email protected]
## Notes: Allows your non-combat pets to send random emotes to chat.
## Notes: Allows your non-combat companion pets to send random emotes to chat.
## SavedVariablesPerCharacter: CE_Save_Table
## LoadOnDemand: 0
## DefaultState: Enabled
Expand Down
5 changes: 1 addition & 4 deletions CritterEmote.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\..\FrameXML\UI.xsd">
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
<Script File="CritterEmote.lua"/>
<Frame name="CritterEmoteFrame">
<Scripts>
Expand Down
17 changes: 10 additions & 7 deletions CritterEmote_Emotes.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
--Critter Emote

--Revision 1.10.05.04 WOW version 10.0.5
--Revision 1.10.10.07 WOW version 10.1

--Some important Emote tables
---Random
---Target

--Organized via
---Emote,default/Category/PetName,emotes

CritterEmote_ResponseDb = {
ABSENT = {
default = { "blinks at you.", },
Expand All @@ -21,7 +22,7 @@ ABSENT = {
chicken = { "pecks at your feet.", },
["Deathy"] = { "starts a little fire.", },
["Lil' Deathwing"] = { "starts a little fire.", },
["Lil' K.T."] = { "is used to dealing with absent minded zombies.", }
["Lil' K.T."] = { "is used to dealing with absent minded zombies.", },
},
AGREE = {
default = { "nods.", },
Expand Down Expand Up @@ -238,9 +239,7 @@ BOUNCE = {
["Lil' K.T."] = { "doesn't like this foolishness.", },
},
BOW = {
default = {
"bows at you.",
},
default = {"bows at you.", },
["Deathy"] = { "praises you for acknowledging %t's superiority.", },
["Gregarious Grell"] = { "looks at you in confusion.", },
["Lil' Deathwing"] = { "praises you for acknowledging %t's superiority.", },
Expand Down Expand Up @@ -308,7 +307,7 @@ BYE = {
mech = {
"shuts down.",
},
["Gregarious Grell"] = { "says, \"You know, we've had a lot of fun together, it's been really special, but I think it's time I should start seeing other masters. Just a little on the side. No no no it's not you, it's not you, it's me. I just need my space.\"", },
["Gregarious Grell"] = { "says, \"You know, we've had a lot of fun together, it's been really special, but I think it's time I should start seeing other masters. Just a little on the side. No, no, no, it's not you, it's not you, it's me. I just need my space.\"", },
},
CACKLE = {
default = {
Expand All @@ -318,7 +317,7 @@ CACKLE = {
"rawrs maniacally with you.",
},
reptile = {
"hisses manically with you.",
"hisses maniacally with you.",
},
},
CALM = {
Expand Down Expand Up @@ -1871,6 +1870,7 @@ Random = {
"loves archaeology.",
"loves the Feast of Winter Veil.",
"loves Brewfest.",
"loves Hallow's End.",
"wants a drink.",
"waves at everybody.",
"puzzles over your outfit.",
Expand Down Expand Up @@ -1946,6 +1946,7 @@ Random = {
"thinks, therefore is.",
"ama il formaggio.",
"wants to find true love.",
"perks head up to listen to the conversation as it helps to stay current on world affairs.",
},
default_Locations = {
"wants to explore all of Azeroth.",
Expand Down Expand Up @@ -2074,6 +2075,8 @@ Random = {
"is amazed that we can enter The Shadowlands. ",
"would like to see The Arbiter in Oribos",
"finds The Jailer in The Maw distasteful",
"wonders how the dracthyr were frozen in time.",
"flies with dragons on the Dragon Isles.",

},
default_Silly = {
Expand Down

0 comments on commit b42d473

Please sign in to comment.