Merge pull request 'master' (#2) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/2new_mapgen_api
commit
a2e0cf83bc
|
@ -1,23 +1,26 @@
|
|||
local modname = minetest.get_current_modname()
|
||||
local S = minetest.get_translator(modname)
|
||||
|
||||
mcl_credits = {
|
||||
players = {},
|
||||
}
|
||||
|
||||
mcl_credits.description = "A faithful Open Source clone of Minecraft"
|
||||
mcl_credits.description = S("A faithful Open Source clone of Minecraft")
|
||||
|
||||
-- Sub-lists are sorted by number of commits, but the list should not be rearranged (-> new contributors are just added at the end of the list)
|
||||
mcl_credits.people = {
|
||||
{"Creator of MineClone", 0x0A9400, {
|
||||
{ S("Creator of MineClone"), 0x0A9400, {
|
||||
"davedevils",
|
||||
}},
|
||||
{"Creator of MineClone2", 0xFBF837, {
|
||||
{ S("Creator of MineClone2"), 0xFBF837, {
|
||||
"Wuzzy",
|
||||
}},
|
||||
{"Maintainers", 0xFF51D5, {
|
||||
{ S("Maintainers"), 0xFF51D5, {
|
||||
"Fleckenstein",
|
||||
"kay27",
|
||||
"oilboi",
|
||||
}},
|
||||
{"Developers", 0xF84355, {
|
||||
{ S("Developers"), 0xF84355, {
|
||||
"bzoss",
|
||||
"AFCMS",
|
||||
"epCode",
|
||||
|
@ -30,7 +33,7 @@ mcl_credits.people = {
|
|||
"Code-Sploit",
|
||||
"NO11",
|
||||
}},
|
||||
{"Contributors", 0x52FF00, {
|
||||
{ S("Contributors"), 0x52FF00, {
|
||||
"Laurent Rocher",
|
||||
"HimbeerserverDE",
|
||||
"TechDudie",
|
||||
|
@ -64,7 +67,7 @@ mcl_credits.people = {
|
|||
"NO11",
|
||||
"j45",
|
||||
}},
|
||||
{"Original Mod Authors", 0x343434, {
|
||||
{ S("Original Mod Authors"), 0x343434, {
|
||||
"Wuzzy",
|
||||
"Fleckenstein",
|
||||
"BlockMen",
|
||||
|
@ -96,12 +99,12 @@ mcl_credits.people = {
|
|||
"jordan4ibanez",
|
||||
"paramat",
|
||||
}},
|
||||
{"3D Models", 0x0019FF, {
|
||||
{ S("3D Models"), 0x0019FF, {
|
||||
"22i",
|
||||
"tobyplowy",
|
||||
"epCode",
|
||||
}},
|
||||
{"Textures", 0xFF9705, {
|
||||
{ S("Textures"), 0xFF9705, {
|
||||
"XSSheep",
|
||||
"Wuzzy",
|
||||
"kingoscargames",
|
||||
|
@ -110,7 +113,7 @@ mcl_credits.people = {
|
|||
"yutyo",
|
||||
"NO11",
|
||||
}},
|
||||
{"Translations", 0x00FF60, {
|
||||
{ S("Translations"), 0x00FF60, {
|
||||
"Wuzzy",
|
||||
"Rocher Laurent",
|
||||
"wuniversales",
|
||||
|
@ -142,7 +145,7 @@ function mcl_credits.show(player)
|
|||
ids = {
|
||||
player:hud_add({
|
||||
hud_elem_type = "image",
|
||||
text = "menu_bg.png",
|
||||
text = "credits_bg.png",
|
||||
position = {x = 0, y = 0},
|
||||
alignment = {x = 1, y = 1},
|
||||
scale = {x = -100, y = -100},
|
||||
|
@ -150,13 +153,22 @@ function mcl_credits.show(player)
|
|||
}),
|
||||
player:hud_add({
|
||||
hud_elem_type = "text",
|
||||
text = "Sneak to skip",
|
||||
text = S("Sneak to skip"),
|
||||
position = {x = 1, y = 1},
|
||||
alignment = {x = -1, y = -1},
|
||||
offset = {x = -5, y = -5},
|
||||
z_index = 1001,
|
||||
number = 0xFFFFFF,
|
||||
})
|
||||
}),
|
||||
player:hud_add({
|
||||
hud_elem_type = "text",
|
||||
text = " "..S("Jump to speed up (additionally sprint)"),
|
||||
position = {x = 0, y = 1},
|
||||
alignment = {x = 1, y = -1},
|
||||
offset = {x = -5, y = -5},
|
||||
z_index = 1002,
|
||||
number = 0xFFFFFF,
|
||||
}),
|
||||
},
|
||||
}
|
||||
add_hud_element({
|
||||
|
@ -216,13 +228,22 @@ end)
|
|||
minetest.register_globalstep(function(dtime)
|
||||
for _, huds in pairs(mcl_credits.players) do
|
||||
local player = huds.player
|
||||
if not huds.new and player:get_player_control().sneak then
|
||||
local control = player:get_player_control()
|
||||
if not huds.new and control.sneak then
|
||||
mcl_credits.hide(player)
|
||||
else
|
||||
local moving = {}
|
||||
local any
|
||||
for id, y in pairs(huds.moving) do
|
||||
y = y - 1
|
||||
|
||||
if control.jump then
|
||||
y = y - 2
|
||||
if control.aux1 then
|
||||
y = y - 5
|
||||
end
|
||||
end
|
||||
|
||||
if y > -100 then
|
||||
if id == huds.icon then
|
||||
y = math.max(400, y)
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
# textdomain: mcl_credits
|
||||
3D Models=3D Modelle
|
||||
A faithful Open Source clone of Minecraft=Ein treuer Open-Source-Klon von Minecraft
|
||||
Contributors=Mitwirkende
|
||||
Creator of MineClone=Schöpfer von MineClone
|
||||
Creator of MineClone2=Schöpfer von MineClone2
|
||||
Developers=Entwickler
|
||||
Jump to speed up (additionally sprint)=Springen, um zu beschleunigen (zusätzlich sprinten)
|
||||
Maintainers=Betreuer
|
||||
Original Mod Authors=Original-Mod-Autoren
|
||||
Sneak to skip=Schleichen zum Überspringen
|
||||
Textures=Texturen
|
||||
Translations=Übersetzungen
|
|
@ -0,0 +1,14 @@
|
|||
# textdomain: mcl_credits
|
||||
3D Models=
|
||||
A faithful Open Source clone of Minecraft=
|
||||
Contributors=
|
||||
Creator of MineClone=
|
||||
Creator of MineClone2=
|
||||
Developers=
|
||||
Jump to speed up (additionally sprint)=
|
||||
Maintainers=
|
||||
MineClone5=
|
||||
Original Mod Authors=
|
||||
Sneak to skip=
|
||||
Textures=
|
||||
Translations=
|
Binary file not shown.
After Width: | Height: | Size: 62 KiB |
|
@ -1,5 +1,5 @@
|
|||
name = mcl_armor
|
||||
author = stu
|
||||
description = Adds craftable armor that is visible to other players.
|
||||
depends = mcl_core, mcl_player, mcl_enchanting
|
||||
depends = mcl_core, mcl_player, mcl_enchanting, mcl_damage
|
||||
optional_depends = mcl_fire, ethereal, bakedclay
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -25,6 +25,8 @@ mcl_player.player_register_model("mcl_armor_character.b3d", {
|
|||
sit_mount = {x=484, y=484},
|
||||
die = {x=498, y=498},
|
||||
fly = {x=502, y=581},
|
||||
bow_walk = {x=650, y=670},
|
||||
bow_sneak = {x=675, y=695},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -55,6 +57,8 @@ mcl_player.player_register_model("mcl_armor_character_female.b3d", {
|
|||
sit_mount = {x=484, y=484},
|
||||
die = {x=498, y=498},
|
||||
fly = {x=502, y=581},
|
||||
bow_walk = {x=650, y=670},
|
||||
bow_sneak = {x=675, y=695},
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
name = mcl_brewing
|
||||
author = bzoss
|
||||
depends = mcl_init, mcl_formspec, mcl_sounds, mcl_potions, mcl_mobitems
|
||||
optional_depends = mcl_core, doc, screwdriver
|
||||
optional_depends = mcl_core, doc, screwdriver, mesecons_mvps
|
||||
|
|
|
@ -203,7 +203,8 @@ minetest.register_abm({
|
|||
chance = 1,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
for _,object in pairs(minetest.get_objects_inside_radius(pos, 0.9)) do
|
||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
||||
local entity = object:get_luaentity()
|
||||
if entity and entity.name == "__builtin:item" then
|
||||
object:remove()
|
||||
end
|
||||
end
|
||||
|
|
|
@ -212,6 +212,10 @@ minetest.register_globalstep(function(dtime)
|
|||
player_set_animation(player, "swim_walk_mine", animation_speed_mod)
|
||||
elseif not controls.sneak and head_in_water and is_sprinting == true then
|
||||
player_set_animation(player, "swim_walk", animation_speed_mod)
|
||||
elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB and controls.sneak then
|
||||
player_set_animation(player, "bow_sneak", animation_speed_mod)
|
||||
elseif string.find(player:get_wielded_item():get_name(), "mcl_bows:bow") and controls.RMB then
|
||||
player_set_animation(player, "bow_walk", animation_speed_mod)
|
||||
elseif is_sprinting == true and get_mouse_button(player) == true and not controls.sneak and not head_in_water then
|
||||
player_set_animation(player, "run_walk_mine", animation_speed_mod)
|
||||
elseif get_mouse_button(player) == true and not controls.sneak then
|
||||
|
|
|
@ -51,6 +51,15 @@ local function player_collision(player)
|
|||
return {x,z}
|
||||
end
|
||||
|
||||
local function walking_player(player, control)
|
||||
if control.up or control.down or control.left or control.right then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- converts yaw to degrees
|
||||
local function degrees(rad)
|
||||
return rad * 180.0 / math.pi
|
||||
|
@ -217,8 +226,9 @@ minetest.register_globalstep(function(dtime)
|
|||
|
||||
player_velocity_old = player:get_velocity() or player:get_player_velocity()
|
||||
|
||||
|
||||
-- controls right and left arms pitch when shooting a bow
|
||||
if string.find(wielded:get_name(), "mcl_bows:bow") and control.RMB and not control.LMB and not control.up and not control.down and not control.left and not control.right then
|
||||
if string.find(wielded:get_name(), "mcl_bows:bow") and control.RMB then
|
||||
player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(pitch+90,-30,pitch * -1 * .35))
|
||||
player:set_bone_position("Arm_Left_Pitch_Control", vector.new(3.5,5.785,0), vector.new(pitch+90,43,pitch * .35))
|
||||
-- when punching
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name = mcl_playerplus
|
||||
author = TenPlus1
|
||||
description = Adds some simple player-related gameplay effects: Hurt by touching a cactus, suffocation and more.
|
||||
depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage
|
||||
depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage, mcl_sprint
|
||||
|
||||
|
|
Loading…
Reference in New Issue