-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Assembling Machines for 2.0 (#203)
* Delete bobassembly/graphics/entity/assembling-machine-4 directory Removing old low-res graphics. The relevant prototype now uses the same color mask graphics as the rest of the assembling machines in both old and new color schemes. * Add new hr assembling machine color mask * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-0.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-1-shadow.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-1.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-2-shadow.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-2.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-3-shadow.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-3.png * Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-mask.png * Delete bobassembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants-mask.png * Delete bobassembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants.png * Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-highlights.png * Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-mask.png * Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-shadow.png * Delete bobassembly/graphics/entity/chemical-plant/chemical-plant.png * Delete bobassembly/graphics/entity/electric-furnace/electric-furnace.png * Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-heater.png * Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-1.png * Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-2.png * Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-shadow.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-base.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-highlights.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-mask.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-shadow.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-base.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-highlights.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-mask.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-shadow.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-base.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-highlights.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-mask.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-shadow.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-base.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-highlights.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-mask.png * Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-shadow.png * Update assembly-burner.lua Updating fluid boxes, emissions_per_minute, color masks, and circuit connections. * Update assembly-electronics.lua Updating fluid boxes, pollution, color masks, and circuit connections. * Removing reference to removed recipes Removing reference to red/green wire recipes that no longer exist. * Update assembly.lua Update fluid boxes, color masks, graphics, and circuit connections. Also replace removed techs and items from assem 4 tech and assem 6 recipe. * Revert accidental pipe_pictures change * Update assembly-updates.lua Add assem 6 replacement for processing unit -> APU Fix automation 3 prereq Update color masks Add check for AAI loaders size change * Update pollution and replace changed prereq * Update chemical-mixing-furnace.lua Updated graphics, fluid boxes, and circuit connections. Replaced name-changed tech prereq * Update chemical-plant.lua Updated fluid boxes, pollution, changed tech prereqs, graphics, and circuit connections. * Add graphics_set_flipped and adjust energy_usage and mining_time * Fix leftover changes from testing * Update electric-furnace.lua Updated graphics, pollution, and renamed tech prereqs. * Update electrolyser.lua Updated graphics, fluid boxes, pollution, circuit connections, and renamed tech prereqs. * Update fluid box and pollution * Update pollution and renamed tech prereqs * Update distillery.lua Added graphics_set_flipped, updated fluid boxes and pollution, adjusted energy usage and mining time. * Update entities.lua Updated all fluid boxes and pollution. Removed low res graphics. Added and updated circuit connections. Fixed graphics pointer for steel furnaces. Added graphics_set_flipped to stone chemical furnace. * Update changelog.txt * Delete bobplates/graphics/entity/electric-furnace/electric-furnace-heater.png * Delete bobplates/graphics/entity/electric-furnace/electric-furnace-propeller-1.png * Delete bobplates/graphics/entity/electric-furnace/electric-furnace-propeller-2.png * Update changelog.txt * Updating directions to use defines constants * Fix overlooked change made for testing * Add missing comma * Additional fixes for small storage tank * Move small storage tank subgroup The old subgroup put the small storage tanks a separate recipe group entirely alone if boblogistics is not active, which is obviously nonsensical. This will place them with the other storage tank. * Move small storage tank subgroup * Vanilla item name changed * Update nuclear.lua * Update pumps.lua Add flipped graphics set (shifting the entity graphics over by one tile, since they only actually fill half of the square, allows them to align with the flipped location of the fluid connections) Updated fluid boxes and pollution. * Add impact_category * Add impact_category * Add impact_category * Add impact_category * Replace impact_sound to impact_category * Add impact_category * Replace impact_sound with impact_category * Replace impact_sound with impact_category * Add impact_category * Remove lowres graphics * Add circuit connections and impact_category * Delete centrifuge-A-light.png * Delete centrifuge-B-light.png * Delete centrifuge-C-light.png * Delete electrolyser-1-base.png * Delete electrolyser-1-highlights.png * Delete electrolyser-1-mask.png * Delete electrolyser-1-shadow.png * Add new item sounds and weight * Add new item sounds and weight * Add new item sounds and weight * Add new item sounds * Add new item sounds * Add new item sounds and weight * Add new item sounds * Add new item sounds and weight * Add new item sounds and weight * Add new item sounds * Add new item sounds * Add new item sounds and weight * Add new item sounds and weight * Renaming hr graphics (bobassembly) * Renaming hr graphics (bobplates) * Don't link to the same table instance --------- Co-authored-by: KiwiHawk <[email protected]>
- Loading branch information
Showing
120 changed files
with
1,636 additions
and
1,551 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-346 KB
bobassembly/graphics/entity/assembling-machine-4/assembling-machine-4.png
Binary file not shown.
Binary file removed
BIN
-531 KB
bobassembly/graphics/entity/assembling-machine/assembling-machine-0.png
Binary file not shown.
Binary file modified
BIN
+27.6 KB
(370%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-1-shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.47 MB
(380%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+29.1 KB
(360%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-2-shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.55 MB
(380%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+49.7 KB
(330%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-3-shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.53 MB
(370%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+7.08 KB
(220%)
bobassembly/graphics/entity/assembling-machine/assembling-machine-mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-37.8 KB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-1-shadow.png
Binary file not shown.
Binary file removed
BIN
-2 MB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-1.png
Binary file not shown.
Binary file removed
BIN
-40.2 KB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-2-shadow.png
Binary file not shown.
Binary file removed
BIN
-2.11 MB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-2.png
Binary file not shown.
Binary file removed
BIN
-71.4 KB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-3-shadow.png
Binary file not shown.
Binary file removed
BIN
-2.1 MB
bobassembly/graphics/entity/assembling-machine/hr-assembling-machine-3.png
Binary file not shown.
Binary file removed
BIN
-6.05 KB
bobassembly/graphics/entity/chemical-plant-old/boiling-green-patch-mask.png
Binary file not shown.
Binary file removed
BIN
-4.77 KB
bobassembly/graphics/entity/chemical-plant-old/boiling-green-patch.png
Binary file not shown.
Binary file removed
BIN
-806 Bytes
bobassembly/graphics/entity/chemical-plant-old/boiling-window-green-patch.png
Binary file not shown.
Binary file removed
BIN
-18.5 KB
bobassembly/graphics/entity/chemical-plant-old/chemical-plant-mask.png
Binary file not shown.
Binary file removed
BIN
-1.34 KB
bobassembly/graphics/entity/chemical-plant-old/chemical-plant-shadow.png
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-20.9 KB
bobassembly/graphics/entity/chemical-plant-old/hr-boiling-green-patch-mask.png
Binary file not shown.
Binary file removed
BIN
-16.8 KB
bobassembly/graphics/entity/chemical-plant-old/hr-boiling-green-patch.png
Binary file not shown.
Binary file removed
BIN
-2.31 KB
bobassembly/graphics/entity/chemical-plant-old/hr-boiling-window-green-patch.png
Binary file not shown.
Binary file removed
BIN
-23.5 KB
bobassembly/graphics/entity/chemical-plant-old/hr-chemical-plant-shadow.png
Binary file not shown.
Binary file removed
BIN
-333 KB
bobassembly/graphics/entity/chemical-plant-old/hr-chemical-plant.png
Diff not rendered.
Binary file modified
BIN
+1.01 MB
(310%)
bobassembly/graphics/entity/chemical-plant/chemical-plant-highlights.png
Oops, something went wrong.
Binary file modified
BIN
+1.07 MB
(310%)
bobassembly/graphics/entity/chemical-plant/chemical-plant-mask.png
Oops, something went wrong.
Binary file modified
BIN
+11.3 KB
(330%)
bobassembly/graphics/entity/chemical-plant/chemical-plant-shadow.png
Oops, something went wrong.
Binary file modified
BIN
+1.74 MB
(380%)
bobassembly/graphics/entity/chemical-plant/chemical-plant.png
Oops, something went wrong.
Binary file removed
BIN
-1.49 MB
bobassembly/graphics/entity/chemical-plant/hr-chemical-plant-highlights.png
Diff not rendered.
Binary file removed
BIN
-1.57 MB
bobassembly/graphics/entity/chemical-plant/hr-chemical-plant-mask.png
Diff not rendered.
Binary file removed
BIN
-16.1 KB
bobassembly/graphics/entity/chemical-plant/hr-chemical-plant-shadow.png
Diff not rendered.
Diff not rendered.
Binary file modified
BIN
+37.6 KB
(340%)
...sembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants-mask.png
Oops, something went wrong.
Binary file modified
BIN
+75.1 KB
(340%)
bobassembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants.png
Oops, something went wrong.
Binary file removed
BIN
-53.4 KB
...bly/graphics/entity/chemical-plant/remnants/hr-chemical-plant-remnants-mask.png
Diff not rendered.
Binary file removed
BIN
-107 KB
bobassembly/graphics/entity/chemical-plant/remnants/hr-chemical-plant-remnants.png
Diff not rendered.
Binary file modified
BIN
+20.5 KB
(580%)
bobassembly/graphics/entity/electric-furnace/electric-furnace-heater.png
Oops, something went wrong.
Binary file modified
BIN
+4.07 KB
(330%)
bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-1.png
Oops, something went wrong.
Binary file modified
BIN
+2.3 KB
(330%)
bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-2.png
Oops, something went wrong.
Binary file modified
BIN
+3.87 KB
(3900%)
bobassembly/graphics/entity/electric-furnace/electric-furnace-shadow.png
Oops, something went wrong.
Binary file modified
BIN
+71 KB
(400%)
bobassembly/graphics/entity/electric-furnace/electric-furnace.png
Oops, something went wrong.
Binary file removed
BIN
-24.8 KB
bobassembly/graphics/entity/electric-furnace/hr-electric-furnace-heater.png
Diff not rendered.
Binary file removed
BIN
-5.83 KB
bobassembly/graphics/entity/electric-furnace/hr-electric-furnace-propeller-1.png
Diff not rendered.
Binary file removed
BIN
-3.3 KB
bobassembly/graphics/entity/electric-furnace/hr-electric-furnace-propeller-2.png
Diff not rendered.
Binary file removed
BIN
-3.98 KB
bobassembly/graphics/entity/electric-furnace/hr-electric-furnace-shadow.png
Diff not rendered.
Binary file removed
BIN
-94.6 KB
bobassembly/graphics/entity/electric-furnace/hr-electric-furnace.png
Diff not rendered.
Binary file modified
BIN
+182 KB
(310%)
bobassembly/graphics/entity/electrolyser/electrolyser-2-base.png
Oops, something went wrong.
Binary file modified
BIN
+94.5 KB
(370%)
bobassembly/graphics/entity/electrolyser/electrolyser-2-highlights.png
Oops, something went wrong.
Binary file modified
BIN
+99.2 KB
(380%)
bobassembly/graphics/entity/electrolyser/electrolyser-2-mask.png
Oops, something went wrong.
Binary file modified
BIN
+7.13 KB
(240%)
bobassembly/graphics/entity/electrolyser/electrolyser-2-shadow.png
Oops, something went wrong.
Binary file modified
BIN
+185 KB
(310%)
bobassembly/graphics/entity/electrolyser/electrolyser-3-base.png
Oops, something went wrong.
Binary file modified
BIN
+97.9 KB
(370%)
bobassembly/graphics/entity/electrolyser/electrolyser-3-highlights.png
Oops, something went wrong.
Binary file modified
BIN
+103 KB
(380%)
bobassembly/graphics/entity/electrolyser/electrolyser-3-mask.png
Oops, something went wrong.
Binary file modified
BIN
+7.48 KB
(240%)
bobassembly/graphics/entity/electrolyser/electrolyser-3-shadow.png
Oops, something went wrong.
Binary file modified
BIN
+184 KB
(300%)
bobassembly/graphics/entity/electrolyser/electrolyser-4-base.png
Oops, something went wrong.
Binary file modified
BIN
+98.3 KB
(370%)
bobassembly/graphics/entity/electrolyser/electrolyser-4-highlights.png
Oops, something went wrong.
Binary file modified
BIN
+103 KB
(380%)
bobassembly/graphics/entity/electrolyser/electrolyser-4-mask.png
Oops, something went wrong.
Binary file modified
BIN
+7.48 KB
(240%)
bobassembly/graphics/entity/electrolyser/electrolyser-4-shadow.png
Oops, something went wrong.
Binary file modified
BIN
+174 KB
(300%)
bobassembly/graphics/entity/electrolyser/electrolyser-5-base.png
Oops, something went wrong.
Binary file modified
BIN
+99 KB
(380%)
bobassembly/graphics/entity/electrolyser/electrolyser-5-highlights.png
Oops, something went wrong.
Binary file modified
BIN
+104 KB
(380%)
bobassembly/graphics/entity/electrolyser/electrolyser-5-mask.png
Oops, something went wrong.
Binary file modified
BIN
+6.93 KB
(220%)
bobassembly/graphics/entity/electrolyser/electrolyser-5-shadow.png
Oops, something went wrong.
Diff not rendered.
Binary file removed
BIN
-130 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-2-highlights.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-12.2 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-2-shadow.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-134 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-3-highlights.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-12.8 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-3-shadow.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-134 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-4-highlights.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-12.8 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-4-shadow.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-135 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-5-highlights.png
Diff not rendered.
Diff not rendered.
Binary file removed
BIN
-12.5 KB
bobassembly/graphics/entity/electrolyser/hr-electrolyser-5-shadow.png
Diff not rendered.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.