From 6ebae422953bb155281aab4ec0df9851286f9440 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Fri, 16 Jan 2015 23:31:59 +0800
Subject: [PATCH] Motor now produces mechanical energy based on electricity

---
 .../edx/electrical/generator/TileMotor.scala      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/edx/electrical/generator/TileMotor.scala b/src/main/scala/edx/electrical/generator/TileMotor.scala
index f3623549e..3d4144d9a 100644
--- a/src/main/scala/edx/electrical/generator/TileMotor.scala
+++ b/src/main/scala/edx/electrical/generator/TileMotor.scala
@@ -74,22 +74,21 @@ class TileMotor extends SpatialTile(Material.iron) with TElectric with TSpatialN
   {
     super.update()
 
+    /*
     //TODO: Debug with free energy
-    val deltaPower = 500d //Math.abs(mechNode.power - dcNode.power)
-
-    if (false && mechNode.power > dcNode.power)
+    if (mechNode.power > dcNode.power)
     {
       //Produce electricity
-      dcNode.setVoltage(deltaPower)
+      dcNode.setVoltage(mechNode.power)
       //TODO: Resist mech energy
     }
     //    else if (dcNode.power > mechNode.power)
-    else
+    else*/
     {
       //Produce mechanical energy
-      val mechRatio = Math.pow(6, gearRatio) * 10
-
-      mechNode.rotate(deltaPower * mechRatio, deltaPower / mechRatio)
+      val mechRatio = Math.pow(7, gearRatio) * 100 + 400
+      val power = dcNode.power
+      mechNode.rotate(power * mechRatio, power / mechRatio)
       //TODO: Resist DC energy
     }
   }