From 2093a6b5c27754e989b4a72c3012abf8372ade9d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 30 Nov 2017 15:36:17 +0100 Subject: [PATCH] Water mobs now swim in river water --- mods/ENTITIES/mobs_mc/0_gameconfig.lua | 1 + mods/ENTITIES/mobs_mc/guardian.lua | 2 +- mods/ENTITIES/mobs_mc/guardian_elder.lua | 2 +- mods/ENTITIES/mobs_mc/squid.lua | 3 +-- mods/ENTITIES/mobs_mc_gameconfig/init.lua | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/0_gameconfig.lua b/mods/ENTITIES/mobs_mc/0_gameconfig.lua index f9624abc50..8d43c54aa5 100644 --- a/mods/ENTITIES/mobs_mc/0_gameconfig.lua +++ b/mods/ENTITIES/mobs_mc/0_gameconfig.lua @@ -81,6 +81,7 @@ mobs_mc.items = { gunpowder = "tnt:gunpowder", flint_and_steel = "fire:flint_and_steel", water_source = "default:water_source", + river_water_source = "default:river_water_source", black_dye = "dye:black", poppy = "flowers:rose", dandelion = "flowers:dandelion_yellow", diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua index de9cac1dd0..81f6f17919 100644 --- a/mods/ENTITIES/mobs_mc/guardian.lua +++ b/mods/ENTITIES/mobs_mc/guardian.lua @@ -73,7 +73,7 @@ mobs:register_mob("mobs_mc:guardian", { max = 1,}, }, fly = true, - fly_in = mobs_mc.items.water_source, + fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source }, view_range = 16, water_damage = 0, lava_damage = 4, diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua index 27e21c4503..45850d4bd2 100644 --- a/mods/ENTITIES/mobs_mc/guardian_elder.lua +++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua @@ -78,7 +78,7 @@ mobs:register_mob("mobs_mc:guardian_elder", { max = 1,}, }, fly = true, - fly_in = mobs_mc.items.water_source, + fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source }, water_damage = 0, lava_damage = 4, light_damage = 0, diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua index 2ab401d1b4..79e123e934 100644 --- a/mods/ENTITIES/mobs_mc/squid.lua +++ b/mods/ENTITIES/mobs_mc/squid.lua @@ -43,8 +43,7 @@ mobs:register_mob("mobs_mc:squid", { makes_footstep_sound = false, stepheight = 1.1, fly = true, - -- fly_in = mobs_mc.items.water_source, fuck this - fly_in = {"mcl_core:water_source", "default:water_source"}, + fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source }, jump = true, jump_height = 1.25, jump_chance = 98, diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua index edd026215f..ec50b12f98 100644 --- a/mods/ENTITIES/mobs_mc_gameconfig/init.lua +++ b/mods/ENTITIES/mobs_mc_gameconfig/init.lua @@ -55,6 +55,7 @@ mobs_mc.override.items = { gunpowder = "mcl_mobitems:gunpowder", flint_and_steel = "mcl_fire:flint_and_steel", water_source = "mcl_core:water_source", + river_water_source = "mclx_core:river_water_source", black_dye = "mcl_dye:black", poppy = "mcl_flowers:poppy", dandelion = "mcl_flowers:dandelion",