argo
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Make Ominous Banner Description generate correctly

This commit is contained in:
PrairieWind 2023-05-11 16:12:50 -06:00
parent 4651bd7e7d
commit 739a894856
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ENVIRONMENT/mcl_raids/init.lua
View File

@ -84,7 +84,9 @@ minetest.register_entity(":mcl_raids:ominous_banner",oban_def)
function mcl_raids.drop_obanner(pos) function mcl_raids.drop_obanner(pos)
local it = ItemStack("mcl_banners:banner_item_white") local it = ItemStack("mcl_banners:banner_item_white")
it:get_meta():set_string("layers",minetest.serialize(oban_layers)) it:get_meta():set_string("layers",minetest.serialize(oban_layers))
it:get_meta():set_string("name",S("Ominous Banner")) local banner_description = string.gsub(it:get_definition().description, "White Banner", "Ominous Banner")
local description = mcl_banners.make_advanced_banner_description(banner_description, oban_layers)
it:get_meta():set_string("description", description)
minetest.add_item(pos,it) minetest.add_item(pos,it)
end end
@ -94,7 +96,7 @@ function mcl_raids.promote_to_raidcaptain(c) -- object
local l = c:get_luaentity() local l = c:get_luaentity()
l._banner = minetest.add_entity(pos,"mcl_raids:ominous_banner") l._banner = minetest.add_entity(pos,"mcl_raids:ominous_banner")
l._banner:set_properties({textures = {mcl_banners.make_banner_texture("unicolor_white", oban_layers)}}) l._banner:set_properties({textures = {mcl_banners.make_banner_texture("unicolor_white", oban_layers)}})
l._banner:set_attach(c,"",vector.new(-1,5.5,0),vector.new(0,0,0),true) l._banner:set_attach(c,"",vector.new(0,5.5,0),vector.new(0,0,0),true)
l._raidcaptain = true l._raidcaptain = true
local old_ondie = l.on_die local old_ondie = l.on_die
l.on_die = function(self, pos, cmi_cause) l.on_die = function(self, pos, cmi_cause)
@ -129,7 +131,7 @@ function mcl_raids.register_possible_raidcaptain(mob)
table.insert(minetest.registered_entities[mob].pick_up,"mcl_banners:banner_item_white") table.insert(minetest.registered_entities[mob].pick_up,"mcl_banners:banner_item_white")
minetest.registered_entities[mob].on_pick_up = function(self,e) minetest.registered_entities[mob].on_pick_up = function(self,e)
local stack = ItemStack(e.itemstring) local stack = ItemStack(e.itemstring)
if not self._raidcaptain and stack:get_meta():get_string("name"):find("Ominous Banner") then if not self._raidcaptain and stack:get_meta():get_string("description"):find("Ominous Banner") then
stack:take_item(1) stack:take_item(1)
mcl_raids.promote_to_raidcaptain(self.object) mcl_raids.promote_to_raidcaptain(self.object)
return stack return stack

2
mods/ENVIRONMENT/mcl_raids/mod.conf
View File

@ -1,3 +1,3 @@
name = mcl_raids name = mcl_raids
author = PrairieWind author = PrairieWind
depends = mcl_events, mobs_mc, mcl_potions, mcl_bells, mcl_achievements depends = mcl_events, mobs_mc, mcl_potions, mcl_bells, mcl_achievements, mcl_banners