diff --git a/README.md b/README.md index 05ac5f3a..3c96a130 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [enchanting][] ([GPL / WTFPL / CC BY-SA-NA][lic.enchanting]) -- version: [13ea31c Git][ver.enchanting] *2016-12-16* * equipment/ * [airtanks][] ([MIT][lic.airtanks]) -- version: [fc01ffb Git][ver.airtanks] *2017-04-01* ([patched][patch.airtanks]) - * [slingshot][] ([MIT][lic.slingshot] / [CC0][lic.cc0]) -- version: [f385f05 Git][ver.slingshot] *2017-06-01* + * [slingshot][] ([MIT][lic.slingshot] / [CC0][lic.cc0]) -- version: [dffa38f Git][ver.slingshot] *2017-06-01* * [xtraarmor][] ([CC BY-SA][lic.ccbysa3.0]) -- version: 0.3 * farming/ * [crops][] ([LGPL / CC BY-SA / CC BY / CC0][lic.crops]) -- version: [2b1bb37 Git][ver.crops] *2017-03-31* ([patched][patch.crops]) @@ -467,7 +467,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.rainbow_ore]: https://github.com/FsxShader2012/rainbow_ore/tree/6e77693 [ver.signs_lib]: https://github.com/minetest-mods/signs_lib/tree/2c36937 [ver.simple_protection]: https://github.com/SmallJoker/simple_protection/tree/23c024f -[ver.slingshot]: https://github.com/AntumDeluge/mtmod-slingshot/tree/f385f05 +[ver.slingshot]: https://github.com/AntumDeluge/mtmod-slingshot/tree/dffa38f [ver.sneeker]: https://github.com/AntumDeluge/mtmod-sneeker/tree/e948a58 [ver.snowdrift]: https://github.com/paramat/snowdrift/tree/fcb0537 [ver.spawneggs]: https://github.com/thefamilygrog66/spawneggs/tree/4650370 diff --git a/mods/equipment/slingshot/README.md b/mods/equipment/slingshot/README.md index 196ebb8f..43e3989d 100644 --- a/mods/equipment/slingshot/README.md +++ b/mods/equipment/slingshot/README.md @@ -31,6 +31,9 @@ Depends: * `SI` = default:steel_ingot * `ST` = default:stick +* `RB` = slingshot:rubber_band +* `TR` = technic:rubber +* `TL` = technic:raw_latex ##### Craft recipes: @@ -44,17 +47,52 @@ slingshot: ║ ║ SI ║ ║ ╚════╩════╩════╝ +slingshot (with technic): + + ╔════╦════╦════╗ + ║ SI ║ ║ SI ║ + ╠════╬════╬════╣ + ║ ║ SI ║ ║ + ╠════╬════╬════╣ + ║ ║ SI ║ ║ + ╚════╩════╩════╝ wood slingshot: ╔════╦════╦════╗ - ║ ST ║ ║ ST ║ + ║ ST ║ RB ║ ST ║ ╠════╬════╬════╣ ║ ║ ST ║ ║ ╠════╬════╬════╣ ║ ║ ST ║ ║ ╚════╩════╩════╝ +wood slingshot (with technic): + + ╔════╦════╦════╗ + ║ ST ║ RB ║ ST ║ + ╠════╬════╬════╣ + ║ ║ ST ║ ║ + ╠════╬════╬════╣ + ║ ║ ST ║ ║ + ╚════╩════╩════╝ + +rubber band: + + ╔════╦════╦════╗ + ║ TL ║ TL ║ ║ + ╠════╬════╬════╣ + ║ TL ║ ║ TL ║ + ╠════╬════╬════╣ + ║ ║ TL ║ TL ║ + ╚════╩════╩════╝ + +rubber band (shapeless): + + ╔════╗ + ║ TR ║ + ╚════╝ + [AiTechEye]: https://forum.minetest.net/memberlist.php?mode=viewprofile&u=16172 diff --git a/mods/equipment/slingshot/init.lua b/mods/equipment/slingshot/init.lua index a4911cfd..c88f658c 100644 --- a/mods/equipment/slingshot/init.lua +++ b/mods/equipment/slingshot/init.lua @@ -9,6 +9,10 @@ if slingshot.require_rubber_band == nil then slingshot.require_rubber_band = true end +if minetest.setting_getbool('log_mods') then + minetest.log('action', '[slingshot] Require rubber band: ' .. tostring(slingshot.require_rubber_band)) +end + local scripts = { 'functions', diff --git a/mods/equipment/slingshot/register.lua b/mods/equipment/slingshot/register.lua index 9244d09d..1c31517f 100644 --- a/mods/equipment/slingshot/register.lua +++ b/mods/equipment/slingshot/register.lua @@ -12,6 +12,15 @@ if minetest.global_exists('technic') then type = 'shapeless', recipe = {'technic:rubber'}, }) + + minetest.register_craft({ + output = 'slingshot:rubber_band 2', + recipe = { + {'technic:raw_latex', 'technic:raw_latex', ''}, + {'technic:raw_latex', '', 'technic:raw_latex'}, + {'', 'technic:raw_latex', 'technic:raw_latex'}, + } + }) end