Merge branch 'master' into mobf_2_1_dev

This commit is contained in:
sapier 2013-01-28 20:06:36 +00:00
commit b5e2085be1
3 changed files with 17 additions and 2 deletions

View File

@ -157,13 +157,22 @@ mobf_delete_disabled_mobs = true/false
Changelog:
-------------------------------------------------------------------------------
Changes 2.0.3
-fixed crash on typical state time not available
-fixed bug mob_slime typical state time not set
Changes 2.0.2
-fix crash with invalid targetpos in follow movgen
Changes 2.0.1
-fix crash on teleport of wolf
Changes 2.0.0
-documentation update
-add more items for trader
-fix price update bug in trader
-new cow textures
-improve sheep model
-fix crash on teleport of wolf
Changes 1.9.15
-fixed crash when mob got spawned at unloaded pos

View File

@ -81,7 +81,7 @@ dofile (mobf_modpath .. "/mgen_rasterized/mgen_raster.lua")
dofile (mobf_modpath .. "/mgen_jordan4ibanez/mgen_jordan4ibanez.lua")
dofile (mobf_modpath .. "/mov_gen_none.lua")
mobf_version = "2.0.1"
mobf_version = "2.0.3"
--! @brief define tools used for more than one mob
function mobf_init_basic_tools()

View File

@ -21,6 +21,7 @@
-------------------------------------------------------------------------------
mob_state = {}
mob_state.default_state_time = 30
-------------------------------------------------------------------------------
-- name: initialize(entity,now)
@ -392,6 +393,11 @@ end
-------------------------------------------------------------------------------
function mob_state.getTimeToNextState(typical_state_time)
if typical_state_time == nil then
mobf_bug_warning(LOGLEVEL_WARNING,"MOBF MOB BUG!!! missing typical state time!")
typical_state_time = mob_state.default_state_time
end
local u1 = 2 * math.random() -1
local u2 = 2 * math.random() -1