Skip to content

Commit

Permalink
Changes for 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dewiniaid committed Dec 24, 2017
1 parent 82f7d4d commit 99fc872
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ already been reported, and report it if not.

## Changelog

### 0.1.3 (2017-12-23)
* Rapid Charging Station rebalanced: Now requires 15 advanced processing units (reduced from 20), has 250% speed (increased from 200), and 80% efficiency (reduced from 100%).
* Charging stations no longer produce drain.

### 0.1.2 (2017-12-14)
* Fixed the Electric Locomotive being available without research. (It's useless without the research for battery packs anyways).
* Fixed Heavy Duty Battery Packs to require Electric Energy Distribution 1 instead of Electric Energy Distribution 2. It no longer is a green science recipe depending on a blue science recipe.
Expand All @@ -74,3 +78,4 @@ already been reported, and report it if not.

### 0.1.0 (2017-12-11)
* First release.

7 changes: 7 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 0.1.3
Date: 14. 23. 2017
Changes:
- Rapid Charging Station rebalanced: Now requires 15 advanced processing units (reduced from 20), has 250% speed (increased from 200), and 80% efficiency (reduced from 100%).
- Charging stations no longer produce drain.

---------------------------------------------------------------------------------------------------
Version: 0.1.2
Date: 14. 12. 2017
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BatteriesNotIncluded",
"version": "0.1.2",
"version": "0.1.3",
"title": "Batteries Not Included",
"author": "Dewin",
"contact": "https://github.com/dewiniaid/BatteriesNotIncluded",
Expand Down
16 changes: 14 additions & 2 deletions prototypes/chargers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ local function make_charging_station(args)
local efficiency = args.efficiency or 1.0
local energy_usage = args.energy_usage or (((config.BASE_CHARGING_KW * crafting_speed) / efficiency) .. "kW")
local ingredients = args.ingredients
local drain = args.drain

args.speed = nil
args.efficiency = nil
args.energy_usage = nil
args.ingredients = nil
args.drain = nil

local entity = {
type = "furnace",
Expand Down Expand Up @@ -39,6 +42,7 @@ local function make_charging_station(args)
energy_source = {
type = "electric",
usage_priority = "secondary-input",
drain = drain,
-- emissions = 0.005 -- FIXME: What should this be?
},
vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
Expand Down Expand Up @@ -85,6 +89,11 @@ local function make_charging_station(args)
}
}

for k, v in pairs(args) do
entity.k = v
end


local item = {
type = "item",
name = entity.name,
Expand Down Expand Up @@ -116,6 +125,7 @@ end

data:extend(make_charging_station {
name = "charging-station",
drain = "0kW",
ingredients = {
{ "accumulator", 1 },
{ "copper-cable", 30 },
Expand All @@ -127,10 +137,12 @@ data:extend(make_charging_station {

data:extend(make_charging_station {
name = "rapid-charging-station",
crafting_speed = 2,
drain = "0kW",
crafting_speed = 2.5,
efficiency = 0.8,
ingredients = {
{ config.PREFIX .. "charging-station", 1 },
{ "advanced-circuit", 20, },
{ "processing-unit", 20 },
{ "processing-unit", 15 },
}
})

0 comments on commit 99fc872

Please sign in to comment.