Skip to content
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

Fixing Unit Test Errors #46

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixing Unit Test Errors #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5431388
Don't overwrite angelsmods table
KiwiHawk Nov 11, 2023
78d59fb
Updating changelog and version number
KiwiHawk Nov 11, 2023
41a1516
Merge remote-tracking branch 'upstream/master'
KiwiHawk Jan 1, 2024
a0546a8
Unit Test Errors #45
KiwiHawk Feb 9, 2024
9f58f9a
Small tweaks to re-add special vanilla functionality
Pezzawinkle Feb 10, 2024
6474f76
fix recipe patching
Pezzawinkle Feb 10, 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
19 changes: 19 additions & 0 deletions Clowns-Processing/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.24
Date: ???
Bugfixes:
- Only create recipe alternate Firearms magazine recipe if lead plate is enabled
- Made sure ores are enabled for all catalyst types
- Made sure Aluminium powder is enabled
- Made sure Sintering Ovens are enabled
- Made sure early Chemical Furnaces are enabled (for White Phosphorus)
- Don't create neurotoxin stuff unless Angel's Bioprocessing mod is enabled
- Don't create Dimethylmercury unless Angel's Bioprocessing mod is enabled
- Removed fluid Boric Acid (completely unused)
- Set minimum machine tiers for Violet Algae and Smelting recipes
- Changed Sand Sluicing recipe to produce Osmium Ore instead of Chrome Ore
- Swapped effects of Mercury Processing 1 and 2
- Added missing tech prerequisites
- Changed Depleted Uranium Smelting techs to be different science pack tiers
- Increased the science pack tier of Phosphorus Processing techs
- Changed Uranium Processing techs to be different science pack tiers
---------------------------------------------------------------------------------------------------
Version: 1.3.23
Date: 2024-01-01
Bugfixes:
Expand Down
16 changes: 13 additions & 3 deletions Clowns-Processing/data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,21 @@ end
if mods["pyrawores"] then --force full mode
clowns.special_vanilla = false
end
if settings.startup["depleted-uranium"].value and clowns.special_vanilla == false then
if settings.startup["depleted-uranium"].value and not clowns.special_vanilla --[[=false]] then
angelsmods.trigger.smelting_products["enable-all"] = true -- to ensure we get the powder
end
angelsmods.trigger.ores["platinum"] = true
angelsmods.trigger.smelting_products["platinum"].wire = true
if not clowns.special_vanilla--[[=false]] then
angelsmods.trigger.smelting_products["aluminium"].powder = true
angelsmods.trigger.ores["aluminium"] = true
angelsmods.trigger.ores["gold"] = true
angelsmods.trigger.ores["platinum"] = true
angelsmods.trigger.ores["silver"] = true
angelsmods.trigger.ores["titanium"] = true
angelsmods.trigger.ores["tungsten"] = true
--angelsmods.trigger.refinery_products["rubyte"] = true
end
angelsmods.trigger.sintering_tech = true
angelsmods.trigger.early_chemical_furnace = true

require("prototypes.categories")

Expand Down
2 changes: 1 addition & 1 deletion Clowns-Processing/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Clowns-Processing",
"version": "1.3.23",
"version": "1.3.24",
"factorio_version": "1.1",
"title": "MadClown01's Processing",
"author": "MadClown01,Pezzawinkle",
Expand Down
294 changes: 148 additions & 146 deletions Clowns-Processing/prototypes/items/neurotoxin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,163 +1,165 @@
local neurotoxincloud=table.deepcopy(data.raw["smoke-with-trigger"]["poison-cloud"])
if mods["angelsbioprocessing"] then
local neurotoxincloud=table.deepcopy(data.raw["smoke-with-trigger"]["poison-cloud"])

neurotoxincloud.name="neurotoxin-cloud"
neurotoxincloud.action =
{
type = "direct",
action_delivery =
neurotoxincloud.name="neurotoxin-cloud"
neurotoxincloud.action =
{
type = "instant",
target_effects =
type = "direct",
action_delivery =
{
type = "nested-result",
action =
type = "instant",
target_effects =
{
type = "area",
radius = 16,--poison cloud has radius = 11,
entity_flags = {"breaths-air"},
action_delivery =
type = "nested-result",
action =
{
type = "instant",
target_effects =
type = "area",
radius = 16,--poison cloud has radius = 11,
entity_flags = {"breaths-air"},
action_delivery =
{
type = "damage",
damage = { amount = 20, type = "poison"}--poison cloud has damage = { amount = 8, type = "poison"}
type = "instant",
target_effects =
{
type = "damage",
damage = { amount = 20, type = "poison"}--poison cloud has damage = { amount = 8, type = "poison"}
}
}
}
}
}
}
}
neurotoxincloud.particle_spread={ 4.5 * 1.05, 4.5 * 0.6 * 1.05 }
neurotoxincloud.particle_count=30
neurotoxincloud.created_effect = {
{
action_delivery = {
target_effects = {
entity_name = "poison-cloud-visual-dummy",
initial_height = 0,
show_in_tooltip = false,
type = "create-smoke"
neurotoxincloud.particle_spread={ 4.5 * 1.05, 4.5 * 0.6 * 1.05 }
neurotoxincloud.particle_count=30
neurotoxincloud.created_effect = {
{
action_delivery = {
target_effects = {
entity_name = "poison-cloud-visual-dummy",
initial_height = 0,
show_in_tooltip = false,
type = "create-smoke"
},
type = "instant"
},
type = "instant"
cluster_count = 15,--10,
distance = 7,--4,
distance_deviation = 5,
type = "cluster"
},
cluster_count = 15,--10,
distance = 7,--4,
distance_deviation = 5,
type = "cluster"
{
action_delivery = {
target_effects = {
entity_name = "poison-cloud-visual-dummy",
initial_height = 0,
show_in_tooltip = false,
type = "create-smoke"
},
type = "instant"
},
cluster_count = 15,--11,
distance = 15,--8.8000000000000007,
distance_deviation = 3, --2,
type = "cluster"
}
},
data:extend({neurotoxincloud})
data:extend(
{
{
action_delivery = {
target_effects = {
entity_name = "poison-cloud-visual-dummy",
initial_height = 0,
show_in_tooltip = false,
type = "create-smoke"
},
type = "instant"
type = "projectile",
name = "neurotoxin-capsule",
flags = {"not-on-map"},
acceleration = 0.005,
action =
{
type = "direct",
action_delivery =
{
type = "instant",
target_effects =
{
type = "create-entity",
show_in_tooltip = true,
entity_name = "neurotoxin-cloud",
initial_height = 0
},
{
type = "create-particle",
particle_name = "poison-capsule-metal-particle",
repeat_count = 8,
initial_height = 1,
initial_vertical_speed = 0.1,
initial_vertical_speed_deviation = 0.05,
offset_deviation = {{-0.1, -0.1}, {0.1, 0.1}},
speed_from_center = 0.05,
speed_from_center_deviation = 0.01
}
}
},
cluster_count = 15,--11,
distance = 15,--8.8000000000000007,
distance_deviation = 3, --2,
type = "cluster"
}
},
data:extend({neurotoxincloud})
data:extend(
{
{
type = "projectile",
name = "neurotoxin-capsule",
flags = {"not-on-map"},
acceleration = 0.005,
action =
{
type = "direct",
action_delivery =
{
type = "instant",
target_effects =
{
type = "create-entity",
show_in_tooltip = true,
entity_name = "neurotoxin-cloud",
initial_height = 0
},
{
type = "create-particle",
particle_name = "poison-capsule-metal-particle",
repeat_count = 8,
initial_height = 1,
initial_vertical_speed = 0.1,
initial_vertical_speed_deviation = 0.05,
offset_deviation = {{-0.1, -0.1}, {0.1, 0.1}},
speed_from_center = 0.05,
speed_from_center_deviation = 0.01
}
}
},
light = {intensity = 0.5, size = 4},
animation =
{
filename = "__base__/graphics/entity/poison-capsule/poison-capsule.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 29,
height = 29,
shift = util.by_pixel(1, 0.5),
priority = "high",
hr_version =
{
filename = "__base__/graphics/entity/poison-capsule/hr-poison-capsule.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 58,
height = 59,
shift = util.by_pixel(1, 0.5),
priority = "high",
scale = 0.5
}
light = {intensity = 0.5, size = 4},
animation =
{
filename = "__base__/graphics/entity/poison-capsule/poison-capsule.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 29,
height = 29,
shift = util.by_pixel(1, 0.5),
priority = "high",
hr_version =
{
filename = "__base__/graphics/entity/poison-capsule/hr-poison-capsule.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 58,
height = 59,
shift = util.by_pixel(1, 0.5),
priority = "high",
scale = 0.5
}

},
shadow =
{
filename = "__base__/graphics/entity/poison-capsule/poison-capsule-shadow.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 27,
height = 21,
shift = util.by_pixel(1, 2),
priority = "high",
draw_as_shadow = true,
hr_version =
{
filename = "__base__/graphics/entity/poison-capsule/hr-poison-capsule-shadow.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 54,
height = 42,
shift = util.by_pixel(1, 2),
priority = "high",
draw_as_shadow = true,
scale = 0.5
}
},
smoke =
{
{
name = "poison-capsule-smoke",
deviation = {0.15, 0.15},
frequency = 1,
position = {0, 0},
starting_frame = 3,
starting_frame_deviation = 5,
starting_frame_speed_deviation = 5
}
}
},
}
)
},
shadow =
{
filename = "__base__/graphics/entity/poison-capsule/poison-capsule-shadow.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 27,
height = 21,
shift = util.by_pixel(1, 2),
priority = "high",
draw_as_shadow = true,
hr_version =
{
filename = "__base__/graphics/entity/poison-capsule/hr-poison-capsule-shadow.png",
frame_count = 16,
line_length = 8,
animation_speed = 0.250,
width = 54,
height = 42,
shift = util.by_pixel(1, 2),
priority = "high",
draw_as_shadow = true,
scale = 0.5
}
},
smoke =
{
{
name = "poison-capsule-smoke",
deviation = {0.15, 0.15},
frequency = 1,
position = {0, 0},
starting_frame = 3,
starting_frame_deviation = 5,
starting_frame_speed_deviation = 5
}
}
},
}
)
end
Loading