-
-
Save hdak1945git/578f0e1fc747a1808ae873ad7f00a3ba to your computer and use it in GitHub Desktop.
Fixes some configuration options, seperates baddies from regulars
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/init.lua b/init.lua | |
index a7cb488..ad379d0 100644 | |
--- a/init.lua | |
+++ b/init.lua | |
@@ -6,9 +6,13 @@ dmobs = {} | |
dofile(minetest.get_modpath("dmobs").."/api.lua") | |
--- Enable dragons (disable to remove tamed dragons and dragon bosses) | |
-dmobs.dragons = minetest.setting_getbool("dmobs.dragons") or false | |
-dmobs.regulars = minetest.setting_getbool("dmobs.regulars") or true | |
+-- Enable dragons (disable to remove tamed dragons and draon bosses) | |
+dmobs.dragons = minetest.setting_getbool("dmobs.dragons") | |
+if dmobs.dragons == nil then dmobs.dragons = false end | |
+dmobs.regulars = minetest.setting_getbool("dmobs.regulars") | |
+if dmobs.regulars == nil then dmobs.regulars = true end | |
+dmobs.baddies = minetest.setting_getbool("dmobs.baddies") | |
+if dmobs.baddies == nil then dmobs.baddies = true end | |
-- Enable fireballs/explosions | |
dmobs.destructive = minetest.setting_getbool("dmobs.destructive") or false | |
@@ -43,8 +47,7 @@ end | |
-- regular mobs | |
-local mobslist = { | |
- -- friendlies | |
+local friendlies = { | |
"pig", | |
"panda", | |
"tortoise", | |
@@ -55,9 +58,16 @@ local mobslist = { | |
"owl", | |
"whale", | |
"badger", | |
- "butterfly", | |
- | |
- -- baddies | |
+ "butterfly" | |
+} | |
+ | |
+if dmobs.regulars then | |
+ for _,mobname in pairs(friendlies) do | |
+ loadmob(mobname) | |
+ end | |
+end | |
+ | |
+local baddies = { | |
"pig_evil", | |
"fox", | |
"rat", | |
@@ -66,11 +76,11 @@ local mobslist = { | |
"golem", | |
"skeleton", | |
"orc", | |
- "ogre", | |
+ "ogre" | |
} | |
-if dmobs.regulars then | |
- for _,mobname in pairs(mobslist) do | |
+if dmobs.baddies then | |
+ for _,mobname in pairs(baddies) do | |
loadmob(mobname) | |
end | |
end | |
diff --git a/spawn.lua b/spawn.lua | |
index 13a32eb..8b04055 100644 | |
--- a/spawn.lua | |
+++ b/spawn.lua | |
@@ -13,7 +13,9 @@ if dmobs.regulars then | |
mobs:register_spawn("dmobs:badger", {"default:dirt_with_grass","default:dirt"}, 20, 10, 15000, 2, 31000) | |
mobs:register_spawn("dmobs:pig", {"default:pine_needles","default:leaves", "nyanland:cloudstone"}, 20, 10, 32000, 2, 31000) | |
mobs:register_spawn("dmobs:panda", {"default:dirt_with_grass","ethereal:bamboo_dirt"}, 20, 10, 15000, 2, 31000) | |
+end | |
+if dmobs.baddies then | |
-- baddies | |
mobs:register_spawn("dmobs:wasp", {"default:dirt_with_grass"}, 20, 10, 32000, 2, 31000) | |
@@ -36,6 +38,7 @@ if dmobs.regulars then | |
mobs:register_spawn("dmobs:rat", {"default:stone","default:sand"}, 20, 0, 32000, 2, 31000) | |
mobs:register_spawn("dmobs:treeman", {"default:leaves", "default:pine_needles"}, 7, 0, 16000, 2, 31000) | |
mobs:register_spawn("dmobs:skeleton", {"default:stone"}, 7, 0, 16000, 2, 31000) | |
+ | |
end | |
-- dragons |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment