Skip to content

Commit 1df0383

Browse files
committed
[4.4.2] Add Currency: Obsidian Fragment
And Change Fissure Stone to Obsidian on Update Update Github Action - Wow Packager Update Package Meta
1 parent 817be44 commit 1df0383

File tree

9 files changed

+28
-17
lines changed

9 files changed

+28
-17
lines changed

.github/workflows/release.yml

+7-11
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,24 @@ on:
55
# Package only when release version pushed
66
tags:
77
- '**'
8-
- '!**[a-z]+'
8+
- '!**[ab]+'
99

1010
jobs:
1111
release:
12-
runs-on: ubuntu-latest
12+
# runs-on: ubuntu-latest
13+
# ubuntu-24.04 has packager svn issue
14+
runs-on: ubuntu-22.04
1315

1416
env:
1517
CF_API_KEY: ${{ secrets.CF_API_KEY }}
16-
# WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
17-
# WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
1818
GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
1919

2020
steps:
21-
# we first have to clone the AddOn project, this is a required step
2221
- name: Clone project
23-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2423
with:
2524
fetch-depth: 0 # gets git history for changelogs
26-
27-
# another example where we supply additional arguments, this example is specifically to release
28-
# for the Burning Crusade Classic version of the game and doesn't upload to WoWInterface
29-
- name: Package and release for WotLK
30-
uses: BigWigsMods/packager@v2
25+
- name: WoW Packager
26+
uses: BigWigsMods/[email protected]
3127
with:
3228
args: -g cata -p 357612 -n "{package-name}-{project-version}"

Core.lua

+11-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function SavedClassic:OnInitialize()
168168
elseif self.db.global.version < "4.4.0.7" then
169169
p(L["Reset due to update"](self.db.global.version, self.version))
170170
self:ResetWholeDB()
171-
else
171+
elseif self.db.global.version < "4.4.1.3" then
172172
for _, saved in pairs(self.db.realm) do
173173
for id, currency in pairs(saved.currencyCount or {}) do
174174
currency.quantity = tonumber(currency.quantity or currency.total)
@@ -184,6 +184,15 @@ function SavedClassic:OnInitialize()
184184
end
185185
end
186186
end
187+
if self.db.global.version < "4.4.2.1" then
188+
-- Protocol Inferno(Fissure Stone) -> Protocol Twilight(Obsidian Fragment)
189+
for _, saved in pairs(self.db.realm) do
190+
saved.info1_1 = saved.info1_1:gsub(L["FS"], L["OF"])
191+
saved.info1_2 = saved.info1_2:gsub(L["FS"], L["OF"])
192+
saved.info2_1 = saved.info2_1:gsub(L["FS"], L["OF"])
193+
saved.info2_2 = saved.info2_2:gsub(L["FS"], L["OF"])
194+
end
195+
end
187196

188197
self.db.global.version = self.version
189198

@@ -306,7 +315,7 @@ function SavedClassic:InitPlayerDB()
306315
playerdb.info1_1 = format("\n[%s/00ff00]■[%s] [[%s]] [%s] [%s/ffffff]([%s]: [%s])[%s]",
307316
L["color"], L["color"], L["name"], L["ilvl"], L["color"], L["zone"], L["subzone"], L["color"])
308317
playerdb.info2_1 = format(" [%s/ffffff][%s:%s] [%s:%s] [%s:%s] [%s:%s] [%s:%s][%s]",
309-
L["color"], L["currency"], L["VP"], L["currency"], L["JP"], L["currency"], L["conquest"], L["currency"], L["honor"], L["currency"], L["FS"], L["color"])
318+
L["color"], L["currency"], L["VP"], L["currency"], L["JP"], L["currency"], L["conquest"], L["currency"], L["honor"], L["currency"], L["OF"], L["color"])
310319
playerdb.info2_2 = format("[%s/ffffff][%s]/[%s][%s]", L["color"], L["dqCom"], L["dqMax"], L["color"])
311320
end
312321

Data.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ local addonName, _ = ...
33
SavedClassic = LibStub("AceAddon-3.0"):NewAddon(addonName, "AceEvent-3.0")
44
SavedClassic.name = addonName
55
--SavedClassic.version = GetAddOnMetadata(addonName, "Version")
6-
SavedClassic.version = "4.4.1.3"
6+
SavedClassic.version = "4.4.2.1"
77

88
local L = LibStub("AceLocale-3.0"):GetLocale(addonName, true)
99

@@ -39,6 +39,7 @@ SavedClassic.currencies = {
3939
[614] = { altName = L["MOD" ] }, -- 4.3.4 Cataclysm Mote of Darkness
4040
[615] = { altName = L["EOC" ] }, -- 4.3.4 Cataclysm Essence of Corrupted Deathwing
4141
[3148]= { altName = L["FS" ] }, -- 4.4.1 Cataclysm Elemental Rune Dungeon - Protocol Inferno
42+
[3281]= { altName = L["OF" ] }, -- 4.4.2 Cataclysm Elemental Rune Dungeon - Protocol Twilight
4243
[416] = { altName = L["MOW" ] }, -- 4.3.4 Cataclysm Mark of the World Tree
4344
[361] = { altName = L["jewel" ] }, -- 4.0.1 Cataclysm Illustrious Jewelcrafter's Token
4445
[402] = { altName = L["cook" ] }, -- 4.3.4 Misc. Chef's Award
@@ -49,7 +50,7 @@ SavedClassic.currencies = {
4950
396,395, -- [Valor], Justice
5051
390,1901, -- [Conquest], Honor
5152
614,615, -- Raid Rewards
52-
3148, -- Elemental Rune Dungeon
53+
3281,3148, -- Elemental Rune Dungeon
5354
416, -- Daily Quest
5455
361,402, -- Jewelcraft, Cooking
5556
391, -- Tol Barad

Locale/enUS.lua

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ L["DPT" ] = true
9696
L["MOD" ] = true
9797
L["EOC" ] = true
9898
L["FS" ] = true
99+
L["OF" ] = true
99100
-- Usage
100101
L["Usage_Character"] = {
101102
{ "|cff00ff00■|r |cffccaa00Keywords for Character info|r" },

Locale/koKR.lua

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ L["DPT" ] = "다크문"
9696
L["MOD" ] = "티끌"
9797
L["EOC" ] = "정수"
9898
L["FS" ] = "균열석"
99+
L["OF" ] = "흑요석"
99100
-- Usage
100101
L["Usage_Character"] = {
101102
{ "|cff00ff00■|r |cffccaa00캐릭터별 정보 키워드|r" },

Locale/ruRU.lua

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ L["DPT" ] = true
9696
L["MOD" ] = true
9797
L["EOC" ] = true
9898
L["FS" ] = true
99+
L["OF" ] = true
99100
-- Usage
100101
L["Usage_Character"] = {
101102
{ "|cff00ff00■|r |cffccaa00Использование - Информация о персонаже|r" },

Locale/zhCN.lua

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ L["DPT" ] = true
9696
L["MOD" ] = true
9797
L["EOC" ] = true
9898
L["FS" ] = true
99+
L["OF" ] = true
99100
-- Usage
100101
L["Usage_Character"] = {
101102
{ "|cff00ff00■|r |cffccaa00使用方法 - 角色信息|r" },

Locale/zhTW.lua

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ L["DPT" ] = true
9696
L["MOD" ] = true
9797
L["EOC" ] = true
9898
L["FS" ] = true
99+
L["OF" ] = true
99100
-- Usage
100101
L["Usage_Character"] = {
101102
{ "|cff00ff00■|r |cffccaa00使用方法 - 角色信息|r" },

SavedClassic.toc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## Interface: 40401
1+
## Interface: 40402
22
## Title: Saved! Classic
3-
## Version: 4.4.1.3
3+
## Version: 4.4.2.1
44
## X-Curse-Project-ID: 357612
55

66
## Notes-koKR: 인스턴스 귀속 정보 및 골드, 경험치 한눈에 보기

0 commit comments

Comments
 (0)