master #16
12 changed files with 191 additions and 11 deletions
|
@ -13,7 +13,7 @@ local S = armor.get_translator
|
||||||
|
|
||||||
-- integration test
|
-- integration test
|
||||||
if minetest.settings:get_bool("enable_3d_armor_integration_test") then
|
if minetest.settings:get_bool("enable_3d_armor_integration_test") then
|
||||||
dofile(modpath.."/integration_test.lua")
|
dofile(modpath.."/integration_test.lua")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ end
|
||||||
|
|
||||||
if minetest.get_modpath("technic") then
|
if minetest.get_modpath("technic") then
|
||||||
armor.formspec = armor.formspec..
|
armor.formspec = armor.formspec..
|
||||||
"label[5,2.5;"..F(S("Radiation"))..": armor_group_radiation]"
|
"label[5,2.5;"..F(S("Radiation"))..": armor_group_radiation]"
|
||||||
armor:register_armor_group("radiation")
|
armor:register_armor_group("radiation")
|
||||||
end
|
end
|
||||||
local skin_mods = {"skins", "u_skins", "simple_skins", "wardrobe"}
|
local skin_mods = {"skins", "u_skins", "simple_skins", "wardrobe"}
|
||||||
|
@ -95,9 +95,9 @@ dofile(modpath.."/armor.lua")
|
||||||
|
|
||||||
armor.formspec = armor.formspec..
|
armor.formspec = armor.formspec..
|
||||||
"label[5,1;"..F(S("Level"))..": armor_level]"..
|
"label[5,1;"..F(S("Level"))..": armor_level]"..
|
||||||
"label[5,1.5;"..F(S("Heal"))..": armor_attr_heal]"
|
"label[5,1.5;"..F(S("Heal"))..": armor_attr_heal]"
|
||||||
if armor.config.fire_protect then
|
if armor.config.fire_protect then
|
||||||
armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..": armor_attr_fire]"
|
armor.formspec = armor.formspec.."label[5,2;"..F(S("Fire"))..": armor_attr_fire]"
|
||||||
end
|
end
|
||||||
armor:register_on_damage(function(player, index, stack)
|
armor:register_on_damage(function(player, index, stack)
|
||||||
local name = player:get_player_name()
|
local name = player:get_player_name()
|
||||||
|
@ -193,6 +193,9 @@ local function init_player_armor(initplayer)
|
||||||
armor:set_player_armor(player)
|
armor:set_player_armor(player)
|
||||||
end,
|
end,
|
||||||
allow_put = function(inv, listname, index, put_stack, player)
|
allow_put = function(inv, listname, index, put_stack, player)
|
||||||
|
if player:get_player_name() ~= name then
|
||||||
|
return 0
|
||||||
|
end
|
||||||
local element = armor:get_element(put_stack:get_name())
|
local element = armor:get_element(put_stack:get_name())
|
||||||
if not element then
|
if not element then
|
||||||
return 0
|
return 0
|
||||||
|
@ -208,9 +211,15 @@ local function init_player_armor(initplayer)
|
||||||
return 1
|
return 1
|
||||||
end,
|
end,
|
||||||
allow_take = function(inv, listname, index, stack, player)
|
allow_take = function(inv, listname, index, stack, player)
|
||||||
|
if player:get_player_name() ~= name then
|
||||||
|
return 0
|
||||||
|
end
|
||||||
return stack:get_count()
|
return stack:get_count()
|
||||||
end,
|
end,
|
||||||
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
|
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
|
||||||
|
if player:get_player_name() ~= name then
|
||||||
|
return 0
|
||||||
|
end
|
||||||
return count
|
return count
|
||||||
end,
|
end,
|
||||||
}, name)
|
}, name)
|
||||||
|
@ -292,7 +301,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
if not name then
|
if not name then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local player_name = player:get_player_name()
|
local player_name = player:get_player_name()
|
||||||
for field, _ in pairs(fields) do
|
for field, _ in pairs(fields) do
|
||||||
if string.find(field, "skins_set") then
|
if string.find(field, "skins_set") then
|
||||||
armor:update_skin(player_name)
|
armor:update_skin(player_name)
|
||||||
|
@ -302,10 +311,10 @@ end)
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function(player)
|
minetest.register_on_joinplayer(function(player)
|
||||||
default.player_set_model(player, "3d_armor_character.b3d")
|
default.player_set_model(player, "3d_armor_character.b3d")
|
||||||
local player_name = player:get_player_name()
|
local player_name = player:get_player_name()
|
||||||
|
|
||||||
minetest.after(0, function()
|
minetest.after(0, function()
|
||||||
local pplayer = minetest.get_player_by_name(player_name)
|
local pplayer = minetest.get_player_by_name(player_name)
|
||||||
if pplayer and init_player_armor(pplayer) == false then
|
if pplayer and init_player_armor(pplayer) == false then
|
||||||
pending_players[pplayer] = 0
|
pending_players[pplayer] = 0
|
||||||
end
|
end
|
||||||
|
|
|
@ -365,7 +365,11 @@ local function generate_cloud_house(minp, maxp, seed)
|
||||||
local y0 = pr:next(minp.y, maxp.y)
|
local y0 = pr:next(minp.y, maxp.y)
|
||||||
local z0 = pr:next(minp.z, maxp.z)
|
local z0 = pr:next(minp.z, maxp.z)
|
||||||
local p0 = {x = x0, y = y0, z = z0}
|
local p0 = {x = x0, y = y0, z = z0}
|
||||||
place_schem_metadata(p0, "cloud_house.we")
|
if not minetest.get_modpath("moreblocks") then
|
||||||
|
place_schem_metadata(p0, "cloud_house_1.we")
|
||||||
|
else
|
||||||
|
place_schem_metadata(p0, "cloud_house_2.we")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
2
mods/cloud_items/schems/cloud_house_2.we
Normal file
2
mods/cloud_items/schems/cloud_house_2.we
Normal file
File diff suppressed because one or more lines are too long
|
@ -164,7 +164,12 @@ if name then
|
||||||
|
|
||||||
-- set player physics
|
-- set player physics
|
||||||
if not monoids and not pova_mod then
|
if not monoids and not pova_mod then
|
||||||
player:set_physics_override(def.speed, def.jump, def.gravity)
|
--player:set_physics_override(def.speed, def.jump, def.gravity)
|
||||||
|
player:set_physics_override({
|
||||||
|
speed = def.speed,
|
||||||
|
jump = def.jump,
|
||||||
|
gravity = def.gravity
|
||||||
|
})
|
||||||
end
|
end
|
||||||
--[[
|
--[[
|
||||||
print ("Speed: " .. def.speed
|
print ("Speed: " .. def.speed
|
||||||
|
|
|
@ -161,7 +161,7 @@ minetest.register_entity("signs_lib:text", {
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "signs_lib_standard_sign_entity_wall.obj",
|
mesh = "signs_lib_standard_sign_entity_wall.obj",
|
||||||
textures = {},
|
textures = {},
|
||||||
static_save = false,
|
static_save = true,
|
||||||
backface_culling = false
|
backface_culling = false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
3
mods/skinsdb/meta/character_1913.txt
Normal file
3
mods/skinsdb/meta/character_1913.txt
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
-ITz_Dark-
|
||||||
|
-ITz_Dark_
|
||||||
|
CC BY-SA 3.0
|
3
mods/skinsdb/meta/character_1914.txt
Normal file
3
mods/skinsdb/meta/character_1914.txt
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
Voxel Man
|
||||||
|
Onyx
|
||||||
|
CC BY-SA 3.0
|
BIN
mods/skinsdb/textures/character_1913.png
Normal file
BIN
mods/skinsdb/textures/character_1913.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 8.1 KiB |
BIN
mods/skinsdb/textures/character_1914.png
Normal file
BIN
mods/skinsdb/textures/character_1914.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 542 B |
|
@ -108,7 +108,7 @@ local function arrow_punch(object, hitter, caps)
|
||||||
if time_from_last_punch >= (caps.full_punch_interval or 1) then
|
if time_from_last_punch >= (caps.full_punch_interval or 1) then
|
||||||
last_punch_times[hitter_name][player_name] = os.time()
|
last_punch_times[hitter_name][player_name] = os.time()
|
||||||
end
|
end
|
||||||
object:punch(hitter, time_from_last_punch, caps)
|
object:punch(hitter, time_from_last_punch, caps, nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
if get_setting("arrow") then
|
if get_setting("arrow") then
|
||||||
|
|
154
mods/xdecor/locale/xdecor.de.tr
Normal file
154
mods/xdecor/locale/xdecor.de.tr
Normal file
|
@ -0,0 +1,154 @@
|
||||||
|
# textdomain: xdecor
|
||||||
|
|
||||||
|
|
||||||
|
### chess.lua ###
|
||||||
|
|
||||||
|
Black Bishop=schwarzer Läufer
|
||||||
|
Black King=schwarter König
|
||||||
|
Black Knight=schwarzes Pferd
|
||||||
|
Black Pawn=schwarzer Bauer
|
||||||
|
Black Queen=schwarze Dame
|
||||||
|
Black Rook=schwarzer Turm
|
||||||
|
Chess=Schach
|
||||||
|
Chess Board=Schachbrett
|
||||||
|
Dumb AI=dumme KI
|
||||||
|
Multiplayer=Mehrspieler
|
||||||
|
New game=neues Spiel
|
||||||
|
Select a mode:=Wähle einen Modus:
|
||||||
|
Singleplayer=Einzelspieler
|
||||||
|
Someone else plays black pieces!=Jemand anderes spielt Schwarz!
|
||||||
|
Someone else plays white pieces!=Jemand anderes spielt Weiß!
|
||||||
|
White Bishop=weißer Läufer
|
||||||
|
White King=weißer König
|
||||||
|
White Knight=weißes Pferd
|
||||||
|
White Pawn=weißer Bauer
|
||||||
|
White Queen=weiße Dame
|
||||||
|
White Rook=weißer Turm
|
||||||
|
|
||||||
|
You can't dig the chessboard, a game has been started791234567. Reset it first if you're a current player, or dig it again in @1=Das Schachbrett ist während eines Schachspieles nicht abbaubar. Setze das Spiel zurück, falls du ein Mitspieler bist oder versuche es in @1 erneut.
|
||||||
|
791234567
|
||||||
|
You can't reset the chessboard, a game has been started. If you aren't a current player, try again in @1=Das Schachbrett kann nicht zurückgesetzt werdenm da ein Spiel im Gang ist. Versuche es in @1 erneut, falls du kein Mitspieler bist.
|
||||||
|
|
||||||
|
check=Schach
|
||||||
|
|
||||||
|
### cooking.lua ###
|
||||||
|
|
||||||
|
Bowl=Schüssel
|
||||||
|
Bowl of soup=Suppenschüssel
|
||||||
|
Cauldron=Kessel
|
||||||
|
Cauldron (active) - Drop foods inside to make a soup=Kessel (aktiv) - Nahrungsmittel einwerfen, um Suppe zu machen.
|
||||||
|
Cauldron (active) - Use a bowl to eat the soup=Kessel (aktiv) - Benutze eine Schüssel, um die Suppe zu essen
|
||||||
|
Cauldron (empty)=Kessel (leer)
|
||||||
|
Cauldron (idle)=Kessel (untätig)
|
||||||
|
No room in your inventory to add a bowl of soup.=Zu wenig Platz im Inventar für eine Schüssel voll Suppe.
|
||||||
|
No room in your inventory to add a bucket of water.=Zu wenig Platz im Inventar für einen Eimer Wasser.
|
||||||
|
|
||||||
|
### enchanting.lua ###
|
||||||
|
|
||||||
|
Axe=axt
|
||||||
|
Bronze=Bronze
|
||||||
|
Diamond=Diamant
|
||||||
|
Durability=Haltbarkeit
|
||||||
|
Efficiency=Effizienz
|
||||||
|
Enchanted @1 @2 @3=verzauberte(s) @1@2 @3
|
||||||
|
Enchantment Table=Zaubertisch
|
||||||
|
Mese=Mese
|
||||||
|
Pickaxe=Spitzhacke
|
||||||
|
Sharpness=Schärfe
|
||||||
|
Shovel=Schaufel
|
||||||
|
Steel=Eisen
|
||||||
|
Sword=Schwert
|
||||||
|
Your tool digs faster=Dein Werkzeug arbeitet schneller
|
||||||
|
Your tool last longer=Dein Werkzeug hält länger
|
||||||
|
Your weapon inflicts more damages=Deine Waffe erzeugt mehr Schaden
|
||||||
|
|
||||||
|
### hive.lua ###
|
||||||
|
|
||||||
|
Artificial Hive=künstlicher Bienenstock
|
||||||
|
Bees are busy making honey…=Bienen sind beschäftigt, Honig herzustellen.
|
||||||
|
Honey=Honig
|
||||||
|
|
||||||
|
### itemframe.lua ###
|
||||||
|
|
||||||
|
@1 (owned by @2)=@1 (gehört @2)
|
||||||
|
Item Frame=Objektrahmen
|
||||||
|
|
||||||
|
### mailbox.lua ###
|
||||||
|
|
||||||
|
@1's Mailbox=Briefkasten von @1
|
||||||
|
Last donators=letzte Spender
|
||||||
|
Mailbox=Briefkasten
|
||||||
|
Send your goods to@n@1=Sende deine Waren an@n@1
|
||||||
|
The mailbox is full.=Der Briefkasten ist voll.
|
||||||
|
|
||||||
|
### mechanisms.lua ###
|
||||||
|
|
||||||
|
Lever=Schalthebel
|
||||||
|
Stone Pressure Plate=steinerne Druckplatte
|
||||||
|
Wooden Pressure Plate=hölzerne Druckplatte
|
||||||
|
|
||||||
|
### nodes.lua ###
|
||||||
|
|
||||||
|
Bamboo Frame=Bambusgerüst
|
||||||
|
Baricade=Barrikade
|
||||||
|
Barrel=Fass
|
||||||
|
Cactus Brick=Kaktusstein
|
||||||
|
Candle=Kerze
|
||||||
|
Chainlink=Kettenvorhang
|
||||||
|
Chair=einfacher Stuhl
|
||||||
|
Coal Stone Tile=Kohle-Stein-Block
|
||||||
|
Cobweb=Spinnenwebe
|
||||||
|
Cushion=Sitzkissen
|
||||||
|
Cushion Block=Sitzkissenblock
|
||||||
|
Desert Stone Tile=Wüstensteinblock
|
||||||
|
Empty Shelf=leeres Regal
|
||||||
|
Ender Chest=Endertruhe
|
||||||
|
Garden Stone Path=Steingartenweg
|
||||||
|
Half Wooden Cabinet=halber Holzschrank
|
||||||
|
Hardened Clay=gehärteter Ton
|
||||||
|
Iron Light Box=eiseneingefasster Lichtblock
|
||||||
|
Ivy=Efeu
|
||||||
|
Japanese Door=japanische Tür
|
||||||
|
Lantern=Laterne
|
||||||
|
Moon Brick=Naturziegelwand
|
||||||
|
Multi Shelf=Mehrzweckregal
|
||||||
|
Packed Ice=Packeis
|
||||||
|
Painting=Gemälde
|
||||||
|
Potted Geranium=Geranien im Topf
|
||||||
|
Potted Rose=Rosen im Topf
|
||||||
|
Potted Tulip=Tulpen im Topf
|
||||||
|
Potted Viola=Veilchen im Topf
|
||||||
|
Potted White Dandelion=weiße Löwenzahn im Topf
|
||||||
|
Potted Yellow Dandelion=gelbe Löwenzahn im Topf
|
||||||
|
Prison Door=Verliestür
|
||||||
|
Red Curtain=roter Vorhang
|
||||||
|
Runestone=Runensteinblock
|
||||||
|
Rusty Iron Bars=rostige Eisenstäbe
|
||||||
|
Rusty Prison Door=rostige Verliestür
|
||||||
|
Screen Door=französische Glastür
|
||||||
|
Slide Door=Schiebetür
|
||||||
|
Stone Tile=steinerner Block
|
||||||
|
Table=einfacher Tisch
|
||||||
|
Tatami=Tatamimatte
|
||||||
|
Television=Fernseher
|
||||||
|
Trampoline=Trampolin
|
||||||
|
Wood Frame=hölzerner Zierrahmen
|
||||||
|
Wood Framed Glass=holzeingefasstes Glas
|
||||||
|
Wooden Cabinet=Holzschrank
|
||||||
|
Wooden Light Box=holzeingefasster Lichtblock
|
||||||
|
Wooden Tile=hölzerner Dekorblock
|
||||||
|
Woodglass Door=Tür mit Lichtausschnitt
|
||||||
|
|
||||||
|
### rope.lua ###
|
||||||
|
|
||||||
|
Rope=Seil
|
||||||
|
|
||||||
|
### workbench.lua ###
|
||||||
|
|
||||||
|
Back=Zurück
|
||||||
|
Crafting=Fertigung
|
||||||
|
Cut=Zuschnitt
|
||||||
|
Hammer=Hämmerchen
|
||||||
|
Repair=Reparatur
|
||||||
|
Storage=Aufbewahrung
|
||||||
|
Work Bench=Werkbank
|
Loading…
Reference in a new issue