games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-04 00:15:45 +02:00
Code Issues Releases Activity
3,897 Commits 2 Branches 464 Tags 31 MiB
a1a3e7d1b9
Commit Graph

2308 Commits

Author SHA1 Message Date
Piratux
ab0d10030e Artillery turret upgrade bug fix 
Changes:
- Fixed an issue where players could get artillery turret when buying the upgrade with full inventory.
 2022-10-23 16:50:48 +03:00
Piratux
f539fe2fb5 Hold and power purchase changes 
Changes:
- Extra hold and power upgrades now can only be purchased at captain's cabin instead of docks.
 2022-10-23 15:16:39 +03:00
Gerkiz
b60ded54e6 Towny - test callback 2022-10-22 22:49:06 +02:00
Gerkiz
6c56663296 Make luacheck happy 2022-10-22 22:20:20 +02:00
Gerkiz
f01ed8c7ae Fix luacheck 2022-10-22 22:17:46 +02:00
Gerkiz
ed9448725c Autostash/Towny - fix that you couldn't insert to neutral chests 2022-10-22 22:16:21 +02:00
Gerkiz
57cdb64b69 Towny - fixed bugs 2022-10-22 22:13:35 +02:00
Gerkiz
0046cfa47e Towny - fix reset 2022-10-21 22:39:45 +02:00
Gerkiz
d0e1ac05bf Towny - fix broken loot 2022-10-21 22:18:50 +02:00
Gerkiz
764a237e3e Towny - small fix 2022-10-21 22:13:27 +02:00
Gerkiz
af15c20445 Handle changes when git does callbacks 2022-10-21 21:54:06 +02:00
Gerkiz
f8eed9baab Scrap Towny - minor changes 2022-10-21 21:49:17 +02:00
Piratux
e9f5abe5f2 Island balance changes 
Changes:
- Reduced worm and spawner density in Poisonous Fens island by 33%. Reasoning: since this island is very big, there are naturally more biters there and it's a bit too dense with bigger crews.
- Reduced spawner density in Walkways island by 25%. Reasoning: in late game these islands become too hard, so this should help a bit.
- Reduced spawner density in Radioactive island by 20%. Reasoning: defending multiple structures can be difficult.
- Increased coal amounts in Frozen pools by 2x. Also amount now also scales with leagues.
- Added construction bots to findable roboport structure. Also robot amount scales with leagues and is slightly randomised.
- Sulfuric acid amount in Poisonous Fens now scales with leagues.
- Added loot to ship wrecks in Sandworm Caldera.
- Increased ore amount in Sandworm Caldera by 3x. Also amount now also scales with leagues.
 2022-10-21 20:16:42 +03:00
Gerkiz
ebed7f49e0 Merge remote-tracking branch 'origin/develop' into develop 2022-10-21 19:06:05 +02:00
Gerkiz
73066f1e7b
Remove unused vars 2022-10-21 19:04:45 +02:00
Nathan Fox
52b44a9840
Merge branch 'develop' into fuchsnj/suicide_command 2022-10-19 22:52:52 -04:00
Nathan Fox
6a64d80c79
cleanup 2022-10-19 22:51:59 -04:00
Nathan Fox
050a09f3fc
switch to scheduler 2022-10-19 22:51:01 -04:00
Gerkiz
0199ff7d0e
Merge branch 'develop' into develop-blub 2022-10-18 19:52:17 +02:00
blubFisch
80a8d64987 Scrap rebalance 2022-10-18 18:51:46 +01:00
Johny
fc7c0bf9f6 Addind coin nerf to forest zone 2022-10-18 17:41:52 +02:00
Nathan Fox
a8f26a7da5
prevent resetting suicide 2022-10-17 22:23:26 -04:00
Nathan Fox
3964ddec72
add timer to suicide 2022-10-17 22:11:38 -04:00
Nathan Fox
a7aa422f58
add suicide command 2022-10-16 13:53:54 -04:00
blubFisch
f82b444d1e Rebalance 2022-10-16 16:13:08 +01:00
blubFisch
1cf9c48d28 Info 2022-10-16 14:05:03 +01:00
blubFisch
9f0d7ce974 Info 2022-10-16 14:03:26 +01:00
blubFisch
1fccead964 Info 2022-10-16 12:41:06 +01:00
blubFisch
d0dc8da4f4 Remove unused 2022-10-16 12:19:46 +01:00
blubFisch
225abff724 Adjustments 2022-10-16 12:17:52 +01:00
blubFisch
33c1949e56 Fix bad ref 2022-10-16 12:14:38 +01:00
blubFisch
e86dd28e3e Prevent building in shielded area 2022-10-16 12:11:47 +01:00
blubFisch
f945ab772b Text updates 2022-10-15 15:45:49 +01:00
blubFisch
da380f80f9 Scrap rebalance 2022-10-15 14:46:25 +01:00
blubFisch
d6494a87f2 Scrap rebalance 2022-10-15 14:06:21 +01:00
blubFisch
e6a22eba59 Team limit rewrite 2022-10-15 14:05:35 +01:00
blubFisch
7bdec964d8 Adjust loot 2022-10-15 13:11:18 +01:00
blubFisch
74a3f193ab Changelog 2022-10-15 12:52:13 +01:00
blubFisch
0ae12def45 More town name fixes 2022-10-15 12:42:34 +01:00
blubFisch
a4ac17f445 Town name fixes and simplifications 2022-10-15 12:36:01 +01:00
blubFisch
32a8825908 Fix some bad refs 2022-10-15 12:23:11 +01:00
blubFisch
71b46cf23d Add msg 2022-10-15 11:50:53 +01:00
blubFisch
3d2289d82f Rebalance combat 2022-10-15 11:27:16 +01:00
blubFisch
001331fbd4 Less crafting for outlanders 2022-10-15 09:45:17 +01:00
blubFisch
fb5b079f78 Temp fix for town limit 2022-10-15 09:44:54 +01:00
Piratux
3b782829d3 Cliff explosives related tweaks 
Changes:
- Chests with cliff-explosives in holds now explode after 5 second delay.
- Changed the price of cliff explosives to cost 1000 coins for 5 (4x cheaper than before). Reasoning: This is an experiment to shift the coin spending meta.
- Players now can find explosives and cliff-explosives in chests in the wild.
 2022-10-13 21:39:42 +03:00
blubFisch
40e80c3f6c Adjustments 2022-10-13 08:44:19 +01:00
Piratux
f32e9c3197 Tweaked static fuel consumption formula 
Changes:
- Changed static fuel consumption formula, which scales less aggressively with each additional crew member. For comparison, previously 3 and 6 crew members increased fuel consumption 2x and 3x respectively. Now 3 and 6 crew members increase fuel consumption by 1.24x and 1.44x respectively.
 2022-10-12 23:55:22 +03:00
blubFisch
1a365557f3 Less ores 2022-10-12 21:30:28 +01:00
Piratux
69a46dd3fc Tweaked quest market item count formula 
Changes:
- Changed quest item count formula using new philosophy: start lower, scale slightly faster. This results in ~30% on average smaller requirement for items to open the market in early game. The reasoning: it was observed that new players rarely complete the market quest, since they don't make items as fast as needed. As well as when players progress, they can craft items much faster (due to speed modules)
 2022-10-12 22:02:12 +03:00
blubFisch
049de72c88 Bigger PvP shield sizes 2022-10-12 19:28:38 +01:00
blubFisch
ce11951c8a Cleanup member limits 2022-10-12 19:22:48 +01:00
blubFisch
28d6849f1b Fewer tanks in scrap 2022-10-12 18:37:25 +01:00
blubFisch
3c1acb9db6 Rebalance damage 2022-10-12 09:04:07 +01:00
blubFisch
fc26616246 More town fall debugs 2022-10-12 09:03:35 +01:00
blubFisch
93a0de6dfb Fix a missing safety check 2022-10-11 22:17:30 +01:00
blubFisch
8985ecf7d1 Rebalance loot more 2022-10-11 21:39:28 +01:00
blubFisch
c134566b10 Rebalancing 2022-10-11 21:16:51 +01:00
Piratux
7ebe940cbb Lumberjack buff 
Changes:
- Lumberjack now gets ~4x more ore from chopping trees and ore amount scales with leagues to make it slightly more "relevant" in late game
 2022-10-11 23:11:49 +03:00
blubFisch
42c662123c Remove tank from default recipes but more loot chance 2022-10-11 20:42:31 +01:00
Piratux
be900aa05b Officer check code cleanup 
Changes:
- Cleaned up code that checks if player is officer and changed to is_officer()
 2022-10-11 21:38:53 +03:00
Piratux
80cc3da1a5 Class check code cleanup 
Changes:
- Cleaned up code that checks for player's class and changed to get_class() where possible
- Deprecated /setclass command (it was equivelant to /unlock + /take command as well as slightly outdated since class GUI was added)
 2022-10-11 20:52:23 +03:00
blubFisch
4da6721e7e Improved anti-armor-view 2022-10-10 22:23:22 +01:00
Piratux
a58220a773 Ore generating class tweaks 
Changes:
- Classes that generate ore now generate a constant amount (independent of crew size). Idea behind this is, that it's not fun being "punished" for having more members in your crew, as well as, with bigger crew you spend less time in islands.
 2022-10-10 23:30:16 +03:00
Piratux
9cda27df02 Standardised island enum usage 
Changes:
- Moved island enum to its own file to avoid dependency loops
- Standardised island enum usage to use IslandEnum.enum
 2022-10-10 22:03:51 +03:00
Piratux
f3f5f0a1b0 Added scroll pane for crews window 
Changes:
- Added scroll pane for crews window.
 2022-10-10 20:39:08 +03:00
Piratux
f72a577b7d New private runs 
Changes:
- Players now can create private runs protected by a password. This run becomes public if the crew is empty or inactive for 24 horus (Limit is currently 1 private run at a time).
 2022-10-10 20:21:14 +03:00
blubFisch
690aa3faba Outlanders/rogues build all entities as neutral 2022-10-10 15:52:00 +01:00
blubFisch
f45e670f34 Nicer shield message 2022-10-10 14:56:40 +01:00
blubFisch
8e44876b96 Nicer town kill messages 2022-10-10 13:53:57 +01:00
blubFisch
96453eabe0 Remove unused 2022-10-10 13:30:31 +01:00
blubFisch
8b0e99a9ba Fix 2022-10-10 13:29:52 +01:00
blubFisch
da743fa58f Remove unused 2022-10-10 13:20:23 +01:00
blubFisch
aa97430392 Fix 2022-10-10 13:18:44 +01:00
blubFisch
2e092a3898 Code clarified 2022-10-10 13:16:08 +01:00
blubFisch
14a9cf040d Fix global 2022-10-10 12:56:37 +01:00
blubFisch
60e37c60a9 Refactor town counting: remove duplicate information 2022-10-10 12:55:56 +01:00
blubFisch
1a008c68b5 Refactor 2022-10-10 12:48:41 +01:00
blubFisch
c68627976e Simplify killing buildings 2022-10-10 12:46:47 +01:00
blubFisch
f9d950a33c Performance improvement for killing towns + spare chests 2022-10-10 12:30:57 +01:00
blubFisch
5c3a7bb1be Cleanup 2022-10-10 12:12:11 +01:00
blubFisch
763bb2095e More info 2022-10-10 12:09:05 +01:00
blubFisch
f0b9938259 Fix 2022-10-10 12:00:53 +01:00
blubFisch
35c26b0baa No more stealing tanks from townys 2022-10-10 11:46:38 +01:00
blubFisch
6a2c9f4bfa Remove unused 2022-10-10 11:36:16 +01:00
blubFisch
04fda19e80 Remove unused 2022-10-10 11:31:30 +01:00
blubFisch
8fadad6e1d Scale starter PvP shield with highest tech on map 2022-10-10 11:30:47 +01:00
Gerkiz
b08b54642f Auto stash before merge of "develop" and "origin/develop" 2022-10-09 17:06:53 +02:00
blubFisch
6c4621e3c7 Prevent players from being in vehicles while AFK shield 2022-10-09 16:02:27 +01:00
blubFisch
26750ed6bd Fix a wrong message 2022-10-09 15:45:14 +01:00
Piratux
93636fd1c3 Cave terrain fixes 2022-10-09 16:48:16 +03:00
blubFisch
f989cbf6a3 Refactor 2022-10-09 12:25:22 +01:00
blubFisch
5d66ef4060 Revert "Add safety for inv clearing" 
This reverts commit 9f7b1e0d8a.
 2022-10-09 12:21:37 +01:00
blubFisch
9f7b1e0d8a Add safety for inv clearing 2022-10-09 12:19:06 +01:00
blubFisch
6513afeea5 Clear inv after town falls offline 2022-10-09 11:40:00 +01:00
blubFisch
6015439277 Add changelog 2022-10-09 11:33:58 +01:00
blubFisch
f5d04d8c63 Add break/AFK protection shield 2022-10-09 11:11:38 +01:00
blubFisch
d672332b33 DRY up town fall messages + 1 fix 2022-10-08 19:09:23 +01:00
blubFisch
2dd5843932 More safe way to fix ghost desync 2022-10-08 18:47:26 +01:00
blubFisch
819b90362c Fix undefined 2022-10-08 17:29:41 +01:00
blubFisch
70f872f460 Don't build near gates 2022-10-08 16:58:45 +01:00
blubFisch
c381b29724 Proper fix for ghost related DESYNC 2022-10-08 16:37:03 +01:00
blubFisch
34f9c9b2b4 Gradual PvP Shield rollout 2022-10-08 16:17:10 +01:00
blubFisch
9c83a364de Cheaper lasers 2022-10-08 14:10:44 +01:00
blubFisch
94a151a094 Increase town distance (protection zone compat) 2022-10-08 13:25:05 +01:00
blubFisch
2ebf9ec808 1 more performance boost 2022-10-08 13:21:47 +01:00
blubFisch
3a1caac80c luacheck 2022-10-08 12:46:38 +01:00
blubFisch
0b6e9ddb2f Less rocks 2022-10-08 12:45:38 +01:00
blubFisch
5e8ac2bf5f Fix deserting combat robots (+others) 2022-10-08 12:39:47 +01:00
blubFisch
52d464bce6 Add hints 2022-10-08 12:15:01 +01:00
blubFisch
7041361a08 Add hint 2022-10-08 12:12:29 +01:00
blubFisch
971afaf438 Bigger zone 2022-10-08 12:09:47 +01:00
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
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
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
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
blubFisch
f27c7519fc Don't use callback in global to fix desync 2022-10-05 20:45:40 +01: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
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
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
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