From 4b9482cb0924574b318fe3b878d99adbd07fed0d Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sun, 5 Feb 2023 05:34:32 +0000 Subject: [PATCH 1/6] Mobs should not drop XP when dying by fire from sunlight --- mods/ENTITIES/mcl_mobs/api.lua | 11 ++++++++++- mods/ENTITIES/mcl_mobs/physics.lua | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index 1e7c9168b..6cc8d3d28 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -365,6 +365,9 @@ function mob_class:on_step(dtime) if self:check_despawn(pos, dtime) then return true end if self:outside_limits() then return end + -- Start: Death/damage processing + -- All damage needs to be undertaken at the start. + -- We need to exit processing if the mob dies. if self:check_death_and_slow_mob() then --minetest.log("action", "Mob is dying: ".. tostring(self.name)) -- Do we abandon out of here now? @@ -377,9 +380,16 @@ function mob_class:on_step(dtime) mcl_burning.tick(self.object, dtime, self) -- mcl_burning.tick may remove object immediately if not self.object:get_pos() then return end + + if self:check_for_death("fire", {type = "fire"}) then + return true + end end + if self:env_damage (dtime, pos) then return end + if self.state == "die" then return end + -- End: Death/damage processing self:check_water_flow() self:env_danger_movement_checks (dtime) @@ -425,7 +435,6 @@ function mob_class:on_step(dtime) self:mob_sound("random", true) end - if self:env_damage (dtime, pos) then return end if self:do_states(dtime) then return end if not self.object:get_luaentity() then diff --git a/mods/ENTITIES/mcl_mobs/physics.lua b/mods/ENTITIES/mcl_mobs/physics.lua index 0c908b639..d4d3c836d 100644 --- a/mods/ENTITIES/mcl_mobs/physics.lua +++ b/mods/ENTITIES/mcl_mobs/physics.lua @@ -462,6 +462,14 @@ function mob_class:check_for_death(cause, cmi_cause) self:mob_sound("death") local function death_handle(self) + if cmi_cause and cmi_cause["type"] then + --minetest.log("cmi_cause: " .. tostring(cmi_cause["type"])) + end + --minetest.log("cause: " .. tostring(cause)) + + -- TODO other env damage shouldn't drop xp + -- "rain", "water", "drowning", "suffocation" + -- dropped cooked item if mob died in fire or lava if cause == "lava" or cause == "fire" then self:item_drop(true, 0) @@ -800,7 +808,7 @@ function mob_class:do_env_damage() self.suffocation_timer = 0 end - return self:check_for_death("", {type = "unknown"}) + return self:check_for_death("unknown", {type = "unknown"}) end function mob_class:env_damage (dtime, pos) From 39d4434df160bdc630c2329f2d35c7db7d33b3d0 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Sun, 5 Feb 2023 23:42:36 +0000 Subject: [PATCH 2/6] Reorder on_step calls --- mods/ENTITIES/mcl_mobs/api.lua | 35 +++++++++++++---------------- mods/ENTITIES/mcl_mobs/movement.lua | 8 ++++++- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index 6cc8d3d28..fa7cd3d4c 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -366,8 +366,7 @@ function mob_class:on_step(dtime) if self:outside_limits() then return end -- Start: Death/damage processing - -- All damage needs to be undertaken at the start. - -- We need to exit processing if the mob dies. + -- All damage needs to be undertaken at the start. We need to exit processing if the mob dies. if self:check_death_and_slow_mob() then --minetest.log("action", "Mob is dying: ".. tostring(self.name)) -- Do we abandon out of here now? @@ -378,8 +377,7 @@ function mob_class:on_step(dtime) if not self.fire_resistant then mcl_burning.tick(self.object, dtime, self) - -- mcl_burning.tick may remove object immediately - if not self.object:get_pos() then return end + if not self.object:get_pos() then return end -- mcl_burning.tick may remove object immediately if self:check_for_death("fire", {type = "fire"}) then return true @@ -394,38 +392,35 @@ function mob_class:on_step(dtime) self:check_water_flow() self:env_danger_movement_checks (dtime) - if mobs_debug then self:update_tag() end self:follow_flop() -- Mob following code. - self:set_animation_speed() -- set animation speed relitive to velocity + self:set_animation_speed() -- set animation speed relative to velocity + self:check_smooth_rotation(dtime) self:check_head_swivel(dtime) - if self.jump_sound_cooloff > 0 then - self.jump_sound_cooloff = self.jump_sound_cooloff - dtime - end + if self.jump_sound_cooloff > 0 then self.jump_sound_cooloff = self.jump_sound_cooloff - dtime end self:do_jump() - self:set_armor_texture() self:check_runaway_from() - self:monster_attack() self:npc_attack() - self:check_breeding() self:check_aggro(dtime) - -- run custom function (defined in mob lua file) - if self.do_custom then - if self.do_custom(self, dtime) == false then - return - end - end + self:check_breeding() + + self:check_item_pickup() + self:set_armor_texture() + + if self.do_custom and self.do_custom(self, dtime) == false then return end if update_timers(self, dtime) then return end self:check_particlespawners(dtime) - self:check_item_pickup() + + if self:env_damage (dtime, pos) then return end + if self:do_states(dtime) then return end if self.opinion_sound_cooloff > 0 then self.opinion_sound_cooloff = self.opinion_sound_cooloff - dtime @@ -437,6 +432,8 @@ function mob_class:on_step(dtime) if self:do_states(dtime) then return end + if mobs_debug then self:update_tag() end + if not self.object:get_luaentity() then return false end diff --git a/mods/ENTITIES/mcl_mobs/movement.lua b/mods/ENTITIES/mcl_mobs/movement.lua index 758e74467..4f174b300 100644 --- a/mods/ENTITIES/mcl_mobs/movement.lua +++ b/mods/ENTITIES/mcl_mobs/movement.lua @@ -239,9 +239,15 @@ function mob_class:is_at_water_danger() return false end local yaw = self.object:get_yaw() + local pos = self.object:get_pos() + + if not yaw or not pos then + return + end + local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5) local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5) - local pos = self.object:get_pos() + local ypos = pos.y + self.collisionbox[2] -- just above floor local free_fall, blocker = minetest.line_of_sight( From b834e790a76fa8610df3548e67941e8552cb4663 Mon Sep 17 00:00:00 2001 From: ancientmarinerdev Date: Mon, 6 Feb 2023 04:35:35 +0000 Subject: [PATCH 3/6] Fix game crashes --- mods/ENTITIES/mcl_mobs/effects.lua | 15 +++++++++++++-- mods/ENTITIES/mcl_mobs/physics.lua | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/effects.lua b/mods/ENTITIES/mcl_mobs/effects.lua index d4b071f93..a8b761d47 100644 --- a/mods/ENTITIES/mcl_mobs/effects.lua +++ b/mods/ENTITIES/mcl_mobs/effects.lua @@ -1,4 +1,4 @@ -local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs +local math, tonumber, vector, minetest, mcl_mobs = math, tonumber, vector, minetest, mcl_mobs local mob_class = mcl_mobs.mob_class local active_particlespawners = {} local disable_blood = minetest.settings:get_bool("mobs_disable_blood") @@ -8,6 +8,15 @@ local player_transfer_distance = tonumber(minetest.settings:get("player_transfer if player_transfer_distance == 0 then player_transfer_distance = math.huge end +local function validate_vector (vect) + if vect then + if tonumber(vect.x) and tonumber(vect.y) and tonumber(vect.z) then + return true + end + end + return false +end + -- custom particle effects function mcl_mobs.effect(pos, amount, texture, min_size, max_size, radius, gravity, glow, go_down) @@ -385,6 +394,8 @@ function mob_class:check_head_swivel(dtime) mcl_util.set_bone_position(self.object,self.head_swivel, vector.new(0,self.bone_eye_height,self.horrizonatal_head_height), final_rotation) end + + function mob_class:set_animation_speed() local v = self.object:get_velocity() if v then @@ -400,7 +411,7 @@ function mob_class:set_animation_speed() end end --set_speed - if self.acc then + if validate_vector(self.acc) then self.object:add_velocity(self.acc) end end diff --git a/mods/ENTITIES/mcl_mobs/physics.lua b/mods/ENTITIES/mcl_mobs/physics.lua index d4d3c836d..797bb4b7e 100644 --- a/mods/ENTITIES/mcl_mobs/physics.lua +++ b/mods/ENTITIES/mcl_mobs/physics.lua @@ -311,6 +311,8 @@ end function mob_class:set_yaw(yaw, delay, dtime) if self.noyaw then return end + if not self.object:get_yaw() or not self.object:get_pos() then return end + if self.state ~= PATHFINDING then self._turn_to = yaw end From d9982e20d2e27ce622a657adaed20b4726ac0393 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Wed, 8 Feb 2023 19:57:00 +0000 Subject: [PATCH 4/6] Make the footer more with the times --- menu/footer.png | Bin 1436 -> 1378 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/menu/footer.png b/menu/footer.png index 72f80a43c524b00635132a989651e967ccbfc4fb..4563e95772fc4616b9af9d977e4c730900437ac8 100644 GIT binary patch delta 1359 zcmV-V1+e;@3*ripB!3c6OjJbxZ)^Yn06I1={{R5#+P~@A!1HKdZU6uP0d!JMQvg8b z*k%9#1pY}xK~#9!?VSmZqc9Kv5#k{T@q^3*P?rC{X#;KguuV3{4vA2eMiFBSCQ(n+4xCPkb(LPReMn^qF3n^?!(Kdz*B>0|Eme@T=Pg zfWW^f@Ni?Chu*F6Iv_BdQ{ZbJ?G@VLm06Ft*4Or+w@vEzI~*r)(>y;s00MuP!0dwSSwgH}%|F$~Osszz7V0z~v#h>emkP_EMhUb7KUC6A7Gxd>9tN+=R5t zUp7~lTK0A;VLfh<-FD}yt>0@R0+-u!8*w*pe^}sU;`Taj-MTrwleHyv-j>pHV?+!f zFaiT0@Secewip7#X#`eXy&gj{GZR=Fy?BcS zQ*DK%>e@avxxn3Qd&*4UZI*19yuK%}Si0`3Q#U_wJIHA;@m4%XU_f9520-Au0?Prg zzXe2Z*nbE^A~2kQF6b&(dQ=Yy@61MNRPjuBUEx&8fwev5%;Dfho+b@PZv+4g{c{jhZW`Jh}mLF!E znt!9?t+e1-FS_}1xy*kqm!BDd0f7-1fdPR(F0lV4%21@+)lBgdA$gucfl{me?GN$G z_G}1Q7J=aqfg4}SD2rjAB*(&^RTp-neXay~_=)xCiV^9v-CE0At95JVR7l0u@_!E1z57_2G;5DT$TR}O5dzOv0I7^{U#&jP zYKj;xCu-522l;3nbck$KlAMRp_XIXs5Eu{`fe{!G_%i~BDle`=N~q<%j_rR1TLrEZ z^&X42wBNysgAWJ{N94dlC>`2W0@7C%H3eb}R|;`<|I)$bx0Rk^f#0wpTt-^>@qe-) zFd#4jBQPNFhXn4eo~Rs=*K2uqa}%p4E@e~3`a22d%{%vvFclr7ICw(^7C1;?o9IG> zhk(>snI>Jnd%F|us-@{FY(vz)3v^fNN)-7t*v>;CFd#4jBQPNF=LAl}k6Qvf&RT6S zyDLRC4#)a^dQ34K>#v)bR{$@(wSP~6I^b}uz`E1Y2v4%bShWQ=1+0Xc+UdQ`Zze8B2@_uFfm z>V4~}cKsCm5Vk_sAruD(_-$N~dkyRm!&$6G7i^-d?4PWs*P+i>mBoB%kVqdr^CBj| z2n+~}zz7To{4s$`-gn79g;zTOd^wf<)3IMb2n>M02n-1PRRRM50000$jlWWn(R-O& Rtk(bl002ovPDHLkV1imXX+Hn} delta 1418 zcmY*Zc{J1u82y>W64_ocUPr@FPnL|GERn6THzN!~BUA`egJ|T}kJ6jMX_PHn9=(h$ zp6m~!p3vkN`($S%OEM7=@lNl&=k)Hm|9t;^=YIFQ=T7g-7QL?wO1L<rkoPJ{c5Up?%6A5=dye+Z=bLjUk{mU0)xYL<6+(T4UI@> zExY)jDYs5KjZj=6hWAZ*gvYPLDSFU^_n!+A;x?d;lVj7ja#-0N-DP*~vIryqNueMC z=$r<{3gKhyVLAPTh*P`*l8EVxM7`r}(Wl8O37HID1A zN8B)F)It7wRQRYB*_@29A)8NDA(QjXr47^k&-B@u&3h;Yp>y(9n;r+9)f1}AU`dM^ zyiD_Hp~W*2&mXcr`Fm$*{T010VWl$A2oJ|Q3WLLxurN3*4^*ejF=G-7EuNw3-O>I7iwtJ{nt3{!a1AkPLOIZ7? zH=)0ODeZ;1$n~`*HB$$*-TqPGs1(G|PaYA~*A44q)u3w5UD@_hr#oZlEs>bwA^8G;2^kn2M$k#&>x zbRX&F1wNV)p@F7f(21CnJLFyK2%fd_)MK){4wsZgqcprPFAn`{4gky3#Iit#Et*q( zH9;5<7W>XU@EL{lvAojQnXsmAf4giG5S5Vbv&u%#@V8Zl?`>zYn>o}Jx#_)=NDzL1&AQTxa+T~ok}IB94EcC8wjoOGC+#elPa)ULXGUH-C_)iSZ%8G{f+*pLx| z2s2x9SBQ%J1MM@G$i`klX=!Ws{I;1bMcc-ETp4I80M?%A5$1D|Dd!-=*+HKC+wj*EQ3`mvUR;{o(K(s$6tbXm*6J~{DhN&yn6CP8{8c1dKH9T$4{N!1d5*-xD z5!yUW?ZRI!3AT!?q-si{L%_Jo)?2M%CngoK3RsvDR)KE>TXbHK1}2nGp^6Qh(k%3j zV@8&giYzA_?Z0KrBy*xld?RCQkbFGkDDF%oCM2f?U^tKaV$FIKkI zZGm`txo-vi?w;jh5TW6PB0+Qb=M^g#=Pi{Z(MNL%|T4f`1&VHY9)=pOC@KfZtzX4<(f` Date: Tue, 7 Feb 2023 22:20:45 +0000 Subject: [PATCH 5/6] Make minecart rails unable to be broken with water --- mods/ENTITIES/mcl_minecarts/rails.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua index 5117fe48c..31bda1c98 100644 --- a/mods/ENTITIES/mcl_minecarts/rails.lua +++ b/mods/ENTITIES/mcl_minecarts/rails.lua @@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) -- Template rail function local function register_rail(itemstring, tiles, def_extras, creative) - local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=1,destroy_by_lava_flow=1, transport=1} + local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=0,destroy_by_lava_flow=1, transport=1} if creative == false then groups.not_in_creative_inventory = 1 end From 71671f8b5f89393488462105fd9eb46519af9760 Mon Sep 17 00:00:00 2001 From: SmokeyDope Date: Tue, 7 Feb 2023 22:36:25 +0000 Subject: [PATCH 6/6] Make minecart rails unable to be broken with lava --- mods/ENTITIES/mcl_minecarts/rails.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua index 31bda1c98..9c9050341 100644 --- a/mods/ENTITIES/mcl_minecarts/rails.lua +++ b/mods/ENTITIES/mcl_minecarts/rails.lua @@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) -- Template rail function local function register_rail(itemstring, tiles, def_extras, creative) - local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=0,destroy_by_lava_flow=1, transport=1} + local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=0,destroy_by_lava_flow=0, transport=1} if creative == false then groups.not_in_creative_inventory = 1 end