1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Commit Graph

3300 Commits

Author SHA1 Message Date
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
e437b5c630 refactor
Adjusts the different difficulties
Adds a new modifier when breaching zone 10 - slowness
Coin nerf was never applied to zone 10 (forest zone)
2022-07-10 19:41:11 +02:00
Gerkiz
3e22b93556 locale changes 2022-07-10 19:37:03 +02:00
Gerkiz
fdcc742914 rpg - fixes 2022-07-06 18:26:28 +02:00
Gerkiz
dc2d77e7e3
Merge pull request #281 from ComfyFactory/decon_fix
Mtn v3 - allow deconstruct
2022-07-04 00:29:27 +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
12edab06f0 Fix minor log issue 2022-06-27 00:17:03 +02:00
Gerkiz
93e0b5f91f Minor fix 2022-06-26 23:40:56 +02:00
Gerkiz
f9009a9e8f
Merge pull request #280 from ComfyFactory/refactor
Refactor and new module(s)
2022-06-26 23:38:35 +02:00
Gerkiz
3bc4f692f0 Luacheck fix 2022-06-26 23:36:49 +02:00
Gerkiz
4e1a5d279b Minor change to clear_vacant_players 2022-06-26 23:35:20 +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
3ee2795ebc New module - clear vacant players 2022-06-26 23:33:05 +02:00
Gerkiz
2ba01e7676 Mtn v3 - remove private module 2022-06-26 23:32:54 +02:00
Gerkiz
3eeb1d6475 Mtn v3 - disallow untrusted to cancel research 2022-06-26 22:38:13 +02:00
Gerkiz
a4193242f3 RPG - fix capsule history 2022-06-26 22:37:51 +02:00
Gerkiz
980d616e16 WD - log wave to discord 2022-06-26 22:37:41 +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
9df1378fc3
Merge pull request #279 from ComfyFactory/fixes
Fixes to scenario
2022-06-25 23:42:25 +02:00
Gerkiz
ac403cf52f Luacheck - make ya happy! 2022-06-25 23:41:39 +02:00
Gerkiz
0bf4f9fb5a fix autostash
from profiler: 2959x C function "can_insert". Total Duration: 10693.515400ms
2022-06-25 23:39:04 +02:00
Gerkiz
7715a201f9 fix fish_defender v2 2022-06-25 23:38:44 +02:00
Gerkiz
8e014cda31
Merge pull request #278 from ComfyFactory/small_fixes
small fixes
2022-06-10 22:09:03 +02:00
Gerkiz
e85271ef2b small fixes 2022-06-10 22:06:47 +02:00
Gerkiz
8b6e72bcb1
Merge pull request #277 from ComfyFactory/mtn_v3
Super minor changes to mtn v3
2022-06-09 00:18:40 +02:00
Gerkiz
72eb252117 Mtn v3 - rename surface to hopefully lessen the ping clutter 2022-06-09 00:08:06 +02:00
Gerkiz
8bbe5278a1 Mtn v3 - switched zone walls force from player to neutral 2022-06-09 00:07:40 +02:00
Gerkiz
bd3aaeb131 Vote - fix that players could vote when timer ended 2022-06-09 00:06:38 +02:00
Gerkiz
82d81c498a
Merge pull request #276 from ComfyFactory/new-workflow
new workflow
2022-06-08 23:23:41 +02:00
Gerkiz
ae8795c844 Fix 2022-06-08 23:22:23 +02:00
Gerkiz
1e5a3fe7e5 new workflow
Checks if maps have been required in control.lua
2022-06-08 23:15:50 +02:00
Gerkiz
7d8d532c7b
Merge pull request #271 from Astorin/develop
RU locale update
2022-06-07 17:45:06 +02:00
Gerkiz
fa5e856b11
Merge branch 'develop' into develop 2022-06-07 17:43:37 +02:00
Gerkiz
b6e0f74655
Merge pull request #274 from danielmartin0/develop
Localisability for Pirates. Should be in the main comfy repo so translators know what to work with
2022-06-07 17:43:29 +02:00
Gerkiz
2a4475da41
Merge branch 'develop' into develop 2022-06-07 17:42:30 +02:00
Gerkiz
410ed2710e
Merge pull request #275 from ComfyFactory/bugfixes
Fixes
2022-06-07 17:42:06 +02:00
Gerkiz
1e3f0ff811 fix bugs 2022-06-07 17:39:57 +02:00
danielmartin0
47c7be0a68 luacheck 2022-06-06 15:55:24 +01:00
danielmartin0
ffde08ffbb unrequire pirates for pr 2022-06-06 15:41:26 +01:00
danielmartin0
39d94709df some luacheck 2022-06-05 12:02:51 +01:00
danielmartin0
685b27cbe1 version number up 2022-06-05 11:58:45 +01:00
danielmartin0
cc39d1fcee make swamp slightly nicer 2022-06-04 16:53:46 +01:00
danielmartin0
86765d7984 partial revert of laser buff against krakens 2022-06-04 16:35:51 +01:00
danielmartin0
86aaab18b9 revert 2022-06-04 16:15:40 +01:00