antumluanti/game-antum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mp.mesecons: Update to version 1.2...

Browse Source 
https://github.com/minetest-mods/mesecons/tree/v1.2
This commit is contained in:
Jordan Irwin 2018-07-23 11:31:47 -07:00
parent 5f3a61a6ad
commit 96a23eceb0
6 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -139,7 +139,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* [3d_armor][] ([LGPL / CC BY-SA][lic.3d_armor]) - version: [0.4.12][ver.3d_armor] *2018-06-10* ([patched][patch.3d_armor]) ***UNSTABLE UPDATES*** * [3d_armor][] ([LGPL / CC BY-SA][lic.3d_armor]) - version: [0.4.12][ver.3d_armor] *2018-06-10* ([patched][patch.3d_armor]) ***UNSTABLE UPDATES***
* [deploy_nodes][] ([BSD 3-Clause][lic.deploy_nodes]) -- version [b67e162 Git][ver.deploy_nodes] *2017-06-08* * [deploy_nodes][] ([BSD 3-Clause][lic.deploy_nodes]) -- version [b67e162 Git][ver.deploy_nodes] *2017-06-08*
* [homedecor][] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version [stable-20170925-3 (48be7dd Git)][ver.homedecor] *2017-09-25* ([patched][patch.homedecor]) ***UNSTABLE UPDATES*** * [homedecor][] ([LGPL / WTFPL / CC BY-SA / CC0][lic.homedecor]) -- version [stable-20170925-3 (48be7dd Git)][ver.homedecor] *2017-09-25* ([patched][patch.homedecor]) ***UNSTABLE UPDATES***
* [mesecons][] ([LGPL / CC BY-SA][lic.mesecons]) -- version [a234006 Git][ver.mesecons] *2018-07-21* ([patched][patch.mesecons]) * [mesecons][] ([LGPL / CC BY-SA][lic.mesecons]) -- version [1.2 (d4e05f3 Git)][ver.mesecons] *2018-07-23*
* [minetest_game][] ([LGPL][lic.lgpl2.1] / [CC BY-SA][lic.ccbysa3.0]) -- version: [0.4.17][ver.minetest_game] *2018-05-18* ([patched][patch.minetest_game]) ***UNSTABLE UPDATES*** * [minetest_game][] ([LGPL][lic.lgpl2.1] / [CC BY-SA][lic.ccbysa3.0]) -- version: [0.4.17][ver.minetest_game] *2018-05-18* ([patched][patch.minetest_game]) ***UNSTABLE UPDATES***
* [moremesecons][] ([MPL][lic.mpl2.0]) -- version [8a56370 Git][ver.moremesecons] *2018-02-27* * [moremesecons][] ([MPL][lic.mpl2.0]) -- version [8a56370 Git][ver.moremesecons] *2018-02-27*
* [technic][] ([LGPL][lic.lgpl2.0]) -- version: [6664714 Git][ver.technic] *2018-06-28* ([patched][patch.technic]) * [technic][] ([LGPL][lic.lgpl2.0]) -- version: [6664714 Git][ver.technic] *2018-06-28* ([patched][patch.technic])
@ -440,7 +440,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.invisibility]: https://notabug.org/TenPlus1/invisibility/src/e3f04a25c22fa6f9ac044de0bf2f5978c0a95cdf [ver.invisibility]: https://notabug.org/TenPlus1/invisibility/src/e3f04a25c22fa6f9ac044de0bf2f5978c0a95cdf
[ver.jukebox]: https://github.com/minetest-mods/jukebox/tree/d1cd9e1 [ver.jukebox]: https://github.com/minetest-mods/jukebox/tree/d1cd9e1
[ver.lightning]: https://github.com/minetest-mods/lightning/tree/39bd36c [ver.lightning]: https://github.com/minetest-mods/lightning/tree/39bd36c
[ver.mesecons]: https://github.com/minetest-mods/mesecons/tree/a234006 [ver.mesecons]: https://github.com/minetest-mods/mesecons/tree/v1.2
[ver.minetest_game]: https://github.com/minetest/minetest_game/tree/f855bee [ver.minetest_game]: https://github.com/minetest/minetest_game/tree/f855bee
[ver.mob-engine]: https://github.com/minetest-mods/mob-engine/tree/c2bedc3 [ver.mob-engine]: https://github.com/minetest-mods/mob-engine/tree/c2bedc3
[ver.mobs_animal]: https://github.com/tenplus1/mobs_animal/tree/52889c7 [ver.mobs_animal]: https://github.com/tenplus1/mobs_animal/tree/52889c7
@ -516,7 +516,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.hovercraft]: https://github.com/AntumMT/mod-hovercraft/tree/73a6223 [patch.hovercraft]: https://github.com/AntumMT/mod-hovercraft/tree/73a6223
[patch.hud]: https://github.com/AntumMT/mod-hud/tree/6846e20 [patch.hud]: https://github.com/AntumMT/mod-hud/tree/6846e20
[patch.invisibility]: https://github.com/AntumMT/mod-invisibility/tree/0ef4c18 [patch.invisibility]: https://github.com/AntumMT/mod-invisibility/tree/0ef4c18
[patch.mesecons]: https://github.com/AntumMT/mp-mesecons/tree/990f28d
[patch.minetest_game]: https://github.com/AntumMT/mtgame-minetest/tree/355a756 [patch.minetest_game]: https://github.com/AntumMT/mtgame-minetest/tree/355a756
[patch.mob-engine]: https://github.com/AntumMT/mp-mob-engine/tree/2aa511d [patch.mob-engine]: https://github.com/AntumMT/mp-mob-engine/tree/2aa511d
[patch.mobs_animal]: https://github.com/AntumMT/mod-mobs_animal/tree/e275046 [patch.mobs_animal]: https://github.com/AntumMT/mod-mobs_animal/tree/e275046

4
mods/modpacks/mesecons/mesecons_luacontroller/init.lua
View File

@ -198,7 +198,11 @@ end
------------------------- -------------------------
local function safe_print(param) local function safe_print(param)
local string_meta = getmetatable("")
local sandbox = string_meta.__index
string_meta.__index = string -- Leave string sandbox temporarily
print(dump(param)) print(dump(param))
string_meta.__index = sandbox -- Restore string sandbox
end end
local function safe_date() local function safe_date()

14
mods/modpacks/mesecons/mesecons_microcontroller/init.lua
View File

@ -103,6 +103,12 @@ minetest.register_node(nodename, {
meta:set_string("eeprom", r) meta:set_string("eeprom", r)
end, end,
on_receive_fields = function(pos, formanme, fields, sender) on_receive_fields = function(pos, formanme, fields, sender)
local player_name = sender:get_player_name()
if minetest.is_protected(pos, player_name) and
not minetest.check_player_privs(player_name, {protection_bypass=true}) then
minetest.record_protection_violation(pos, player_name)
return
end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if fields.band then if fields.band then
fields.code = "sbi(C, A&B) :A and B are inputs, C is output" fields.code = "sbi(C, A&B) :A and B are inputs, C is output"
@ -272,7 +278,7 @@ yc.parsecode = function(code, pos)
end end
yc.parse_get_command = function(code, starti) yc.parse_get_command = function(code, starti)
i = starti local i = starti
local s local s
while s ~= "" do while s ~= "" do
s = string.sub(code, i, i) s = string.sub(code, i, i)
@ -298,7 +304,7 @@ yc.parse_get_command = function(code, starti)
end end
yc.parse_get_params = function(code, starti) yc.parse_get_params = function(code, starti)
i = starti local i = starti
local s local s
local params = {} local params = {}
local is_string = false local is_string = false
@ -321,7 +327,7 @@ yc.parse_get_params = function(code, starti)
end end
yc.parse_get_eeprom_param = function(cond, starti) yc.parse_get_eeprom_param = function(cond, starti)
i = starti local i = starti
local s local s
local addr local addr
while s ~= "" do while s ~= "" do
@ -488,7 +494,7 @@ end
--Condition parsing --Condition parsing
yc.command_if_getcondition = function(code, starti) yc.command_if_getcondition = function(code, starti)
i = starti local i = starti
local s local s
local brackets = 1 --1 Bracket to close local brackets = 1 --1 Bracket to close
while s ~= "" do while s ~= "" do

16
mods/modpacks/mesecons/mesecons_movestones/init.lua
View File

@ -60,14 +60,16 @@ function mesecon.register_movestone(name, def, is_sticky, is_vertical)
minetest.get_node_timer(frontpos):start(timer_interval) minetest.get_node_timer(frontpos):start(timer_interval)
-- ### Step 3: If sticky, pull stack behind ### -- ### Step 3: If sticky, pull stack behind ###
if not is_sticky then if is_sticky then
return local backpos = vector.subtract(pos, direction)
end success, stack, oldstack = mesecon.mvps_pull_all(backpos, direction, max_pull)
local backpos = vector.subtract(pos, direction) if success then
success, stack, oldstack = mesecon.mvps_pull_all(backpos, direction, max_pull) mesecon.mvps_move_objects(backpos, vector.multiply(direction, -1), oldstack, -1)
if success then end
mesecon.mvps_move_objects(backpos, vector.multiply(direction, -1), oldstack, -1)
end end
-- ### Step 4: Let things fall ###
minetest.check_for_falling(vector.add(pos, {x=0, y=1, z=0}))
end end
def.is_ground_content = false def.is_ground_content = false

34
mods/modpacks/mesecons/settingtypes.txt
View File

@ -1,43 +1,43 @@
[mesecons] [mesecons]
mesecon.resumetime (Resume time) int 4 mesecon.resumetime (Startup delay) int 4 1 10
mesecon.overheat_max (Device heat limit) int 20 mesecon.overheat_max (Device heat limit) int 20 1 100
mesecon.cooldown_time (Device cooldown time) float 2.0 mesecon.cooldown_time (Device cooldown time) float 2.0 0.1 10.0
mesecon.cooldown_granularity (Cooldown step length) float 0.5 mesecon.cooldown_granularity (Cooldown step length) float 0.5 0.0 1.0
[mesecons_blinkyplant] [mesecons_blinkyplant]
mesecon.blinky_plant_interval (Plant blinking interval) int 3 mesecon.blinky_plant_interval (Plant blinking interval) int 3 1 5
[mesecons_detector] [mesecons_detector]
mesecon.detector_radius (Player detector radius) int 6 mesecon.detector_radius (Player detector scanning radius) int 6 3 16
mesecon.node_detector_distance_max (Node detector radius) int 10 mesecon.node_detector_distance_max (Node detector distance limit) int 10 1 16
[mesecons_luacontroller] [mesecons_luacontroller]
mesecon.luacontroller_string_rep_max (string:rep result length limit) int 64000 mesecon.luacontroller_string_rep_max (string:rep result length limit) int 64000 1000 1000000
mesecon.luacontroller_digiline_maxlen (Digiline message size limit) int 50000 mesecon.luacontroller_digiline_maxlen (Digiline message size limit) int 50000 1000 1000000
mesecon.luacontroller_maxevents (Controller execution time limit) int 10000 mesecon.luacontroller_maxevents (Controller execution time limit) int 10000 1000 100000
mesecon.luacontroller_memsize (Controller memory limit) int 100000 mesecon.luacontroller_memsize (Controller memory limit) int 100000 10000 1000000
[mesecons_movestones] [mesecons_movestones]
mesecon.movestone_speed (Speed) int 3 mesecon.movestone_speed (Speed) int 3 1 10
mesecon.movestone_max_push (Max push) int 50 mesecon.movestone_max_push (Max push) int 50 1 100
mesecon.movestone_max_pull (Max pull) int 50 mesecon.movestone_max_pull (Max pull) int 50 1 100
[mesecons_pistons] [mesecons_pistons]
mesecon.piston_max_push (Max push) int 15 mesecon.piston_max_push (Max push) int 15 1 100
mesecon.piston_max_pull (Max pull) int 15 mesecon.piston_max_pull (Max pull) int 15 1 100
[mesecons_pressureplates] [mesecons_pressureplates]
mesecon.pplate_interval (Check interval) float 0.1 mesecon.pplate_interval (Check interval) float 0.1 0.1 1.0

34
settingtypes.txt
View File

@ -699,50 +699,50 @@ mobs.velociraptor_spawn_time (Velociraptor spawn time) enum any day,night,any
[**mesecons] [**mesecons]
mesecon.resumetime (Resume time) int 4 mesecon.resumetime (Startup delay) int 4 1 10
# The value at which circuits will overheat. # The value at which circuits will overheat.
mesecon.overheat_max (Device heat limit) int 20 mesecon.overheat_max (Device heat limit) int 20 1 100
mesecon.cooldown_time (Device cooldown time) float 2.0 mesecon.cooldown_time (Device cooldown time) float 2.0 0.1 10.0
mesecon.cooldown_granularity (Cooldown step length) float 0.5 mesecon.cooldown_granularity (Cooldown step length) float 0.5 0.0 1.0
[**mesecons_blinkyplant] [**mesecons_blinkyplant]
mesecon.blinky_plant_interval (Plant blinking interval) int 3 mesecon.blinky_plant_interval (Plant blinking interval) int 3 1 5
[**mesecons_detector] [**mesecons_detector]
mesecon.detector_radius (Player detector radius) int 6 mesecon.detector_radius (Player detector scanning radius) int 6 3 16
mesecon.node_detector_distance_max (Node detector radius) int 10 mesecon.node_detector_distance_max (Node detector distance limit) int 10 1 16
[**mesecons_luacontroller] [**mesecons_luacontroller]
mesecon.luacontroller_string_rep_max (string:rep result length limit) int 64000 mesecon.luacontroller_string_rep_max (string:rep result length limit) int 64000 1000 1000000
mesecon.luacontroller_digiline_maxlen (Digiline message size limit) int 50000 mesecon.luacontroller_digiline_maxlen (Digiline message size limit) int 50000 1000 1000000
mesecon.luacontroller_maxevents (Controller execution time limit) int 10000 mesecon.luacontroller_maxevents (Controller execution time limit) int 10000 1000 100000
mesecon.luacontroller_memsize (Controller memory limit) int 100000 mesecon.luacontroller_memsize (Controller memory limit) int 100000 10000 1000000
[**mesecons_movestones] [**mesecons_movestones]
mesecon.movestone_speed (Speed) int 3 mesecon.movestone_speed (Speed) int 3 1 10
mesecon.movestone_max_push (Max push) int 50 mesecon.movestone_max_push (Max push) int 50 1 100
mesecon.movestone_max_pull (Max pull) int 50 mesecon.movestone_max_pull (Max pull) int 50 1 100
[**mesecons_pistons] [**mesecons_pistons]
mesecon.piston_max_push (Max push) int 15 mesecon.piston_max_push (Max push) int 15 1 100
mesecon.piston_max_pull (Max pull) int 15 mesecon.piston_max_pull (Max pull) int 15 1 100
[**mesecons_pressureplates] [**mesecons_pressureplates]
mesecon.pplate_interval (Check interval) float 0.1 mesecon.pplate_interval (Check interval) float 0.1 0.1 1.0
[*Minetest Game] [*Minetest Game]