1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-22 03:38:48 +02:00

3409 Commits

Author SHA1 Message Date
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
danielmartin0
77a70c5c61 Update .gitignore 2022-06-20 10:52:45 +01:00
Piratux
b8034ddafe added landfill for wooden boxes on lakes
- Wooden chests that spawn on lakes will have a landfill tile underneath them
2022-06-18 17:45:38 +03:00
Piratux
2944a907aa features+code cleanup
Changes:
- Changed requirements for placing structures on islands: instead of trying to squeeze in-between trees, now it needs a single corner to be on land (it still can't spawn in ocean). In result, islands with more dense forests should see special structures more often and more scattered around the island, rather than them spawning mostly on beaches (because they had no trees)
- When area in which structure is going to be placed contains water, it's replaced with landfill
- New structure: friendly small-cliff-base with cliffs, gun turrets and car
- Captain's cabin now contains cliff-explosives that can be placed in hold's chests to remove them
- Moved repeating code snippets into seperate functions
2022-06-16 00:00:18 +03: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
danielmartin0
686e39e4d4
Merge pull request #6 from Piratux/develop 2022-06-09 16:49:19 +01:00
danielmartin0
62a6ffe39c
Merge pull request #7 from dwightkung/develop 2022-06-09 16:48:01 +01:00
dwightkung
4123082366
Update pirates.cfg 2022-06-09 11:09:05 +08:00
dwightkung
12f65de94c
Merge branch 'danielmartin0:develop' into develop 2022-06-09 09:35:56 +08: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
Piratux
e6663a737b warning fixes 2022-06-08 16:44:24 +03:00
Piratux
b4ed57025b damaged cannons and silo now plays alert sound 2022-06-08 16:26:49 +03:00
Piratux
d3cd4015cd Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 14:11:23 +03:00
Piratux
5ebadb4474 Fixed mining base drill placement position 2022-06-08 13:17:03 +03:00
Piratux
6706fb6711 Reset control.lua 2022-06-08 12:30:08 +03:00
Piratux
0c0c2b4944 localised commands.lua 2022-06-07 23:48:42 +03:00
Piratux
fd205f2647 Fixed empty fluid storage bug 2022-06-07 21:58:36 +03: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
Piratux
6236eec4d1 Allow automation-3 to be researched and crafted 2022-06-07 00:35:23 +03:00
Piratux
f9dbf54677 Improved kraken battle
list of changes:
- kraken now may choose to shoot at any spot in the ship instead of some player
- biters, that spawn around kraken, now swim towards the ship
2022-06-06 23:13:58 +03: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