Skip to content

Commit

Permalink
Many French and German translations
Browse files Browse the repository at this point in the history
Localization files are now loaded first
Finished Auto craft and Mimic Stone toggles
Toggle button position and size of window are now saved
Some additional strings now use strings in the translation files rather than hardcoded strings
Interaction buttons are now nicely anchored. The craft button will only show up if auto craft is off and only at a crafting station
Backdrop moved behind divider
Unused TopLevelControl 'DolgubonSetCrafterConfirm' removed, as there is now the Craft button
Added a tooltip for mimic stone usage
Feedback no longer checks the server before showing the gold buttons. However, any gold received on EU server will be passed along to other addon authors.
Added Ring and necklace texture files
Added packaging script files
  • Loading branch information
Dolgubon committed May 20, 2018
1 parent 68fcd4f commit ca258a2
Show file tree
Hide file tree
Showing 20 changed files with 321 additions and 126 deletions.
13 changes: 7 additions & 6 deletions ConstantSetup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,16 @@ end
table.remove(DolgubonSetCrafter.setIndexes,1)

table.sort(DolgubonSetCrafter.setIndexes, function(a,b) return a[2]<b[2] end)
table.insert(DolgubonSetCrafter.setIndexes,1, {[1] = 1, [2] = "No Set"})
table.insert(DolgubonSetCrafter.setIndexes,1, {[1] = 1, [2] = DolgubonSetCrafter.localizedStrings.UIStrings.noSet})

--[[ TODO:
1 make the toggle button moveable
1 make the toggle button moveable - Check
2. make a control container for the left side of stuff - Check
3. Add craft now button
4. Add crown mimic stone toggle
5. Reticle colouring
6. Add new amount of item to the valuable reward text
3. Add craft now button - Check
4. Add crown mimic stone toggle - Check
5. Reticle colouring - Check
6. Add new amount of item to the valuable reward text - Check
7. Resizing - Check
8. Save Window Size - Check
--]]
8 changes: 4 additions & 4 deletions DolgubonsLazySetCrafter.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ libs\LibAddonMenu-2.0\controls\slider.lua
libs\LibAddonMenu-2.0\controls\texture.lua
libs\LibAddonMenu-2.0\controls\divider.lua

; Load the UI elements
Templates.xml
SetCrafterXMLUI.xml

; Localization files - Default (en) first
Lang/en.lua
Lang/$(language).lua

; Load the UI elements
Templates.xml
SetCrafterXMLUI.xml

; Load all the styles, traits, qualities, etc.
ConstantSetup.lua

Expand Down
27 changes: 18 additions & 9 deletions Lang/de.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ DolgubonSetCrafter.localizedStrings.UIStrings.level = GetString(SI
DolgubonSetCrafter.localizedStrings.UIStrings.CP = "CP"
DolgubonSetCrafter.localizedStrings.UIStrings.armourTrait = "|t100%:100%:EsoUI/Art/Inventory/inventory_tabIcon_armor_up.dds|tEigenschaft"
DolgubonSetCrafter.localizedStrings.UIStrings.weaponTrait = "|t100%:100%:DolgubonsLazySetCrafter/images/patterns/greatsword_up.dds|tEigenschaft"
DolgubonSetCrafter.localizedStrings.UIStrings.jewelryTrait = "Schmuck Eigenschaft"
DolgubonSetCrafter.localizedStrings.UIStrings.quality = "Qualität"
DolgubonSetCrafter.localizedStrings.UIStrings.gearSet = "Set"
DolgubonSetCrafter.localizedStrings.UIStrings.addToQueue = "|c26CD00Auswahl → Warteschlange|r"
Expand All @@ -28,19 +29,24 @@ DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughSpecificMat= "Du besitzt
DolgubonSetCrafter.localizedStrings.UIStrings.invalidLevel = "Ungültiges Level"
DolgubonSetCrafter.localizedStrings.UIStrings.multiplier = "Anzahl"
DolgubonSetCrafter.localizedStrings.UIStrings.autoCraft = "Automatische Herstellung"
DolgubonSetCrafter.localizedStrings.UIStrings.craftStart = "Herstellung beginnen"
DolgubonSetCrafter.localizedStrings.UIStrings.mimicStones = "Mimensteine benutzen"
DolgubonSetCrafter.localizedStrings.UIStrings.craftStart = "Herstellung Beginnen"
DolgubonSetCrafter.localizedStrings.UIStrings.mimicStones = "Mimenstein benutzen"
DolgubonSetCrafter.localizedStrings.UIStrings.materialScrollTitle ="Materialvoraussetzungen"
DolgubonSetCrafter.localizedStrings.UIStrings.mailRequirements ="Voraussetzungen per Mail"
DolgubonSetCrafter.localizedStrings.UIStrings.chatRequirements ="In Chat einfügen"
DolgubonSetCrafter.localizedStrings.UIStrings.defaultUserId ="@UserId eingeben"

DolgubonSetCrafter.localizedStrings.SettingStrings = DolgubonSetCrafter.localizedStrings.SettingStrings or {}
DolgubonSetCrafter.localizedStrings.SettingsStrings = DolgubonSetCrafter.localizedStrings.SettingsStrings or {}

DolgubonSetCrafter.localizedStrings.SettingsStrings.nowEditing = "Du änderst %s Einstellungen"
DolgubonSetCrafter.localizedStrings.SettingsStrings.accountWide = "Gesamtes Konto"
DolgubonSetCrafter.localizedStrings.SettingsStrings.characterSpecific = "Charakter spezifisch"

DolgubonSetCrafter.localizedStrings.SettingStrings.showAtStation = "Bei Handwerkstation anzeigen"
DolgubonSetCrafter.localizedStrings.SettingStrings.showAtStationTooltip = "Zeigt das Set Crafter Fenster beim Öffnen einer Handwerkstation automatisch an"
DolgubonSetCrafter.localizedStrings.SettingStrings.saveLastChoice = "Auswahl sichern"
DolgubonSetCrafter.localizedStrings.SettingStrings.saveLastChoiceTooltip = "Sichert die zuletzt gewählte Auswahl"
DolgubonSetCrafter.localizedStrings.SettingsStrings.showAtStation = "Bei Handwerkstation anzeigen"

DolgubonSetCrafter.localizedStrings.SettingsStrings.showAtStationTooltip = "Zeigt das Set Crafter Fenster beim Öffnen einer Handwerkstation automatisch an"
DolgubonSetCrafter.localizedStrings.SettingsStrings.saveLastChoice = "Auswahl sichern"
DolgubonSetCrafter.localizedStrings.SettingsStrings.saveLastChoiceTooltip = "Sichert die zuletzt gewählte Auswahl"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExit = "Schließen beim Verlassen"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExitTooltip = "Schließt die Set Crafter Benutzeroberfläche, wenn eine Handwerksstation verlassen wird"
DolgubonSetCrafter.localizedStrings.SettingsStrings.useCharacterSettings = "Nutze Charakter Einstellungen"
Expand All @@ -53,6 +59,10 @@ DolgubonSetCrafter.localizedStrings.weaponNames =
{
"Axt", "Keule", "Schwert", "Streitaxt", "Streitkolben", "Bidenhänder", "Dolch", "Bogen", "Flammenstab", "Froststab", "Blitzstab", "Heilungsstab", "Schild"
}
DolgubonSetCrafter.localizedStrings.jewelryNames =
{
"Ring" , "Halskette",
}
DolgubonSetCrafter.localizedStrings.pieceNames =
{
"Torso","Füße","Hände","Kopf","Beine","Schultern","Taille","Hemd"
Expand All @@ -63,5 +73,4 @@ DolgubonSetCrafter.localizedStrings.armourTypes =
}


ZO_CreateStringId("SI_BINDING_NAME_SET_CRAFTER_OPEN", "Öffne/Schließe Set Crafter Fenster")
DolgubonSetCrafterWindowAdd:SetDimensions(230,28)
ZO_CreateStringId("SI_BINDING_NAME_SET_CRAFTER_OPEN", "Öffne/Schließe Set Crafter Fenster")
5 changes: 5 additions & 0 deletions Lang/en.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ DolgubonSetCrafter.localizedStrings.UIStrings.autoCraft = "Auto Craft"
DolgubonSetCrafter.localizedStrings.UIStrings.mimicStones = "Use Mimic Stones"
DolgubonSetCrafter.localizedStrings.UIStrings.craftStart = "Start Crafting"
DolgubonSetCrafter.localizedStrings.UIStrings.materialScrollTitle = "Material Requirements"
DolgubonSetCrafter.localizedStrings.UIStrings.mailRequirements = "Mail Requirements"
DolgubonSetCrafter.localizedStrings.UIStrings.chatRequirements = "Requirements to Chat"
DolgubonSetCrafter.localizedStrings.UIStrings.defaultUserId = "Enter @UserId"
DolgubonSetCrafter.localizedStrings.UIStrings.noSet = "No Set"
DolgubonSetCrafter.localizedStrings.UIStrings.usesMimicStone = "This item will be made using a Mimic Stone"


DolgubonSetCrafter.localizedStrings.SettingsStrings = {}
Expand Down
44 changes: 23 additions & 21 deletions Lang/fr.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,40 @@ DolgubonSetCrafter.localizedStrings.UIStrings.level = "Niveau"
DolgubonSetCrafter.localizedStrings.UIStrings.CP = "CP"
DolgubonSetCrafter.localizedStrings.UIStrings.armourTrait = "Armures Trait"
DolgubonSetCrafter.localizedStrings.UIStrings.weaponTrait = "Armes Trait"
DolgubonSetCrafter.localizedStrings.UIStrings.genericTrait = "Traits"
DolgubonSetCrafter.localizedStrings.UIStrings.jewelryTrait = "Joaillerie Trait"
DolgubonSetCrafter.localizedStrings.UIStrings.quality = "Qualite"
DolgubonSetCrafter.localizedStrings.UIStrings.gearSet = "Ensemble"
DolgubonSetCrafter.localizedStrings.UIStrings.addToQueue = "Ajouter a la Liste"
DolgubonSetCrafter.localizedStrings.UIStrings.queueHeader = "File D'attente D'artisanat"
DolgubonSetCrafter.localizedStrings.UIStrings.clearQueue = "Effacer la Liste"
DolgubonSetCrafter.localizedStrings.UIStrings.resetToDefault = "Effacer Selections"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughKnowledge = "You do not have enough knowledge for this attribute"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughMats = "You do not have enough materials to make this attribute"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughSpecificMat= "You do not have enough of this material to craft all items"
DolgubonSetCrafter.localizedStrings.UIStrings.invalidLevel = "Invalid Level"
DolgubonSetCrafter.localizedStrings.UIStrings.multiplier = "Multiplier"
DolgubonSetCrafter.localizedStrings.UIStrings.autoCraft = "Auto Craft"
DolgubonSetCrafter.localizedStrings.UIStrings.mimicStones = "Use Mimic Stones"
DolgubonSetCrafter.localizedStrings.UIStrings.craftStart = "Start Crafting"
DolgubonSetCrafter.localizedStrings.UIStrings.materialScrollTitle = "Material Requirements"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughKnowledge = "Vous n'avez pas assez de connaissance pour fabriquer cet attribut"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughMats = "Vous n'avez pas les matériaux requis pour fabriquer cet attribut"
DolgubonSetCrafter.localizedStrings.UIStrings.notEnoughSpecificMat= "Vous n'avez pas assez de matériaux pour fabriquer touts les items requis"
DolgubonSetCrafter.localizedStrings.UIStrings.invalidLevel = "Niveau Invalide"
DolgubonSetCrafter.localizedStrings.UIStrings.multiplier = "Multiplicateur"
DolgubonSetCrafter.localizedStrings.UIStrings.autoCraft = "Fabrication Automatique"
DolgubonSetCrafter.localizedStrings.UIStrings.mimicStones = "Utiliser les Pierre Cameleon"
DolgubonSetCrafter.localizedStrings.UIStrings.craftStart = "Débuter la fabrication"
DolgubonSetCrafter.localizedStrings.UIStrings.materialScrollTitle = "Materiaux Requis"

DolgubonSetCrafter.localizedStrings.SettingStrings = DolgubonSetCrafter.localizedStrings.SettingStrings or {}

DolgubonSetCrafter.localizedStrings.SettingsStrings.nowEditing = "You are changing %s settings"
DolgubonSetCrafter.localizedStrings.SettingsStrings.accountWide = "Account Wide"
DolgubonSetCrafter.localizedStrings.SettingsStrings.characterSpecific = "Character Specific"
DolgubonSetCrafter.localizedStrings.SettingsStrings = DolgubonSetCrafter.localizedStrings.SettingsStrings or {}

DolgubonSetCrafter.localizedStrings.SettingStrings.showAtStation = "Show at Station"
DolgubonSetCrafter.localizedStrings.SettingStrings.showAtStationTooltip = "Always show the Set Crafter UI at crafting stations"
DolgubonSetCrafter.localizedStrings.SettingStrings.saveLastChoice = "Save Choices"
DolgubonSetCrafter.localizedStrings.SettingStrings.saveLastChoiceTooltip = "Save the last selected choices"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExit = "Close on Station Exit"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExitTooltip = "Close the Set Crafter UI when exiting a crafting station"
DolgubonSetCrafter.localizedStrings.SettingsStrings.useCharacterSettings = "Use character settings"
DolgubonSetCrafter.localizedStrings.SettingsStrings.useCharacterSettingsTooltip = "Use character specific settings on this character only"
DolgubonSetCrafter.localizedStrings.SettingsStrings.nowEditing = "Vous modifier le réglage de %s"
DolgubonSetCrafter.localizedStrings.SettingsStrings.accountWide = "Configuration Globale"
DolgubonSetCrafter.localizedStrings.SettingsStrings.characterSpecific = " Configuration Specifique par personnage"


DolgubonSetCrafter.localizedStrings.SettingsStrings.showAtStation = "Rendre Visible aux stations"
DolgubonSetCrafter.localizedStrings.SettingsStrings.showAtStationTooltip = "Toujours voir le UI de Création aux stations de fabrication"
DolgubonSetCrafter.localizedStrings.SettingsStrings.saveLastChoice = "Sauvegarder vos choix"
DolgubonSetCrafter.localizedStrings.SettingsStrings.saveLastChoiceTooltip = "Sauvegarder votre dernier choix"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExit = "Fermer en quittant la station"
DolgubonSetCrafter.localizedStrings.SettingsStrings.closeOnExitTooltip = "Fermet le UI de création the en quittant une station"
DolgubonSetCrafter.localizedStrings.SettingsStrings.useCharacterSettings = "Utilliser les paramètres du personnage"
DolgubonSetCrafter.localizedStrings.SettingsStrings.useCharacterSettingsTooltip = "Utilliser les paramètres spécifique du personnage actuel seulement"


DolgubonSetCrafter.localizedStrings.weaponNames =
Expand Down
14 changes: 13 additions & 1 deletion Libs/LibLazyCrafting/LibLazyCrafting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ end

-- Initialize libraries
local libLoaded
local LIB_NAME, VERSION = "LibLazyCrafting", 2.0
local LIB_NAME, VERSION = "LibLazyCrafting", 2.1
local LibLazyCrafting, oldminor = LibStub:NewLibrary(LIB_NAME, VERSION)
if not LibLazyCrafting then return end
local LLC = LibLazyCrafting
Expand Down Expand Up @@ -370,6 +370,7 @@ end
LibLazyCrafting.findEarliestRequest = findEarliestRequest

local function LLC_CraftAllItems(self)
if GetCraftingInteractionType() == 0 then return end
for i = 1, #craftingQueue[self.addonName] do
for j = 1, #craftingQueue[self.addonName][i] do
craftingQueue[self.addonName][i][j]["craftNow"] = true
Expand All @@ -378,6 +379,7 @@ local function LLC_CraftAllItems(self)
end

local function LLC_CraftItem(self, station, position)
if GetCraftingInteractionType() == 0 then return end
if position == nil then
for i = 1, #craftingQueue[self.addonName][station] do
craftingQueue[self.addonName][station][i]["craftNow"] = true
Expand Down Expand Up @@ -454,6 +456,16 @@ local function LLC_SetAllAutoCraft(self, newAutoCraftSetting)
end
end

local function LLC_SetAutoCraft(self, station, position)
if position == nil then
for i = 1, #craftingQueue[self.addonName][station] do
craftingQueue[self.addonName][station][i]["autocraft"] = true
end
else
craftingQueue[self.addonName][station][position]["autocraft"] = true
end
end

LibLazyCrafting.functionTable.SetAllAutoCraft = LLC_SetAllAutoCraft

LibLazyCrafting.functionTable.cancelItemByReference = LLC_CancelItemByReference
Expand Down
2 changes: 1 addition & 1 deletion Libs/LibLazyCrafting/Smithing.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
local LibLazyCrafting = LibStub("LibLazyCrafting")

local widgetType = 'smithing'
local widgetVersion = 2.1
local widgetVersion = 2.2
if not LibLazyCrafting:RegisterWidget(widgetType, widgetVersion) then return end

local function dbug(...)
Expand Down
12 changes: 10 additions & 2 deletions SetCrafter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ DolgubonSetCrafter.default = {
["accountWideProfile"] = DolgubonSetCrafter.defaultCharacter,
["notifyWiped"] = true,
['autoCraft'] = true,
['toggleXPos'] = 50,
['toggleYPost'] = 50,
['width'] = 1050,
['height'] = 650,
}


Expand Down Expand Up @@ -110,7 +114,7 @@ local function closeWindow (optionalOverride)
if optionalOverride==nil then optionalOverride = not DolgubonSetCrafterWindow:IsHidden() end
DolgubonSetCrafterWindow:SetHidden(optionalOverride)
CraftingQueueScroll:SetHidden(optionalOverride)
DolgubonSetCrafterConfirm:SetHidden(true)

end

DolgubonSetCrafter.close = closeWindow
Expand All @@ -128,7 +132,10 @@ end

EVENT_MANAGER:RegisterForEvent(DolgubonSetCrafter.name, EVENT_CRAFTING_STATION_INTERACT,
function(event, station)
if station <3 or station >5 then
if station <3 or station >5 then
if not DolgubonSetCrafter:GetAutocraft() then
DolgubonSetCrafter.toggleCraftButton(true)
end
if DolgubonSetCrafter:GetSettings().OpenAtCraftStation then
closeWindow(false)
else
Expand All @@ -140,6 +147,7 @@ EVENT_MANAGER:RegisterForEvent(DolgubonSetCrafter.name, EVENT_CRAFTING_STATION_I
EVENT_MANAGER:RegisterForEvent(DolgubonSetCrafter.name, EVENT_END_CRAFTING_STATION_INTERACT,
function(event, station)
if (station <3 or station >5) then
DolgubonSetCrafter.toggleCraftButton(false)
if DolgubonSetCrafter:GetSettings().closeOnExit then closeWindow(true)
end
if not DolgubonSetCrafter:GetSettings().showToggle then
Expand Down
Loading

0 comments on commit ca258a2

Please sign in to comment.