diff --git a/mods/mobs/README.txt b/mods/mobs/README.txt index c83c08b..c1a632f 100644 --- a/mods/mobs/README.txt +++ b/mods/mobs/README.txt @@ -1,7 +1,7 @@ Mobs mod ======== By PilzAdam, KrupnovPavel, Zeg9, TenPlus1 -Tweaked by Kaadmy, for Pixture +Tweaked by KaadmY, for Pixture Asset license: CC BY-SA 4.0 Source License: @@ -11,4 +11,3 @@ Source License: npc.lua: MIT mineturtle.lua: LGPLv2.1 crafts.lua: LGPLv2.1 - diff --git a/mods/mobs/init.lua b/mods/mobs/init.lua index 0768245..ff397f2 100644 --- a/mods/mobs/init.lua +++ b/mods/mobs/init.lua @@ -2,7 +2,7 @@ -- -- Mobs mod -- By PilzAdam, KrupnovPavel, Zeg9, TenPlus1 --- Tweaked by Kaadmy, for Pixture +-- Tweaked by KaadmY, for Pixture -- local path = minetest.get_modpath("mobs") @@ -11,18 +11,6 @@ local path = minetest.get_modpath("mobs") dofile(path.."/api.lua") --- Animals - -dofile(path.."/sheep.lua") -- PilzAdam -dofile(path.."/boar.lua") -- KrupnoPavel -dofile(path.."/skunk.lua") -- Kaadmy -dofile(path.."/mineturtle.lua") -- Kaadmy -dofile(path.."/walker.lua") -- Kaadmy - --- NPC - -dofile(path.."/npc.lua") -- TenPlus1 - -- Mob items and crafts dofile(path.."/crafts.lua") @@ -31,4 +19,16 @@ dofile(path.."/crafts.lua") dofile(path.."/achievements.lua") +-- Animals + +dofile(path.."/mob_sheep.lua") -- PilzAdam +dofile(path.."/mob_boar.lua") -- KrupnoPavel +dofile(path.."/mob_skunk.lua") -- KaadmY +dofile(path.."/mob_mineturtle.lua") -- KaadmY +dofile(path.."/mob_walker.lua") -- KaadmY + +-- NPC + +dofile(path.."/mob_npc.lua") -- TenPlus1 + default.log("mod:mobs", "loaded") diff --git a/mods/mobs/boar.lua b/mods/mobs/mob_boar.lua similarity index 98% rename from mods/mobs/boar.lua rename to mods/mobs/mob_boar.lua index 5fb56a8..80d3db0 100644 --- a/mods/mobs/boar.lua +++ b/mods/mobs/mob_boar.lua @@ -1,6 +1,6 @@ -- Warthog(Boar) by KrupnoPavel --- Changed to Boar and tweaked by Kaadmy +-- Changed to Boar and tweaked by KaadmY mobs:register_mob( "mobs:boar", diff --git a/mods/mobs/mineturtle.lua b/mods/mobs/mob_mineturtle.lua similarity index 98% rename from mods/mobs/mineturtle.lua rename to mods/mobs/mob_mineturtle.lua index c5a0df4..69f56aa 100644 --- a/mods/mobs/mineturtle.lua +++ b/mods/mobs/mob_mineturtle.lua @@ -1,5 +1,5 @@ --- Mineturtle by Kaadmy +-- Mineturtle by KaadmY mobs:register_mob( "mobs:mineturtle", diff --git a/mods/mobs/npc.lua b/mods/mobs/mob_npc.lua similarity index 99% rename from mods/mobs/npc.lua rename to mods/mobs/mob_npc.lua index 292c21c..6dfae03 100644 --- a/mods/mobs/npc.lua +++ b/mods/mobs/mob_npc.lua @@ -1,6 +1,6 @@ -- Npc by TenPlus1 --- Modded by Kaadmy +-- Modded by KaadmY local npc_types = { "farmer", diff --git a/mods/mobs/sheep.lua b/mods/mobs/mob_sheep.lua similarity index 98% rename from mods/mobs/sheep.lua rename to mods/mobs/mob_sheep.lua index 877d74d..c1afe45 100644 --- a/mods/mobs/sheep.lua +++ b/mods/mobs/mob_sheep.lua @@ -1,5 +1,5 @@ --- Sheep by PilzAdam; tweaked for Pixture by Kaadmy +-- Sheep by PilzAdam; tweaked for Pixture by KaadmY mobs:register_mob( "mobs:sheep", diff --git a/mods/mobs/skunk.lua b/mods/mobs/mob_skunk.lua similarity index 97% rename from mods/mobs/skunk.lua rename to mods/mobs/mob_skunk.lua index 1780a36..c86ca38 100644 --- a/mods/mobs/skunk.lua +++ b/mods/mobs/mob_skunk.lua @@ -1,5 +1,5 @@ -- Boar by KrupnoPavel --- Changed to Skunk and tweaked by Kaadmy +-- Changed to Skunk and tweaked by KaadmY mobs:register_mob( "mobs:skunk", diff --git a/mods/mobs/walker.lua b/mods/mobs/mob_walker.lua similarity index 84% rename from mods/mobs/walker.lua rename to mods/mobs/mob_walker.lua index 87a4bc3..53c979e 100644 --- a/mods/mobs/walker.lua +++ b/mods/mobs/mob_walker.lua @@ -1,4 +1,4 @@ --- Walker by Kaadmy +-- Walker by KaadmY mobs:register_mob( "mobs:walker", @@ -6,7 +6,7 @@ mobs:register_mob( type = "monster", passive = false, attack_type = "dogfight", - damage = 2, + damage = 3, hp_min = 8, hp_max = 16, armor = 200, @@ -22,10 +22,10 @@ mobs:register_mob( distance = 16, }, walk_velocity = 1, - run_velocity = 5, - jump = false, + run_velocity = 3, + jump = true, follow = "default:rope", - view_range = 8, + view_range = 14, drops = { { name = "default:stick", @@ -40,20 +40,19 @@ mobs:register_mob( chance = 15, min = 2, max = 3 }, }, - water_damage = 6, - lava_damage = 10, - light_damage = 1, + water_damage = 2, + lava_damage = 30, animation = { speed_normal = 20, - speed_run = 30, + speed_run = 20, stand_start = 0, stand_end = 24, - run_start = 35, - run_end = 50, - walk_start = 35, - walk_end = 50, punch_start = 25, punch_end = 34, + walk_start = 35, + walk_end = 50, + run_start = 35, + run_end = 50, }, }) @@ -65,7 +64,7 @@ mobs:register_spawn( }, 20, 14, - 200000, + 12000, 1, 31000 ) diff --git a/mods/mobs/models/mobs_walker.b3d b/mods/mobs/models/mobs_walker.b3d index 6a2cb81..85f7895 100644 Binary files a/mods/mobs/models/mobs_walker.b3d and b/mods/mobs/models/mobs_walker.b3d differ diff --git a/mods/mobs/models/mobs_walker.blend b/mods/mobs/models/mobs_walker.blend index d71ad97..b73411d 100644 Binary files a/mods/mobs/models/mobs_walker.blend and b/mods/mobs/models/mobs_walker.blend differ diff --git a/mods/mobs/textures/mobs_mineturtle.png b/mods/mobs/textures/mobs_mineturtle.png index 2d79426..0b52f52 100644 Binary files a/mods/mobs/textures/mobs_mineturtle.png and b/mods/mobs/textures/mobs_mineturtle.png differ diff --git a/mods/mobs/textures/mobs_mineturtle.xcf b/mods/mobs/textures/mobs_mineturtle.xcf index dabe596..0ce1c78 100644 Binary files a/mods/mobs/textures/mobs_mineturtle.xcf and b/mods/mobs/textures/mobs_mineturtle.xcf differ diff --git a/mods/mobs/textures/mobs_npc1.png b/mods/mobs/textures/mobs_npc1.png index afacd03..90c488c 100644 Binary files a/mods/mobs/textures/mobs_npc1.png and b/mods/mobs/textures/mobs_npc1.png differ diff --git a/mods/mobs/textures/mobs_npc1.xcf b/mods/mobs/textures/mobs_npc1.xcf index e9199a0..f3d3637 100644 Binary files a/mods/mobs/textures/mobs_npc1.xcf and b/mods/mobs/textures/mobs_npc1.xcf differ diff --git a/mods/mobs/textures/mobs_npc2.png b/mods/mobs/textures/mobs_npc2.png index 6c29a63..01d4fc0 100644 Binary files a/mods/mobs/textures/mobs_npc2.png and b/mods/mobs/textures/mobs_npc2.png differ diff --git a/mods/mobs/textures/mobs_npc2.xcf b/mods/mobs/textures/mobs_npc2.xcf index b182ca6..dad75cc 100644 Binary files a/mods/mobs/textures/mobs_npc2.xcf and b/mods/mobs/textures/mobs_npc2.xcf differ diff --git a/mods/mobs/textures/mobs_sheep.png b/mods/mobs/textures/mobs_sheep.png index 5b8289a..637e60a 100644 Binary files a/mods/mobs/textures/mobs_sheep.png and b/mods/mobs/textures/mobs_sheep.png differ diff --git a/mods/mobs/textures/mobs_sheep_shaved.png b/mods/mobs/textures/mobs_sheep_shaved.png index 65b9f1d..7f486eb 100644 Binary files a/mods/mobs/textures/mobs_sheep_shaved.png and b/mods/mobs/textures/mobs_sheep_shaved.png differ diff --git a/mods/mobs/textures/mobs_sheep_shaved.xcf b/mods/mobs/textures/mobs_sheep_shaved.xcf index cba20d2..94087ea 100644 Binary files a/mods/mobs/textures/mobs_sheep_shaved.xcf and b/mods/mobs/textures/mobs_sheep_shaved.xcf differ diff --git a/mods/mobs/textures/mobs_skunk.png b/mods/mobs/textures/mobs_skunk.png index 8ad7a2f..9b81ec7 100644 Binary files a/mods/mobs/textures/mobs_skunk.png and b/mods/mobs/textures/mobs_skunk.png differ diff --git a/mods/mobs/textures/mobs_skunk.xcf b/mods/mobs/textures/mobs_skunk.xcf index c24794e..d4fda60 100644 Binary files a/mods/mobs/textures/mobs_skunk.xcf and b/mods/mobs/textures/mobs_skunk.xcf differ diff --git a/mods/mobs/textures/mobs_zombie.png b/mods/mobs/textures/mobs_zombie.png deleted file mode 100644 index 8d8a1af..0000000 Binary files a/mods/mobs/textures/mobs_zombie.png and /dev/null differ diff --git a/mods/mobs/textures/mobs_zombie.xcf b/mods/mobs/textures/mobs_zombie.xcf deleted file mode 100644 index aeeffc6..0000000 Binary files a/mods/mobs/textures/mobs_zombie.xcf and /dev/null differ