[mp_animals_modpack] Update to Git commit b9d0172 & patch e84e1e6:

Commit: https://github.com/sapier/animals_modpack/tree/b9d0172
Patch: https://github.com/AntumDeluge/mtmp-animals_modpack/tree/e84e1e6
This commit is contained in:
AntumDeluge 2017-05-12 16:38:21 -07:00
parent 5847a79dfc
commit 9b1fe0a938
48 changed files with 55 additions and 219 deletions

View File

@ -134,7 +134,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* animalmaterials
* cooking
* mob_environments
* [animals_modpack][] -- version: [2.5.0 (963cef1 Git)][ver.animals_modpack] *2015-12-28* ***UPDATE***
* [animals_modpack][] -- version: [b9d0172 Git][ver.animals_modpack] *2017-03-22* ([patched][patch.animals_modpack])
* mp_animals_modpack/
* animal_chicken ([CC BY-SA / CC0][lic.amp_chicken])
* animal_clownfish ([CC BY-SA][lic.amp_clownfish])
@ -315,7 +315,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[lic.amp_ostrich]: mods/mp_animals_modpack/mob_ostrich/License.txt
[lic.amp_rat]: mods/mp_animals_modpack/animal_rat/License.txt
[lic.amp_shark]: mods/mp_animals_modpack/mob_shark/License.txt
[lic.amp_sheep]: mods/mp_animals_modpack/License.txt
[lic.amp_sheep]: mods/mp_animals_modpack/animal_sheep/License%20information.txt
[lic.amp_slime]: mods/mp_animals_modpack/mob_slime/License.txt
[lic.amp_warthog]: mods/mp_animals_modpack/mob_warthog/License.txt
[lic.antum]: mods/mp_antum/LICENSE.txt
@ -396,7 +396,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.advtrains]: https://github.com/orwell96/advtrains/tree/28717b4
[ver.airtanks]: https://github.com/minetest-mods/airtanks/tree/fc01ffb
[ver.animalmaterials]: https://github.com/sapier/animalmaterials/tree/d952d27
[ver.animals_modpack]: https://github.com/sapier/animals_modpack/tree/963cef1
[ver.animals_modpack]: https://github.com/sapier/animals_modpack/tree/b9d0172
[ver.antum]: https://github.com/AntumDeluge/mtmp-antum/tree/4477d40
[ver.areas]: https://github.com/ShadowNinja/areas/tree/6080ff0
[ver.awards]: https://github.com/minetest-mods/awards/tree/096fe16
@ -474,6 +474,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[ver.worldedge]: https://github.com/minetest-mods/worldedge/tree/e15fa99
[patch.adv_spawning]: https://github.com/AntumDeluge/mtmod-adv_spawning/tree/572688b
[patch.animals_modpack]: https://github.com/AntumDeluge/mtmp-animals_modpack/tree/e84e1e6
[patch.bags]: https://github.com/AntumDeluge/mtmod-bags/tree/4363284
[patch.campfire]: https://github.com/AntumDeluge/mtmod-campfire/tree/67b9dd7
[patch.christmas]: https://github.com/AntumDeluge/mtmod-christmas/tree/f6c8dc2

View File

@ -24,7 +24,7 @@ else
end
minetest.log("action","MOD: animal_chicken mod loading ...")
local version = "0.2.2"
local version = "0.3.0"
local chicken_groups = {
not_in_creative_inventory=1
@ -96,7 +96,7 @@ local chicken_prototype = {
max_accel=0.1,
max_speed=0.3,
min_speed=0.1,
pattern="stop_and_go",
pattern="stop_and_go_v2",
canfly = false,
},
catching = {
@ -180,7 +180,7 @@ local chicken_prototype = {
},
{
name = "walking",
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
chance = 0.50,
animation = "walk",
typical_state_time = 180,
@ -222,7 +222,7 @@ local rooster_prototype = {
max_accel=0.1,
max_speed=0.3,
min_speed=0.1,
pattern="stop_and_go",
pattern="stop_and_go_v2",
canfly = false,
},
catching = {
@ -295,7 +295,7 @@ local rooster_prototype = {
},
{
name = "walking",
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
chance = 0.25,
animation = "walk",
typical_state_time = 180,
@ -336,7 +336,7 @@ local chick_m_prototype = {
max_accel=0.05,
max_speed=0.2,
min_speed=0.05,
pattern="stop_and_go",
pattern="stop_and_go_v2",
canfly = false,
},
catching = {
@ -380,7 +380,7 @@ local chick_m_prototype = {
},
{
name = "walking",
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
chance = 0.50,
animation = "walk",
typical_state_time = 180,
@ -421,7 +421,7 @@ local chick_f_prototype = {
max_accel=0.05,
max_speed=0.2,
min_speed=0.05,
pattern="stop_and_go",
pattern="stop_and_go_v2",
canfly = false,
},
catching = {
@ -465,7 +465,7 @@ local chick_f_prototype = {
},
{
name = "walking",
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
chance = 0.50,
animation = "walk",
typical_state_time = 180,

View File

@ -1,6 +0,0 @@
# Translation by Xanthin
Chicken = Henne
Rooster = Hahn
Chick - male = maennliches Kueken
Chick - female = weibliches Kueken

View File

@ -1,8 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Chicken = Gallina
Rooster = Gallo
Chick - male = Pollito - macho
Chick - female = Pollito - hembra

View File

@ -1,6 +0,0 @@
# Template
Chicken =
Rooster =
Chick - male =
Chick - female =

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Clownfish = Clownfisch

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Clownfish = Pez Payaso

View File

@ -1,3 +0,0 @@
# Template
Clownfish =

View File

@ -65,14 +65,9 @@ function cattle_drop()
table.insert(result,"animalmaterials:meat_beef 5")
end
--[[
if math.random() < 0.25 then
table.insert(result,"animalmaterials:coat_cattle 1")
end
]]--
-- 100% cow hide drop
table.insert(result,"animalmaterials:coat_cattle 1")
if math.random() < 0.1 then
table.insert(result,"animalmaterials:bone 1")

View File

@ -1,6 +0,0 @@
# Translation by Xanthin
Cow = Kuh
Steer = Bulle
Baby Calf female = Kuhkalb
Baby Calf male = Bullenkalb

View File

@ -1,8 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Cow = Vaca
Steer = Novillo
Baby Calf female = Ternero
Baby Calf male = Ternera

View File

@ -1,6 +0,0 @@
# Template
Cow =
Steer =
Baby Calf female =
Baby Calf male =

View File

@ -1,4 +0,0 @@
# Translation by Xanthin
Deer (m) = Hirsch
Deer (f) = Hirschkuh

View File

@ -1,6 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Deer (m) = Venado (macho)
Deer (f) = Venado (hembra)

View File

@ -1,4 +0,0 @@
# Template
Deer (m) =
Deer (f) =

View File

@ -49,7 +49,7 @@ local dm_prototype = {
kill_result="",
armor_groups= {
fleshy=30,
deamon=40,
demon=40,
},
groups = dm_groups,
envid="simple_air",

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Dungeonmaster (MOBF) = Meister des Kerkers (MOBF)

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Dungeonmaster (MOBF) = Maestro de la mazmorra (MOBF)

View File

@ -1,3 +0,0 @@
# Template
Dungeonmaster (MOBF) =

View File

@ -247,15 +247,15 @@ end
vault.checkdistance = function(pos,mindistance)
for i=1,#vault.spawnpositions,1 do
local distance = mobf_calc_distance(pos,vault.spawnpositions[i])
dm_debug("Distance to vault: " .. i .. " at " ..minetest.pos_to_string(vault.spawnpositions[i]) .. " is : " .. distance)
if distance < mindistance then
return false
end
end
for i=1,#vault.spawnpositions,1 do
local distance = vector.distance(pos,vault.spawnpositions[i])
dm_debug("Distance to vault: " .. i .. " at " ..minetest.pos_to_string(vault.spawnpositions[i]) .. " is : " .. distance)
if distance < mindistance then
return false
end
end
return true
return true
end
vault.addvaultpos = function(pos)

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Blue white fish = Blau-weisser Fisch

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Blue white fish = Pez azul blanco

View File

@ -1,3 +0,0 @@
# Template
Blue white fish =

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Gull = Moewe

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Gull = Gaviota

View File

@ -1,3 +0,0 @@
# Template
Gull =

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Rat (Animals) = Ratte (Animals)

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Rat (Animals) = Rata (Animales)

View File

@ -1,3 +0,0 @@
# Template
Rat (Animals) =

View File

@ -25,7 +25,7 @@ end
minetest.log("action","MOD: animal_sheep mod loading ...")
local version = "0.3.2"
local version = "0.4.0"
local sheep_groups = {
sheerable=1,
@ -33,9 +33,9 @@ local sheep_groups = {
not_in_creative_inventory=1
}
local selectionbox_sheep = {-0.65, -0.75, -0.65, 0.65, 0.45, 0.65}
local selectionbox_lamb = {-0.65*0.6, -0.8*0.6, -0.65*0.6,
0.65*0.6, 0.45*0.6, 0.65*0.65 }
local selectionbox_sheep = {-0.49, -0.75, -0.49, 0.49, 0.3, 0.49}
local selectionbox_lamb = {-0.49*0.6, -0.49*0.6, -0.49*0.6,
0.49*0.6, 0.49*0.6, 0.49*0.6 }
local feeding_nodes = {
"default:junglegrass",
@ -53,11 +53,11 @@ local feeding_nodes = {
}
local hunger_config = {
target_nodes = feeding_nodes,
range = 10,
chance = 0.3,
typical_walk_time = 30,
}
target_nodes = feeding_nodes,
range = 10,
chance = 0.3,
typical_walk_time = 30,
}
local sheep_prototype = {
name="sheep",
@ -79,14 +79,14 @@ local sheep_prototype = {
},
groups = sheep_groups,
envid="meadow",
population_density = 50
population_density = 50,
},
movement = {
min_accel=0.05,
max_accel=0.1,
max_speed=0.5,
min_speed=0.1,
pattern="stop_and_go",
pattern="stop_and_go_v2",
canfly=false,
-- max_distance = 0.1
},
@ -97,6 +97,9 @@ local sheep_prototype = {
result="wool:white 1",
transforms_to="animal_sheep:sheep_naked",
min_delay=-1,
dyeable=true,
dye_removed=true,
dye_result_base="wool:"
},
catching = {
tool="animalmaterials:lasso",
@ -144,7 +147,7 @@ local sheep_prototype = {
walk = {
start_frame = 0,
end_frame = 60,
basevelocity = 3,
basevelocity = 0.25,
},
stand = {
start_frame = 61,
@ -199,7 +202,7 @@ local sheep_prototype = {
{
name = "walking",
custom_preconhandler = nil,
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
typical_state_time = 180,
chance = 0.50,
animation = "walk"
@ -221,6 +224,7 @@ local sheep_prototype = {
-- },
},
hunger = hunger_config,
}
local lamb_prototype = {
@ -250,7 +254,7 @@ local lamb_prototype = {
max_accel=0.05,
max_speed=0.3,
min_speed=0.05,
pattern="stop_and_go"
pattern="stop_and_go_v2"
},
harvest = nil,
catching = {
@ -288,7 +292,7 @@ local lamb_prototype = {
walk = {
start_frame = 0,
end_frame = 60,
basevelocity = 3,
basevelocity = 0.25,
},
stand = {
start_frame = 61,
@ -343,7 +347,7 @@ local lamb_prototype = {
{
name = "walking",
custom_preconhandler = nil,
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
typical_state_time = 180,
chance = 0.50,
animation = "walk"
@ -386,7 +390,7 @@ local sheep_naked_prototype = {
max_accel=0.1,
max_speed=0.5,
min_speed=0.1,
pattern="stop_and_go"
pattern="stop_and_go_v2"
},
catching = {
tool="animalmaterials:lasso",
@ -428,7 +432,7 @@ local sheep_naked_prototype = {
walk = {
start_frame = 0,
end_frame = 60,
basevelocity = 0.3,
basevelocity = 0.25,
},
stand = {
start_frame = 61,
@ -483,7 +487,7 @@ local sheep_naked_prototype = {
{
name = "walking",
custom_preconhandler = nil,
movgen = "probab_mov_gen",
movgen = "probab_v2_mov_gen",
typical_state_time = 180,
chance = 0.50,
animation = "walk"

View File

@ -1,5 +0,0 @@
# Translation by Xanthin
Sheep = Schaf
Lamb = Lamm
Naked sheep = Geschorenes Schaf

View File

@ -1,7 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Sheep = Oveja
Lamb = Cordero
Naked sheep = Oveja Esquilada

View File

@ -1,5 +0,0 @@
# Template
Sheep =
Lamb =
Naked sheep =

View File

@ -200,11 +200,9 @@ mobf_spawner_register("bear_spawner_1",bear_name,
collisionbox = selectionbox_bear
})
local FACTIONSDIR = minetest.get_modpath("factions")
if FACTIONSDIR then
if factions~= nil and type(factions.set_base_reputation) == "function" then
factions.set_base_reputation("bears","players",-25)
end
if core.global_exists("factions") and factions ~= nil and
type(factions.set_base_reputation) == "function" then
factions.set_base_reputation("bears","players",-25)
end
minetest.log("action","\tadding mob "..bear_prototype.name)

View File

@ -212,7 +212,7 @@ mobf_spawner_register("ghost_spawner_1",ghost_name,
collisionbox = selectionbox_ghost
})
if minetest.get_modpath('factions') and
if factions~= nil and
type(factions.set_base_reputation) == "function" then
factions.set_base_reputation("ghosts","players",-25)
end

View File

@ -39,7 +39,7 @@ local oerkki_prototype = {
kill_result="animalmaterials:meat_toxic 1",
armor_groups= {
fleshy=30,
deamon=30,
demon=30,
},
groups = oerkki_groups,
envid="simple_air",

View File

@ -1,4 +0,0 @@
# Translation by Xanthin
Ostrich (f) = Straussenhenne
Ostrich (m) = Straussenhahn

View File

@ -1,6 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Ostrich (f) = Avestruz (hembra)
Ostrich (m) = Avestruz (macho)

View File

@ -1,4 +0,0 @@
# Template
Ostrich (f) =
Ostrich (m) =

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Shark = Hai

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Shark = Tiburon

View File

@ -1,3 +0,0 @@
# Template
Shark =

View File

@ -127,7 +127,7 @@ local prototype_mob_slime_L = {
--! @brief [OPTIONAL] armor groups of mob
armor_groups = {
fleshy=40,
deamon=30,
demon=30,
},
groups = slime_groups,
@ -257,7 +257,7 @@ local prototype_mob_slime_S = {
--! @brief [OPTIONAL] armor groups of mob
armor_groups = {
fleshy=40,
deamon=30,
demon=30,
},
groups = slime_groups,
@ -370,7 +370,7 @@ local prototype_mob_slime_M = {
--! @brief [OPTIONAL] armor groups of mob
armor_groups = {
fleshy=40,
deamon=30,
demon=30,
},
groups = slime_groups,

View File

@ -1,3 +0,0 @@
# Translation by Xanthin
Slime = Schleim

View File

@ -1,5 +0,0 @@
# Spanish translation for Animals Modpack.
# Traducción al español de Animals Modpack.
# Author/Autor: Diego Martínez <kaeza>
Slime = Moco

View File

@ -1,3 +0,0 @@
# Template
Slime =

View File

@ -191,7 +191,7 @@ mobf_spawner_register("warthog_spawner_1",warthog_name,
collisionbox = selectionbox_warthog
})
if minetest.get_modpath('factions') and
if factions~= nil and
type(factions.set_base_reputation) == "function" then
factions.set_base_reputation("warthogs","players",-5)
end