Make Facility have an arbitrary connection distance

DanielVartanov · Jul 19, 2015 · a9b446c · a9b446c
1 parent c6b154e
commit a9b446c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/lib/connectable.rb b/lib/connectable.rb
@@ -3,8 +3,6 @@
 
 module GeekGame
   module Connectable
-    CONNECTION_DISTANCE = 10
-
     attr_reader :connection
 
     def connect_to(facility)
@@ -31,7 +29,7 @@ def can_connect_to?(facility)
     end
 
     def close_enough_to?(facility)
-      position.distance_to(facility.position) <= CONNECTION_DISTANCE
+      position.distance_to(facility.position) <= facility.connection_distance
     end
 
     def directed_towards?(facility)

diff --git a/lib/engineer_factory.rb b/lib/engineer_factory.rb
@@ -1,5 +1,6 @@
 module GeekGame
   class EngineerFactory < Factory
+    facility_properties connection_distance: 20
     factory_properties production_time: 5.0, bot_class: Engineer, production_cost: 5
   end
 end
diff --git a/lib/facility.rb b/lib/facility.rb
@@ -1,5 +1,6 @@
 module GeekGame
   class Facility < GameObject
+    define_properties :connection_distance
     attr_reader :connections
 
     def initialize(*args)

diff --git a/lib/metal_derrick.rb b/lib/metal_derrick.rb
@@ -1,6 +1,8 @@
 module GeekGame
   class MetalDerrick < Facility
     define_properties :metal_bars_per_chunk, :cooldown_period
+
+    facility_properties connection_distance: 20
     metal_derrick_properties metal_bars_per_chunk: 5, cooldown_period: 2.0
 
     attr_reader :metal_bars_available

diff --git a/lib/pew_pew_factory.rb b/lib/pew_pew_factory.rb
@@ -1,5 +1,6 @@
 module GeekGame
   class PewPewFactory < Factory
+    facility_properties connection_distance: 30
     factory_properties production_time: 5.0, bot_class: PewPew, production_cost: 15
   end
 end