blubFisch
cb782c20e3
No free uranium
2022-10-08 12:09:24 +01:00
blubFisch
730bc3c11f
Limit backpack slots
2022-10-08 12:06:46 +01:00
blubFisch
1b8bc9f986
Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub
2022-10-08 12:01:48 +01:00
blubFisch
d7fc81fcb1
Simplification and massive performance boost for building restrictions
2022-10-08 12:01:32 +01:00
hanakocz
3fbbda99f9
Merge pull request #326 from blubFisch/develop-blub
...
Bunch of small adjustments
2022-10-07 11:32:42 +02:00
hanakocz
49a2758249
Merge branch 'develop' into develop-blub
2022-10-07 11:09:12 +02:00
blubFisch
0e32c7d475
Rebrand to "PvP Shield"
2022-10-07 08:55:25 +01:00
blubFisch
1411dae640
Show protection info to other forces
2022-10-07 08:50:58 +01:00
blubFisch
8965ff94b5
Cheaper lasers
2022-10-07 08:50:19 +01:00
blubFisch
7bde2a7f9f
Start with 20 laser slots
2022-10-07 08:46:29 +01:00
hanakocz
461e1b7a46
Merge pull request #325 from ComfyFactory/spiral_troopers_fix
...
remove non-existent item
2022-10-06 22:34:04 +02:00
hanakocz
9bd70819b5
remove non-existent item
2022-10-06 22:27:20 +02:00
Piratux
72b5391ce8
Cars and nuclear enabled + cleanup
...
Changes:
- Car and nuclear fuel related technologies are now enabled.
- Cliff base now contains tank instead of car after 25 islands.
2022-10-06 14:47:17 +03:00
Gerkiz
23248b5c77
Merge pull request #324 from blubFisch/develop-blub
...
Some fixes
2022-10-06 09:07:49 +02:00
blubFisch
34290d4d11
Fix for failed zone removal
2022-10-06 07:56:30 +01:00
blubFisch
f853abd030
Fix towny start research
2022-10-06 07:41:10 +01:00
blubFisch
c56de7dd7d
Fix a non-update of protection zones and text updates
2022-10-06 07:34:41 +01:00
blubFisch
ff3535205b
Rework starting items
2022-10-05 21:03:01 +01:00
Gerkiz
72029ca42b
Merge pull request #323 from blubFisch/town-protection
...
Town protection fix
2022-10-05 21:47:08 +02:00
blubFisch
98933f3184
Merge branch 'ComfyFactory:develop' into town-protection
2022-10-05 20:46:03 +01:00
blubFisch
f27c7519fc
Don't use callback in global to fix desync
2022-10-05 20:45:40 +01:00
Gerkiz
2607d77ffc
Merge pull request #322 from blubFisch/town-protection
...
Town protection
2022-10-05 21:19:40 +02:00
blubFisch
58dcf78831
Merge branch 'town-protection' of github.com:blubFisch/ComfyFactorio into town-protection
2022-10-05 20:17:34 +01:00
blubFisch
db2060b93d
Fix global var
2022-10-05 20:16:53 +01:00
Gerkiz
c21ae239e8
Merge branch 'develop' into town-protection
2022-10-05 21:15:22 +02:00
blubFisch
b3ee0a4de2
Increase zone size
2022-10-05 20:13:07 +01:00
blubFisch
df0eb28925
Force check and polishing
2022-10-05 20:10:45 +01:00
blubFisch
6349c7663b
Display protection
2022-10-05 20:02:35 +01:00
Gerkiz
63d085b8b9
Merge pull request #321 from blubFisch/develop-blub
...
Disable artillery
2022-10-05 20:48:40 +02:00
blubFisch
bce447cf96
Comment out arty for luacheck
2022-10-05 19:38:19 +01:00
blubFisch
94f8d3befc
Zone lifetime
2022-10-05 19:33:59 +01:00
blubFisch
f824fdeb5e
Cleanup and remove zones
2022-10-05 19:21:12 +01:00
blubFisch
6d09cc29fa
Merge branch 'ComfyFactory:develop' into develop-blub
2022-10-05 18:24:32 +01:00
blubFisch
b4246578cd
Disable artillery
2022-10-05 18:23:48 +01:00
blubFisch
6cc6d84ed4
Cleanup
2022-10-05 18:21:32 +01:00
blubFisch
f225b21c50
Basic Zone mechanics working
2022-10-05 17:32:44 +01:00
Gerkiz
838007bcfd
Merge pull request #320 from blubFisch/develop-blub
...
Remove fallen town's entity ghosts (maybe desync fix) + random small stuff
2022-10-05 18:30:49 +02:00
blubFisch
792a795840
Override natural deep water "walls" to make map edges less OP
2022-10-05 09:24:14 +01:00
blubFisch
0e706a61de
Fix losing map at 2nd join (can't test though, might not be 100% correct)
2022-10-05 09:17:51 +01:00
blubFisch
87c48b61ac
Merge branch 'develop' into develop-blub
...
# Conflicts:
# maps/scrap_towny_ffa/team.lua
2022-10-05 09:12:30 +01:00
blubFisch
bc27bbe2ea
Recreate hint to not attack biters as outlander
2022-10-05 09:09:28 +01:00
Piratux
a228fa401a
Fixed uranium-ammo pre-requisites
...
Changes:
- Fixed uranium-ammo pre-requisites
2022-10-04 23:56:42 +03:00
blubFisch
051e00dd7d
Reformat
2022-10-04 20:45:05 +01:00
Piratux
079be7fe49
Explanatory text for sulfuric barrels in radioactive island
...
Changes:
- Changed message in radioactive island "2 [sulfuric barrels]" -> "Free resources granted for staying in this island. 2 [sulfuric barrels]"
2022-10-04 22:25:13 +03:00
blubFisch
2968892a2b
Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub
2022-10-04 20:14:06 +01:00
blubFisch
12c35b40d4
Remove fallen town's entity ghosts (maybe desync fix)
2022-10-04 20:13:42 +01:00
Piratux
e75091009d
Added science packs to labs in radioactive island
...
Changes:
- Added science packs to labs in radioactive island.
2022-10-04 21:43:11 +03:00
Piratux
077df6c208
Raffle bandaid fix + added cave island to rotation
...
Changes:
- Made quest structures return random requirement item when raffle returns nil. This happens because some items have negative weights in lambda raffle.
- Added Cave island to B and D island categories.
2022-10-04 21:28:35 +03:00
Gerkiz
2589a68ad8
Merge pull request #319 from ComfyFactory/towny
...
Towny - fix bugs
2022-10-04 17:53:23 +02:00
Gerkiz
f12a3d7d16
Towny - fix bugs
2022-10-04 17:51:22 +02:00
