1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Commit Graph

382 Commits

Author SHA1 Message Date
Gerkiz
b4c5b42548 Misc - various nil checks 2022-09-03 21:26:20 +02:00
Gerkiz
3ada59a9be Jaildata - send jail to named channel 2022-09-03 21:25:30 +02:00
Gerkiz
8a4aa9220f Add new jail channel to discord 2022-09-03 21:25:10 +02:00
Gerkiz
0e6a3c464e add expanse to github worker 2022-08-28 22:54:05 +02:00
Gerkiz
4733010dc9 Jail - revert test 2022-08-28 18:02:40 +02:00
Gerkiz
64b63f691a Session handler - fix minor issue 2022-08-18 21:09:13 +02:00
Gerkiz
1aa4329701 Session handler - fix broken table key 2022-08-18 20:55:29 +02:00
Gerkiz
de6a2937e0 Fix luacheck 2022-08-16 19:33:41 +02:00
Gerkiz
5492de059b Fix jail and session handler 2022-08-16 19:31:45 +02:00
Gerkiz
5f84bd3845 Gui - minor fix 2022-08-12 19:13:48 +02:00
Gerkiz
819233410b Jail - refactor
Whenever a player jails an offender - the player must now provide a valid reason.
If they can't provide a reason then the offender is automatically released from jail.
2022-08-12 19:13:38 +02:00
Gerkiz
426e7be2bf Global
This fixes if a file calls `Global.register` multiple times from the same file.
2022-08-12 00:05:26 +02:00
Gerkiz
cb471b1aac Modded - fix scenario maps when running with mods 2022-08-07 21:20:30 +02:00
Gerkiz
c68a49fa6c chatbot - add ability to switch to classic print 2022-08-05 14:49:48 +02:00
Gerkiz
8390e6f781 Make luacheck happy. 2022-08-01 22:25:55 +02:00
Gerkiz
746d86f89f AG - more checks. 2022-08-01 22:23:39 +02:00
Gerkiz
46ac920e76 JailData - added more checks 2022-08-01 22:23:31 +02:00
Gerkiz
5c440f84b3 Server - added nil checks 2022-08-01 22:23:10 +02:00
Gerkiz
a8bbfcfbc9 Antigrief - fix deconstruct bug 2022-07-20 00:40:38 +02:00
Gerkiz
664b400198 new module and changes to rpg and mtn v3 2022-07-19 00:25:42 +02:00
Gerkiz
a1ff13f365 mtn v3 - small fix to higher diff 2022-07-13 22:32:21 +02:00
Gerkiz
1f0a6577a3 minor changes 2022-07-11 00:14:21 +02:00
Gerkiz
71a3cee6a0 mtn v3 - more fixes 2022-07-10 22:35:22 +02:00
Gerkiz
897360c70c update module 2022-07-10 20:27:18 +02:00
Gerkiz
f2baab5978 minor changes 2022-07-10 19:42:07 +02:00
Gerkiz
1b1b7b620b new module 2022-07-10 19:41:43 +02:00
Gerkiz
ce714f6518 move functions 2022-07-10 19:41:26 +02:00
Gerkiz
b4a7709593 minor changes to globals 2022-07-10 19:41:21 +02:00
Gerkiz
2428a6d3a2 Luacheck happy 2022-07-04 00:28:30 +02:00
Gerkiz
aea19abe17 AG - add decon handler 2022-07-04 00:27:35 +02:00
Gerkiz
158898e261 Mtn v3 - allow decon but log who is deconstructing so we can ban 2022-07-04 00:27:16 +02:00
Gerkiz
93e0b5f91f Minor fix 2022-06-26 23:40:56 +02:00
Gerkiz
3bc4f692f0 Luacheck fix 2022-06-26 23:36:49 +02:00
Gerkiz
7590be58fe Change Game.get_player_by_index -> game.get_player 2022-06-26 23:34:38 +02:00
Gerkiz
3f582a5cd1 Global and tokens
Fixes an issue where if you unloaded a module midgame, the whole save broke.
2022-06-26 23:34:12 +02:00
Gerkiz
720feaf13b Event - add script.raise_event 2022-06-26 23:33:37 +02:00
Gerkiz
696de12321 Minor nil checks 2022-06-26 23:33:27 +02:00
Gerkiz
bb96ff4fef New module - banhandler
Bans a player on join if found in banlist
2022-06-26 22:37:31 +02:00
Gerkiz
e85271ef2b small fixes 2022-06-10 22:06:47 +02:00
Gerkiz
1e3f0ff811 fix bugs 2022-06-07 17:39:57 +02:00
hanakocz
50469c804b bp requesting - player can disable the feature in config menu 2022-05-16 01:02:25 +02:00
Gerkiz
f0560c1d27 misc fixes 2022-05-12 22:22:03 +02:00
Gerkiz
304b3402fc
Merge branch 'develop' into master 2022-04-25 08:12:32 +02:00
Gerkiz
984b73b365 fix minor gui issues 2022-04-23 18:22:00 +02:00
Gerkiz
378dfe373d fix gui issues 2022-04-18 01:18:06 +02:00
Gerkiz
5e89190141 lock bottom frames whenever a player rejoins 2022-04-18 01:17:42 +02:00
Gerkiz
7438b07cce Test another welcome message when a player joins the game 2022-04-10 11:21:43 +02:00
Gerkiz
7f8ad0b184 small tweak 2022-04-08 22:39:15 +02:00
Gerkiz
3aff9a5ce7 minor fix 2022-04-08 16:59:30 +02:00
Gerkiz
1e378bf3cd Add Pirate ship to the panel 2022-04-08 16:56:40 +02:00
Eric Anderson
b8158f1f01 Merge remote-tracking branch 'gh/develop' into master 2022-04-07 21:05:59 -07:00
Eric Anderson
26f34ea8d5 Review fixes.
* Clearing corpses remains trusted only.
* Remove spurious debugging code.
2022-04-07 20:54:22 -07:00
Gerkiz
e7658d12a1 small change 2022-04-08 00:34:10 +02:00
Gerkiz
6e98f1c1bc final fix 2022-04-08 00:11:10 +02:00
Gerkiz
8177457a5b fix 2022-04-08 00:04:29 +02:00
Gerkiz
d274165af5 template fix 2022-04-07 23:27:31 +02:00
Gerkiz
a5a0dafb2c test webhook event 2022-04-07 22:00:46 +02:00
Gerkiz
5bbd704438 Added new function to iterate over all connected players 2022-04-07 16:12:47 +02:00
Gerkiz
c048002b7d gui label fixes 2022-04-07 16:12:34 +02:00
Gerkiz
095895ed81 perlin - made it faster when using in loop 2022-04-07 16:12:25 +02:00
Gerkiz
86ae1d5c9b fix lua tooltip warnings 2022-04-07 16:11:57 +02:00
Gerkiz
38415cead9 player modifiers - limit rpg inventory 2022-04-07 16:11:03 +02:00
Gerkiz
82affb25dd minor fix 2022-04-05 19:41:44 +02:00
Gerkiz
95f2e90e55 refactor more gui 2022-04-05 19:28:08 +02:00
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