added superboom TNT as an item

added proper names and lore's for TNT and ender pearls.

Author: Stivais

src/dungeon/dungeon.rs

@@ -8,6 +8,7 @@ use crate::dungeon::items::magical_map::MagicalMap;
 use crate::dungeon::items::pickaxe::Pickaxe;
 use crate::dungeon::items::skyblock_menu::SkyblockMenu;
 use crate::dungeon::items::spirit_sceptre::SpiritSceptre;
+use crate::dungeon::items::superboom::SuperboomTNT;
 use crate::dungeon::items::tactical_insertion::TacticalInsertion;
 use crate::dungeon::map::DungeonMap;
 use crate::dungeon::room::room::{Room, RoomNeighbour, RoomSegment, RoomStatus};
@@ -207,6 +208,7 @@ impl WorldExtension for Dungeon {
         player.inventory.set_slot(37, Some(AspectOfTheVoid.into()));
         player.inventory.set_slot(38, Some(EnderPearl.into()));
         player.inventory.set_slot(39, Some(Pickaxe.into()));
+        player.inventory.set_slot(40, Some(SuperboomTNT.into()));
         player.inventory.set_slot(41, Some(SpiritSceptre.into()));
         player.inventory.set_slot(42, Some(TacticalInsertion.into()));
         player.inventory.set_slot(44, Some(SkyblockMenu.into()));

src/dungeon/dungeon_player.rs

@@ -76,14 +76,19 @@ impl PlayerExtension for DungeonPlayer {
         let mut restore_block = false;
         match action {
             PlayerDiggingAction::StartDestroyBlock => {
-                if let Some(item) = *player.inventory.get_hotbar_slot(player.held_slot as usize) {
+                let held_item = *player.inventory.get_hotbar_slot(player.held_slot as usize);
+
+                // todo: use block toughness/tool to figure out, since blocks like grass can be broken instantly without pickaxe etc
+                if let Some(item) = held_item {
                     if matches!(item, DungeonItems::Pickaxe(_)) {
                         restore_block = true;
                     }
+
+                    DungeonItem::on_start_dig(&item, player, position)
                 }
 
                 if let Some(room_rc) = player.get_current_room() && player.world().has_started() {
-                    Room::attack_block(&room_rc, player, position);
+                    Room::on_start_dig(&room_rc, player, position);
                 }
             }
             PlayerDiggingAction::FinishDestroyBlock => {

src/dungeon/items/dungeon_items.rs

@@ -6,8 +6,10 @@ use crate::dungeon::items::magical_map::MagicalMap;
 use crate::dungeon::items::pickaxe::Pickaxe;
 use crate::dungeon::items::skyblock_menu::SkyblockMenu;
 use crate::dungeon::items::spirit_sceptre::SpiritSceptre;
+use crate::dungeon::items::superboom::SuperboomTNT;
 use crate::dungeon::items::tactical_insertion::TacticalInsertion;
 use enum_dispatch::enum_dispatch;
+use glam::IVec3;
 use server::inventory::item::Item;
 use server::inventory::item_stack::ItemStack;
 use server::player::packet_processing::BlockInteractResult;
@@ -17,6 +19,8 @@ use server::Player;
 pub trait DungeonItem {
 
     fn on_interact(&self, player: &mut Player<DungeonPlayer>, block: Option<BlockInteractResult>);
+    
+    fn on_start_dig(&self, _player: &mut Player<DungeonPlayer>, _position: IVec3) {}
 
     fn item_stack(&self) -> ItemStack;
 
@@ -32,6 +36,7 @@ pub enum DungeonItems {
     AspectOfTheVoid,
     SpiritSceptre,
     SkyblockMenu,
+    SuperboomTNT,
     MagicalMap,
     EnderPearl,
     Hyperion,

src/dungeon/items/ender_pearl.rs

@@ -3,11 +3,13 @@ use crate::dungeon::dungeon_player::DungeonPlayer;
 use crate::dungeon::items::dungeon_items::DungeonItem;
 use bevy_ecs::prelude::Component;
 use glam::dvec3;
+use indoc::indoc;
 use server::block::block_collision::check_block_collisions;
 use server::constants::{ObjectVariant, Sound};
 use server::entity::components::{EntityAppearance, EntityBehaviour};
 use server::entity::entity::MinecraftEntity;
 use server::inventory::item_stack::ItemStack;
+use server::network::binary::nbt::NBT;
 use server::network::binary::var_int::VarInt;
 use server::network::packets::packet_buffer::PacketBuffer;
 use server::network::protocol::play::clientbound::{DestroyEntites, EntityTeleport, EntityVelocity, PositionLook, Relative, SpawnObject};
@@ -49,7 +51,16 @@ impl DungeonItem for EnderPearl {
             item: 368,
             stack_size: 16,
             metadata: 0,
-            tag_compound: None,
+            tag_compound: Some(NBT::with_nodes(vec![
+                NBT::compound("display", vec![
+                    NBT::list_from_string("Lore", indoc! {r#"
+                            §8Collection Item
+
+                            §f§lCOMMON
+                        "#}),
+                    NBT::string("Name", "§fEnder Pearl"),
+                ]),
+            ])),
         }
     }
 }

src/dungeon/items/mod.rs

@@ -7,4 +7,5 @@ pub mod hyperion;
 pub mod skyblock_menu;
 pub mod magical_map;
 pub mod spirit_sceptre;
-pub mod tactical_insertion;
+pub mod tactical_insertion;
+pub mod superboom;

src/dungeon/items/superboom.rs

@@ -0,0 +1,70 @@
+use crate::dungeon::dungeon_player::DungeonPlayer;
+use crate::dungeon::items::ability::Cooldown;
+use crate::dungeon::items::dungeon_items::DungeonItem;
+use glam::IVec3;
+use indoc::indoc;
+use server::constants::Sound;
+use server::inventory::item_stack::ItemStack;
+use server::network::binary::nbt::NBT;
+use server::player::packet_processing::BlockInteractResult;
+use server::Player;
+
+#[derive(Copy, Clone, Hash, Eq, PartialEq)]
+pub struct SuperboomTNT;
+
+impl DungeonItem for SuperboomTNT {
+
+    fn on_interact(&self, player: &mut Player<DungeonPlayer>, block: Option<BlockInteractResult>) {
+        if let Some(block) = block {
+            if player.item_cooldown(&SuperboomTNT.into()).is_some() {
+                return;
+            }
+
+            player.sync_inventory();
+            player.play_sound_at(
+                Sound::RandomExplode,
+                1.0,
+                0.8,
+                block.position.as_dvec3()
+            );
+
+            player.add_item_cooldown(&SuperboomTNT.into(), Cooldown::from_ticks(10, true))
+            // get current room, iterate over crypts and walls and explode
+        }
+    }
+
+    fn on_start_dig(&self, player: &mut Player<DungeonPlayer>, position: IVec3) {
+        if player.item_cooldown(&SuperboomTNT.into()).is_some() {
+            return;
+        }
+
+        player.play_sound_at(
+            Sound::RandomExplode,
+            1.0,
+            0.8,
+            position.as_dvec3()
+        );
+
+        player.add_item_cooldown(&SuperboomTNT.into(), Cooldown::from_ticks(7, true))
+    }
+
+    fn item_stack(&self) -> ItemStack {
+        ItemStack {
+            item: 46,
+            stack_size: 64,
+            metadata: 0,
+            tag_compound: Some(NBT::with_nodes(vec![
+                NBT::compound("display", vec![
+                    NBT::list_from_string("Lore", indoc! {r#"
+                            §7Breaks weak walls. Can be used to
+                            §7blow up Crypts in §cThe Catacombs and
+                            §5Crystal Hollows§7.
+
+                            §9§lRARE
+                        "#}),
+                    NBT::string("Name", "§9Superboom TNT"),
+                ]),
+            ])),
+        }
+    }
+}

src/dungeon/items/tactical_insertion.rs

@@ -23,7 +23,7 @@ impl DungeonItem for TacticalInsertion {
             yaw: player.yaw,
             pitch: player.pitch,
         });
-        player.extension.add_item_cooldown(&TacticalInsertion.into(), Cooldown::from_seconds(20, false))
+        player.add_item_cooldown(&TacticalInsertion.into(), Cooldown::from_seconds(20, false))
     }
 
     fn item_stack(&self) -> ItemStack {

src/dungeon/room/room.rs

@@ -242,7 +242,7 @@ impl Room {
         })
     }
 
-    pub fn attack_block(room_rc: &Rc<RefCell<Room>>, player: &mut Player<DungeonPlayer>, position: IVec3) {
+    pub fn on_start_dig(room_rc: &Rc<RefCell<Room>>, player: &mut Player<DungeonPlayer>, position: IVec3) {
         if Self::try_open_door(room_rc, player, position) {
             return;
         }