Vary combat chance randomly

This adds slight variance to the numbers, which makes sure the combat feels even more dynamic, and there is no set order of best moves, ever.
filiph · Feb 8, 2021 · d2b5170 · d2b5170
1 parent e97cdf0
commit d2b5170
Show file tree

Hide file tree

Showing 70 changed files with 162 additions and 79 deletions.
diff --git a/edgehead/lib/director/situational/leroy_quits.dart b/edgehead/lib/director/situational/leroy_quits.dart
@@ -28,3 +28,5 @@ final _leroyQuits = Rule(_id++, 2, true, (ApplicabilityContext c) {
     b.currentRoomName = 'bleeds_trader_hut';
   });
 });
+
+// TODO: leroy simply quits when being too long with Aren
diff --git a/edgehead/lib/src/fight/actions/disarm_kick.dart b/edgehead/lib/src/fight/actions/disarm_kick.dart
@@ -87,7 +87,7 @@ class DisarmKick extends EnemyTargetAction with CombatCommandPath {
   @override
   ReasonedSuccessChance getSuccessChance(
       Actor a, Simulation sim, WorldState world, Actor enemy) {
-    return getCombatMoveChance(a, enemy, 0.6, [
+    return getCombatMoveChance(a, enemy, 0.6, world.statefulRandomState, [
       const Modifier(50, CombatReason.dexterity),
       const Modifier(30, CombatReason.balance),
       const Bonus(90, CombatReason.targetHasAllEyesDisabled),

diff --git a/edgehead/lib/src/fight/actions/smack_with_harmless_item.dart b/edgehead/lib/src/fight/actions/smack_with_harmless_item.dart
@@ -80,7 +80,7 @@ class SmackWithHarmlessItem extends EnemyTargetAction with CombatCommandPath {
   @override
   ReasonedSuccessChance getSuccessChance(
       Actor a, Simulation sim, WorldState world, Actor enemy) {
-    return getCombatMoveChance(a, enemy, 0.3, [
+    return getCombatMoveChance(a, enemy, 0.3, world.statefulRandomState, [
       const Modifier(50, CombatReason.dexterity),
       const Modifier(30, CombatReason.balance),
       const Bonus(40, CombatReason.targetHasAllEyesDisabled),

diff --git a/edgehead/lib/src/fight/actions/start_bite.dart b/edgehead/lib/src/fight/actions/start_bite.dart
@@ -31,7 +31,7 @@ ReasonedSuccessChance computeStartBiteAtBodyPartGenerator(
       math.max(bodyPart.swingSurfaceLeft, bodyPart.swingSurfaceRight) / 10, 1);
   final base = minBase + maxBase * relativeBiteSurface;
 
-  return getCombatMoveChance(a, enemy, base, [
+  return getCombatMoveChance(a, enemy, base, w.statefulRandomState, [
     const Modifier(30, CombatReason.dexterity),
     const Penalty(30, CombatReason.targetHasShield),
     const Modifier(30, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_blunt_swing_at_head.dart b/edgehead/lib/src/fight/actions/start_blunt_swing_at_head.dart
@@ -20,7 +20,7 @@ const String startBluntSwingAtHeadHelpMessage =
 
 ReasonedSuccessChance computeBluntSwingAtHeadPlayer(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.2, [
+  return getCombatMoveChance(a, enemy, 0.2, w.statefulRandomState, [
     const Modifier(30, CombatReason.dexterity),
     const Penalty(30, CombatReason.targetHasShield),
     const Modifier(20, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_break_neck_on_ground.dart b/edgehead/lib/src/fight/actions/start_break_neck_on_ground.dart
@@ -17,7 +17,7 @@ const String startBreakNeckOnGroundHelpMessage =
 
 ReasonedSuccessChance computeBreakNeckOnGroundChance(
         Actor a, Simulation sim, WorldState w, Actor enemy) =>
-    getCombatMoveChance(a, enemy, 0.6, [
+    getCombatMoveChance(a, enemy, 0.6, w.statefulRandomState, [
       const Modifier(50, CombatReason.dexterity),
       ...disabledModifiers,
     ]);

diff --git a/edgehead/lib/src/fight/actions/start_clash.dart b/edgehead/lib/src/fight/actions/start_clash.dart
@@ -16,7 +16,7 @@ import 'package:edgehead/src/predetermined_result.dart';
 
 ReasonedSuccessChance computeStartClash(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.8, [
+  return getCombatMoveChance(a, enemy, 0.8, w.statefulRandomState, [
     const Modifier(95, CombatReason.dexterity),
     const Modifier(30, CombatReason.balance),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/actions/start_crack_skull_on_ground.dart b/edgehead/lib/src/fight/actions/start_crack_skull_on_ground.dart
@@ -17,7 +17,7 @@ const String startCrackSkullOnGroundHelpMessage =
 
 ReasonedSuccessChance computeCrackSkullOnGroundChance(
         Actor a, Simulation sim, WorldState w, Actor enemy) =>
-    getCombatMoveChance(a, enemy, 0.6, [
+    getCombatMoveChance(a, enemy, 0.6, w.statefulRandomState, [
       const Modifier(50, CombatReason.dexterity),
       Penalty(a.currentDamageCapability.length >= 2 ? 40 : 90,
           CombatReason.targetHasWeapon),

diff --git a/edgehead/lib/src/fight/actions/start_feint_slash.dart b/edgehead/lib/src/fight/actions/start_feint_slash.dart
@@ -17,7 +17,7 @@ import 'package:meta/meta.dart';
 
 ReasonedSuccessChance computeStartFeint(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.8, const [
+  return getCombatMoveChance(a, enemy, 0.8, w.statefulRandomState, const [
     Modifier(95, CombatReason.dexterity),
     Modifier(50, CombatReason.balance),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/actions/start_leap.dart b/edgehead/lib/src/fight/actions/start_leap.dart
@@ -17,7 +17,7 @@ const String startLeapHelpMessage =
 
 ReasonedSuccessChance computeStartLeap(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.2, [
+  return getCombatMoveChance(a, enemy, 0.2, w.statefulRandomState, [
     const Modifier(70, CombatReason.balance),
     const Modifier(50, CombatReason.height),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/actions/start_pull_down.dart b/edgehead/lib/src/fight/actions/start_pull_down.dart
@@ -16,7 +16,7 @@ import 'package:edgehead/src/predetermined_result.dart';
 
 ReasonedSuccessChance computeStartPullDown(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.05, [
+  return getCombatMoveChance(a, enemy, 0.05, w.statefulRandomState, [
     const Modifier(20, CombatReason.dexterity),
     const Modifier(10, CombatReason.balance),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/actions/start_punch.dart b/edgehead/lib/src/fight/actions/start_punch.dart
@@ -17,7 +17,7 @@ const String startPunchHelpMessage =
 
 ReasonedSuccessChance computeStartPunch(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.7, [
+  return getCombatMoveChance(a, enemy, 0.7, w.statefulRandomState, [
     const Modifier(75, CombatReason.dexterity),
     const Modifier(30, CombatReason.balance),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/actions/start_punch_on_ground.dart b/edgehead/lib/src/fight/actions/start_punch_on_ground.dart
@@ -17,7 +17,7 @@ const String startPunchOnGroundHelpMessage =
 
 ReasonedSuccessChance computeStartPunchOnGround(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.7, [
+  return getCombatMoveChance(a, enemy, 0.7, w.statefulRandomState, [
     const Modifier(75, CombatReason.dexterity),
     ...disabledModifiers,
   ]);

diff --git a/edgehead/lib/src/fight/actions/start_slash_at_body_part.dart b/edgehead/lib/src/fight/actions/start_slash_at_body_part.dart
@@ -35,7 +35,7 @@ ReasonedSuccessChance computeStartSlashAtBodyPartGenerator(
       math.max(bodyPart.swingSurfaceLeft, bodyPart.swingSurfaceRight) / 10, 1);
   final base = minBase + maxBase * relativeSlashSurface;
 
-  return getCombatMoveChance(a, enemy, base, const [
+  return getCombatMoveChance(a, enemy, base, w.statefulRandomState, const [
     Modifier(30, CombatReason.dexterity),
     Modifier(30, CombatReason.balance),
     Modifier(30, CombatReason.weaponReach),

diff --git a/edgehead/lib/src/fight/actions/start_strike_down.dart b/edgehead/lib/src/fight/actions/start_strike_down.dart
@@ -33,7 +33,7 @@ ReasonedSuccessChance computeStartStrikeDownPlayer(
       WeaponType.dagger.defaultLength;
   final base = (didRecentlyRoll ? 0.8 : 0.4) - (hasShortBlade ? 0.1 : 0);
 
-  return getCombatMoveChance(a, enemy, base, [
+  return getCombatMoveChance(a, enemy, base, w.statefulRandomState, [
     const Modifier(50, CombatReason.dexterity),
     const Penalty(30, CombatReason.targetHasShield),
     const Modifier(30, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_sweep_feet.dart b/edgehead/lib/src/fight/actions/start_sweep_feet.dart
@@ -17,7 +17,7 @@ import 'package:edgehead/src/predetermined_result.dart';
 ReasonedSuccessChance computeStartSweepFeet(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
   assert(a.isPlayer);
-  return getCombatMoveChance(a, enemy, 0.6, [
+  return getCombatMoveChance(a, enemy, 0.6, w.statefulRandomState, [
     const Modifier(70, CombatReason.dexterity),
     const Modifier(70, CombatReason.balance),
     const Bonus(30, CombatReason.targetHasOneLegDisabled),

diff --git a/edgehead/lib/src/fight/actions/start_throw_harmless.dart b/edgehead/lib/src/fight/actions/start_throw_harmless.dart
@@ -17,7 +17,7 @@ const String startThrowHarmlessHelpMessage =
 
 ReasonedSuccessChance computeThrowHarmlessPlayer(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.2, [
+  return getCombatMoveChance(a, enemy, 0.2, w.statefulRandomState, [
     const Modifier(30, CombatReason.dexterity),
     const Penalty(30, CombatReason.targetHasShield),
     const Modifier(10, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_throw_rock.dart b/edgehead/lib/src/fight/actions/start_throw_rock.dart
@@ -20,7 +20,7 @@ const String startThrowRockHelpMessage =
 
 ReasonedSuccessChance computeThrowRockPlayer(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.3, [
+  return getCombatMoveChance(a, enemy, 0.3, w.statefulRandomState, [
     const Modifier(50, CombatReason.dexterity),
     const Penalty(30, CombatReason.targetHasShield),
     const Modifier(20, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_throw_thrusting_weapon.dart b/edgehead/lib/src/fight/actions/start_throw_thrusting_weapon.dart
@@ -25,7 +25,8 @@ ReasonedSuccessChance computeThrowThrustingWeaponPlayer(
   final hasDagger =
       a.currentWeapon?.damageCapability?.type == WeaponType.dagger ?? false;
   final hasThrowingWeapon = hasSpear || hasDagger;
-  return getCombatMoveChance(a, enemy, hasThrowingWeapon ? 0.3 : 0.01, [
+  return getCombatMoveChance(
+      a, enemy, hasThrowingWeapon ? 0.3 : 0.01, w.statefulRandomState, [
     Modifier(hasThrowingWeapon ? 20 : 10, CombatReason.dexterity),
     const Penalty(20, CombatReason.targetHasShield),
     Modifier(hasThrowingWeapon ? 20 : 10, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/actions/start_thrust.dart b/edgehead/lib/src/fight/actions/start_thrust.dart
@@ -29,7 +29,7 @@ ReasonedSuccessChance computeThrustAtBodyPartChance(
   const maxBase = 0.6;
   final base = lerpDouble(bodyPart.thrustSurface, 0, 8, minBase, maxBase);
 
-  return getCombatMoveChance(a, enemy, base, [
+  return getCombatMoveChance(a, enemy, base, w.statefulRandomState, [
     const Modifier(30, CombatReason.dexterity),
     const Modifier(30, CombatReason.weaponReach),
     const Penalty(30, CombatReason.targetHasShield),

diff --git a/edgehead/lib/src/fight/actions/start_thrust_on_ground.dart b/edgehead/lib/src/fight/actions/start_thrust_on_ground.dart
@@ -24,7 +24,7 @@ const String startThrustOnGroundHelpMessage =
 ReasonedSuccessChance computeStartThrustOnGroundPlayer(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
   assert(a.isPlayer);
-  return getCombatMoveChance(a, enemy, 0.5, [
+  return getCombatMoveChance(a, enemy, 0.5, w.statefulRandomState, [
     const Modifier(20, CombatReason.dexterity),
     const Penalty(60, CombatReason.targetHasShield),
     const Bonus(90, CombatReason.targetHasAllEyesDisabled),

diff --git a/edgehead/lib/src/fight/actions/wrestle_weapon_on_ground.dart b/edgehead/lib/src/fight/actions/wrestle_weapon_on_ground.dart
@@ -113,7 +113,8 @@ class WrestleWeaponOnGround extends EnemyTargetAction with CombatCommandPath {
   @override
   ReasonedSuccessChance getSuccessChance(
       Actor a, Simulation sim, WorldState world, Actor enemy) {
-    return getCombatMoveChance(a, enemy, a.holdsSomeWeapon ? 0.2 : 0.4, [
+    return getCombatMoveChance(
+        a, enemy, a.holdsSomeWeapon ? 0.2 : 0.4, world.statefulRandomState, [
       const Modifier(50, CombatReason.dexterity),
       const Bonus(90, CombatReason.targetHasAllEyesDisabled),
     ]);

diff --git a/edgehead/lib/src/fight/bite/bite_defense/actions/dodge_bite.dart b/edgehead/lib/src/fight/bite/bite_defense/actions/dodge_bite.dart
@@ -15,7 +15,7 @@ import 'package:edgehead/src/fight/fight_situation.dart';
 
 ReasonedSuccessChance computeDodgeBite(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.5, [
+  return getCombatMoveChance(a, enemy, 0.5, w.statefulRandomState, [
     const Modifier(60, CombatReason.dexterity),
     const Modifier(50, CombatReason.balance),
     const Bonus(50, CombatReason.targetHasOneLegDisabled),

diff --git a/edgehead/lib/src/fight/bite/bite_defense/actions/impale_biter.dart b/edgehead/lib/src/fight/bite/bite_defense/actions/impale_biter.dart
@@ -213,7 +213,7 @@ class ImpaleBiter extends OtherActorAction {
   @override
   ReasonedSuccessChance getSuccessChance(
       Actor a, Simulation sim, WorldState w, Actor enemy) {
-    final chance = getCombatMoveChance(a, enemy, 0.3, [
+    final chance = getCombatMoveChance(a, enemy, 0.3, w.statefulRandomState, [
       const Modifier(40, CombatReason.dexterity),
       const Modifier(30, CombatReason.height),
       const Modifier(20, CombatReason.balance),

diff --git a/edgehead/lib/src/fight/bite/bite_defense/actions/jump_back_from_bite.dart b/edgehead/lib/src/fight/bite/bite_defense/actions/jump_back_from_bite.dart
@@ -11,7 +11,7 @@ import 'package:edgehead/src/fight/common/defense_situation.dart';
 
 ReasonedSuccessChance computeJumpBackBite(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.9, [
+  return getCombatMoveChance(a, enemy, 0.9, w.statefulRandomState, [
     const Modifier(90, CombatReason.dexterity),
     const Modifier(10, CombatReason.balance),
     const Bonus(30, CombatReason.targetHasOneLegDisabled),

diff --git a/edgehead/lib/src/fight/bite/bite_defense/actions/shield_block_bite.dart b/edgehead/lib/src/fight/bite/bite_defense/actions/shield_block_bite.dart
@@ -13,7 +13,7 @@ import 'package:edgehead/src/fight/counter_attack/counter_attack_situation.dart'
 
 ReasonedSuccessChance computeShieldBlockBite(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.6, [
+  return getCombatMoveChance(a, enemy, 0.6, w.statefulRandomState, [
     const Modifier(50, CombatReason.dexterity),
     const Modifier(30, CombatReason.balance),
     const Bonus(50, CombatReason.targetHasSecondaryArmDisabled),

diff --git a/...ad/lib/src/fight/blunt_swing/blunt_swing_defense/actions/defensive_parry_blunt_swing.dart b/...ad/lib/src/fight/blunt_swing/blunt_swing_defense/actions/defensive_parry_blunt_swing.dart
@@ -11,7 +11,7 @@ import 'package:edgehead/src/fight/common/defense_situation.dart';
 
 ReasonedSuccessChance computeDefensiveParryBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.9, [
+  return getCombatMoveChance(a, enemy, 0.9, w.statefulRandomState, [
     const Modifier(95, CombatReason.dexterity),
     const Modifier(30, CombatReason.balance),
     ...disabledModifiers,

diff --git a/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/dodge_blunt_swing.dart b/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/dodge_blunt_swing.dart
@@ -13,7 +13,7 @@ import 'package:edgehead/src/fight/counter_attack/counter_attack_situation.dart'
 
 ReasonedSuccessChance computeDodgeBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.4, [
+  return getCombatMoveChance(a, enemy, 0.4, w.statefulRandomState, [
     const Modifier(60, CombatReason.dexterity),
     const Modifier(50, CombatReason.balance),
     const Bonus(50, CombatReason.targetHasOneLegDisabled),

diff --git a/...ead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/jump_back_from_blunt_swing.dart b/...ead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/jump_back_from_blunt_swing.dart
@@ -9,7 +9,7 @@ import 'package:edgehead/src/fight/common/defense_situation.dart';
 
 ReasonedSuccessChance computeJumpBackBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.9, [
+  return getCombatMoveChance(a, enemy, 0.9, w.statefulRandomState, [
     const Modifier(90, CombatReason.dexterity),
     const Modifier(10, CombatReason.balance),
     const Bonus(30, CombatReason.targetHasOneLegDisabled),

diff --git a/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/parry_blunt_swing.dart b/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/parry_blunt_swing.dart
@@ -13,7 +13,7 @@ import 'package:edgehead/src/fight/counter_attack/counter_attack_situation.dart'
 
 ReasonedSuccessChance computeParryBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.6, [
+  return getCombatMoveChance(a, enemy, 0.6, w.statefulRandomState, [
     const Modifier(50, CombatReason.dexterity),
     const Modifier(70, CombatReason.balance),
     ...disabledModifiers,

diff --git a/...ead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/roll_away_from_blunt_swing.dart b/...ead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/roll_away_from_blunt_swing.dart
@@ -10,7 +10,7 @@ import 'package:edgehead/src/fight/fight_situation.dart';
 
 ReasonedSuccessChance computeRollAwayFromBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.5, [
+  return getCombatMoveChance(a, enemy, 0.5, w.statefulRandomState, [
     const Modifier(90, CombatReason.dexterity),
     const Modifier(10, CombatReason.balance),
     const Bonus(20, CombatReason.targetHasOneLegDisabled),

diff --git a/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/shield_block_blunt_swing.dart b/edgehead/lib/src/fight/blunt_swing/blunt_swing_defense/actions/shield_block_blunt_swing.dart
@@ -13,7 +13,7 @@ import 'package:edgehead/src/fight/counter_attack/counter_attack_situation.dart'
 
 ReasonedSuccessChance computeShieldBlockBluntSwing(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.7, [
+  return getCombatMoveChance(a, enemy, 0.7, w.statefulRandomState, [
     const Modifier(50, CombatReason.dexterity),
     const Modifier(30, CombatReason.balance),
     const Bonus(50, CombatReason.targetHasSecondaryArmDisabled),

diff --git a/edgehead/lib/src/fight/clash/clash_defense/actions/counter_clash.dart b/edgehead/lib/src/fight/clash/clash_defense/actions/counter_clash.dart
@@ -11,7 +11,7 @@ import 'package:edgehead/src/fight/counter_attack/counter_attack_situation.dart'
 
 ReasonedSuccessChance computeCounterClash(
     Actor a, Simulation sim, WorldState w, Actor enemy) {
-  return getCombatMoveChance(a, enemy, 0.2, const [
+  return getCombatMoveChance(a, enemy, 0.2, w.statefulRandomState, const [
     Modifier(20, CombatReason.dexterity),
     Modifier(20, CombatReason.balance),
     ...disabledModifiers,