v2.0.0 - qa

adefee · Apr 19, 2019 · 7c2a521 · 7c2a521
1 parent ae82952
commit 7c2a521
Show file tree

Hide file tree

Showing 13 changed files with 2,473 additions and 2,027 deletions.
diff --git a/.vscode/numbered-bookmarks.json b/.vscode/numbered-bookmarks.json
@@ -4,7 +4,7 @@
 			"fsPath": "$ROOTPATH$\\Joker.lua",
 			"bookmarks": [
 				-1,
-				1727,
+				716,
 				-1,
 				-1,
 				-1,

diff --git a/Joker.lua b/Joker.lua
diff --git a/Joker.txt b/Joker.txt
@@ -2,8 +2,8 @@
 ## Description: Best enjoyed with Skooma, Joker offers a collection of various jokes, riddles, & other amusing pop-culture references both in and out of Tamriel.
 ## Author: Lent (IGN @CallMeLent, Github @adefee)
 
-## Version: 1.2.2
-## AddOnVersion: 102020
+## Version: 2.0.0
+## AddOnVersion: 200000
 ## APIVersion: 100026 100027
 
 ## This Add-On is not created by, affiliated with or sponsored by ZeniMax Media Inc. or its affiliates. 
@@ -13,12 +13,14 @@
 ## SavedVariables: JokerSavedVariables
 ## OptionalDependsOn: LibAddonMenu-2.0
 
+## Internationalization
 i18n\en.lua
 i18n\$(language).lua
 
 Bindings.xml
 Joker.xml
 
+## Lib Dependencies
 libs\LibStub\LibStub.lua
 libs\LibAddonMenu-2.0\LibAddonMenu-2.0.lua
 libs\LibAddonMenu-2.0\controls\panel.lua
@@ -36,5 +38,17 @@ libs\LibAddonMenu-2.0\controls\texture.lua
 libs\LibAddonMenu-2.0\controls\iconpicker.lua
 libs\LibAddonMenu-2.0\controls\divider.lua
 
+## Jokes
+jokes\CatFacts.lua
+jokes\Dad.lua
+jokes\Edgy.lua
+jokes\ESO.lua
+jokes\Norris.lua
+jokes\PickupLines.lua
+jokes\Wisdom.lua
+
+## Core
 Joker.lua
+
+## Addon Settings Window
 Settings.lua
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ A community addon for [Elder Scrolls Online](https://www.elderscrollsonline.com)
 
 ### [Download here](https://www.esoui.com/downloads/info2329-Joker-JokesandOtherLeisurelyTomfoo....html) (also available via Minion)
 
-#### Current Release: **v1.2.2** (102020)
+#### Current Release: **v2.0.0** (200000)
 
 > Best enjoyed with Skooma, Joker offers a collection of various jokes, riddles, & other amusing pop-culture references both in and out of Tamriel. 
 

diff --git a/Settings.lua b/Settings.lua
@@ -6,7 +6,7 @@ function Joker.LoadSettings()
         type = "panel",
         name = Joker.menuName,
         displayName = Joker.Colorize(Joker.menuName),
-        author = Joker.Colorize(Joker.author, "D66E4A"),
+        author = Joker.Colorize(Joker.author, "AA00FF"),
         version = Joker.Colorize(Joker.version, "AA00FF"),
         slashCommand = "/joker",
         registerForRefresh = true,
@@ -16,6 +16,12 @@ function Joker.LoadSettings()
 
     local optionsTable = {}
 
+    table.insert(optionsTable, {
+      type = "description",
+      text = "You've viewed " .. Joker.Colorize(Joker.formatNumber(Joker.savedVariables.CountSeenJokesTotal)) .. " of " .. Joker.Colorize(Joker.formatNumber(Joker.savedVariables.CountJokesTotal)) .. " loaded jokes, wisdom, fun facts, & more!",
+      width = "full",	--or "half" (optional)
+    })
+
     table.insert(optionsTable, {
       type = "header",
       name = ZO_HIGHLIGHT_TEXT:Colorize("Joker Options"),
@@ -25,58 +31,68 @@ function Joker.LoadSettings()
     -- General Info Note
     table.insert(optionsTable, {
       type = "description",
-      title = "GUI options soon! Version 1 includes the following slash (/) commands:",
-      text = "'/joker' shows this window!",
+      title = "GUI options soon! Version 2 includes the following slash (/) commands:",
+      width = "full",	--or "half" (optional)
+    })
+    table.insert(optionsTable, {
+      type = "description",
+      text = Joker.Colorize('/joker') .. " shows this window!",
+      width = "full",	--or "half" (optional)
+    })
+    table.insert(optionsTable, {
+      type = "description",
+      text = Joker.Colorize('/joke') .. " adds a random joke to your chatbox. Random pool does not include Edgy jokes or pickup lines",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke' adds a random joke to your chatbox. Random pool does not include Edgy jokes or pickup lines",
+      text = Joker.Colorize('/joke-eso') .. " adds a random ESO-related joke to your chatbox.",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke-eso' adds a random ESO-related joke to your chatbox.",
+      text = Joker.Colorize('/joke-dad or /dad') .. " adds a random Dad joke to your chatbox.",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke-dad' (or '/dad') adds a random Dad joke to your chatbox.",
+      text = Joker.Colorize('/joke-wisdom or /wisdom') .. " adds a random tidbit of wisdom (though sometimes a bit sarcastic) to your chatbox.",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke-wisdom' (or '/wisdom') adds a random tidbit of wisdom (though sometimes a bit sarcastic) to your chatbox.",
+      text = Joker.Colorize('/joke-edgy') .. " adds a random edgy/explicit joke to your chatbox (added by popular request!). Note that these jokes have been flagged as particularly inappropriate or explicit and likely are not suitable for all audiences. Please be considerate with your usage.",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke-edgy' adds a random edgy joke to your chatbox (added by popular request!). Note that these jokes have been flagged as particularly inappropriate or explicit and likely are not suitable for all audiences. Please be considerate with your usage.",
+      text = Joker.Colorize('/joke-norris or /norris') .. " adds a random Chuck Norris joke to your chatbox.",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/joke-norris' (or '/norris') adds a random Chuck Norris joke to your chatbox.",
+      text = Joker.Colorize('/norris me') .. " adds a random Norris joke to your chatbox, but replaces Chuck's name with your own!",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/norris me' adds a random joke to your chatbox featuring none other than you!, /n '/norris <target>' adds a random joke to your chatbox, using any text as the subject!",
+      text = Joker.Colorize('/norris <target>') .. " adds a random Norris joke to your chatbox, but replaces Chuck's name with your custom text!",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/norris <target>' adds a random joke to your chatbox, using any text as the subject!",
+      text = Joker.Colorize('/8ball <question>') .. ": Undecided? Get quality life advice from the magic 8ball! Asking the question is optional :)",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/8ball <question>': Undecided? Get quality life advice from the magic 8ball!",
+      text = Joker.Colorize('/catfact') .. ": Get a random Khaji--err, cat fact in your chatbox. Sometimes they're true!",
       width = "full",	--or "half" (optional)
     })
     table.insert(optionsTable, {
       type = "description",
-      text = "'/catfact': Get a random Khaji--err, cat fact in your chatbox. Sometimes they're true!",
+      title = "Show me jokes periodically? " .. Joker.Colorize(Joker.savedVariables.PeriodicJokes),
+      text = Joker.Colorize('/joke-auto') .. ": Joker can periodically post a joke to your chat window! Run this command to toggle on/off. Note: toggling takes immediate affect, but may require UI reload to update the status you see here.",
       width = "full",	--or "half" (optional)
     })
 
@@ -89,16 +105,16 @@ function Joker.LoadSettings()
     -- Requests Note
     table.insert(optionsTable, {
       type = "description",
-      title = "Want more jokes?",
+      title = Joker.Colorize("Want more jokes?"),
       text = "More fun-, pop-culture- and leisure-minded options (such as GoT jokes, popular memes, riddles, and more) are expected to be added in future releases. Bug reports, requests & suggestions are always enthusiastically welcomed! Whisper me ingame (NA @CallMeLent), or get in touch via esoui.com, Twitter (@adefee), or Github (@adefee).",
       width = "full",	--or "half" (optional)
     })
 
     -- Copyright Note
     table.insert(optionsTable, {
       type = "description",
-      title = "Sources, Copyrights, etc",
-      text = "The current version of this addon includes 545+ jokes! I want to emphasize that the jokes contained in this addon are (for the most part) not my own, but rather are originally sourced from various public internet sources. I claim no ownership of the content, and make no money from this addon or any content therein. If there are any copyright, trademark, DMCA, or other legal issues please reach out at me@andrewdefee.com and I'll comply as quickly and accurately as I can within the scope of US law. I'm just trying to share a few laughs - after all, what good is a joke if it's not shared?",
+      title = Joker.Colorize("Sources, Copyrights, etc"),
+      text = "I want to emphasize that the jokes contained in this addon are (for the most part) not my own, but rather are originally sourced from various public internet sources. I claim no ownership of the content, and make no profit from this addon or any content therein. If there are any copyright, trademark, DMCA, or other legal issues please reach out at me@andrewdefee.com and I'll comply as quickly and accurately as I can within the scope of US law. I'm just trying to share a few laughs - after all, what good is a joke if it's not shared?",
       width = "full",	--or "half" (optional)
     })