1 files changed, 2 insertions, 24 deletions
diff --git a/internal/combat/formulas.go b/internal/combat/formulas.go
index 963ee9c..f4e1ba2 100644
--- a/internal/combat/formulas.go
+++ b/internal/combat/formulas.go
@@ -2,12 +2,7 @@ package combat
 
 import "math/rand"
 
-func AttackRoll(level int, styleBonus int, equipBonus int) int {
-	effective := level + styleBonus + 8
-	return effective * (equipBonus + 64)
-}
-
-func DefenseRoll(level int, styleBonus int, equipBonus int) int {
+func EffectiveRoll(level int, styleBonus int, equipBonus int) int {
 	effective := level + styleBonus + 8
 	return effective * (equipBonus + 64)
 }
@@ -72,24 +67,7 @@ func RangedStyleBonus(style string) (ranged, defense int) {
 	}
 }
 
-func SelectAttackBonus(attackType string, stab, slash, crush, science, ranged int) int {
-	switch attackType {
-	case "stab":
-		return stab
-	case "slash":
-		return slash
-	case "crush":
-		return crush
-	case "science":
-		return science
-	case "ranged":
-		return ranged
-	default:
-		return crush
-	}
-}
-
-func SelectDefenseBonus(attackType string, stab, slash, crush, science, ranged int) int {
+func SelectBonus(attackType string, stab, slash, crush, science, ranged int) int {
 	switch attackType {
 	case "stab":
 		return stab