Skip to content
Merged

Dev #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
897c418
Improve save load speed
BloodStainedCrow May 16, 2025
8677f23
update rust version
BloodStainedCrow May 16, 2025
ce1ebd2
Add rustup to shell.nix
BloodStainedCrow May 16, 2025
708ea54
Start with beacons
BloodStainedCrow May 16, 2025
ff1f419
Start world cascading updates to fix beacons and inserters
BloodStainedCrow May 24, 2025
7686dbb
cargo fix
BloodStainedCrow May 24, 2025
daa8abd
Fix up instantiate_inserter and adjust tests to work properly
BloodStainedCrow May 25, 2025
a079b10
Add additional items and recipes, move declaration into fgmod file an…
BloodStainedCrow May 27, 2025
7576973
cargo fmt
BloodStainedCrow May 27, 2025
6b3c23b
Allow visual test runners to fully work (switch to parking_lot to avo…
BloodStainedCrow May 27, 2025
10f2e58
more tests
BloodStainedCrow May 27, 2025
827066b
Add event for new power poles (allowing new power poles to trigger up…
BloodStainedCrow May 28, 2025
e51648c
Fix power grid merging not emitting storage updates for assemblers an…
BloodStainedCrow May 28, 2025
e0cd3fa
Fix beacon test
BloodStainedCrow May 28, 2025
68f1fc4
Fix Beacon removal
BloodStainedCrow May 28, 2025
f523388
Add proper profiling using puffin
BloodStainedCrow May 30, 2025
5c16257
Add consumption graph, add (but not use yet) bit packed storage id fo…
BloodStainedCrow Jun 3, 2025
c93ab9c
cargo fix
BloodStainedCrow Jun 3, 2025
b85ebed
Minor Fixes
BloodStainedCrow Jun 3, 2025
a4109ef
Change Position to usze i32
BloodStainedCrow Jun 3, 2025
4bc0633
Add a couple of benchmarks
BloodStainedCrow Jun 3, 2025
c522d57
Use compact inserter storage (#15)
BloodStainedCrow Jun 13, 2025
ed0aeeb
Enable graphics for vscode debug
BloodStainedCrow Jun 13, 2025
32dbd42
Add initial fluid implementation (#17)
BloodStainedCrow Jun 22, 2025
0b1149c
cargo update
BloodStainedCrow Jun 22, 2025
5c0dc20
Add some noise for a couple of ore patches to start implementing mini…
BloodStainedCrow Jun 22, 2025
c4977cb
Add support for rendering and simulating slower belt speeds
BloodStainedCrow Jun 23, 2025
a533c43
Update TODOs
BloodStainedCrow Jun 23, 2025
ce0cc3d
Add proper underground belt support
BloodStainedCrow Jun 24, 2025
85b3279
Improve Grid merging and allow undergrounds to work in more cases
BloodStainedCrow Jun 24, 2025
36d3d56
Add Defragment button
BloodStainedCrow Jun 26, 2025
2934e7b
Fix belt not allowing sushi
BloodStainedCrow Jun 26, 2025
0b38fbb
Use gimli/addr2line
BloodStainedCrow Jun 26, 2025
d38ec7f
Fix extremely slow add_pole
BloodStainedCrow Jun 26, 2025
378df96
Add experiemnt
BloodStainedCrow Jun 26, 2025
890ba93
Add hand size to inserter logic
BloodStainedCrow Jun 26, 2025
4ebe00c
Pull out belt type so we do not have to load the full belt for it, if…
BloodStainedCrow Jun 27, 2025
1361ca9
Switch rust nightly
BloodStainedCrow Jun 28, 2025
448ad03
Improve BeltStorageInserter Performance by 30%
BloodStainedCrow Jun 28, 2025
1b9052c
StorageStorage with buckets, using smart search with prediction
BloodStainedCrow Jun 30, 2025
6fb7d2e
next_tick optimization
BloodStainedCrow Jun 30, 2025
dbb0c85
Add fork of petgraph as patch
BloodStainedCrow Jun 30, 2025
96681e4
Add power drain per tile to bot calculations
BloodStainedCrow Jul 7, 2025
1ee3a8a
update dependencies
BloodStainedCrow Jul 7, 2025
73ec7c6
Add Main Menu and loading screen
BloodStainedCrow Jul 8, 2025
3b74abe
Splitter rework
BloodStainedCrow Jul 12, 2025
d658084
Use Inserter Buckets
BloodStainedCrow Jul 1, 2025
6ca3d7d
Add profiling
BloodStainedCrow Jul 1, 2025
d76bffb
Add variable movetime to storage storage inserters (~3x speed improve…
BloodStainedCrow Jul 2, 2025
0f29d97
Update petgraph
BloodStainedCrow Jul 2, 2025
05e629e
cargo fmt
BloodStainedCrow Jul 2, 2025
5cb1dcf
Add Full Technology support
BloodStainedCrow Jul 13, 2025
db990ba
Cross Technology off the todo list
BloodStainedCrow Jul 13, 2025
12ea824
Bit cleanup
BloodStainedCrow Jul 14, 2025
6e6a610
Improve storage_list generation
BloodStainedCrow Jul 14, 2025
eb453b9
Add Technology Cheat button
BloodStainedCrow Jul 14, 2025
c030a5f
Allow SushiBelts to be circular
BloodStainedCrow Jul 14, 2025
ccd50af
Add Client Connection and Escape Menu
BloodStainedCrow Jul 17, 2025
530ed18
Add graphics to belts (including animations)
BloodStainedCrow Jul 17, 2025
bc158cd
Upgrade to rust 2024
BloodStainedCrow Jul 17, 2025
43c6c1f
Update Blueprint logic and add CtrlC
BloodStainedCrow Jul 19, 2025
2eb3fc9
New blueprints for testing
BloodStainedCrow Jul 19, 2025
f7a94d0
Properly support map view
BloodStainedCrow Jul 19, 2025
1a323c0
Fix belt serialize missing a field
BloodStainedCrow Jul 19, 2025
f73f5ad
increase speed of debug recipes
BloodStainedCrow Jul 19, 2025
23eab83
Fix inserter storage change not updating inserter_id
BloodStainedCrow Jul 19, 2025
eada2af
New blueprint format
BloodStainedCrow Jul 19, 2025
562ffff
Update blueprints
BloodStainedCrow Jul 19, 2025
ae0c4fc
Fix PowerPoles being added as chests to blueprints
BloodStainedCrow Jul 20, 2025
2339baf
Add new technologies
BloodStainedCrow Jul 20, 2025
9297978
Fix save game deadlock and crash from failing to update storage_ids o…
BloodStainedCrow Jul 20, 2025
d35fd60
Finalize blue_sci bp
BloodStainedCrow Jul 20, 2025
ad0b1d3
Add items, recipes and tech for purple
BloodStainedCrow Jul 20, 2025
3c53695
Start working on purple bp
BloodStainedCrow Jul 20, 2025
5ad9213
Change liquid insertion speed
BloodStainedCrow Jul 20, 2025
e30fe6c
Add red chip bp
BloodStainedCrow Jul 20, 2025
5e1eaaa
Fix Power Grid info wrapping
BloodStainedCrow Jul 21, 2025
ca65cc0
Fix CtrlC being one tile off
BloodStainedCrow Jul 21, 2025
ce9242f
Add unlock all tech button
BloodStainedCrow Jul 21, 2025
d11ac6b
Severely increase speed of placing entities
BloodStainedCrow Jul 21, 2025
bf0b0bc
Add blueprint mirroring
BloodStainedCrow Jul 22, 2025
7d2abac
Add Purple science base blueprints
BloodStainedCrow Jul 22, 2025
cedbcc8
Fix splitters not connecting in the correct position
BloodStainedCrow Jul 22, 2025
12555c6
Fix purple blueprints
BloodStainedCrow Jul 22, 2025
c846964
Fix stone brick recipe
BloodStainedCrow Jul 22, 2025
e35d5c5
Fix vertical blueprint flipping
BloodStainedCrow Jul 23, 2025
91792aa
Add sink technologies for testing SPM
BloodStainedCrow Jul 23, 2025
0039bad
Fix ghost of old map being in mapview after quitting to main menu
BloodStainedCrow Jul 23, 2025
c0c77eb
Minor Cleanup
BloodStainedCrow Jul 23, 2025
2060c06
New blueprints for assembling the megabase
BloodStainedCrow Jul 23, 2025
f72f2d1
Stop puffin from hoggin the mutexes
BloodStainedCrow Jul 23, 2025
f090a32
Add Sushi belt pruning
BloodStainedCrow Jul 23, 2025
86f598a
Add some more profiling
BloodStainedCrow Jul 23, 2025
01cc0d0
Allow rotating blueprints
BloodStainedCrow Jul 23, 2025
7af2b84
Fix assemblers not correctly attaching to fluid pipes
BloodStainedCrow Jul 23, 2025
5dec60c
allow more in/out count options for recipes
BloodStainedCrow Jul 23, 2025
32efdac
Fix wrong names on technologies
BloodStainedCrow Jul 23, 2025
03809ab
Allow disabling puffin
BloodStainedCrow Jul 23, 2025
3c9cb12
Remove profiling from tiny functions
BloodStainedCrow Jul 23, 2025
ca5f6a0
Multithread entity rendering
BloodStainedCrow Jul 23, 2025
3a76587
Fix belt item iter allocating needlessly and make them lazy
BloodStainedCrow Jul 23, 2025
36e6255
Spped up rendering
BloodStainedCrow Jul 23, 2025
5e16131
Remove canonical
BloodStainedCrow Jul 24, 2025
57b6c87
Update placeholder graphics
BloodStainedCrow Jul 24, 2025
5dce7c8
Allow assembler rotation
BloodStainedCrow Jul 24, 2025
b6882b1
Add Krastorio 2 assets
BloodStainedCrow Jul 24, 2025
95ab794
Allow bigger chests
BloodStainedCrow Jul 24, 2025
fda1272
Add cracking recipes
BloodStainedCrow Jul 24, 2025
cd3ce10
Add megabase blueprints
BloodStainedCrow Jul 25, 2025
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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.bp filter=lfs diff=lfs merge=lfs -text
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
*.exe
*.temp
stats.svg
last_replay.rep
perf.data
perf.data.old
flamegraph.svg
dhat-heap.json
samply.json
vtune-results
49 changes: 36 additions & 13 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"build",
"--bin=factory",
"--package=factory",
"--features=graphics",
],
"filter": {
"name": "factory",
Expand All @@ -44,54 +45,76 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug factory client",
"name": "Debug executable 'factory' verbose",
"cargo": {
"args": [
"build",
"--bin=factory",
"--package=factory",
"--features=graphics",
],
"filter": {
"name": "factory",
"kind": "bin"
}
},
"args": ["--client"],
"cwd": "${workspaceFolder}"
"args": [],
"cwd": "${workspaceFolder}",
"env": { "RUST_LOG": "info" }
},{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'factory' without tick wait",
"cargo": {
"args": [
"build",
"--bin=factory",
"--package=factory",
"--features=graphics",
],
"filter": {
"name": "factory",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}",
"env": { "ZOOM": "true" }
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'factory'",
"name": "Debug factory client",
"cargo": {
"args": [
"test",
"--no-run",
"build",
"--bin=factory",
"--package=factory"
"--package=factory",
"--features=graphics",
],
"filter": {
"name": "factory",
"kind": "bin"
}
},
"args": [],
"args": ["--client"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug integration test 'test'",
"name": "Debug unit tests in executable 'factory'",
"cargo": {
"args": [
"test",
"--no-run",
"--test=test",
"--package=factory"
"--bin=factory",
"--package=factory",
"--features=graphics",
],
"filter": {
"name": "test",
"kind": "test"
"name": "factory",
"kind": "bin"
}
},
"args": [],
Expand Down
Loading
Loading