diff --git a/brave-new-world/changelog.txt b/brave-new-world/changelog.txt index 6873b1e..d49fdad 100644 --- a/brave-new-world/changelog.txt +++ b/brave-new-world/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 3.3.0 +Date: 29. 01. 2020 + Changes: + - Updated for Factorio 0.18 +--------------------------------------------------------------------------------------------------- Version: 3.2.1 Date: 24. 03. 2019 Changes: diff --git a/brave-new-world/info.json b/brave-new-world/info.json index c08f5f8..bd71e02 100644 --- a/brave-new-world/info.json +++ b/brave-new-world/info.json @@ -1,11 +1,11 @@ { "name": "brave-new-world", - "version": "3.2.1", - "factorio_version": "0.17", + "version": "3.3.0", + "factorio_version": "0.18", "title": "Brave New World", "author": "canidae", "contact": "canidae@exent.net", "homepage": "http://exent.net", "description": "RTS-like scenario for Factorio. Player character is removed, all work must be done by bots", - "dependencies": ["base >= 0.17.0"] + "dependencies": ["base >= 0.18.0"] } diff --git a/brave-new-world/scenarios/bnw/control.lua b/brave-new-world/scenarios/bnw/control.lua index 32399c9..3d44d96 100644 --- a/brave-new-world/scenarios/bnw/control.lua +++ b/brave-new-world/scenarios/bnw/control.lua @@ -99,14 +99,14 @@ function dropItems(player, name, count) for _, inventory_id in pairs(defines.inventory) do local inventory = entity.get_inventory(inventory_id) if inventory then - local barpos = inventory.hasbar() and inventory.getbar() or nil - if inventory.hasbar() then - inventory.setbar() -- clear bar (the chest size limiter) + local barpos = inventory.supports_bar() and inventory.get_bar() or nil + if inventory.supports_bar() then + inventory.set_bar() -- clear bar (the chest size limiter) end inserted = inserted + inventory.insert{name = name, count = count} count = count - inserted - if inventory.hasbar() then - inventory.setbar(barpos) -- reset bar + if inventory.supports_bar() then + inventory.set_bar(barpos) -- reset bar end if count <= 0 then break diff --git a/brave-new-world/scenarios/bnw/description.json b/brave-new-world/scenarios/bnw/description.json new file mode 100644 index 0000000..760f14b --- /dev/null +++ b/brave-new-world/scenarios/bnw/description.json @@ -0,0 +1,4 @@ +{ + "multiplayer-compatible": true, + "order": "b" +} diff --git a/brave-new-world/scenarios/bnw/image.png b/brave-new-world/scenarios/bnw/image.png new file mode 100644 index 0000000..c08d39f Binary files /dev/null and b/brave-new-world/scenarios/bnw/image.png differ diff --git a/brave-new-world/scenarios/bnw/locale/en/bnw.cfg b/brave-new-world/scenarios/bnw/locale/en/bnw.cfg index 50853a2..27fae4a 100644 --- a/brave-new-world/scenarios/bnw/locale/en/bnw.cfg +++ b/brave-new-world/scenarios/bnw/locale/en/bnw.cfg @@ -1,3 +1,4 @@ -scenario-name=BNW 3.2.1 +scenario-name=BNW 3.3.0 out-of-storage=[Brave New World] You've run out of storage, bots will drop carried items! You're strongly advised to cancel any deconstruction orders and build storage chests! item_not_allowed=[Brave New World] That item is not allowed in this scenario +description=Brave New World is a RTS-like scenario where the player character is removed, and all construction must be done by construction bots. You start with a roboport, a radar, an active provider chest, a storage chest, some solar panels and some few items.\n\nMake sure [font=default-bold]"Pick ghost item if no items are available"[/font] option (Settings->Interface->Interaction section) is [font=default-bold]ON[/font] for better experience.