diff --git a/db/seeds.rb b/db/seeds.rb
index 14c4a89..153137d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -9,18 +9,23 @@
 rng = RandomNameGenerator.new
 
 nb_creatures = rand(10..20)
-nb_creatures.times do 
+nb_creatures.times do
   nb_syllables = rand(2..4)
 
   c = Creature.create(name: rng.compose(nb_syllables), health_points: rand(6..50))
   puts "Création de #{c.to_label}"
 end
 
-3.times do |i| 
-  combat = Combat.new(left_fighter: Creature.alive.first, right_fighter: Creature.alive.last, name: "Auto-généré #{i + 1}")
+nb_combats = rand(10..20)
+nb_combats.times do |i|
+  left_fighter, right_fighter = Creature.alive.sample(2)
+
+  next unless left_fighter && right_fighter
+
+  combat = Combat.new(left_fighter: left_fighter, right_fighter: right_fighter, name: "Auto-généré #{i + 1}")
   combat.baston!
   combat.left_fighter.save!
   combat.right_fighter.save!
   combat.save!
   puts combat.to_label
-end
\ No newline at end of file
+end