develop #30

Merged
milan merged 8 commits from develop into master 2021-01-27 21:59:08 +01:00
15 changed files with 79 additions and 15 deletions
Showing only changes of commit c4e5c29942 - Show all commits

View file

@ -267,3 +267,4 @@ load_mod_advtrains_itrainmap = true
load_mod_assets = true load_mod_assets = true
load_mod_advtrains_signals_ks = true load_mod_advtrains_signals_ks = true
load_mod_claycrafter = true load_mod_claycrafter = true
load_mod_serialize_lib = true

View file

@ -0,0 +1,34 @@
# textdomain: basic_materials
# Author: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Silicon lump=Grumo di silicio
Simple Integrated Circuit=Circuito integrato semplice
Simple Motor=Motore semplice
Heating element=Elemento riscaldante
Simple energy crystal=Cristallo di energia semplice
Spool of steel wire=Bobina di filo d'acciaio
Spool of copper wire=Bobina di filo di rame
Spool of silver wire=Bobina di filo d'argento
Spool of gold wire=Bobina di filo d'oro
Steel Strip=Striscia d'acciaio
Copper Strip=Striscia di rame
Steel Bar=Barra d'acciaio
Chainlinks (brass)=Catena (ottone)
Chainlinks (steel)=Catena (acciaio)
Brass Ingot=Lingotto di ottone
Steel gear=Ingranaggio d'acciaio
Padlock=Catenaccio
Chain (steel, hanging)=Catena (acciaio, pendente)
Chain (brass, hanging)=Catena (ottone, pendente)
Brass Block=Blocco di ottone
Oil extract=Estratto d'olio
Unprocessed paraffin=Paraffina grezza
Uncooked Terracotta Base=Argilla cruda
Wet Cement=Cemento umido
Cement=Cemento
Concrete Block=Blocco di calcestruzzo
Plastic sheet=Foglio di plastica
Plastic strips=Striscia di plastica
Empty wire spool=Rocchetto vuoto

View file

@ -36,9 +36,12 @@ Copyright (C) [Melkor](https://forum.minetest.net/memberlist.php?mode=viewprofil
- `cloud_items_car_cloud.png` - [`car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/car_white.png) - `cloud_items_car_cloud.png` - [`car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/car_white.png)
- `cloud_items_car_cloud_inventory.png` - [`inv_car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/inv_car_white.png) - `cloud_items_car_cloud_inventory.png` - [`inv_car_white.png`](https://github.com/minetest-mods/vehicle_mash/blob/master/textures/inv_car_white.png)
Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2018 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)): Copyright (C) [davidthecreator](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=11158) 2017-2019 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)):
- All [`3d_armor`](https://github.com/stujones11/minetest-3d_armor) [textures](https://github.com/stujones11/minetest-3d_armor/tree/master/3d_armor/textures). - All [`3d_armor`](https://github.com/stujones11/minetest-3d_armor) [textures](https://github.com/stujones11/minetest-3d_armor/tree/master/3d_armor/textures).
- `cloud_items_gloves_cloud.png` - [`3d_armor_gloves_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel.png)
- `cloud_items_gloves_cloud_preview.png` - [`3d_armor_gloves_gloves_steel_preview.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_gloves_steel_preview.png)
- `cloud_items_gloves_inv_gloves_cloud.png` - [`3d_armor_gloves_inv_gloves_steel.png`](https://github.com/sirrobzeroone/3d_armor_gloves/blob/main/textures/3d_armor_gloves_inv_gloves_steel.png)
## License for source code ## License for source code

View file

@ -108,6 +108,7 @@ There are 4 types of cloud:
- [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) - [`toolranks`](https://github.com/lisacvuk/minetest-toolranks)
- [`moreblocks`](https://github.com/minetest-mods/moreblocks) - [`moreblocks`](https://github.com/minetest-mods/moreblocks)
- [`multitools`](https://github.com/ChimneySwift/multitools) - [`multitools`](https://github.com/ChimneySwift/multitools)
- [`3d_armor_gloves`](https://github.com/sirrobzeroone/3d_armor_gloves)
- `stairs` (included in [Minetest Game](https://github.com/minetest/minetest_game)) - `stairs` (included in [Minetest Game](https://github.com/minetest/minetest_game))
## Requirements ## Requirements

View file

@ -723,6 +723,25 @@ if minetest.get_modpath("3d_armor") then
}) })
end end
-- Support for 3D Armor Gloves/Gauntlets
if minetest.get_modpath("3d_armor_gloves") then
armor:register_armor("cloud_items:gloves_cloud", {
description = S("Cloud Gauntlets"),
inventory_image = "cloud_items_inv_gloves_cloud.png",
groups = {armor_hands=1, armor_heal=12, armor_use=70},
armor_groups = {fleshy=10},
damage_groups = {cracky=2, snappy=1, level=6},
})
minetest.register_craft({
output = "cloud_items:gloves_cloud",
recipe = {
{"cloud_items:cloud_ingot", "", "cloud_items:cloud_ingot"},
{"farming:string", "", "farming:string"},
},
})
end
--------------- ---------------
-- Crafting -- -- Crafting --
--------------- ---------------

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage decorativa
Decorative cloud Stairs=Escalera de nube decorativa Decorative cloud Stairs=Escalera de nube decorativa
Cloud multitool=Multiherramienta de nube Cloud multitool=Multiherramienta de nube
Cloud car=Carro de nube Cloud car=Carro de nube
Cloud Gauntlets=Guanteletes de nube

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=Barre en nuage décoratif
Decorative cloud Stairs=Escaliers en nuage décoratif Decorative cloud Stairs=Escaliers en nuage décoratif
Cloud multitool=Outil-multi nuage Cloud multitool=Outil-multi nuage
Cloud car=Voiture de nuage Cloud car=Voiture de nuage
Cloud Gauntlets=Gantelets de nuage.

View file

@ -37,3 +37,4 @@ Decorative cloud Panel=
Decorative cloud Stairs= Decorative cloud Stairs=
Cloud multitool= Cloud multitool=
Cloud car= Cloud car=
Cloud Gauntlets=

View file

@ -1,6 +1,6 @@
name = cloud_items name = cloud_items
depends = default, worldedit, vehicle_mash depends = default, worldedit, vehicle_mash
optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools optional_depends = 3d_armor, toolranks, stairs, moreblocks, multitools, 3d_armor_gloves
description = Adds powerful cloud tools for Minetest. description = Adds powerful cloud tools for Minetest.
min_minetest_version = 5.0.0 min_minetest_version = 5.0.0
license = LGPLv2.1 license = LGPLv2.1

View file

@ -161,7 +161,7 @@ minetest.register_craft({
minetest.register_craftitem(":mobs:rabbit_hide", { minetest.register_craftitem(":mobs:rabbit_hide", {
description = S("Rabbit Hide"), description = S("Rabbit Hide"),
inventory_image = "mobs_rabbit_hide.png", inventory_image = "mobs_rabbit_hide.png",
groups = {flammable = 2}, groups = {flammable = 2, leather = 1},
}) })
minetest.register_craft({ minetest.register_craft({

View file

@ -302,7 +302,7 @@ minetest.register_craft({
minetest.register_craftitem(":mobs:chicken_feather", { minetest.register_craftitem(":mobs:chicken_feather", {
description = S("Feather"), description = S("Feather"),
inventory_image = "mobs_chicken_feather.png", inventory_image = "mobs_chicken_feather.png",
groups = {flammable = 2}, groups = {flammable = 2, feather = 1},
}) })
minetest.register_craft({ minetest.register_craft({

View file

@ -8,7 +8,7 @@ local use_cmi = minetest.global_exists("cmi")
mobs = { mobs = {
mod = "redo", mod = "redo",
version = "20210108", version = "20210114",
intllib = S, intllib = S,
invis = minetest.global_exists("invisibility") and invisibility or {} invis = minetest.global_exists("invisibility") and invisibility or {}
} }
@ -3705,9 +3705,6 @@ local can_spawn = function(pos, name)
end end
end end
-- spawn mob 1/2 node above ground
pos.y = pos.y + 0.5
-- tweak X/Z spawn pos -- tweak X/Z spawn pos
if width_x % 2 == 0 then if width_x % 2 == 0 then
pos.x = pos.x + 0.5 pos.x = pos.x + 0.5
@ -3972,15 +3969,15 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter
end end
end end
local ent = minetest.registered_entities[name]
-- should we check mob area for obstructions ? -- should we check mob area for obstructions ?
if mob_area_spawn ~= true then if mob_area_spawn ~= true then
-- do we have enough height clearance to spawn mob? -- do we have enough height clearance to spawn mob?
local ent = minetest.registered_entities[name] local height = max(0, ent.collisionbox[5] - ent.collisionbox[2])
local height = max(1, math.ceil(
(ent.collisionbox[5] or 0.25) - (ent.collisionbox[2] or -0.25) - 1))
for n = 0, height do for n = 0, floor(height) do
local pos2 = {x = pos.x, y = pos.y + n, z = pos.z} local pos2 = {x = pos.x, y = pos.y + n, z = pos.z}
@ -3996,6 +3993,9 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter
if pos then if pos then
-- adjust for mob collision box
pos.y = pos.y + (ent.collisionbox[2] * -1) - 0.4
local mob = minetest.add_entity(pos, name) local mob = minetest.add_entity(pos, name)
-- print("[mobs] Spawned " .. name .. " at " -- print("[mobs] Spawned " .. name .. " at "

View file

@ -5,7 +5,7 @@ local S = mobs.intllib
minetest.register_craftitem("mobs:nametag", { minetest.register_craftitem("mobs:nametag", {
description = S("Name Tag"), description = S("Name Tag"),
inventory_image = "mobs_nametag.png", inventory_image = "mobs_nametag.png",
groups = {flammable = 2} groups = {flammable = 2, nametag = 1}
}) })
if minetest.get_modpath("dye") and minetest.get_modpath("farming") then if minetest.get_modpath("dye") and minetest.get_modpath("farming") then
@ -20,7 +20,7 @@ end
minetest.register_craftitem("mobs:leather", { minetest.register_craftitem("mobs:leather", {
description = S("Leather"), description = S("Leather"),
inventory_image = "mobs_leather.png", inventory_image = "mobs_leather.png",
groups = {flammable = 2} groups = {flammable = 2, leather = 1}
}) })
-- raw meat -- raw meat
@ -119,7 +119,7 @@ minetest.register_craft({
minetest.register_craftitem("mobs:saddle", { minetest.register_craftitem("mobs:saddle", {
description = S("Saddle"), description = S("Saddle"),
inventory_image = "mobs_saddle.png", inventory_image = "mobs_saddle.png",
groups = {flammable = 2} groups = {flammable = 2, saddle = 1}
}) })
minetest.register_craft({ minetest.register_craft({

View file

@ -0,0 +1,3 @@
...
...
CC BY-SA 3.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB