Make the fuel_scoop capacity impact the scooping rate

While I was at it, I've differentiated the rates of the normal fuel scoop equipment and the "all in one" equipment.
pioneerspacesim · Dec 3, 2014 · d66d2d1 · d66d2d1
1 parent 5ed6ad2
commit d66d2d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/libs/Equipment.lua b/data/libs/Equipment.lua
@@ -528,15 +528,15 @@ misc.advanced_radar_mapper = EquipType.New({
 })
 misc.fuel_scoop = EquipType.New({
 	l10n_key="FUEL_SCOOP", slots="scoop", price=3500,
-	capabilities={mass=6, fuel_scoop=1}, purchasable=true
+	capabilities={mass=6, fuel_scoop=3}, purchasable=true
 })
 misc.cargo_scoop = EquipType.New({
 	l10n_key="CARGO_SCOOP", slots="scoop", price=3900,
 	capabilities={mass=7, cargo_scoop=1}, purchasable=true
 })
 misc.multi_scoop = EquipType.New({
 	l10n_key="MULTI_SCOOP", slots="scoop", price=12000,
-	capabilities={mass=9, cargo_scoop=1, fuel_scoop=1}, purchasable=true
+	capabilities={mass=9, cargo_scoop=1, fuel_scoop=2}, purchasable=true
 })
 misc.hypercloud_analyzer = EquipType.New({
 	l10n_key="HYPERCLOUD_ANALYZER", slots="hypercloud", price=1500,

diff --git a/src/Ship.cpp b/src/Ship.cpp
@@ -1030,7 +1030,7 @@ void Ship::StaticUpdate(const float timeStep)
 				vector3d pdir = -GetOrient().VectorZ();
 				double dot = vdir.Dot(pdir);
 				if ((m_stats.free_capacity) && (dot > 0.95) && (speed > 2000.0) && (density > 1.0)) {
-					double rate = speed*density*0.00001f;
+					double rate = speed*density*0.00000333f*double(capacity);
 					if (Pi::rng.Double() < rate) {
 						lua_State *l = Lua::manager->GetLuaState();
 						pi_lua_import(l, "Equipment");