From 07fd9ac377bfe7fbdc667abe3c888a2da7a94d1b Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Mon, 21 Aug 2023 00:58:19 +0100 Subject: [PATCH] halved ac-bonus from dex --- raws/spawn_tables.json | 4 ++++ src/gui/mod.rs | 2 +- src/gui/race_selection.rs | 2 +- src/melee_combat_system.rs | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/raws/spawn_tables.json b/raws/spawn_tables.json index 776b8e1..f6fade0 100644 --- a/raws/spawn_tables.json +++ b/raws/spawn_tables.json @@ -2,8 +2,12 @@ { "id": "equipment", "table": [ + { "id": "equip_pitchfork", "weight": 1, "difficulty": 1}, + { "id": "equip_sickle", "weight": 1, "difficulty": 1}, + { "id": "equip_handaxe", "weight": 1, "difficulty": 1}, { "id": "equip_dagger", "weight": 3, "difficulty": 1}, { "id": "equip_shortsword", "weight": 3, "difficulty": 1}, + { "id": "equip_rapier", "weight": 2, "difficulty": 1}, { "id": "equip_smallshield", "weight": 3, "difficulty": 1}, { "id": "equip_mediumshield", "weight": 2, "difficulty": 1}, { "id": "equip_body_weakleather", "weight": 4, "difficulty": 1}, diff --git a/src/gui/mod.rs b/src/gui/mod.rs index feffeb5..c7fab2a 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -102,7 +102,7 @@ pub fn draw_ui(ecs: &World, ctx: &mut Rltk) { armour_ac_bonus += ac.amount; } } - let armour_class = stats.bac - attributes.dexterity.bonus - skill_ac_bonus - armour_ac_bonus; + let armour_class = stats.bac - (attributes.dexterity.bonus / 2) - skill_ac_bonus - armour_ac_bonus; ctx.print_color(26, 53, RGB::named(rltk::PINK), RGB::named(rltk::BLACK), "AC"); ctx.print_color(28, 53, RGB::named(rltk::WHITE), RGB::named(rltk::BLACK), armour_class); // Draw level diff --git a/src/gui/race_selection.rs b/src/gui/race_selection.rs index 126216f..5ad3d47 100644 --- a/src/gui/race_selection.rs +++ b/src/gui/race_selection.rs @@ -228,7 +228,7 @@ fn get_starting_inventory(class: Classes, rng: &mut RandomNumberGenerator) -> (V carried = vec!["food_rations".to_string()]; } Classes::Rogue => { - equipped = vec!["equip_rapier".to_string(), "equip_body_leather".to_string()]; + equipped = vec!["equip_rapier".to_string(), "equip_body_weakleather".to_string()]; carried = vec![ "equip_dagger".to_string(), "equip_dagger".to_string(), diff --git a/src/melee_combat_system.rs b/src/melee_combat_system.rs index 32b2473..ecfd97b 100644 --- a/src/melee_combat_system.rs +++ b/src/melee_combat_system.rs @@ -141,7 +141,7 @@ impl<'a> System<'a> for MeleeCombatSystem { // Get armour class let bac = target_pools.bac; - let attribute_ac_bonus = target_attributes.dexterity.bonus; + let attribute_ac_bonus = target_attributes.dexterity.bonus / 2; let skill_ac_bonus = gamesystem::skill_bonus(Skill::Defence, &*target_skills); let mut armour_ac_bonus = 0; for (wielded, ac) in (&equipped, &ac).join() {