Skip to content

Initial working version for Factorio 2.0 Space Age #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaciejGorczyca wants to merge 2 commits into
base: master
Choose a base branch
from
+122 −194
Open

Initial working version for Factorio 2.0 Space Age #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
360b8fd
Initial fixes for 2.0
Oct 25, 2024
c5c5a0f
Remove unnecessary collision mask function
Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "Aircraft",
"version": "1.8.9",
"factorio_version": "1.1",
"version": "2.0.0",
"factorio_version": "2.0",
"title": "Aircraft",
"author": "Thomasnotused",
"description": "Adds 4 aircraft, each with their benefits and drawbacks, to allow for more biter-killing fun!",
"homepage": "https://forums.factorio.com/viewtopic.php?f=120&t=18714",
"dependencies": [
"base >= 1.1.0",
"base >= 2.0.0",
"? bobplates >= 1.1.0",
"? bobelectronics >= 1.1.0",
"? boblibrary >= 1.1.0",
Expand Down
17 changes: 12 additions & 5 deletions prototypes/entities.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ local function add_recurrent_params(craft)
craft.dying_explosion = "medium-explosion"
craft.terrain_friction_modifier = 0
craft.collision_box = {{-0.9, -1.3}, {0.9, 1.3}}
craft.collision_mask = {}
-- Original
Copy link
Copy Markdown

@duchenpaul duchenpaul Oct 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the "added due to 2.0 modding API changes" comments, as the git commit has indicated the changes.

--craft.collision_mask = getCollisionMask() -- Updated collision mask
-- added due to 2.0 modding API changes
craft.collision_mask = { layers = {} }
craft.selection_box = {{-0.9, -1.3}, {0.9, 1.3}}
craft.selection_priority = 60
craft.render_layer = "air-object"
Expand Down Expand Up @@ -182,7 +185,8 @@ local gunship = { -- Gunship with Car sound
--MOVEMENT
effectivity = 0.7,
braking_power = "450kW",
burner = {
energy_source = {
type = "burner",
fuel_inventory_size = 2,
smoke = { smokedef(-16, 60, 38), smokedef(16, 60, 38) }
},
Expand Down Expand Up @@ -219,7 +223,8 @@ local cargo_plane = { -- Cargo Plane with Car sound
--MOVEMENT
effectivity = 1,
braking_power = "650kW",
burner = {
energy_source = {
type = "burner",
fuel_inventory_size = 6,
smoke = { smokedef(0, 40, 36) }
},
Expand Down Expand Up @@ -257,7 +262,8 @@ local jet = { -- Jet with Car sound
--MOVEMENT
effectivity = 0.9,
braking_power = "2000kW",
burner = {
energy_source = {
type = "burner",
fuel_inventory_size = 4,
smoke = { smokedef(0, 62, 38) }
},
Expand Down Expand Up @@ -295,7 +301,8 @@ local flying_fortress = { -- Flying Fortress with Car sound
--MOVEMENT
effectivity = 2.3,
braking_power = "850kW",
burner = {
energy_source = {
type = "burner",
fuel_inventory_size = 4,
smoke = { smokedef(0, 65, 38) }
},
Expand Down
18 changes: 11 additions & 7 deletions prototypes/items.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ data:extend({
name = "aircraft-machine-gun",
icon = "__base__/graphics/icons/submachine-gun.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "a[basic-clips]-c[aircraft-machine-gun]",
attack_parameters =
Expand Down Expand Up @@ -97,7 +97,7 @@ data:extend({
name = "aircraft-rocket-launcher",
icon = "__base__/graphics/icons/rocket-launcher.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "e[aircraft-rocket-launcher]",
attack_parameters =
Expand All @@ -118,7 +118,7 @@ data:extend({
name = "cargo-plane-machine-gun",
icon = "__base__/graphics/icons/submachine-gun.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "a[basic-clips]-c[cargo-plane-machine-gun]",
attack_parameters =
Expand Down Expand Up @@ -149,7 +149,7 @@ data:extend({
name = "aircraft-cannon",
icon = "__base__/graphics/icons/tank-cannon.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "z[tank]-a[cannon]",
attack_parameters =
Expand All @@ -170,7 +170,7 @@ data:extend({
name = "flying-fortress-machine-gun",
icon = "__base__/graphics/icons/submachine-gun.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "a[basic-clips]-c[aircraft-machine-gun]",
attack_parameters = {
Expand Down Expand Up @@ -199,7 +199,7 @@ data:extend({
name = "flying-fortress-rocket-launcher",
icon = "__base__/graphics/icons/rocket-launcher.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "e[flying-fortress-rocket-launcher]",
attack_parameters = {
Expand All @@ -219,7 +219,7 @@ data:extend({
name = "napalm-launcher",
icon = "__base__/graphics/icons/flamethrower.png",
icon_size = 64,
flags = {"hidden"},
hidden = true,
subgroup = "gun",
order = "e[napalm-launcher]",
attack_parameters = {
Expand All @@ -240,6 +240,8 @@ data:extend({
{ -- High explosive cannon shell
type = "ammo",
name = "high-explosive-cannon-shell",
-- added due to 2.0 modding API changes
Copy link
Copy Markdown

@duchenpaul duchenpaul Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the "added due to 2.0 modding API changes" comments, as the git commit has indicated the changes.

ammo_category = "cannon-shell",
icon = ICONPATH .. "high_explosive_shell_icon.png",
icon_size = 64,
flags = {},
Expand Down Expand Up @@ -270,6 +272,8 @@ data:extend({
{ -- Napalm
type = "ammo",
name = "napalm",
-- added due to 2.0 modding API changes
Copy link
Copy Markdown

@duchenpaul duchenpaul Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the "added due to 2.0 modding API changes" comments, as the git commit has indicated the changes.

ammo_category = "flamethrower",
icon = ICONPATH .. "napalm-ammo.png",
icon_size = 64,
flags = {},
Expand Down
7 changes: 6 additions & 1 deletion prototypes/particles.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ napalm_particle.tint = napalm_tint

local napalm_fire_flame = table.deepcopy(data.raw["fire"]["fire-flame"])
napalm_fire_flame.name = "napalm_fire_flame"
napalm_fire_flame.emissions_per_second = 0.050
--napalm_fire_flame.emissions_per_second = 0.050
--change in 2.0 modding API
Copy link
Copy Markdown

@duchenpaul duchenpaul Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove the "added due to 2.0 modding API changes" comments, as the git commit has indicated the changes.

napalm_fire_flame.emissions = {
type = "pollution",
amount = 0.050
}
napalm_fire_flame.damage_per_tick = {amount = 9 / 60, type = "fire"}
napalm_fire_flame.maximum_damage_multiplier = 6
napalm_fire_flame.spread_delay = 5
Expand Down
Loading