From 8cb1216b25f2b5cf2dd5a8a114257ee71bd88f21 Mon Sep 17 00:00:00 2001
From: D00Med <heiselong@gmx.com>
Date: Wed, 23 Nov 2016 09:29:51 +1000
Subject: [PATCH] Dragon improvements
>Made wasps nest flammable and changed description from "Hive" to "Nest"
>Dragons now slow down in water, they will not be able to leave
>Fixed dragons attacking mobs whilst flying
>Improved dragon attacks - they are slower and the ice dragon can freeze
water
>all dragons now drop gems
>Increased spawn rate of boss dragons
>Improved ice texture
---
api.lua | 18 ++++++--
dragons.lua | 91 +++++++++++++++++------------------------
init.lua | 4 +-
textures/dmobs_ice.png | Bin 565 -> 1721 bytes
4 files changed, 53 insertions(+), 60 deletions(-)
diff --git a/api.lua b/api.lua
index 76fc03b..caf2e80 100644
--- a/api.lua
+++ b/api.lua
@@ -160,9 +160,13 @@ function object_fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_anim
local vec_forward = {x=dir.x*speed,y=dir.y*speed+2,z=dir.z*speed}
local vec_backward = {x=-dir.x*speed,y=dir.y*speed+2,z=-dir.z*speed}
local vec_rise = {x=velo.x,y=velo.y+0.2,z=velo.z}
- local vec_stop = {x=0,y=-2,z=0}
+ local vec_stop = {x=0,y=-0.2,z=0}
local yaw = entity.driver:get_look_yaw();
- if ctrl.up then
+ local pos = entity.object:getpos()
+ local node = minetest.get_node(pos).name
+ if node == "default:water_source" or node == "default:river_water_source" or node == "default:river_water_flowing" or node == "default:water_flowing" then
+ entity.object:setvelocity({x=velo.x*0.9, y=-1, z=velo.z*0.9})
+ elseif ctrl.up then
entity.object:setyaw(yaw+math.pi+math.pi/2)
entity.object:setvelocity(vec_forward)
elseif ctrl.down then
@@ -175,13 +179,19 @@ function object_fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_anim
entity.object:setyaw(yaw+math.pi+math.pi/2)
entity.object:setvelocity(vec_stop)
end
- if ctrl.LMB and ctrl.sneak and shoots then
+ if ctrl.aux1 and shoots and not entity.loaded then
local pos = entity.object:getpos()
local obj = minetest.env:add_entity({x=pos.x+0+dir.x*2.5,y=pos.y+1.5+dir.y,z=pos.z+0+dir.z*2.5}, arrow)
- local vec = {x=dir.x*6,y=dir.y*6,z=dir.z*6}
+ local vec = {x=dir.x*12,y=dir.y*12,z=dir.z*12}
local yaw = entity.driver:get_look_yaw();
+ entity.loaded = true
obj:setyaw(yaw+math.pi/2)
obj:setvelocity(vec)
+ local object = obj:get_luaentity()
+ object.launcher = entity.driver
+ minetest.after(1, function()
+ entity.loaded = false
+ end)
end
--lib_mount animation
if velo.x == 0 and velo.y == 0 and velo.z == 0 then
diff --git a/dragons.lua b/dragons.lua
index 2568172..ac14ffc 100644
--- a/dragons.lua
+++ b/dragons.lua
@@ -36,18 +36,6 @@ local on_rc = function(self, clicker)
end
if self.tamed and self.owner == clicker:get_player_name() then
local inv = clicker:get_inventory()
- if clicker:get_wielded_item():get_name() == "dmobs:dragon_armor_steel" then
- self.armor = true
- inv:remove_item("main", "dmobs:dragon_gem_fire")
- end
- if self.armor == true then
- self.armor = false
- if inv:room_for_item("main", "dmobs:dragon_armor_steel") then
- inv:add_item("main", "dmobs:dragon_armor_steel")
- else
- minetest.add_item(clicker.getpos(), "dmobs:dragon_armor_steel")
- end
- end
if self.driver and clicker == self.driver then
-- detach
lib_mount.detach(self, clicker, {x=1, y=0, z=1})
@@ -176,6 +164,7 @@ mobs:register_mob("dmobs:dragon2", {
fly = true,
drops = {
{name = "dmobs:egg", chance = 1, min = 1, max = 1},
+ {name = "dmobs:dragon_gem", chance = 1, min = 1, max = 1},
},
fall_speed = 0,
stepheight = 10,
@@ -241,6 +230,7 @@ mobs:register_mob("dmobs:dragon3", {
fly = true,
drops = {
{name = "dmobs:egg", chance = 1, min = 1, max = 1},
+ {name = "dmobs:dragon_gem", chance = 1, min = 1, max = 1},
},
fall_speed = 0,
stepheight = 10,
@@ -306,6 +296,7 @@ mobs:register_mob("dmobs:dragon4", {
fly = true,
drops = {
{name = "dmobs:egg", chance = 1, min = 1, max = 1},
+ {name = "dmobs:dragon_gem", chance = 1, min = 1, max = 1},
},
fall_speed = 0,
stepheight = 10,
@@ -416,6 +407,9 @@ mobs:register_mob("dmobs:dragon_red", {
do_custom = function(self, dtime)
if self.driver then
object_fly(self, dtime, 10, true, "dmobs:fire_plyr", "walk", "stand")
+ if self.state == "attack" then
+ self.state = "idle"
+ end
return false
end
return true
@@ -507,6 +501,9 @@ mobs:register_mob("dmobs:dragon_black", {
do_custom = function(self, dtime)
if self.driver then
object_fly(self, dtime, 15, true, "dmobs:lightning_plyr", "walk", "stand")
+ if self.state == "attack" then
+ self.state = "idle"
+ end
return false
end
return true
@@ -598,6 +595,9 @@ mobs:register_mob("dmobs:dragon_green", {
do_custom = function(self, dtime)
if self.driver then
object_fly(self, dtime, 10, true, "dmobs:poison_plyr", "walk", "stand")
+ if self.state == "attack" then
+ self.state = "idle"
+ end
return false
end
return true
@@ -689,6 +689,9 @@ mobs:register_mob("dmobs:dragon_blue", {
do_custom = function(self, dtime)
if self.driver then
object_fly(self, dtime, 10, true, "dmobs:ice_plyr", "walk", "stand")
+ if self.state == "attack" then
+ self.state = "idle"
+ end
return false
end
return true
@@ -975,7 +978,7 @@ mobs:register_arrow("dmobs:fire", {
--function to register tamed dragon attacks
-function dmobs.register_fire(fname, texture, dmg, replace_node, explode)
+function dmobs.register_fire(fname, texture, dmg, replace_node, explode, ice, variance, size)
minetest.register_entity(fname, {
textures = {texture},
velocity = 0.1,
@@ -990,7 +993,7 @@ minetest.register_entity(fname, {
for k, obj in pairs(objs) do
if obj:get_luaentity() ~= nil then
if obj:get_luaentity().name ~= fname and obj:get_luaentity().name ~= "dmobs:dragon_red" and obj:get_luaentity().name ~= "dmobs:dragon_blue" and obj:get_luaentity().name ~= "dmobs:dragon_black" and obj:get_luaentity().name ~= "dmobs:dragon_green" and obj:get_luaentity().name ~= "dmobs:dragon_great_tame" and obj:get_luaentity().name ~= "__builtin:item" then
- obj:punch(self.object, 1.0, {
+ obj:punch(self.launcher, 1.0, {
full_punch_interval=1.0,
damage_groups={fleshy=3},
}, nil)
@@ -1010,47 +1013,28 @@ minetest.register_entity(fname, {
self.object:remove()
return
end
+ if ice and n == "default:water_source" then
+ minetest.env:set_node(t, {name="default:ice"})
+ self.object:remove()
+ end
end
end
end
end
- hit_node = function(self, pos, node)
- if explode then
- local pos = self.object:getpos()
- tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
- else
--- local pos = self.object:getpos()
- for dx=-4,4 do
- for dy=-4,4 do
- for dz=-4,4 do
- local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
- local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
- local n = minetest.env:get_node(pos).name
- if math.random(1, 50) <= 35 then
- minetest.env:remove_node(p)
- end
- if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <=5 then
- minetest.env:set_node(t, {name=replace_node})
- end
- end
- end
- end
- end
- end
local apos = self.object:getpos()
local part = minetest.add_particlespawner(
6, --amount
0.3, --time
- {x=apos.x-0.3, y=apos.y-0.3, z=apos.z-0.3}, --minpos
- {x=apos.x+0.3, y=apos.y+0.3, z=apos.z+0.3}, --maxpos
+ {x=apos.x-variance, y=apos.y-variance, z=apos.z-variance}, --minpos
+ {x=apos.x+variance, y=apos.y+variance, z=apos.z+variance}, --maxpos
{x=-0, y=-0, z=-0}, --minvel
{x=0, y=0, z=0}, --maxvel
- {x=0,y=-0.5,z=0}, --minacc
- {x=0.5,y=0.5,z=0.5}, --maxacc
+ {x=variance,y=-0.5-variance,z=variance}, --minacc
+ {x=0.5+variance,y=0.5+variance,z=0.5+variance}, --maxacc
0.1, --minexptime
0.3, --maxexptime
- 1, --minsize
- 2, --maxsize
+ size, --minsize
+ size+2, --maxsize
false, --collisiondetection
texture --texture
)
@@ -1059,10 +1043,10 @@ minetest.register_entity(fname, {
})
end
-dmobs.register_fire("dmobs:fire_plyr", "dmobs_fire.png", 2, "fire:basic_flame", true)
-dmobs.register_fire("dmobs:ice_plyr", "dmobs_ice.png", 2, "default:snow", false)
-dmobs.register_fire("dmobs:poison_plyr", "dmobs_poison.png", 2, "air", false)
-dmobs.register_fire("dmobs:lightning_plyr", "dmobs_lightning.png", 2, "air", true)
+dmobs.register_fire("dmobs:fire_plyr", "dmobs_fire.png", 2, "fire:basic_flame", true, false, 0.3, 1)
+dmobs.register_fire("dmobs:ice_plyr", "dmobs_ice.png", 2, "default:ice", false, true, 0.5, 10)
+dmobs.register_fire("dmobs:poison_plyr", "dmobs_poison.png", 2, "air", false, false, 0.3, 1)
+dmobs.register_fire("dmobs:lightning_plyr", "dmobs_lightning.png", 2, "air", true, false, 0, 0.5)
@@ -1170,10 +1154,6 @@ minetest.register_craftitem("dmobs:dragon_gem", {
inventory_image = "dmobs_gem.png"
})
--- minetest.register_craftitem("dmobs:dragon_armor_steel", {
- -- description = "Dragon Armor",
- -- inventory_image = "dmobs_dragon_armor_inv.png"
--- })
--spawns and eggs
@@ -1331,7 +1311,7 @@ mobs:register_mob("dmobs:waterdragon_2", {
},
})
-mobs:register_spawn("dmobs:waterdragon", {"default:water_source"}, 20, 10, 64000, 1, 31000, false)
+mobs:register_spawn("dmobs:waterdragon", {"default:water_source"}, 20, 10, 32000, 1, 31000, false)
mobs:register_egg("dmobs:waterdragon", "Boss Waterdragon", "dmobs_egg4.png", 1)
@@ -1396,7 +1376,7 @@ mobs:register_mob("dmobs:wyvern", {
knock_back = 2,
})
-mobs:register_spawn("dmobs:wyvern", {"default:leaves"}, 20, 10, 64000, 1, 31000, false)
+mobs:register_spawn("dmobs:wyvern", {"default:leaves"}, 20, 10, 32000, 1, 31000, false)
mobs:register_egg("dmobs:wyvern", "Boss Wyvern", "dmobs_egg3.png", 1)
@@ -1545,12 +1525,15 @@ mobs:register_mob("dmobs:dragon_great_tame", {
do_custom = function(self, dtime)
if self.driver then
object_fly(self, dtime, 10, true, "dmobs:fire_plyr", "walk", "stand")
+ if self.state == "attack" then
+ self.state = "idle"
+ end
return false
end
return true
end,
})
-mobs:register_spawn("dmobs:dragon_great", {"default:lava_source"}, 20, 0, 128000, -21000, 1000, false)
+mobs:register_spawn("dmobs:dragon_great", {"default:lava_source"}, 20, 0, 64000, -21000, 1000, false)
mobs:register_egg("dmobs:dragon_great", "Boss Dragon", "dmobs_egg1.png", 1)
diff --git a/init.lua b/init.lua
index 5a59117..7aa666a 100644
--- a/init.lua
+++ b/init.lua
@@ -51,9 +51,9 @@ minetest.register_entity("dmobs:butterfly", {
--wasps nest
minetest.register_node("dmobs:hive", {
- description = "Wasp Hive",
+ description = "Wasp Nest",
tiles = {"dmobs_hive.png"},
- groups = {crumbly=1, oddly_breakable_by_hand=1, falling_node=1},
+ groups = {crumbly=1, oddly_breakable_by_hand=1, falling_node=1, flammable=1},
on_destruct = function(pos, oldnode)
minetest.env:add_entity(pos, "dmobs:wasp")
minetest.env:add_entity(pos, "dmobs:wasp")
diff --git a/textures/dmobs_ice.png b/textures/dmobs_ice.png
index 2a49aec2b1aae3effd7ef0c58d657b899c65d610..ae16b3a17b9ea769c9640feaac5c353726883cc0 100644
GIT binary patch
literal 1721
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk
z0|Q⩔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
delta 555
zcmdnVyOl+;Gr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4*E#C|=L_+|$J|#NzbU
z$@Uq+fg;E1%{?z`d9GF4*0FU;nt*D^k%g*OTS^5>N&+tIbrok{SXvk$=qS+c^J-DE
z(xsDK5o`61+N|2~<G;Uyl<)6JGnV-$b=LlrsZm;JxZ}$K*>^j?|M_w5q4kEWjVmUL
zlnS^<7nHpE-?b@Aaq+cTF^*Xw^^aEX%r)}X`NY@|9%N%VGfTdnM_$!P?#13`ubI27
zSPqn3cJ%6sG?uwJ`$cwtj#|}sxe_Vn1N^sMGxJ=2qMEk!#%)PA_NtS$<(%s?mulW}
z{c@>ggN^8WlZ`?b($YGmgsY7XzX;I(xrzJq0iz#GinGj01b5bRmq{EB+dO}c-=BI`
zizxrV%O9VlygIgT$5j2@AJR*hRz1k(6MWMrY*`#!6U0_1t-#=LL!|NUx2>AKHPLD3
z3LmQP(bM_3EM(EF^G)(Dtakgibj<uWRX62oGCyBY>MO}kGo6}y*$=)4Zf&xjer#ve
zy8FR<SBnWeU}&&4N;xLC?}fL^hHI?aV!jIT^{nM~zCT|WJlW&ecJ_0W!vyv(5{Jc4
z%1Ih6KQ6y<d9to9cjW1<m#6ge9yUwPc&6FccYS-Pr?uuw1BUpe=eWy*7H+=oEn@QE
z=I>4F_wV1h)ORj8M2I0;yl~6M_;_FE3r$WxUb5vJIu<u|>0eg;s0#{8u1&`o7#J8l
NUHx3vIVCVQ0RX|g_a*=U
--
GitLab