From c1d022dcf291733d24ef71a6e9fa92999d93cdf4 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Dec 2021 14:18:56 +0100 Subject: [PATCH] 5.4 dowgrade --- mods/juanchi/eraz/.gitignore | 2 + mods/juanchi/eraz/init.lua | 2 +- mods/juanchi/eraz/locale/eraz.es.tr | 1 + mods/juanchi/eraz/loots.lua | 1 + mods/juanchi/eraz/spawn.lua | 4 ++ mods/juanchi/eraz/user.lua | 101 ++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 mods/juanchi/eraz/.gitignore create mode 100644 mods/juanchi/eraz/user.lua diff --git a/mods/juanchi/eraz/.gitignore b/mods/juanchi/eraz/.gitignore new file mode 100644 index 0000000..5cd9613 --- /dev/null +++ b/mods/juanchi/eraz/.gitignore @@ -0,0 +1,2 @@ +## Generic ignorable patterns and files +user.conf diff --git a/mods/juanchi/eraz/init.lua b/mods/juanchi/eraz/init.lua index 5daf438..e9a2f50 100644 --- a/mods/juanchi/eraz/init.lua +++ b/mods/juanchi/eraz/init.lua @@ -20,5 +20,5 @@ if eraz.settings.spawn then end local user_file = modpath .. "/user.lua" if eraz.file_exists(user_file) then - assert(loadfile(user_file))() + assert(loadfile(user_file))(S) end diff --git a/mods/juanchi/eraz/locale/eraz.es.tr b/mods/juanchi/eraz/locale/eraz.es.tr index 55d42c6..b17ba00 100644 --- a/mods/juanchi/eraz/locale/eraz.es.tr +++ b/mods/juanchi/eraz/locale/eraz.es.tr @@ -26,3 +26,4 @@ A new merchant has just arrived at=Un nuevo comerciante acaba de llegar a bringing=trayendo unknown stuff=cosas desconocidas basic food=comida básica + diff --git a/mods/juanchi/eraz/loots.lua b/mods/juanchi/eraz/loots.lua index 18e8810..c3f31d3 100644 --- a/mods/juanchi/eraz/loots.lua +++ b/mods/juanchi/eraz/loots.lua @@ -16,3 +16,4 @@ eraz.register_loot("basic_food", { }, }, }) + diff --git a/mods/juanchi/eraz/spawn.lua b/mods/juanchi/eraz/spawn.lua index d6cf742..49d14a8 100644 --- a/mods/juanchi/eraz/spawn.lua +++ b/mods/juanchi/eraz/spawn.lua @@ -1,5 +1,9 @@ local S = ... +local function round(x) + return x>=0 and math.floor(x+0.5) or math.ceil(x-0.5) +end + --SPAWN eraz.spawn = function(spawn_pos, limit_max_mobs, abr, liquidflag) diff --git a/mods/juanchi/eraz/user.lua b/mods/juanchi/eraz/user.lua new file mode 100644 index 0000000..df8cbc0 --- /dev/null +++ b/mods/juanchi/eraz/user.lua @@ -0,0 +1,101 @@ +local S = ... + +eraz.register_loot("minerals", { + description = S("some minerals"), + type = "fixed", + items = { + iron = { + name = "default:iron_lump", + price = 10, + amount = 25, + }, + copper = { + name = "default:copper_lump", + price = 5, + amount = 25, + }, + bauxite = { + name = "aloz:bauxite_lump", + price = 7, + amount = 25, + }, + }, +}) + +eraz.register_loot("fruits", { + description = S("some fruits"), + type = "fixed", + items = { + apple = { + name = "default:apple", + price = 3, + amount = 6, + }, + cherries = { + name = "cherrytree:cherries", + price = 5, + amount = 10, + }, + lemon = { + name = "lemontree:lemon", + price = 2, + amount = 12, + }, + clementine = { + name = "clementinetree:clementine", + price = 4, + amount = 8, + }, + blueberries = { + name = "default:blueberries", + price = 5, + amount = 15, + }, + pineapple = { + name = "pineapple:pineapple", + price = 6, + amount = 4, + }, + pomegranate = { + name = "pomegranate:pomegranate", + price = 3, + amount = 7, + }, + plum= { + name = "plumtree:plum", + price = 2, + amount = 8, + }, + cacao_beans = { + name = "cacaotree:cacao_beans", + price = 10, + amount = 30, + }, + barberries = { + name = "swaz:barberries", + price = 1, + amount = 20, + }, + redcurrants = { + name = "redw:redcurrants", + price = 1, + amount = 15, + }, + acorn = { + name = "oak:acorn", + price = 2, + amount = 25, + }, + chestnut = { + name = "chestnuttree:fruit", + price = 3, + amount = 25, + }, + persimmon = { + name = "ebony:persimmon", + price = 5, + amount = 7, + }, + }, +}) +