Skip to content
This repository has been archived by the owner on Oct 25, 2019. It is now read-only.

Commit

Permalink
Remaining formatting issues (#14)
Browse files Browse the repository at this point in the history
* remove UTF8 byte order mark

All other files are saved as UTF8 without BOM. The BOM causes issues
with luaformatter.

* Add Makefile for formatting

Run make format to format all files in the project before pushing. Libs/
folder is excluded.

* doc/bossTemplate: Fix syntax error

* bossTemplate: formatting
  • Loading branch information
birdayz authored and Hosq committed Jun 25, 2017
1 parent c19cbc5 commit 0605776
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 53 deletions.
4 changes: 4 additions & 0 deletions Makefile
@@ -0,0 +1,4 @@
.PHONY: format

format:
@find . -name "*.lua" -not -path "./Libs/*" -exec luaformatter -a -t 1 {} \;
2 changes: 1 addition & 1 deletion Plugins/CustomBar.lua
@@ -1,4 +1,4 @@
assert(BigWigs, "BigWigs not found!")
assert(BigWigs, "BigWigs not found!")

----------------------------
-- Localization --
Expand Down
34 changes: 17 additions & 17 deletions Plugins/RaidIcon.lua
@@ -1,4 +1,4 @@
assert(BigWigs, "BigWigs not found!")
assert(BigWigs, "BigWigs not found!")

------------------------------
-- Are you local? --
Expand All @@ -21,11 +21,11 @@ L:RegisterTranslations("enUS", function() return {
["Place"] = true,
["Place Raid Icons"] = true,
["Toggle placing of Raid Icons on players."] = true,

["Icon"] = true,
["Set Icon"] = true,
["Set which icon to place on players."] = true,

["Options for Raid Icons."] = true,

["star"] = true,
Expand All @@ -44,11 +44,11 @@ L:RegisterTranslations("koKR", function() return {
["Place"] = "지정",
["Place Raid Icons"] = "공격대 아이콘 지정",
["Toggle placing of Raid Icons on players."] = "플레이어에 공격대 아이콘 지정 토글",

["Icon"] = "아이콘",
["Set Icon"] = "아이콘 설정",
["Set which icon to place on players."] = "플레이어에 아이콘 지정을 위한 설정",

["Options for Raid Icons."] = "공격대 아이콘에 대한 설정",

["star"] = "",
Expand All @@ -68,13 +68,13 @@ L:RegisterTranslations("zhCN", function() return {
["Place"] = "标记",
["Place Raid Icons"] = "标记团队图标",
["Toggle placing of Raid Icons on players."] = "切换是否在玩家身上标记团队图标",

["Icon"] = "图标",
["Set Icon"] = "设置图标",
["Set which icon to place on players."] = "设置玩家身上标记的图标。",

["Options for Raid Icons."] = "团队图标设置",

["star"] = "星星",
["circle"] = "圆圈",
["diamond"] = "钻石",
Expand All @@ -91,13 +91,13 @@ L:RegisterTranslations("zhTW", function() return {
["Place"] = "標記",
["Place Raid Icons"] = "標記團隊圖示",
["Toggle placing of Raid Icons on players."] = "切換是否在玩家身上標記團隊圖示",

["Icon"] = "圖標",
["Set Icon"] = "設置圖示",
["Set which icon to place on players."] = "設置玩家身上標記的圖示。",

["Options for Raid Icons."] = "團隊圖示設置",

["star"] = "星星",
["circle"] = "圓圈",
["diamond"] = "方塊",
Expand All @@ -118,11 +118,11 @@ L:RegisterTranslations("deDE", function() return {
["Place"] = "Platzierung",
["Place Raid Icons"] = "Schlachtzug-Symbole platzieren",
["Toggle placing of Raid Icons on players."] = "Schlachtzug-Symbole auf Spieler setzen.",

["Icon"] = "Symbol",
["Set Icon"] = "Symbol platzieren",
["Set which icon to place on players."] = "W\195\164hle, welches Symbol auf Spieler gesetzt wird.",

["Options for Raid Icons."] = "Optionen f\195\188r Schlachtzug-Symbole.",

["star"] = "Stern",
Expand All @@ -141,11 +141,11 @@ L:RegisterTranslations("frFR", function() return {
["Place"] = "Placement",
["Place Raid Icons"] = "Placer les icônes de raid",
["Toggle placing of Raid Icons on players."] = "Place ou non les icônes de raid sur les joueurs.",

["Icon"] = "Icône",
["Set Icon"] = "Déterminer l'icône",
["Set which icon to place on players."] = "Détermine quelle icône sera placée sur les joueurs.",

["Options for Raid Icons."] = "Options concernant les icônes de raid.",

["star"] = "étoile",
Expand Down Expand Up @@ -188,7 +188,7 @@ BigWigsRaidIcon.consoleOptions = {
name = L["Place Raid Icons"],
desc = L["Toggle placing of Raid Icons on players."],
get = function() return BigWigsRaidIcon.db.profile.place end,
set = function(v) BigWigsRaidIcon.db.profile.place = v end,
set = function(v) BigWigsRaidIcon.db.profile.place = v end,
},
[L["icon"]] = {
type = "text",
Expand Down Expand Up @@ -217,7 +217,7 @@ function BigWigsRaidIcon:BigWigs_SetRaidIcon(player, iconnumber)
icon = L["skull"]
end
icon = self.icontonumber[icon]

for i=1,GetNumRaidMembers() do
if UnitName("raid"..i) == player then
if not iconnumber then
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Tranq.lua
@@ -1,4 +1,4 @@


assert(BigWigs, "BigWigs not found!")

----------------------------
Expand Down
68 changes: 34 additions & 34 deletions documentation/bossTemplate.lua
Expand Up @@ -14,28 +14,28 @@ L:RegisterTranslations("enUS", function() return {
cmd = "Testboss",

start_trigger = "Let the games begin.",

berserk_cmd = "berserk",
berserk_name = "Berserk",
berserk_desc = "Warn for when Testboss goes berserk",

berserktrigger = "%s goes into a berserker rage!",
berserkannounce = "Berserk - Berserk!",
berserksoonwarn = "Berserk Soon - Get Ready!",

add_name = "Dragon",
} end )

L:RegisterTranslations("deDE", function() return {
start_trigger = "Lasst die Spiele beginnen."
start_trigger = "Lasst die Spiele beginnen.",

berserk_name = "Berserk",
berserk_desc = "Warn for when Testboss goes berserk",

berserktrigger = "%s bekommt Berserkerwut!",
berserkannounce = "Berserk - Berserk!",
berserksoonwarn = "Berserkerwut in Kürze - Bereit machen!",

add_name = "Drache",
} end )

Expand Down Expand Up @@ -79,10 +79,10 @@ local berserkannounced = nil
--module:RegisterYellEngage(L["start_trigger"])

-- called after module is enabled
function module:OnEnable()
function module:OnEnable()
self:RegisterEvent("UNIT_HEALTH")
self:RegisterEvent("CHAT_MSG_MONSTER_EMOTE")

self:ThrottleSync(10, syncName.berserk)
end

Expand Down Expand Up @@ -154,31 +154,31 @@ end
----------------------------------

function module:Test()
local function berserkSoon()
self:UNIT_HEALTH(boss)
end
local function berserk()
self:CHAT_MSG_MONSTER_EMOTE(L["berserktrigger"])
end
local function deactivate()
self.core:DisableModule(self:ToString())
end
BigWigs:Print("BigWigsTestboss Test started")
BigWigs:Print(" Berserk Soon Warning after 5s")
BigWigs:Print(" Berserk after 10s")
-- immitate CheckForEngage
self:SendEngageSync()
-- berserk soon warning after 5s
self:ScheduleEvent(self:ToString().."Test_berserkSoon", berserkSoon, 5, self)
-- berserk after 10s
self:ScheduleEvent(self:ToString().."Test_sandblast", berserk, 10, self)
-- reset after 15s
self:ScheduleEvent(self:ToString().."Test_deactivate", deactivate, 15, self)
end
local function berserkSoon()
self:UNIT_HEALTH(boss)
end

local function berserk()
self:CHAT_MSG_MONSTER_EMOTE(L["berserktrigger"])
end
local function deactivate()
self.core:DisableModule(self:ToString())
end

BigWigs:Print("BigWigsTestboss Test started")
BigWigs:Print(" Berserk Soon Warning after 5s")
BigWigs:Print(" Berserk after 10s")

-- immitate CheckForEngage
self:SendEngageSync()

-- berserk soon warning after 5s
self:ScheduleEvent(self:ToString().."Test_berserkSoon", berserkSoon, 5, self)

-- berserk after 10s
self:ScheduleEvent(self:ToString().."Test_sandblast", berserk, 10, self)

-- reset after 15s
self:ScheduleEvent(self:ToString().."Test_deactivate", deactivate, 15, self)

end

0 comments on commit 0605776

Please sign in to comment.