diff --git a/README.md b/README.md index df9c2f5..e191af1 100644 --- a/README.md +++ b/README.md @@ -10,18 +10,20 @@ A skeleton mob using the [cmer (Creatures Revived)](https://forum.minetest.net/v - Textures: - [cmer_skeleton_mesh](http://minetest.fensta.bplaced.net/#id=1141): by I don't know (CC BY-SA 3.0) - [cmer_skeleton_bone](https://opengameart.org/node/3755): by bart (CC0) +- Models: + - [creatures_zombie.b3d](https://github.com/BlockMen/cme): by BlockMen (CC-BY-SA 3.0) ### Requirements: ``` +Minetest min version: 5.0 + Depends: none Optional depends: - mobs - cmer - - cmer_zombie - creatures - - zombie - asm_spawneggs - sounds ``` diff --git a/TODO.txt b/TODO.txt index 59cd49c..d9e3a0b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,5 +1,4 @@ TODO: - port to mobkit -- fix walking animation if cmer_zombie not available - rename diff --git a/changelog.txt b/changelog.txt index 7cfe8bb..2124435 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ v1.1 - added Spanish translation - added nametag - added sounds +- added model by BlockMen v1.0 diff --git a/entity.lua b/entity.lua index 25d4d74..46554e1 100644 --- a/entity.lua +++ b/entity.lua @@ -11,29 +11,6 @@ if core.global_exists("sounds") then end end -local zombie_model -local zombie_sounds = {} -local anim_walk = {start=102, stop=122, speed=15.5} -local anim_attack = {start=102, stop=122, speed=25} - -if core.get_modpath("cmer_zombie") or core.get_modpath("zombie") then - zombie_model = "creatures_zombie.b3d" -end - --- use player model if zombie not installed -if not zombie_model then - if not core.get_modpath("player_api") then - error("Compatible model not found (requires one of the following mods: \"cmer_zombie\", \"zombie\", \"player_api\")") - end - - zombie_model = "character.b3d" - -- I don't know what the correct animations for default player model are - --anim_walk = {start=102, stop=122, speed=15.5} - --anim_attack = {start=102, stop=122, speed=25} - - cmer_skeleton.log("warning", "using \"" .. zombie_model .. "\" model, may not look right") -end - local mob_name = "creatures:skeleton" @@ -49,7 +26,7 @@ local base_def = { stepheight = 1, collisionbox = {-0.25, -0.01, -0.25, 0.25, 1.65, 0.25}, rotation = -90.0, - mesh = zombie_model, + mesh = "creatures_zombie.b3d", textures = {"cmer_skeleton_mesh.png"}, drops = { {name="creatures:bone", min=1, max=1, chance=1}, @@ -93,9 +70,9 @@ local base_def = { }, animation = { idle = {start=0, stop=80, speed=15}, - walk = anim_walk, + walk = {start=102, stop=122, speed=15.5}, run = {}, - attack = anim_attack, + attack = {start=102, stop=122, speed=25}, death = {start=81, stop=101, speed=28, loop=false, rotate=false, duration=2.12}, }, } diff --git a/mod.conf b/mod.conf index e62fca2..8eed2e1 100644 --- a/mod.conf +++ b/mod.conf @@ -5,4 +5,4 @@ version = 1.0 author = Jordan Irwin (AntumDeluge) license = MIT min_minetest_version = 5.0 -optional_depends = mobs, cmer, cmer_zombie, creatures, zombie, asm_spawneggs, sounds +optional_depends = mobs, cmer, creatures, asm_spawneggs, sounds diff --git a/models/creatures_zombie.b3d b/models/creatures_zombie.b3d new file mode 100644 index 0000000..b7906d1 Binary files /dev/null and b/models/creatures_zombie.b3d differ