Code: Select all
--- bulldozer_1.3.4/bulldozer.lua
+++ bulldozer_1.3.5/bulldozer.lua
@@ -56,7 +56,7 @@
["unit-spawner"]=true, player=true, decorative=true, resource=true, smoke=true, explosion=true,
corpse=true, particle=true, ["flying-text"]=true, projectile=true, ["particle-source"]=true, turret=true,
sticker=true, ["logistic-robot"] = true, ["combat-robot"]=true, ["construction-robot"]=true, projectile=true, ["ghost"]=true,
- ["entity-ghost"]=true, ["leaf-particle"]=true, ["death-chest"]=true
+ ["entity-ghost"]=true, ["leaf-particle"]=true, ["death-chest"]=true, ["cliff"]=true
}
local blacklistname = {
@@ -135,9 +135,6 @@
entity.die()
end
end
- if self.settings.collect then
- self:pickupItems(pos, area)
- end
self:blockprojectiles(pos,area)
for _, entity in ipairs(game.surfaces[1].find_entities{{area[1][1], area[1][2]}, {area[2][1], area[2][2]}}) do
if not blacklisttype[entity.type] and not blacklistname[entity.name] then
@@ -171,30 +168,23 @@
end
end
- if self:addItemToCargo(entity.name, 1) then
- entity.destroy()
- else
- self:deactivate("Error (Storage Full)",true)
- end
- else
- entity.die()
- end
- end
- end
-
- if removeStone then
- for _, entity in ipairs(game.surfaces[1].find_entities_filtered{area = area, name = "stone-rock"}) do
- if self.settings.collect then
- if self:addItemToCargo("stone", 5) then
+ if entity.prototype.count_as_rock_for_filtered_deconstruction then
entity.die()
else
- self:deactivate("Error (Storage Full)",true)
+ if self:addItemToCargo(entity.name, 1) then
+ entity.destroy()
+ else
+ self:deactivate("Error (Storage Full)",true)
+ end
end
else
entity.die()
end
end
end
+ if self.settings.collect then
+ self:pickupItems(pos, area)
+ end
end,
--- bulldozer_1.3.4/control.lua
+++ bulldozer_1.3.5/control.lua
@@ -147,6 +147,6 @@
script.on_event(defines.events.on_tick, onTick)
script.on_event(defines.events.on_gui_click, onGuiClick)
script.on_event(defines.events.on_player_mined_item, on_player_mined_item)
- script.on_event(defines.events.on_preplayer_mined_item, on_preplayer_mined_item)
+ script.on_event(defines.events.on_pre_player_mined_item, on_preplayer_mined_item)
script.on_event(defines.events.on_built_entity, on_built_entity)
script.on_event(defines.events.on_entity_died, on_entity_died)
--- bulldozer_1.3.4/GUI.lua
+++ bulldozer_1.3.5/GUI.lua
@@ -56,8 +56,8 @@
createGui = function(player)
if player.gui.left.bull ~= nil then return end
local bull = GUI.add(player.gui.left, {type="frame", direction="vertical", name="bull"})
- local rows = GUI.add(bull, {type="table", name="rows", colspan=1})
- local buttons = GUI.add(rows, {type="table", name="buttons", colspan=3})
+ local rows = GUI.add(bull, {type="table", name="rows", column_count=1})
+ local buttons = GUI.add(rows, {type="table", name="buttons", column_count=3})
GUI.addButton(buttons, {name="start"}, GUI.toggleStart)
GUI.add(rows,{type="checkbox", name="collect",caption={"stg-collect"}},"collect")
--- bulldozer_1.3.4/info.json
+++ bulldozer_1.3.5/info.json
@@ -1,10 +1,10 @@
{
"name": "bulldozer",
- "version": "1.3.4",
+ "version": "1.3.5",
"title": "Bulldozer",
"author": "Cheata, hassad the hittite. Updated by ckhawks. Fixed by AMWDRIZZ. Updated again by ckhawks.",
"contact": "",
"description": "Bulldozer for tearing up your base",
- "dependencies": ["base >= 0.15","? roadtrain >=1.0.0"],
- "factorio_version": "0.15"
+ "dependencies": ["base >= 0.16","? roadtrain >=1.0.0"],
+ "factorio_version": "0.16"
}
--- bulldozer_1.3.4/locale/en/bulldozer.cfg
+++ bulldozer_1.3.5/locale/en/bulldozer.cfg
@@ -1,6 +1,6 @@
-text-start = Start
-text-stop = Stop
-stg-collect = Collect
+text-start=Start
+text-stop=Stop
+stg-collect=Collect
[entity-name]
bulldozer=Bulldozer
--- bulldozer_1.3.4/prototypes/entity.lua
+++ bulldozer_1.3.5/prototypes/entity.lua
@@ -4,6 +4,7 @@
type = "car",
name = "bulldozer",
icon = "__bulldozer__/graphics/icons/bulldozer.png",
+ icon_size = 32,
flags = {"pushable", "placeable-neutral", "player-creation"},
minable = {mining_time = 1, result = "bulldozer"},
max_health = 1500,
@@ -174,22 +175,22 @@
stripes = util.multiplystripes(2,
{
{
- filename = "__base__/graphics/entity/tank/base-shadow-1.png",
+ filename = "__base__/graphics/entity/tank/tank-base-shadow-1.png",
width_in_frames = 1,
height_in_frames = 16,
},
{
- filename = "__base__/graphics/entity/tank/base-shadow-2.png",
+ filename = "__base__/graphics/entity/tank/tank-base-shadow-2.png",
width_in_frames = 1,
height_in_frames = 16,
},
{
- filename = "__base__/graphics/entity/tank/base-shadow-3.png",
+ filename = "__base__/graphics/entity/tank/tank-base-shadow-3.png",
width_in_frames = 1,
height_in_frames = 16,
},
{
- filename = "__base__/graphics/entity/tank/base-shadow-4.png",
+ filename = "__base__/graphics/entity/tank/tank-base-shadow-4.png",
width_in_frames = 1,
height_in_frames = 16,
}
--- bulldozer_1.3.4/prototypes/item.lua
+++ bulldozer_1.3.5/prototypes/item.lua
@@ -4,6 +4,7 @@
type = "item",
name = "bulldozer",
icon = "__bulldozer__/graphics/icons/bulldozer.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "transport",
order = "b[personal-transport]-c[bulldozer]",
--- bulldozer_1.3.4/prototypes/styles.lua
+++ bulldozer_1.3.5/prototypes/styles.lua
@@ -50,6 +50,6 @@
data.raw["gui-style"].default["bull_checkbox"] =
{
type = "checkbox_style",
- parent = "checkbox_style",
+ --parent = "checkbox_style",
font = "bull-small",
}
--- bulldozer_1.3.4/prototypes/tech.lua
+++ bulldozer_1.3.5/prototypes/tech.lua
@@ -4,6 +4,7 @@
type = "technology",
name = "bulldozer",
icon = "__bulldozer__/graphics/icons/bulldozer.png",
+ icon_size = 32,
effects =
{
{