jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

remove 3rd attr for killcounter weapons and fix tests

Browse Source
This commit is contained in:
andy 2022-05-24 00:15:06 +00:00
parent a5a21d0968
commit 6a7d6ffdf2
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ship/drops/rare_drop_table.rs
View File

@ -110,7 +110,6 @@ impl RareDropTable {
dropped_weapon.kills = Some(0); dropped_weapon.kills = Some(0);
}; };
ItemDropType::Weapon(dropped_weapon) ItemDropType::Weapon(dropped_weapon)
})
}, },
RareDropItem::Armor(armor) => { RareDropItem::Armor(armor) => {
ItemDropType::Armor(Armor { ItemDropType::Armor(Armor {

4
src/ship/packet/handler/direct_message.rs
View File

@ -79,7 +79,6 @@ pub async fn request_item<EG>(id: ClientId,
where where
EG: EntityGateway 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_id = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() })?;
let room = rooms.get_mut(room_id.0) let room = rooms.get_mut(room_id.0)
.ok_or(ShipError::InvalidRoom(room_id.0 as u32))? .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?
@ -87,9 +86,7 @@ where
.ok_or(ShipError::InvalidRoom(room_id.0 as u32))?; .ok_or(ShipError::InvalidRoom(room_id.0 as u32))?;
let monster = room.maps.enemy_by_id(request_item.enemy_id as usize)?; let monster = room.maps.enemy_by_id(request_item.enemy_id as usize)?;
println!("room id: {:?}, monster: {:?}", room_id, monster);
if monster.dropped_item { if monster.dropped_item {
println!("monster {:?} already dropped an item!", monster);
return Err(ShipError::MonsterAlreadyDroppedItem(id, request_item.enemy_id).into()) return Err(ShipError::MonsterAlreadyDroppedItem(id, request_item.enemy_id).into())
} }
@ -98,7 +95,6 @@ where
let client_and_drop = clients_in_area.into_iter() let client_and_drop = clients_in_area.into_iter()
.filter_map(|area_client| { .filter_map(|area_client| {
if room.redbox { 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| { room.drop_table.get_rare_drop(&monster.map_area, &monster.monster).map(|item_drop_type| {
(area_client, item_drop_type) (area_client, item_drop_type)
}) })