1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-04 00:15:45 +02:00
Commit Graph

318 Commits

Author SHA1 Message Date
Eric Anderson
79e9bdee7e Merge https://github.com/eric-anderson/ComfyFactorio into master 2022-03-29 22:15:56 -07:00
Gerkiz
e5611d8a3c minor fix 2022-03-29 21:35:00 +02:00
Gerkiz
b7315b5980 Fix freeplay and various other files 2022-03-29 20:12:50 +02:00
Gerkiz
d8066b5ee7 Rework jail permissions 2022-03-15 20:00:00 +01:00
Gerkiz
acba7ebfe1 use _G where we can 2022-03-06 00:33:54 +01:00
Gerkiz
87a5796a08 spam protect - disable warnings 2022-03-06 00:33:35 +01:00
Gerkiz
f065a745bb more fixes 2022-03-01 19:16:44 +01:00
Gerkiz
1478bbbbff planet prison - fixes 2022-02-28 23:47:00 +01:00
Eric Anderson
aa23e76a33 Add flag to always allow clearing corpses 2022-02-25 19:40:36 -08:00
Gerkiz
ad0f6255f7 Make luacheck happy 2022-02-14 00:27:14 +01:00
Gerkiz
ebb95ee000 Spam check players 2022-02-13 23:32:57 +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
fb1fd99ea5
Merge branch 'develop' into patch-2 2022-01-19 22:41:15 +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
bd906f8e7f Add the ability to connect to other servers via ingame 2022-01-18 00:07:25 +01:00
Gerkiz
c39279ffdd Server util - new ways to send messages to discord 2022-01-14 16:16:21 +01:00
Gerkiz
8013d125a3 Minor fix 2022-01-06 01:09:35 +01:00
Gerkiz
d7dcb7270c Fix missing commit 2022-01-05 22:53:25 +01:00
Gerkiz
74bf9bec20 Minor changes to logging to discord 2022-01-05 22:49:07 +01:00
Gerkiz
966dcf220a Move files in main folder to utils 2021-12-05 22:15:49 +01:00
Gerkiz
f047ff98ed Minor changes to chatbot and debug view 2021-11-13 01:32:50 +01:00
Gerkiz
ac026d36c8 event - minor changes
Added support for filters.
2021-11-11 01:56:30 +01:00
Gerkiz
36bc63b220 make gui mod_gui ready 2021-10-23 00:04:48 +02:00
Gerkiz
cb5248cabd add scheduler (acts like task) 2021-10-23 00:04:33 +02:00
Gerkiz
f3cbba181e Add supporter information to the playerlist 2021-10-09 13:45:19 +02:00
Gerkiz
eaf20f1158 mtn v3 - fix of broken core feature 2021-10-02 21:04:15 +02:00
Gerkiz
6a165c79cb Minor adjustments 2021-07-23 17:23:33 +02:00
Gerkiz
e813e875d7 Bugfix
Fixed antigrief logging limit
Fixed autostash healing/increasing durability of items
Added two new functions to session_data
2021-07-20 22:17:49 +02:00
Gerkiz
64705020fd Improved jail_data and how it handles different scenarios 2021-07-17 20:39:41 +02:00
Gerkiz
e2707f68d6 changes to prestige system 2021-07-14 21:34:48 +02:00
Gerkiz
9f9c20de39 minor changes to prestige system 2021-07-12 16:50:58 +02:00
Gerkiz
7ce9894a15 two new modules and changes to scenario 2021-07-12 16:15:55 +02:00
Gerkiz
d3880c78a6 various tweaks 2021-07-02 10:52:27 +02:00
Gerkiz
b3ffa965eb minor fix to rpg and session 2021-07-01 21:34:39 +02:00
Gerkiz
37710fac2c minor changes 2021-07-01 21:30:29 +02:00
Gerkiz
1449c0a71e minor bug fixes 2021-06-13 13:54:19 +02:00
Gerkiz
2e30470025 tweaks and bugfixes 2021-06-06 20:14:26 +02:00
Gerkiz
6a262c01a2 new command - playtime
returns a value from the webpanel and prints it out to the player that ran the command
2021-06-02 00:05:45 +02:00
Gerkiz
2a1f3dea2c update module 2021-05-28 20:28:28 +02:00
Gerkiz
fbaa411073 refactor and changes 2021-05-23 17:03:52 +02:00
Gerkiz
0be0055eb7 minor adjustments done to rpg, wave defense and mtn v3 2021-05-23 02:02:11 +02:00
MewMew
b7c7cff886 update
16 unique world traits added.
Positive world modifiers halfed.
Starting area modifier removed.
Reduce capsule drop radius.
Reduced worm spawn radius in mothership surface.
Fix for game freeze on entering next world.
Fix for random high tier biters in next world.
Fix for being stuck in chunk destroy phase when a player joins.
Added modifiers for pollution diffusion, biter group size and tree durability.
2021-05-21 01:01:48 +02:00
Gerkiz
d3d85ad720 don't do anything if we're debugging 2021-05-19 19:51:38 +02:00
Gerkiz
4ee808e6f3 new module - game pause
this module pauses the game whenever the last player leaves the game, ensuring that rcon does not progress the map.
2021-05-19 19:49:57 +02:00
Gerkiz
89223f5dbd fix broken session time 2021-05-18 21:11:28 +02:00
Gerkiz
df75d37a4a desync fix to mtn fortress 2021-05-18 00:20:15 +02:00
Gerkiz
5b8c1a2fee various tweaks 2021-05-12 20:52:29 +02:00
Gerkiz
1644b024cf Fix gui config when clicking poll and remove unused functions 2021-05-08 02:03:38 +02:00
Gerkiz
a94fcc98af Removal of global variables and removed laggy functions 2021-05-07 01:36:10 +02:00
Gerkiz
64e588128e Validate functions and log player messages. 2021-05-07 01:19:38 +02:00
Gerkiz
550bef8445 enable debug for all admins 2021-05-01 21:19:45 +02:00
Gerkiz
f76af8c582 debug and desync fixes 2021-04-04 13:51:27 +02:00
Gerkiz
4f484de35a add biter battles to discord channels 2021-04-01 22:06:55 +02:00
Gerkiz
d12b4423db enable feature on /debug command 2021-03-28 17:01:39 +02:00
Gerkiz
5b88f8fdfc removed comfy_panel_tabs from _G and made it use tokens instead 2021-03-25 23:49:57 +01:00
Gerkiz
e2a33f9f30 luacheck more fixes 2021-03-24 20:14:55 +01:00
Gerkiz
da7546565b more luacheck fixes 2021-03-24 17:36:07 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +01:00
Gerkiz
f07c77d421 minor changes
autostash now has priority
send pings to map channels instead of announcements
2021-03-19 16:17:38 +01:00
Gerkiz
5cddfdbc59 added ping role support
allows a given role to be pinged by the webpanel
2021-03-17 16:39:03 +01:00
Gerkiz
959018aca2 message on join - fix that player names were missing 2021-03-16 22:54:07 +01:00
Gerkiz
fae09298fb minor fix
clear the handler when we've loaded the game
2021-03-16 22:49:26 +01:00
Gerkiz
717d838f39 Event - on_configuration_changed
Added support to handle multiple handlers
2021-03-16 22:44:40 +01:00
Gerkiz
e46d23eb4e minor tweak 2021-03-11 22:06:21 +01:00
Gerkiz
25050bbefe minor tweaks 2021-03-11 21:53:12 +01:00
Gerkiz
b508f37ff1 minor changes to some global functions 2021-02-15 22:35:54 +01:00
Gerkiz
84dead05f1 various tweaks and fixes 2021-02-13 13:04:22 +01:00
Gerkiz
fba31809c2 minor fixes
removed unused function in poll
fixed rpg exp gui not updating
fixed rpg boss biters not giving xp
fixed spam_protection activated in events it shouldn't
2021-02-12 00:48:56 +01:00
Gerkiz
1ecd90425d jail data - fix that players who left and joined lost state 2021-02-01 00:00:48 +01:00
Gerkiz
8062179602 event core - log where the error comes from 2021-02-01 00:00:02 +01:00
Gerkiz
99c48cfd3b tweaks and changes 2021-01-26 20:17:52 +01:00
Gerkiz
c9aaa450a6
Merge pull request #220 from Quadrum1/patch-3
Update message_on_join_data.lua
2021-01-26 19:14:15 +01:00
Gerkiz
68b99f39f4 gui spam logging 2021-01-12 21:52:45 +01:00
Gerkiz
cc0df3d549 minor changes 2021-01-11 23:34:19 +01:00
Gerkiz
bea9e619fa random tweak 2021-01-11 15:58:45 +01:00
Gerkiz
db337754cb minor fix 2021-01-03 10:51:49 +01:00
Gerkiz
ee0719442e minor fixes 2021-01-03 10:46:59 +01:00
Gerkiz
5a49113958 minor tweaks 2020-12-31 18:43:49 +01:00
Gerkiz
53aa78896e profiler - now usable when game is ongoing
for now, only usable by me and mew or if _DEBUG is enabled by everyone.
2020-12-29 00:08:53 +01:00
Gerkiz
e65726d120 spam protect - on reset clear all players and then add them again 2020-12-15 07:34:07 +01:00
Gerkiz
3a13d261e2 make gui handlers utilize anti-spam 2020-12-14 19:36:37 +01:00
Gerkiz
835c5ee22d new module - anti spam 2020-12-14 19:35:55 +01:00
Gerkiz
d23d62b8e6 we now check what game version is active 2020-12-14 18:02:26 +01:00
Quadrum
06c9f9e589
Update message_on_join_data.lua
Customizable layout of on_join_message by providing "{name}" as a string replaced by the username when printing
2020-12-09 13:36:35 +01:00
Gerkiz
8521eb4278 locale fixes 2020-11-29 21:26:49 +01:00
Gerkiz
f3ef03915a locale fixes 2020-11-29 21:20:39 +01:00
Gerkiz
c60bd7221c minor fix 2020-11-29 02:27:21 +01:00
Gerkiz
d8104abe54 fix for modded gameplayes 2020-11-29 02:24:05 +01:00
Gerkiz
1b2c7f6cd8 tweaks 2020-11-15 19:23:54 +01:00
MewMew
9f976d2579 terrain stuff 2020-11-07 07:40:36 +01:00
Gerkiz
a76fafa944 lag feista and tweaks 2020-11-04 17:14:30 +01:00
Gerkiz
50acabfe8c more wonderful tweaks 2020-10-30 22:05:05 +01:00
Gerkiz
75ebb4a3b2 more modules and tweaks 2020-10-30 17:32:40 +01:00
Gerkiz
d586bddd54 perlin noise fix 2020-10-30 11:37:58 +01:00
Gerkiz
24831460d3 mtn fortress changes 2020-10-30 10:45:12 +01:00
Gerkiz
6470842b72 minor tweaks 2020-10-29 13:07:42 +01:00
MewMew
673f068b92 update
randomized markets
another mining event
pond biome
2020-10-28 04:38:20 +01:00
MewMew
8605e31a91 updates 2020-10-27 01:28:24 +01:00
Gerkiz
da8f82ba29 changes
added export_stats so web panel can fetch data from instance
and minor tweaks
2020-10-26 23:55:06 +01:00
MewMew
ee9bd72115 weighted table function addition 2020-10-26 23:32:47 +01:00
Gerkiz
d12d7a7770 minor fixes 2020-10-24 16:07:37 +02:00
Gerkiz
bef4bfea55 tweaks and fixes 2020-10-24 14:46:14 +02:00
Gerkiz
30fdb4b8ad minor tweaks 2020-10-22 12:44:27 +02:00
Gerkiz
92fbf5efd8 minor tweaks to files 2020-10-21 23:17:17 +02:00
Gerkiz
fa269da6ee Tweaks 2020-10-21 17:10:13 +02:00
Gerkiz
3076b408db tweaks 2020-10-21 13:45:45 +02:00
Gerkiz
729c252a02 added UPS measurement
this is done in the wrapper
2020-10-21 13:34:59 +02:00
Gerkiz
4a1ce15e07 tweaks and fixes! 2020-10-19 20:21:27 +02:00
MewMew
96d554b0af new module 2020-10-19 18:26:24 +02:00
Gerkiz
853bfa1659 minor adjustments
added support for when mods try to call freeplay
fixes for mountain fortress
added more info to wave_defense module
2020-10-18 12:45:18 +02:00
Gerkiz
2bf649a215 removed not needed locals 2020-10-10 20:37:28 +02:00
Gerkiz
9790e124d9 minor tweak 2020-10-02 08:43:28 +02:00
Gerkiz
f4c5ea7703 fixes 2020-09-12 19:16:38 +02:00
Gerkiz
75ed42bfc0 tweaks 2020-09-04 23:37:44 +02:00
Gerkiz
d171aa6e51 upload data smoothly 2020-09-04 16:57:17 +02:00
MewMew
36269aa6e4 things 2020-09-03 05:50:45 +02:00
Gerkiz
7a07ac5cae fixes 2020-08-31 20:37:27 +02:00
Gerkiz
c9898b2ee9 tweaks 2020-08-31 09:03:18 +02:00
Gerkiz
ac383e0211 tweak jail surface 2020-08-29 00:28:49 +02:00
Gerkiz
a6bba87606 tweaks and desync fix 2020-08-27 13:27:34 +02:00
Gerkiz
b5990868e4 minor tweaks 2020-08-26 11:08:43 +02:00
Gerkiz
786dc954b6 added more config settings to mountain fortress 2020-08-22 18:08:39 +02:00
Gerkiz
27a7e03461 jail surface and explosive gun update 2020-08-21 20:12:18 +02:00
Gerkiz
85146ba28e tweaks to several files 2020-08-17 20:18:06 +02:00
Gerkiz
00f2a9b0c3 minor changes 2020-08-14 23:57:00 +02:00
Gerkiz
632ca676e6 fixes 2020-08-14 22:53:59 +02:00
Gerkiz
e38baa3085 new modules and refactor 2020-08-14 22:07:54 +02:00
Gerkiz
3613c37c1c changes to mtn and wave_defense 2020-08-09 20:22:33 +02:00
Gerkiz
0a5f986640 minor changes to mtn fortress 2020-08-04 12:10:15 +02:00
Gerkiz
3e92eb9dc0 minor changes 2020-07-31 12:04:46 +02:00
Gerkiz
1f2fa4d910 minor fixes 2020-07-30 22:27:38 +02:00
Gerkiz
0e8945d7f7 tweaks and minor fixes 2020-07-30 17:47:50 +02:00
Gerkiz
106148f674 minor fixes 2020-07-29 19:30:45 +02:00
Gerkiz
2b63282d79 add one more check 2020-07-29 10:45:41 +02:00
Gerkiz
7d7c649e05 fixed minor bug 2020-07-29 10:43:15 +02:00
Gerkiz
20fa0e187f minor fix 2020-07-29 10:23:41 +02:00
Gerkiz
0e8e6f4a02 refactor 2020-07-25 17:22:04 +02:00
Gerkiz
8bc37712ff fixes 2020-07-17 16:59:15 +02:00
Gerkiz
0aea9c28b4 tweaks and fixes 2020-07-11 17:04:53 +02:00
Gerkiz
78cba7f311 minor changes 2020-07-09 14:26:07 +02:00
Gerkiz
df097d7520 more tweaks 2020-07-08 22:57:43 +02:00
Gerkiz
6335126c6c refactor 2020-07-07 23:42:44 +02:00
Gerkiz
29561ec862 fixed minor issues with 0.17 and 0.18 2020-07-07 16:31:01 +02:00
Gerkiz
31d388f590 fix that jail_data could jail a nil player 2020-07-06 23:21:32 +02:00
Gerkiz
f3a9d0e85e minor changes to playtime 2020-07-06 17:28:57 +02:00
Gerkiz
8a29f9e34b minor changes 2020-07-06 15:45:09 +02:00
Gerkiz
04a9abb2f7 minor changes 2020-07-01 19:35:38 +02:00
Gerkiz
48552be083 refactor and minor fixes 2020-06-29 15:50:01 +02:00