1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-06 00:23:49 +02:00
Commit Graph

2810 Commits

Author SHA1 Message Date
Eric Anderson
0a4cedeb01 relock research that is incorrectly enabled 2022-02-25 19:39:43 -08:00
Eric Anderson
86b9d7ac54 tweak room generation to increase chance of creating room 2022-02-24 02:19:37 -08:00
Eric Anderson
fe2943bf2f reduce mindist for hard rooms, 200 was too far out. move tech multiplier into research module 2022-02-24 02:17:38 -08:00
Eric Anderson
35308dc65a maybe fix bool/int error in log with parens, if not, will get better line number next time 2022-02-24 02:16:48 -08:00
Eric Anderson
b84e59bf80 tweak recipe unlock pattern to be more controllable. Change research scaling to start hard and scale down as research is found on floors 2022-02-24 02:15:39 -08:00
Eric Anderson
bc5729313e add lots of missing locals, fix print to use proper quoting 2022-02-24 02:14:35 -08:00
Eric Anderson
9ae73f34da enable melee mode, move doom rooms under the enable_hard_rooms if test 2022-02-23 03:52:27 -08:00
Eric Anderson
64b0a33073 Add support for a button to put character in melee mode so that guns/ammo will not go into weapon/ammo slots 2022-02-23 03:51:51 -08:00
Eric Anderson
2c0cd0ce94 fix nil dereference 2022-02-23 03:50:42 -08:00
Eric Anderson
3f6ae6210a Enable autostash and corpse clearing lower buttons 2022-02-22 20:19:24 -08:00
Eric Anderson
b647973ff1 Enable randomized technology on all floors 2022-02-21 21:47:11 -08:00
Eric Anderson
ae963fd774 Make hard rooms (acid/concrete) only appear farther out from the center on upper levels 2022-02-21 21:46:06 -08:00
Eric Anderson
2114b8fea2 fix typo 2022-02-21 17:54:52 -08:00
Eric Anderson
cc37d6381d Bound number of spawners and worms in dirtlands; more gradual difficulty curve 2022-02-19 21:02:50 -08:00
Eric Anderson
bebb71b869 Refactor to move research unlock logic to a separate module 2022-02-19 00:33:12 -08:00
Gerkiz
d7056ff82d
Merge pull request #214 from ComfyFactory/minor_fixes
Minor changes
2022-02-14 00:28:19 +01:00
Gerkiz
ad0f6255f7 Make luacheck happy 2022-02-14 00:27:14 +01:00
Gerkiz
b90f6f2811 Don't alert if a player has zero items in their inventory 2022-02-14 00:25:27 +01:00
Gerkiz
8ae1318c50 Don't check for entity ghosts when checking fullness 2022-02-13 23:33:10 +01:00
Gerkiz
ebb95ee000 Spam check players 2022-02-13 23:32:57 +01:00
Gerkiz
ffda7393b8
Merge pull request #211 from Quadrum1/patch-3
Fix serious error
2022-01-24 22:43:41 +01:00
Quadrum
eeb739a9ae
Make luacheck happy 2022-01-24 20:46:37 +01:00
Quadrum
7c202dcb76
Fix serious error
Error was in --Friendly Fire History -> local function on_entity_died(event)

There is a unique case, when an item dies and is not within blacklisted_types (belts and so on), but is within the whitelist_types array (I would guess this is for trees?), the friendy_fire history is incremented, but not checked for a limit.

Previously, this was a none-issue, as the list would be cleared when any other case is trigger. Now, however, only 1 log entry is deleted when it overflows, and only without that case. So every time somebody triggers that special case, by lets say destroying a tree, the array is increased by one without removing the first entry.

This should hopefully fix that.
2022-01-24 20:35:51 +01:00
Gerkiz
f3a688d3fe
Merge pull request #209 from Quadrum1/patch-2
Add overflow for history arrays
2022-01-19 22:42:21 +01:00
Gerkiz
fb1fd99ea5
Merge branch 'develop' into patch-2 2022-01-19 22:41:15 +01:00
Gerkiz
d8b3e355ac
Merge pull request #210 from ComfyFactory/minor_fix
Minor fix to server select
2022-01-19 22:38:55 +01:00
Gerkiz
116a5f89d5
Merge branch 'develop' into minor_fix 2022-01-19 22:37:48 +01:00
Gerkiz
17e0988d2d Minor fix 2022-01-19 22:36:35 +01:00
Quadrum
02f6479019
Add overflow for history arrays 2022-01-19 21:16:35 +01:00
Gerkiz
07251991a8
Merge pull request #205 from Agocelt/develop
Spidertrons warning message
2022-01-19 17:30:02 +01:00
Gerkiz
09bcdab575
Merge branch 'develop' into develop 2022-01-18 15:23:52 +01:00
Gerkiz
cb822bdc45
Merge pull request #208 from ComfyFactory/server_select
server select - fix tooltip and various things
2022-01-18 15:05:14 +01:00
Gerkiz
8eb6765aa4 fix local 2022-01-18 15:04:23 +01:00
Gerkiz
f4b9bc5de0 server select - fix tooltip and various things 2022-01-18 15:02:39 +01:00
Gerkiz
b82d0f125f
Merge pull request #207 from ComfyFactory/code_cleanup
Remove unused global
2022-01-18 00:12:26 +01:00
Gerkiz
4f2097ca73 Remove unused global 2022-01-18 00:11:20 +01:00
Gerkiz
280720ec46
Merge pull request #206 from ComfyFactory/server_connect
Add the ability to connect to other servers via ingame gui
2022-01-18 00:08:31 +01:00
Gerkiz
bd906f8e7f Add the ability to connect to other servers via ingame 2022-01-18 00:07:25 +01:00
Johny
4258e1830f Spidertrons warning message 2022-01-16 20:37:27 +01:00
Gerkiz
547c6dadd4
Merge pull request #204 from ComfyFactory/changes
User requested changes
2022-01-14 22:56:57 +01:00
Gerkiz
49f342d3fd rpg - future fix 2022-01-14 22:53:27 +01:00
Gerkiz
d909dc42ba Wave defense - minor change 2022-01-14 22:50:49 +01:00
Gerkiz
f463ad71d6 Mtn v3 - adjust the car price as per vote request 2022-01-14 22:12:28 +01:00
Gerkiz
1fa63ba251 Mtn v3 - change layout tile inside the "surface" locomotives 2022-01-14 22:12:11 +01:00
Gerkiz
0e6b406567 Mtn v3 - adjust discharge cost 2022-01-14 22:11:54 +01:00
Gerkiz
aea8596ccd Fish v2 - add more difficulties when playing solo 2022-01-14 22:05:01 +01:00
Gerkiz
7750b47722 Wave defense - user requested feature
Prints a popup to pause the wave defense waves for 5 minutes. Requires 50% of connected players to have voted.
2022-01-14 21:58:43 +01:00
Gerkiz
4f16030532 Mtn v3 - user requested feature
Changes mining ore chances
2022-01-14 21:02:35 +01:00
Gerkiz
c7fd81da94
Merge pull request #203 from ComfyFactory/changes
Minor changes
2022-01-14 16:21:05 +01:00
Gerkiz
c287e06fd0 Make luacheck happy 2022-01-14 16:20:15 +01:00