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

3493 Commits

Author SHA1 Message Date
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
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
Piratux
4dc9dbfdca purchasing artillery also increases max artillery hp 2022-06-04 21:52:55 +03: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
danielmartin0
804363c725 revert 2022-06-04 16:14:45 +01:00
danielmartin0
a4b805819a reverse some of the cost increase 2022-06-04 16:06:05 +01:00
danielmartin0
c37a1a3f3e furnace structures more common 2022-06-04 15:26:56 +01:00
danielmartin0
7175b9efe0 and again 2022-06-04 15:23:51 +01:00
danielmartin0
b5baba7a20 more pollution from silo charging hits immediately 2022-06-04 15:23:18 +01:00
danielmartin0
57bd49d2c5 comment fix 2022-06-04 15:17:41 +01:00
Piratux
0bc327ba50 Lesser restrictions for buying class
You now are able to buy class upgrades without being that class yourself. It upgrades the class wherever it is. In addition when you buy any class and you're using one already, it doesn't replace the class you're using with the newer one.
2022-06-04 17:01:34 +03:00
danielmartin0
a527b08f70 debug off 2022-06-04 14:43:21 +01:00
danielmartin0
3202f9d5cf cleanup; more treasure chests; harder electronic circuit leaving costs 2022-06-04 14:43:08 +01:00
dwightkung
2661dad0b9
add parameter to /tax 2022-06-04 08:07:16 +08:00