lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#2285) from master into Raytraced_arrows

Browse Source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2285
This commit is contained in:
epCode 2022-06-07 18:41:22 +00:00
commit 0aaede2f50
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game.conf
View File

@ -1,2 +1,2 @@
name = MineClone 2 title = MineClone 2
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more. description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.

4
mods/ITEMS/mcl_bows/crossbow.lua
View File

@ -151,7 +151,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
}) })
minetest.register_tool("mcl_bows:crossbow_loaded", { minetest.register_tool("mcl_bows:crossbow_loaded", {
description = S("Corssbow"), description = S("Crossbow"),
_tt_help = S("Launches arrows"), _tt_help = S("Launches arrows"),
_doc_items_longdesc = S("Corssbow are ranged weapons to shoot arrows at your foes.").."\n".. _doc_items_longdesc = S("Corssbow are ranged weapons to shoot arrows at your foes.").."\n"..
S("The speed and damage of the arrow increases the longer you charge. The regular damage of the arrow is between 1 and 9. At full charge, there's also a 20% of a critical hit, dealing 10 damage instead."), S("The speed and damage of the arrow increases the longer you charge. The regular damage of the arrow is between 1 and 9. At full charge, there's also a 20% of a critical hit, dealing 10 damage instead."),
@ -181,7 +181,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
itemstack:get_meta():set_string("active", "true") itemstack:get_meta():set_string("active", "true")
return itemstack return itemstack
end, end,
groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1}, groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1,not_in_creative_inventory=1},
_mcl_uses = 326, _mcl_uses = 326,
}) })

13
mods/MAPGEN/mcl_shipwrecks/init.lua
View File

@ -2,10 +2,11 @@ local modname = minetest.get_current_modname()
local modpath = minetest.get_modpath(modname) local modpath = minetest.get_modpath(modname)
--local S = minetest.get_translator(modname) --local S = minetest.get_translator(modname)
local mgp = minetest.get_mapgen_params() local seed = minetest.get_mapgen_setting("seed")
local pr = PseudoRandom(mgp.seed) local water_level = minetest.get_mapgen_setting("water_level")
local pr = PseudoRandom(seed)
--schematics by chmodsayshello --schematics by chmodsayshello
local schems = { local schems = {
"shipwreck_full_damaged", "shipwreck_full_damaged",
"shipwreck_full_normal", "shipwreck_full_normal",
@ -101,7 +102,7 @@ minetest.register_decoration({
fill_ratio = 0.00002, fill_ratio = 0.00002,
flags = "place_center_x, place_center_z, force_placement", flags = "place_center_x, place_center_z, force_placement",
biomes = get_ocean_biomes(), biomes = get_ocean_biomes(),
y_max=mgp.water_level-4, y_max=water_level-4,
}) })
--rare beached variant --rare beached variant
@ -115,8 +116,8 @@ minetest.register_decoration({
fill_ratio=0.000001, fill_ratio=0.000001,
flags = "place_center_x, place_center_z, force_placement", flags = "place_center_x, place_center_z, force_placement",
biomes = get_beach_biomes(), biomes = get_beach_biomes(),
y_max = mgp.water_level + 4, y_max = water_level + 4,
y_min = mgp.water_level - 1, y_min = water_level - 1,
}) })
minetest.register_lbm({ minetest.register_lbm({