From 5dec2fd60b9b5a21bfb474f06d40a74c602c180d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 1 Aug 2016 21:34:23 +0200 Subject: Make textures follow naming conventions --- api.lua | 6 +++--- init.lua | 36 ++++++++++++++++++------------------ textures/awards_bg_default.png | Bin 0 -> 31407 bytes textures/awards_bg_mining.png | Bin 0 -> 21274 bytes textures/awards_mese.png | Bin 0 -> 564 bytes textures/awards_miniminer.png | Bin 0 -> 455 bytes textures/awards_novicebuilder.png | Bin 0 -> 374 bytes textures/awards_template.png | Bin 0 -> 322 bytes textures/awards_unknown.png | Bin 0 -> 322 bytes textures/bg_default.png | Bin 31407 -> 0 bytes textures/bg_mining.png | Bin 21274 -> 0 bytes textures/mese.png | Bin 564 -> 0 bytes textures/miniminer.png | Bin 455 -> 0 bytes textures/novicebuilder.png | Bin 374 -> 0 bytes textures/template.png | Bin 322 -> 0 bytes textures/unknown.png | Bin 322 -> 0 bytes 16 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 textures/awards_bg_default.png create mode 100644 textures/awards_bg_mining.png create mode 100644 textures/awards_mese.png create mode 100644 textures/awards_miniminer.png create mode 100644 textures/awards_novicebuilder.png create mode 100644 textures/awards_template.png create mode 100644 textures/awards_unknown.png delete mode 100644 textures/bg_default.png delete mode 100644 textures/bg_mining.png delete mode 100644 textures/mese.png delete mode 100644 textures/miniminer.png delete mode 100644 textures/novicebuilder.png delete mode 100644 textures/template.png delete mode 100644 textures/unknown.png diff --git a/api.lua b/api.lua index 1fd8a29..a1ed306 100644 --- a/api.lua +++ b/api.lua @@ -220,8 +220,8 @@ function awards.unlock(name, award) -- Get Notification Settings local title = awdef.title or award local desc = awdef.description or "" - local background = awdef.background or "bg_default.png" - local icon = awdef.icon or "unknown.png" + local background = awdef.background or "awards_bg_default.png" + local icon = awdef.icon or "awards_unknown.png" local custom_announce = awdef.custom_announce or S("Achievement Unlocked:") -- Do Notification @@ -309,7 +309,7 @@ function awards.getFormspec(name, to, sid) local def = awards.def[item.name] if def and def.secret and not item.got then formspec = formspec .. "label[1,2.75;Secret Award]".. - "image[1,0;3,3;unknown.png]" + "image[1,0;3,3;awards_unknown.png]" if def and def.description then formspec = formspec .. "label[0,3.25;Unlock this award to find out what it is]" end diff --git a/init.lua b/init.lua index 04339a9..2ac26ea 100644 --- a/init.lua +++ b/init.lua @@ -32,7 +32,7 @@ awards.set_intllib(S) awards.register_achievement("award_lightitup",{ title = S("Light It Up"), description = S("Place 100 torches."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "default:torch", @@ -44,7 +44,7 @@ awards.register_achievement("award_lightitup",{ awards.register_achievement("award_well_lit",{ title = S("Well Lit"), description = S("Place 1,000 torches."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "default:torch", @@ -58,7 +58,7 @@ if minetest.get_modpath("moreblocks") then awards.register_achievement("award_saint_maclou",{ title = S("Saint-Maclou"), description = S("Place 20 coal checkers."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "moreblocks:coal_checker", @@ -70,7 +70,7 @@ if minetest.get_modpath("moreblocks") then awards.register_achievement("award_castorama",{ title = S("Castorama"), description = S("Place 20 iron checkers."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "moreblocks:iron_checker", @@ -82,7 +82,7 @@ if minetest.get_modpath("moreblocks") then awards.register_achievement("award_sam_the_trapper",{ title = S("Sam the Trapper"), description = S("Place 2 trap stones."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "moreblocks:trap_stone", @@ -95,8 +95,8 @@ end awards.register_achievement("award_obsessed_with_obsidian",{ title = S("Obsessed with Obsidian"), description = S("Mine 50 obsidian."), - icon = "miniminer.png", - background = "bg_mining.png", + icon = "awards_miniminer.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:obsidian", @@ -108,7 +108,7 @@ awards.register_achievement("award_obsessed_with_obsidian",{ awards.register_achievement("award_on_the_way", { title = S("On The Way"), description = S("Place 100 rails."), - icon = "novicebuilder.png", + icon = "awards_novicebuilder.png", trigger = { type = "place", node = "default:rail", @@ -193,7 +193,7 @@ awards.register_achievement("award_mesefind", { title = S("First Mese Find"), description = S("Find some Mese."), icon = "default_mese_block.png", - background = "bg_mining.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:stone_with_mese", @@ -205,8 +205,8 @@ awards.register_achievement("award_mesefind", { awards.register_achievement("award_youre_a_copper", { title = S("You're a copper"), description = S("Dig 1,000 copper ores."), - icon = "miniminer.png", - background = "bg_mining.png", + icon = "awards_miniminer.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:stone_with_copper", @@ -230,8 +230,8 @@ awards.register_achievement("award_nyanfind", { awards.register_achievement("award_mine2", { title = S("Mini Miner"), description = S("Dig 100 stone blocks."), - icon = "miniminer.png", - background = "bg_mining.png", + icon = "awards_miniminer.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:stone", @@ -243,8 +243,8 @@ awards.register_achievement("award_mine2", { awards.register_achievement("award_mine3", { title = S("Hardened Miner"), description = S("Dig 1,000 stone blocks"), - icon = "miniminer.png", - background = "bg_mining.png", + icon = "awards_miniminer.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:stone", @@ -256,8 +256,8 @@ awards.register_achievement("award_mine3", { awards.register_achievement("award_mine4", { title = S("Master Miner"), description = S("Dig 10,000 stone blocks."), - icon = "miniminer.png", - background = "bg_mining.png", + icon = "awards_miniminer.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:stone", @@ -269,7 +269,7 @@ awards.register_achievement("award_mine4", { awards.register_achievement("award_marchand_de_sable", { title = S("Marchand De Sable"), description = S("Dig 1,000 sand."), - background = "bg_mining.png", + background = "awards_bg_mining.png", trigger = { type = "dig", node = "default:sand", diff --git a/textures/awards_bg_default.png b/textures/awards_bg_default.png new file mode 100644 index 0000000..a6f57d3 Binary files /dev/null and b/textures/awards_bg_default.png differ diff --git a/textures/awards_bg_mining.png b/textures/awards_bg_mining.png new file mode 100644 index 0000000..a698779 Binary files /dev/null and b/textures/awards_bg_mining.png differ diff --git a/textures/awards_mese.png b/textures/awards_mese.png new file mode 100644 index 0000000..3fc800e Binary files /dev/null and b/textures/awards_mese.png differ diff --git a/textures/awards_miniminer.png b/textures/awards_miniminer.png new file mode 100644 index 0000000..45c7238 Binary files /dev/null and b/textures/awards_miniminer.png differ diff --git a/textures/awards_novicebuilder.png b/textures/awards_novicebuilder.png new file mode 100644 index 0000000..f24d843 Binary files /dev/null and b/textures/awards_novicebuilder.png differ diff --git a/textures/awards_template.png b/textures/awards_template.png new file mode 100644 index 0000000..b290454 Binary files /dev/null and b/textures/awards_template.png differ diff --git a/textures/awards_unknown.png b/textures/awards_unknown.png new file mode 100644 index 0000000..b290454 Binary files /dev/null and b/textures/awards_unknown.png differ diff --git a/textures/bg_default.png b/textures/bg_default.png deleted file mode 100644 index a6f57d3..0000000 Binary files a/textures/bg_default.png and /dev/null differ diff --git a/textures/bg_mining.png b/textures/bg_mining.png deleted file mode 100644 index a698779..0000000 Binary files a/textures/bg_mining.png and /dev/null differ diff --git a/textures/mese.png b/textures/mese.png deleted file mode 100644 index 3fc800e..0000000 Binary files a/textures/mese.png and /dev/null differ diff --git a/textures/miniminer.png b/textures/miniminer.png deleted file mode 100644 index 45c7238..0000000 Binary files a/textures/miniminer.png and /dev/null differ diff --git a/textures/novicebuilder.png b/textures/novicebuilder.png deleted file mode 100644 index f24d843..0000000 Binary files a/textures/novicebuilder.png and /dev/null differ diff --git a/textures/template.png b/textures/template.png deleted file mode 100644 index b290454..0000000 Binary files a/textures/template.png and /dev/null differ diff --git a/textures/unknown.png b/textures/unknown.png deleted file mode 100644 index b290454..0000000 Binary files a/textures/unknown.png and /dev/null differ -- cgit v1.2.3