SK-update

master
maikerumine 2017-12-04 19:32:28 -05:00
parent e4b5a681fc
commit f143bdf36b
11 changed files with 205 additions and 31 deletions

View File

@ -16,7 +16,7 @@
--Alias "old"--->"new"
------------------------------------------
--[[
--===========================================
--===========================================
--This is to fix the old interaction with my modified 3d_armor mod.
@ -52,14 +52,14 @@ minetest.register_alias("bags:small", "unified_inventory:small_esmmese")
minetest.register_alias("bags:medium", "unified_inventory:medium_esmmese")
minetest.register_alias("bags:large", "unified_inventory:large_esmmese")
]]
--===========================================
--===========================================
--beds
minetest.register_alias("beds:bed_bottom_white", "beds:bed_bottom")
minetest.register_alias("beds:bed_top_white", "beds:bed_top")
--[[
--===========================================
--===========================================
--carts
@ -74,7 +74,7 @@ minetest.register_alias("default:desert_stone_with_iron", "es:desert_stone_with_
minetest.register_alias("default:desert_stone_with_gold", "es:desert_stone_with_gold")
minetest.register_alias("default:desert_stone_with_coal", "es:desert_stone_with_coal")
]]
--===========================================
--===========================================
--doors
@ -94,7 +94,7 @@ minetest.register_alias("doors:door_steel_b_1", "doors:door_steel_a")
minetest.register_alias("doors:door_steel_b_2", "doors:door_steel_b")
minetest.register_alias("doors:door_steel_t_2", "doors:hidden")
--[[
--===========================================
--===========================================
--es crushing furnace
@ -304,12 +304,12 @@ for i in ipairs(es.treelist) do
end
--[[
minetest.register_alias("moretrees:"..treename.."_planks", "default:junglewood")
minetest.register_alias("moretrees:"..treename.."_trunk", "default:acacia_tree")
minetest.register_alias("moretrees:"..treename.."_sapling", "default:sapling")
minetest.register_alias("moretrees:"..treename.."_leaves", "default:leaves")
]]
--minetest.register_alias("moretrees:"..treename.."_planks", "default:junglewood")
--minetest.register_alias("moretrees:"..treename.."_trunk", "default:acacia_tree")
--minetest.register_alias("moretrees:"..treename.."_sapling", "default:sapling")
--minetest.register_alias("moretrees:"..treename.."_leaves", "default:leaves")
--aspen
minetest.register_alias("aspen:sapling", "default:aspen_sapling")
@ -772,7 +772,7 @@ minetest.register_alias("mg_villages:desert_sand_soil", "default:desert_sand")
minetest.register_alias("mg_villages:plotmarker", "stairs:slab_stonebrick")
minetest.register_alias("mg_villages:lava_flowing_tamed", "default:lava_flowing")
minetest.register_alias("mg_villages:lava_source_tamed", "default:lava_source")
]]

View File

@ -34,6 +34,7 @@ function prevent_place_above(name)
minetest.registered_craftitems[name].on_place=function(itemstack, placer, pointed_thing)
local pos = pointed_thing.above
if pos.y>0 then
minetest.chat_send_player(placer:get_player_name(), "Don't place water or lava above 0.")
minetest.log("action","ANTI GRIEF " .. placer:get_player_name() .. " tried to place " .. name .. " at " .. minetest.pos_to_string(pos));
return itemstack
else
@ -57,6 +58,7 @@ function prevent_place_above(name)
--after_place_node = func(pos, placer, itemstack, pointed_thing)
local pos = pointed_thing.above
if pos.y>0 then
minetest.chat_send_player(placer:get_player_name(), "Don't place water or lava above 0.")
minetest.log("action","ANTI GRIEF " .. placer:get_player_name() .. " tried to place " .. name .. " at " .. minetest.pos_to_string(pos));
minetest.set_node(pos, {name = "air"});
return itemstack
@ -99,6 +101,7 @@ function no_tnt_above(name)
minetest.registered_craftitems[name].on_place=function(itemstack, placer, pointed_thing)
local pos = pointed_thing.above
if pos.y>-150 then
minetest.chat_send_player(placer:get_player_name(), "Don't place TNT above -150.")
minetest.log("action","ANTI GRIEF " .. placer:get_player_name() .. " tried to place " .. name .. " at " .. minetest.pos_to_string(pos));
return itemstack
else
@ -122,6 +125,7 @@ function no_tnt_above(name)
--after_place_node = func(pos, placer, itemstack, pointed_thing)
local pos = pointed_thing.above
if pos.y>-150 then
minetest.chat_send_player(placer:get_player_name(), "Don't place TNT above -150.")
minetest.log("action","ANTI GRIEF " .. placer:get_player_name() .. " tried to place " .. name .. " at " .. minetest.pos_to_string(pos));
minetest.set_node(pos, {name = "air"});
return itemstack

View File

@ -22,6 +22,108 @@
-- See README.txt for licensing and other information.
--Lag Block
--maikerumine
es = {}
--Bronze
--[[
minetest.register_craft({
output = "default:bronze_ingot 9",
recipe = {
{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
{"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
}
})
]]
minetest.clear_craft({
type = "shapeless",
output = "default:bronze_ingot"
})
minetest.register_craft({
--type = "shapeless",
output = 'default:bronze_ingot 8',
recipe = {
{'default:copper_ingot', 'default:coal_lump', 'default:copper_ingot'},
{'default:copper_ingot', 'moreores:tin_ingot', 'default:copper_ingot'},
{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
}
})
minetest.register_craft({
--type = "shapeless",
output = 'default:bronze_ingot 8',
recipe = {
{'default:copper_ingot', 'default:coal_lump', 'default:copper_ingot'},
{'default:copper_ingot', 'default:tin_ingot', 'default:copper_ingot'},
{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
}
})
--Treated logs
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "es:tree",
recipe = {"default:tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "es:jungletree",
recipe = {"default:jungletree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "es:pine_tree",
recipe = {"default:pine_tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "es:acacia_tree",
recipe = {"default:acacia_tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "es:aspen_tree",
recipe = {"default:aspen_tree", "es:boneblock"},
})
--revert
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "default:tree",
recipe = {"es:tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "default:jungletree",
recipe = {"es:jungletree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "default:pine_tree",
recipe = {"es:pine_tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "default:acacia_tree",
recipe = {"es:acacia_tree", "es:boneblock"},
})
minetest.register_craft({
type = "shapeless",
replacements = {{"es:boneblock", "es:boneblock"}},
output = "default:aspen_tree",
recipe = {"es:aspen_tree", "es:boneblock"},
})
minetest.register_craft({
output = 'es:lag_block',
recipe = {

View File

@ -3,6 +3,7 @@ farming?
flowers?
stairs?
moreblocks?
moreores?
cblocks?
toolranks?

View File

@ -84,7 +84,7 @@ end
local function register_flower(seed, name)
minetest.register_decoration({
deco_type = "simple",
place_on = {"default:dirt_with_grass","es:strange_grass","es:aiden_grass"},
place_on = {"default:dirt_with_grass"},
sidelen = 16,
noise_params = {
offset = -0.015,
@ -95,7 +95,7 @@ local function register_flower(seed, name)
persist = 0.6
},
biomes = {"stone_grassland", "sandstone_grassland",
"deciduous_forest", "coniferous_forest","strangeland","aidenland"},
"deciduous_forest", "coniferous_forest"},
y_min = 1,
y_max = 31000,
decoration = "flowers:"..name,

View File

@ -4,8 +4,8 @@ local timer = 0;
--local positionx = 0.97;
--local positiony = 0.02;
local positionx = 0.30; --horz
local positiony = 0.90; --vert
local positionx = 0.97; --horz
local positiony = 0.02; --vert
local last_time = os.time()

View File

@ -21,7 +21,7 @@ enable_stairsplus = true
local modpath = minetest.get_modpath("es")
es.modpath = modpath
--dofile(modpath.."/alias.lua")
dofile(modpath.."/alias.lua")
dofile(modpath.."/crafting.lua")
dofile(modpath.."/antigrief.lua")
dofile(modpath.."/itemdrop.lua")
@ -29,7 +29,7 @@ dofile(modpath.."/musicmod.lua")
dofile(modpath.."/armor.lua")
dofile(modpath.."/kill.lua")
dofile(modpath.."/shields.lua")
--dofile(modpath.."/shutdown.lua")
dofile(modpath.."/shutdown.lua")
dofile(modpath.."/spawn.lua")
dofile(modpath.."/crushingfurnace.lua")
dofile(modpath.."/tools.lua")

View File

@ -13,6 +13,72 @@
--Media(if not stated differently):
--(c) Copyright (2014-2015) maikerumine; CC-BY-SA 3.0
--Treated Logs
minetest.register_node("es:tree", {
description = "Treated Apple Tree --=Use for buildings, will not grow moss or mushroom.",
tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
minetest.register_node("es:jungletree", {
description = "Treated Jungle Tree --=Use for buildings, will not grow moss or mushroom.",
tiles = {"default_jungletree_top.png", "default_jungletree_top.png",
"default_jungletree.png"},
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
minetest.register_node("es:pine_tree", {
description = "Treated Pine Tree --=Use for buildings, will not grow moss or mushroom.",
tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
"default_pine_tree.png"},
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 3},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
minetest.register_node("es:acacia_tree", {
description = "Treated Acacia Tree --=Use for buildings, will not grow moss or mushroom.",
tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
"default_acacia_tree.png"},
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
minetest.register_node("es:aspen_tree", {
description = "Treated Aspen Tree --=Use for buildings, will not grow moss or mushroom.",
tiles = {"default_aspen_tree_top.png", "default_aspen_tree_top.png",
"default_aspen_tree.png"},
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 3},
sounds = default.node_sound_wood_defaults(),
on_place = minetest.rotate_node
})
minetest.register_node("es:lag_block", {
description = "Show this around town to sho you love the original Just Test. REMEMBER THE TEST. Lag, This is a dedication block to your ideas, your server, and you. My skuchayem i lyubyat vas. WE MISS AND LOVE YOU!",
@ -76,7 +142,7 @@ minetest.register_node( "es:granite", {
--tiles = { "technic_granite.png" },
tiles = { "mcl_core_granite.png" },
is_ground_content = true,
groups = {cracky=3},
groups = {cracky=1, granite=1},
sounds = default.node_sound_stone_defaults(),
})
@ -85,7 +151,7 @@ minetest.register_node( "es:granite_bricks", {
--tiles = { "technic_granite_bricks.png",},
tiles = { "mcl_core_granite_smooth.png",},
is_ground_content = true,
groups = {cracky=3},
groups = {cracky=1, granite=1},
sounds = default.node_sound_stone_defaults(),
})
@ -94,7 +160,7 @@ minetest.register_node( "es:marble", {
--tiles = { "technic_marble.png" },
tiles = { "mcl_core_diorite.png" },
is_ground_content = true,
groups = {cracky=3},
groups = {cracky=1, marble=1},
sounds = default.node_sound_stone_defaults(),
})
@ -103,7 +169,7 @@ minetest.register_node( "es:marble_bricks", {
--tiles = { "technic_marble_bricks.png" },
tiles = { "mcl_core_diorite_smooth.png" },
is_ground_content = true,
groups = {cracky=3},
groups = {cracky=1, marble=1},
sounds = default.node_sound_stone_defaults(),
})
--[[
@ -327,7 +393,7 @@ minetest.register_node("es:sand_with_diamond", {
--BONEBLOCK
minetest.register_node("es:boneblock", {
description = "Bone Blox",
description = "Bone Blok --=Use for treating default logs for building.",
tiles = {
"bones_top.png",
"bones_bottom.png",

View File

@ -43,8 +43,8 @@ minetest.register_globalstep(function(dtime)
and ((D == nil) or (t.wday == D))) then
minetest.chat_send_all("Scheduled shutdown. 2000 Eastern Time Zone DST 0000 ZULU "
.."Shutting down in FIVE minutes. Enjoy the break")
minetest.chat_send_all("STORE YOUR ITEMS WITHIN 4 MINUTES. "
.."Shutting down in FIVE minutes.")
minetest.chat_send_all("Find safety. "
.."Never forget ESM.")
--minetest.after(2, minetest.request_shutdown)
end
if ((t.hour == Y or t.hour == Z) and (t.min ==N) and (t.sec <= 2)

View File

@ -40,16 +40,17 @@ minetest.register_chatcommand("spawn", {
if pos.x<-47 and pos.x>-255 and pos.y>-20 and pos.z<1078 and pos.z>820
then
minetest.chat_send_player(name, "YOU MUST CLIMB OUT!")
]]
else
if pos.x<2085 and pos.x>1971 and pos.y>1598 and pos.z<1438 and pos.z>820
if pos.x<2085 and pos.x>1990 and pos.y>100 and pos.z<1590 and pos.z>1500
then
minetest.chat_send_player(name, "YOU MUST DIE TO ESCAPE!")
]]
else
player:setpos(spawn_prison.pos)
minetest.chat_send_player(name, "Teleported to spawn!")
--end
end
--end
end
end,

View File

@ -349,17 +349,17 @@ if minetest.get_modpath("toolranks") then
--aikerum
minetest.override_item("es:pick_aikerum", {
original_description = "Extreme Survival Aikerum Pickaxe",
description = toolranks.create_description("Extreme Survival Aikerum Shovel Pickaxe", 0, 1),
description = toolranks.create_description("Extreme Survival Aikerum Pickaxe", 0, 1),
after_use = toolranks.new_afteruse})
minetest.override_item("es:axe_aikerum", {
original_description = "Extreme Survival Aikerum Axe",
description = toolranks.create_description("Extreme Survival Aikerum Shovel Axe", 0, 1),
description = toolranks.create_description("Extreme Survival Aikerum Axe", 0, 1),
after_use = toolranks.new_afteruse})
minetest.override_item("es:shovel_aikerum", {
original_description = "Extreme Survival Aikerum Shovel",
description = toolranks.create_description("Extreme Survival Aikerum Shovel Shovel", 0, 1),
description = toolranks.create_description("Extreme Survival Aikerum Shovel", 0, 1),
after_use = toolranks.new_afteruse})
--purpellium
minetest.override_item("es:pick_purpellium", {