From 6a7d6ffdf2a5057de68e009d527ea4266c82ba81 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 24 May 2022 00:15:06 +0000 Subject: [PATCH] remove 3rd attr for killcounter weapons and fix tests --- src/ship/drops/rare_drop_table.rs | 1 - src/ship/packet/handler/direct_message.rs | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/ship/drops/rare_drop_table.rs b/src/ship/drops/rare_drop_table.rs index 1e6578f..fc44b5b 100644 --- a/src/ship/drops/rare_drop_table.rs +++ b/src/ship/drops/rare_drop_table.rs @@ -110,7 +110,6 @@ impl RareDropTable { dropped_weapon.kills = Some(0); }; ItemDropType::Weapon(dropped_weapon) - }) }, RareDropItem::Armor(armor) => { ItemDropType::Armor(Armor { diff --git a/src/ship/packet/handler/direct_message.rs b/src/ship/packet/handler/direct_message.rs index 548fb91..963fa66 100644 --- a/src/ship/packet/handler/direct_message.rs +++ b/src/ship/packet/handler/direct_message.rs @@ -79,7 +79,6 @@ pub async fn request_item(id: ClientId, where EG: EntityGateway { - println!("src::ship::packet::handler::request_item() - requesting an item!"); let room_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?; let room = rooms.get_mut(room_id.0) .ok_or(ShipError::InvalidRoom(room_id.0 as u32))? @@ -87,9 +86,7 @@ where .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?; let monster = room.maps.enemy_by_id(request_item.enemy_id as usize)?; - println!("room id: {:?}, monster: {:?}", room_id, monster); if monster.dropped_item { - println!("monster {:?} already dropped an item!", monster); return Err(ShipError::MonsterAlreadyDroppedItem(id, request_item.enemy_id).into()) } @@ -98,7 +95,6 @@ where let client_and_drop = clients_in_area.into_iter() .filter_map(|area_client| { if room.redbox { - println!("red box mode is currently enabled. dropping red box!"); room.drop_table.get_rare_drop(&monster.map_area, &monster.monster).map(|item_drop_type| { (area_client, item_drop_type) })