]> git.lizzy.rs Git - xocean.git/commitdiff
Fishes drown in air
authorElias Fleckenstein <eliasfleckenstein@web.de>
Tue, 2 Jun 2020 15:41:35 +0000 (17:41 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Tue, 2 Jun 2020 15:41:35 +0000 (17:41 +0200)
init.lua

index 0106fd8a6f430dd818810e1cc84ec4c4cd848e7d..dd44805070d49752b325e3c77258a71e4be1d2be 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -1732,11 +1732,11 @@ mobs:register_mob("xocean:fish", {
                run_velocity = 3,\r
                fly = true,\r
                fly_in = "default:water_source",\r
-               fall_speed = 0,\r
                view_range = 30,\r
                water_damage = 0,\r
                lava_damage = 10,\r
                light_damage = 0,\r
+               air_damage = 2,\r
                animation = {\r
                        speed_normal = 15,\r
            speed_run = 25,\r
@@ -1747,6 +1747,12 @@ mobs:register_mob("xocean:fish", {
            run_start = 40,\r
            run_end = 100,\r
                },\r
+               do_custom = function(self, dtime)\r
+                       if self.standing_in == "air" then\r
+                               self.health = self.health - dtime\r
+                               self:check_for_death({type = "environment", pos = pos, node = self.standing_in})\r
+                       end\r
+               end,\r
        })\r
        mobs:spawn_specific("xocean:fish",      {"default:water_source"},       {"default:water_flowing","default:water_source"},       2, 20, 30, 10000, 5, -31000, l_water_level)\r
        mobs:register_egg("xocean:fish", "Tropical Fish (Kob)", "xocean_fish.png", 0)\r
@@ -1787,6 +1793,12 @@ mobs:register_mob("xocean:fish2", {
            run_start = 40,\r
            run_end = 100,\r
                },\r
+               do_custom = function(self, dtime)\r
+                       if self.standing_in == "air" then\r
+                               self.health = self.health - dtime\r
+                               self:check_for_death({type = "environment", pos = pos, node = self.standing_in})\r
+                       end\r
+               end,\r
        })\r
        mobs:spawn_specific("xocean:fish2",     {"default:water_source"},       {"default:water_flowing","default:water_source"},       2, 20, 30, 10000, 5, -31000, l_water_level)\r
        mobs:register_egg("xocean:fish2", "Tropical Fish (SunStreak)", "xocean_fish2.png", 0)\r
@@ -1827,6 +1839,12 @@ mobs:register_mob("xocean:fish3", {
            run_start = 40,\r
            run_end = 100,\r
                },\r
+               do_custom = function(self, dtime)\r
+                       if self.standing_in == "air" then\r
+                               self.health = self.health - dtime\r
+                               self:check_for_death({type = "environment", pos = pos, node = self.standing_in})\r
+                       end\r
+               end,\r
        })\r
        mobs:spawn_specific("xocean:fish3",     {"default:water_source"},       {"default:water_flowing","default:water_source"},       2, 20, 30, 10000, 5, -31000, l_water_level)\r
        mobs:register_egg("xocean:fish3", "Tropical Fish (Dasher)", "xocean_fish3.png", 0)\r
@@ -1867,6 +1885,12 @@ mobs:register_mob("xocean:fish4", {
            run_start = 40,\r
            run_end = 100,\r
                },\r
+               do_custom = function(self, dtime)\r
+                       if self.standing_in == "air" then\r
+                               self.health = self.health - dtime\r
+                               self:check_for_death({type = "environment", pos = pos, node = self.standing_in})\r
+                       end\r
+               end,\r
        })\r
        mobs:spawn_specific("xocean:fish4",     {"default:water_source"},       {"default:water_flowing","default:water_source"},       2, 20, 30, 10000, 5, -31000, l_water_level)\r
        mobs:register_egg("xocean:fish4", "Tropical Fish (Snapper)", "xocean_fish4.png", 0)\r