Move default achievements to rp_default

mods/rp_achievements/init.lua

@@ -413,121 +413,3 @@ local function receive_fields(player, form_name, fields)
 end
 
 minetest.register_on_player_receive_fields(receive_fields)
-
---
--- Below are the default achievements
---
-
--- Digging wood
-
-achievements.register_achievement(
-   "timber",
-   {
-      title = S("Timber"),
-      description = S("Dig a tree trunk."),
-      times = 1,
-      dignode = "group:tree",
-      item_icon = "rp_default:tree",
-})
-
--- Tools
-
-achievements.register_achievement(
-   "first_pickaxe",
-   {
-      title = S("My First Pickaxe"),
-      description = S("Craft a pickaxe."),
-      times = 1,
-      craftitem = "group:pickaxe",
-      item_icon = "rp_default:pick_wood",
-})
-
-achievements.register_achievement(
-   "hardened_miner",
-   {
-      title = S("Hardened Miner"),
-      description = S("Craft a carbon steel pickaxe."),
-      times = 1,
-      craftitem = "rp_default:pick_carbon_steel",
-})
-
-achievements.register_achievement(
-   "off_to_battle",
-   {
-      title = S("Off to Battle"),
-      description = S("Craft a broadsword."),
-      times = 1,
-      craftitem = "rp_default:broadsword",
-})
-
--- Stone
-
-achievements.register_achievement(
-   "mineority",
-   {
-      title = S("Mineority"),
-      description = S("Mine a stone."),
-      times = 1,
-      dignode = "rp_default:stone",
-})
-
-achievements.register_achievement(
-   "smelting_room",
-   {
-      title = S("Smelting Room"),
-      description = S("Craft a furnace."),
-      times = 1,
-      craftitem = "rp_default:furnace",
-})
-
--- Biomes
-
-achievements.register_achievement(
-   "gardener",
-   {
-      title = S("Gardener"),
-      description = S("Plant a flower."),
-      times = 1,
-      placenode = "rp_default:flower",
-})
-
-achievements.register_achievement(
-   "welcome_to_the_mountains",
-   {
-      title = S("Dry Lands"),
-      description = S("Collect dry grass."),
-      times = 1,
-      dignode = "rp_default:dry_grass",
-})
-
-achievements.register_achievement(
-   "drain_the_swamp",
-   {
-      title = S("Drain the Swamp"),
-      description = S("Dig some swamp dirt."),
-      times = 1,
-      dignode = "group:swamp_dirt",
-      item_icon = "rp_default:swamp_dirt",
-})
-
--- Farming
-
-achievements.register_achievement(
-   "fertile",
-   {
-      title = S("Fertile"),
-      description = S("Craft a bag of fertilizer."),
-      times = 1,
-      craftitem = "rp_default:fertilizer",
-})
-
--- Literature
-
-achievements.register_achievement(
-   "librarian",
-   {
-      title = S("Librarian"),
-      description = S("Craft a bookshelf."),
-      times = 1,
-      craftitem = "rp_default:bookshelf",
-})

mods/rp_achievements/locale/rp_achievements.de.tr

@@ -4,25 +4,4 @@ Gotten=Erhalten
 @1/@2=@1/@2
 Missing=Fehlt
 @1 of @2 achievements gotten, @3 in progress=@1 von @2 Errungenschaften erhalten, @3 in Arbeit
-Timber=Bauholz
+
-Dig a tree trunk.=Bauen Sie einen Baumstamm ab.
-My First Pickaxe=Erste Spitzhacke
-Craft a pickaxe.=Fertigen Sie eine Spitzhacke.
-Hardened Miner=Harte Bergarbeit
-Craft a carbon steel pickaxe.=Fertigen Sie eine Karbonstahlspitzhacke.
-Off to Battle=Auf in die Schlacht
-Craft a broadsword.=Fertigen Sie ein Breitschwert.
-Mineority=Bergbaby
-Mine a stone.=Graben Sie einen Stein.
-Smelting Room=Schmelzraum
-Craft a furnace.=Fertigen Sie einen Ofen.
-Gardener=Gärtner
-Plant a flower.=Pflanzen Sie eine Blume.
-Dry Lands=Trockenland
-Collect dry grass.=Sammeln Sie trockenes Gras auf.
-Drain the Swamp=Sumpf trockenlegen
-Dig some swamp dirt.=Graben Sie etwas Sumpferde.
-Fertile=Fruchtbar
-Craft a bag of fertilizer.=Fertigen Sie einen Beutel mit Dünger.
-Librarian=Bibliothekar
-Craft a bookshelf.=Fertigen Sie ein Bücherregal.

mods/rp_achievements/locale/rp_achievements.fr.tr

@@ -4,30 +4,4 @@ Gotten=Obtenu
 @1/@2=@1/@2
 Missing=Manquant
 @1 of @2 achievements gotten, @3 in progress=@1 @2 réalisations obtenues, @3 en cours
-Timber=Charpente
-Dig a tree trunk.=Extraire un tronc d'arbre.
-My First Pickaxe=Ma première pioche
-Craft a pickaxe.=Constuire une pioche.
-Hardened Miner=Mineur endurci
-Craft a carbon steel pickaxe.=Constuire une hache en acier carbone.
-Off to Battle=En route vers la bataille
-Craft a broadsword.=Constuire une épée.
-Mineority=Minoritaire
-Mine a stone.=Miner une pierre.
-Smelting Room=Salle de fonte
-Craft a furnace.=Constuire un four.
-Gardener=Jardinier
-Plant a flower.=Plantez une fleur.
-Dry Lands=Terres arides
-Collect dry grass.=Collecter de l'herbe sèche.
-Drain the Swamp=Assécher le marais
-Dig some swamp dirt.=
-Fertile=Fertile
-Craft a bag of fertilizer.=Constuire un sac d'engrais.
-Librarian=Bibliothécaire
-Craft a bookshelf.=Constuire une étagère.
 
-
-##### not used anymore #####
-
-Dig somme swamp dirt.=Extraire de la terre du marais.

mods/rp_achievements/locale/template.txt

@@ -4,25 +4,3 @@ Gotten=
 @1/@2=
 Missing=
 @1 of @2 achievements gotten, @3 in progress=
-Timber=
-Dig a tree trunk.=
-My First Pickaxe=
-Craft a pickaxe.=
-Hardened Miner=
-Craft a carbon steel pickaxe.=
-Off to Battle=
-Craft a broadsword.=
-Mineority=
-Mine a stone.=
-Smelting Room=
-Craft a furnace.=
-Gardener=
-Plant a flower.=
-Dry Lands=
-Collect dry grass.=
-Drain the Swamp=
-Dig some swamp dirt.=
-Fertile=
-Craft a bag of fertilizer.=
-Librarian=
-Craft a bookshelf.=

mods/rp_default/init.lua

@@ -43,6 +43,7 @@ dofile(minetest.get_modpath("rp_default").."/tools.lua")
 dofile(minetest.get_modpath("rp_default").."/fertilizer.lua")
 
 dofile(minetest.get_modpath("rp_default").."/crafting.lua")
+dofile(minetest.get_modpath("rp_default").."/achievements.lua")
 
 dofile(minetest.get_modpath("rp_default").."/mapgen.lua")
 

mods/rp_default/locale/rp_default.de.tr

@@ -175,8 +175,25 @@ Weak Torch=Schwache Fackel
 Provides a bit of light but it will eventually burn out=Leuchtet ein bisschen, aber sie wird bald ausbrennen
 Torch=Fackel
 It's bright and burns forever=Sie ist hell und brennt für immer
-
+Timber=Bauholz
-
+Dig a tree trunk.=Bauen Sie einen Baumstamm ab.
-##### not used anymore #####
+My First Pickaxe=Erste Spitzhacke
-
+Craft a pickaxe.=Fertigen Sie eine Spitzhacke.
-Sign=Schild
+Hardened Miner=Harte Bergarbeit
+Craft a carbon steel pickaxe.=Fertigen Sie eine Karbonstahlspitzhacke.
+Off to Battle=Auf in die Schlacht
+Craft a broadsword.=Fertigen Sie ein Breitschwert.
+Mineority=Bergbaby
+Mine a stone.=Graben Sie einen Stein.
+Smelting Room=Schmelzraum
+Craft a furnace.=Fertigen Sie einen Ofen.
+Gardener=Gärtner
+Plant a flower.=Pflanzen Sie eine Blume.
+Dry Lands=Trockenland
+Collect dry grass.=Sammeln Sie trockenes Gras auf.
+Drain the Swamp=Sumpf trockenlegen
+Dig some swamp dirt.=Graben Sie etwas Sumpferde.
+Fertile=Fruchtbar
+Craft a bag of fertilizer.=Fertigen Sie einen Beutel mit Dünger.
+Librarian=Bibliothekar
+Craft a bookshelf.=Fertigen Sie ein Bücherregal.

mods/rp_default/locale/rp_default.fr.tr

@@ -175,7 +175,28 @@ Weak Torch=Torche faible
 Provides a bit of light but it will eventually burn out=
 Torch=Torche
 It's bright and burns forever=
-
+Timber=Charpente
+Dig a tree trunk.=Extraire un tronc d'arbre.
+My First Pickaxe=Ma première pioche
+Craft a pickaxe.=Constuire une pioche.
+Hardened Miner=Mineur endurci
+Craft a carbon steel pickaxe.=Constuire une hache en acier carbone.
+Off to Battle=En route vers la bataille
+Craft a broadsword.=Constuire une épée.
+Mineority=Minoritaire
+Mine a stone.=Miner une pierre.
+Smelting Room=Salle de fonte
+Craft a furnace.=Constuire un four.
+Gardener=Jardinier
+Plant a flower.=Plantez une fleur.
+Dry Lands=Terres arides
+Collect dry grass.=Collecter de l'herbe sèche.
+Drain the Swamp=Assécher le marais
+Dig some swamp dirt.=Extraire de la terre du marais.
+Fertile=Fertile
+Craft a bag of fertilizer.=Constuire un sac d'engrais.
+Librarian=Bibliothécaire
+Craft a bookshelf.=Constuire une étagère.
 
 ##### not used anymore #####
 

mods/rp_default/locale/template.txt

@@ -175,3 +175,25 @@ Weak Torch=
 Provides a bit of light but it will eventually burn out=
 Torch=
 It's bright and burns forever=
+Timber=
+Dig a tree trunk.=
+My First Pickaxe=
+Craft a pickaxe.=
+Hardened Miner=
+Craft a carbon steel pickaxe.=
+Off to Battle=
+Craft a broadsword.=
+Mineority=
+Mine a stone.=
+Smelting Room=
+Craft a furnace.=
+Gardener=
+Plant a flower.=
+Dry Lands=
+Collect dry grass.=
+Drain the Swamp=
+Dig some swamp dirt.=
+Fertile=
+Craft a bag of fertilizer.=
+Librarian=
+Craft a bookshelf.=

mods/rp_default/mod.conf

@@ -1,3 +1,3 @@
 name = rp_default
-depends = rp_sounds, rp_formspec, rp_crafting
+depends = rp_sounds, rp_formspec, rp_crafting, rp_achievements
-description = Core Repixture mods. Contains most basic blocks, items, tools, chests, furnaces, fertilizer, signs, torches, ladders, buckets
+description = Main Repixture content mod. Contains most of the basic building blocks and items, including, tools, chest, furnace, fertilizer, signs, torches, ladders, buckets, fences. Also contains the core map generator.