diff --git a/public/.idea/workspace.xml b/public/.idea/workspace.xml
index 7388155..d6615d5 100755
--- a/public/.idea/workspace.xml
+++ b/public/.idea/workspace.xml
@@ -12,21 +12,57 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -34,8 +70,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -49,21 +94,29 @@
guyGirlfoxyhunter
+ mage
+ mech
+ scour
+ undeadd
+ north
-
+
-
+
@@ -140,24 +193,22 @@
1596911104125
-
+
+
+
-
+
-
+
-
-
+
-
-
-
-
+
@@ -165,34 +216,353 @@
-
+
+
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
diff --git a/public/ExpressYourElf.toc b/public/ExpressYourElf.toc
index 2cb9ab7..d6a7e15 100755
--- a/public/ExpressYourElf.toc
+++ b/public/ExpressYourElf.toc
@@ -1,7 +1,7 @@
-## Interface: 80300
+## Interface: 90200
## Title: Express Your Elf
## Version: @project-version@
-## Author: Darkrider - Talnivarr (EU)
+## Author: Darkrider, Talnivarr (EU)
## Notes: Express oneself in a more casual and fun way.
## SavedVariablesPerCharacter: ExpressYourElfIsShown
## X-Category: Fun, Communication, Miscellaneous
diff --git a/public/Features/DanceWithMe/DanceWithMe.lua b/public/Features/DanceWithMe/DanceWithMe.lua
index 012f320..3a2b965 100755
--- a/public/Features/DanceWithMe/DanceWithMe.lua
+++ b/public/Features/DanceWithMe/DanceWithMe.lua
@@ -15,9 +15,15 @@ ExpressYourElf.DanceWithMe.list = {
"Like a ${race}, raiding for the very first time",
"They're out to get you, there's demons closing in on every side. That this is thriller, thriller night!",
"What you gon' do with all that junk? All that junk inside that trunk? I'ma get, get, get, get, you drunk, Get you love drunk off my hump. My hump my hump my hump my hump my hump",
- "I just want to show you off to all of my ${race}s friends, make them drool on their chiny, chin, chins."
+ "I just want to show you off to all of my ${race}s friends, make them drool on their chiny, chin, chins.",
+ "Lack toes, intolerant. It sucks when you can't stand! Lack toes, intolerant. Anything, when you can't stand!",
+ "We don't like it on this chair. We dont like it on these stairs. We don't like it on her skirt. Mommy's hair drives daddy nuts. He even found it in his butt. But he gets sad when it gets cut. Where should her hair be instead? We like her hair up on her head.",
+ "No one knows I'm cool. They all think I'm a fool. Just because I drool. And I like my pocket pool.",
+ "Silithus gel, I think it's swell. It tastes just like chicken. And when you get sickened. It makes you feel well.",
+ "Poopy-di scoop. Scoop-diddy-whoop. Whoop-di-scoop-di-poop!"
}
+
ExpressYourElf.DanceWithMe.listWithTarget = {
'Are we ${race} or are we dancers.',
'${name}, dance with me baby!',
diff --git a/public/Features/Flirt/Flirt.lua b/public/Features/Flirt/Flirt.lua
index 1a2eae4..fd576b5 100755
--- a/public/Features/Flirt/Flirt.lua
+++ b/public/Features/Flirt/Flirt.lua
@@ -5,9 +5,9 @@ ExpressYourElf.Flirt = {}
function ExpressYourElf.Flirt.GetRandomPrefix()
local prefix = {
'${targetName}, ',
- 'Hey ${targetName} ',
+ 'Hey ${targetName}. ',
'Hey there ${targetName}! ',
- 'Hey ${targetName} baby! ',
+ 'Hey ${targetName}, baby! ',
'${targetName}, baby, ',
'${targetName}, honey, ',
'Hi ${targetName}, ',
@@ -40,20 +40,23 @@ function ExpressYourElf.Flirt.GetMessage(
'Was your father a rogue? ‘Cause someone stole the stars from the sky and put them in your eyes.',
'Anybody ever tell you I have beautiful eyes?',
'My name is ${playerName} - a ${playerManWoman} of the Universe. A popular ${targetGuyGirl} like you is going to need some wooing.',
- 'Enough about you, let`s talk about me, ${playerName}.',
+ 'Enough about you, let’s talk about me, ${playerName}.',
'I seem to have lost my Heartstone. Can I have yours?',
'They say the Darkmoon Faire is the happiest place on earth. Well apparently, no one has ever been standing next to you.',
'I’m not a blacksmith, but I can melt me and you together.',
'Is there an Flight master nearby or is it my heart taking off?',
'Do you play Heartstone? I can show you my deck.',
'That tabard looks great on you… as a matter of fact, so would I.',
- 'You’re so hot, you make the Tanaris look like the Northrend.',
+ 'You’re so hot, you make the Northrend look like Tanaris.',
'I must be in Medivh`s tower, because you are truly magical!',
'Your voice melt chocolates.',
- 'you`re so hot, my armor melts',
+ 'you’re so hot, my armor melts',
+ 'I would give myself an A+',
'Say baby. You`re pretty, I`m pretty, what say we go back to my place and stare at each other for a while.',
'If loving me is wrong, you don`t wanna be right!',
- 'How much does a Titanweigh? Enough to break the ice.'
+ 'How much does a Titan weigh? Enough to break the ice.',
+ 'You remind me of my uncle, we should get it on!',
+ 'I really like your eyebrows'
}
-- from
@@ -92,6 +95,10 @@ function ExpressYourElf.Flirt.GetMessage(
table.insert(flirtLines, "My armor is bending bending just by looking at you!")
end
+ if (playerRace == "Mechagnome") then
+ table.insert(flirtLines, "You know, I have over 200 Bionicles.")
+ end
+
if (playerClass == "Death Knight" or playerRace == "Mechagnome") then
table.insert(flirtLines, "Let's be ${playerManWoman} and ${targetManWoman} until decay makes us fall apart.")
end
@@ -124,7 +131,7 @@ function ExpressYourElf.Flirt.GetMessage(
end
if (playerRace == "Goblin" or playerRace == "Gnome" or playerRace == "Mechagnome") then
- table.insert(flirtLines, "Ride with me away. We doesn't have much time. My leggins are tight. So onto my love rocket, climb.")
+ table.insert(flirtLines, "Ride with me away. We doesn't have much time. My legging are tight. So onto my love rocket, climb.")
table.insert(flirtLines, "Fly away in my space rocket. You no need put money in my pocket.")
end
@@ -184,6 +191,7 @@ function ExpressYourElf.Flirt.GetMessage(
if (targetRace == "Scourge") then
table.insert(flirtLines, "Do you have a shovel? Because I’m digging you.")
+ table.insert(flirtLines, "Take me out tonight. Where there's music and there's people, and they're young and undead.")
end
if (targetClass == "Warrior" or targetClass == "Paladin" or targetClass == "Demon Hunter" or targetClass == "Death Knight") then
diff --git a/public/Features/GivePresent/GivePresent.lua b/public/Features/GivePresent/GivePresent.lua
index f2dd428..49a3f7f 100755
--- a/public/Features/GivePresent/GivePresent.lua
+++ b/public/Features/GivePresent/GivePresent.lua
@@ -20,17 +20,25 @@ targetHisHer
"gives ${targetName} a [Free Pen] with engravings: '${playerName} <3 ${targetName}'.",
'appreciates ${targetName} with a [Mars].',
'folds an [Orgimai Bird] for ${targetName}, how original!',
+ 'hands over a [Vial of luminol spray] to ${targetName}. Super handy, right?!',
"passes ${targetName} an [Autographed picture of Gul'Dan riding a Pony]. Now this is awkward!",
"gives a [Photoalbum] of pictures from ${playerName} and ${targetName}'s on it. How nice!",
+ "gives a [Book 'Crafting with Uther's remains'] to ${targetName}. Now that's a creative gift!",
+ "gives a [Bag of Earthworm Jerky'] to ${targetName}. Crunchy, yet sweet!",
"gives a [Box of chocolates] to ${targetName}. How sweet!",
- "hands ${targetName} a handwritten card with a personal message on it, saying: 'Thanks for the nuts, Balboa'. Wait a minute!, who is this BALBOA!?",
+ "passes on [Uranium ore] to ${targetName}. It was getting too hot in my pants anyways.",
+ "gives a set of [Elf ear shaped earbuds] to ${targetName}. Now that's listening in style!",
+ "gives a [Home Genetic Engineering Kit] to ${targetName}. How interesting!",
+ "hands ${targetName} a handwritten card with a personal message on it, saying: 'Thanks for all the nuts, Balboa'. Wait a minute!, who is this BALBOA!?",
"pulls a [Puppy] out of ${playerHisHer} pocket. Here, he never really liked me anyways!",
"gives a gift-wrapped [Tauren] to ${targetName}. How could've this Tauren be breathing in THERE! Wow!",
+ "gives a [Custom voodoo doll of Thrall] to ${targetName}. So you can finally get that windfury totem you've always wanted!",
"gives a [Snail Secretion Facial Mask] to ${targetName}. It's less slimey as it looks. REALLY!",
"gives a [Bycicle pizza-cutter] to ${targetName}. Everyone needs one of those!",
"gives a handy [Centaur Finger Puppet] to ${targetName}. You never know when they come in handy!",
"gives a set of [Finger Tentacles] to ${targetName}. It's not just Pandaren who uses them.",
- "gives an [Ant Filled Watch] to ${targetName}. They are so much more reliable than those sun dials found in Uldum."
+ "gives an [Ant Filled Watch] to ${targetName}. They are so much more reliable than those sun dials found in Uldum.",
+ "gives an [Staff with built in uranial] to ${targetName}. So handy during raiding!"
}
pickedGift = listOfGifts[math.random(1, #listOfGifts)]
diff --git a/public/Features/RandomPhrases/RandomPhrases.lua b/public/Features/RandomPhrases/RandomPhrases.lua
index 08ace2a..5bc8058 100755
--- a/public/Features/RandomPhrases/RandomPhrases.lua
+++ b/public/Features/RandomPhrases/RandomPhrases.lua
@@ -39,13 +39,16 @@ targetHisHer
"The world is not doing well and we're going great.",
"What if Trump was Warchief. He would build a great, great wall.",
"I think I am actually humble. I think I’m much more humble than you would understand.",
- "Everything is a mount, as long as you're brave enough.",
+ "Everything is a mount, as long as you’re brave enough.",
"Just an ordinary gas cloud. But watch out, because that's no ordinary gas cloud!",
"I’m intelligent. Some people would say I’m very, very, very intelligent.",
"I think the only difference between me and other guildies is that I'm more honest and my ${oppositeSex} are more beautiful.",
"I saved a big war. I saved a couple of them.",
- "He calls me Mr. ${playerRace}. I've known this guy forever. He used to call me, 'Hey, ${playerName}, let's go out to dinner.' You know, before, he'll go, 'Hey, let's go out to dinner.' Now he goes, 'Mr. ${playerRace}, ${playerSirMam}, how are you?'",
- 'No, no. But I don`t say -- I say flames, we`ll put out the flames. And we`ll put out in some cases just burning embers. We also have burning embers. We have embers and we do have flames. Mount Hyjal became more flame like, but it`s going to be under control.'
+ 'He calls me Mr. ${playerRace}. I’ve known this guy forever. He used to call me, "Hey, ${playerName}, let’s go out to dinner."s You know, before, he’ll go, "Hey, let’s go out to dinner." Now he goes, "Mr. ${playerRace}, ${playerSirMam}, how are you?"',
+ 'No, no. But I don`t say -- I say flames, we`ll put out the flames. And we`ll put out in some cases just burning embers. We also have burning embers. We have embers and we do have flames. Mount Hyjal became more flame like, but it`s going to be under control.',
+ 'We have it totally under control. It’s only one person coming in from The Maw. It’s going to be just fine.',
+ 'The burning legion will have much greater respect for our worlds when I am leading it than when their people have led it.',
+ 'Will someone from Sylvana’s regime please inform her that I too have a Nuclear Button, but it is a much bigger and more powerful one than hers, and my Button works!'
}
-- self
@@ -66,6 +69,10 @@ targetHisHer
table.insert(listOfPhrases, "I never understood Fel.")
end
+ if (playerClass == "Mage") then
+ table.insert(listOfPhrases, "I was elected to represent the citizens of Dalaran, not Gnomeregan")
+ end
+
if (playerClass == "Hunter" or playerClass == "Demon Hunter") then
table.insert(listOfPhrases, "But Hunter, where's Hunter? Where is Hunter, by the way?")
end
diff --git a/public/Main.xml b/public/Main.xml
index 439b582..6801aa1 100755
--- a/public/Main.xml
+++ b/public/Main.xml
@@ -2,19 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"
>
-
-
-
-
-
-
-