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

1028 Commits

Author SHA1 Message Date
MewMew
c57a41e045 new biome 2020-04-05 03:39:52 +02:00
MewMew
905bd3f3f5 update
loots and biteys
2020-04-05 02:23:03 +02:00
MewMew
52e341947a loot raffles 2020-04-05 00:05:13 +02:00
MewMew
d14e80d243 decoratives for dirt biome 2020-04-04 20:50:58 +02:00
MewMew
eb74c7daeb update
tiered worm turrets
decoratives for grassland biome
various roll values
2020-04-04 20:24:05 +02:00
MewMew
59933837b0 update 2020-04-04 19:07:08 +02:00
MewMew
0d80cad631 update 2020-04-04 10:21:39 +02:00
MewMew
40062953d7 biomes update 2020-04-04 06:25:13 +02:00
MewMew
379cbd3750 wip update 2020-04-04 04:55:05 +02:00
MewMew
325c865b97 map view fix 2020-04-04 01:13:48 +02:00
MewMew
528f5404bc update 2020-04-04 00:40:04 +02:00
MewMew
5f7e97726c wip 2020-04-03 22:40:42 +02:00
MewMew
b438e6fa6c updates 2020-04-01 17:10:29 +02:00
MewMew
5f319d88f6 revert to old kaboom 2020-04-01 17:08:41 +02:00
hanakocz
b0e3726651 tiny update to science in hedge maze 2020-04-01 05:24:22 +02:00
MewMew
93eb2fdb36
Merge pull request #152 from hanakocz/patch-2
Fix for Overgrowth map crashes
2020-03-31 20:42:50 +02:00
MewMew
eb1762973c wider biter area 2020-03-28 21:10:59 +01:00
MewMew
df6cb42ad6 small update 2020-03-28 21:04:48 +01:00
MewMew
c02e3fa9dc less difficulty 2020-03-27 16:40:05 +01:00
MewMew
2e93b031de oil kill fix 2020-03-27 14:07:56 +01:00
MewMew
2e38c17471 terrain update 2020-03-27 12:04:35 +01:00
MewMew
ed09efe03f pickup and inventory research 2020-03-26 20:46:12 +01:00
MewMew
345914dc6a tweaks 2020-03-26 20:11:07 +01:00
MewMew
55ee9cf1bf attack tweaks 2020-03-26 19:27:15 +01:00
MewMew
ae0c3a3554 tick wave 2020-03-26 17:50:45 +01:00
MewMew
ed55eb07cf attack steps 2020-03-26 17:04:27 +01:00
MewMew
1c8178a8ba periodic attacks 2020-03-26 16:25:03 +01:00
MewMew
d96eab95f1 infini ore wells addition 2020-03-26 15:52:10 +01:00
MewMew
8986bdda7c update 2020-03-26 13:47:08 +01:00
hanakocz
8be8c713db tiny update + new module 2020-03-26 04:41:16 +01:00
MewMew
46368f096f tweaks and fix 2020-03-26 00:58:22 +01:00
MewMew
e3d34264f9 new map 2020-03-25 22:14:47 +01:00
hanakocz
eb2e509228 scrapyard nerf because mining prod makes it give more 2020-03-22 22:30:29 +01:00
MewMew
1c5dc1f67c terrain tweaks by nekobaron 2020-03-22 10:03:27 +01:00
hanakocz
9dd516ef1c update, fixes 2020-03-20 19:40:14 +01:00
hanakocz
8e3c8cc1ea mini fixes + new admin tab 2020-03-17 21:36:00 +01:00
hanakocz
771e5e7aeb Change comfy panel to allow multiple admin tabs 2020-03-17 04:07:33 +01:00
hanakocz
1e9b923b69 now real repair fix 2020-03-16 22:52:29 +01:00
hanakocz
dd56d048b1 repair fix 2020-03-16 22:51:39 +01:00
hanakocz
dc8bd97058 small update 2020-03-16 21:55:08 +01:00
hanakocz
9e2537a468 final inventory handling fixes 2020-03-14 12:01:17 +01:00
hanakocz
7d5ab6e450
Merge pull request #5 from jacobwatkinsgit/master
clean hard-coded logic in repair_train
2020-03-14 09:23:23 +01:00
hanakocz
75d5fe6342 test update 2020-03-14 09:12:49 +01:00
hanakocz
94b21a8048
Merge pull request #6 from M3wM3w/master
update from main
2020-03-14 09:05:06 +01:00
hanakocz
5ee0dbb598
Add files via upload 2020-03-14 08:55:13 +01:00
hanakocz
361a418ffa
Fix for Overgrowth map crashes
no technical changes, only making things work again, plus my writing program probably loves to nuke additional spaces...
2020-03-12 20:28:11 +01:00
jacobwatkinsgit
195da3f845 clean hard-coded logic in repair_train
remove need for almost all hard-coded values and branching logic
2020-03-11 16:20:21 -04:00
MewMew
a34ccf540a fix for deleted decoratives 2020-03-11 03:01:19 +01:00
MewMew
ff8fec2669 fix for biters destroying crates and tweaks 2020-03-11 02:58:09 +01:00
MewMew
5643582e84 fixes and things 2020-03-10 13:25:42 +01:00
MewMew
93b9894116 support for angel bob's 2020-03-10 11:59:29 +01:00
hanakocz
7d7a25e1e6
big update 2020-03-05 15:56:59 +01:00
MewMew
dd454afcf4 small update 2020-03-02 18:48:29 +01:00
MewMew
541decc58d new module added 2020-02-28 15:04:30 +01:00
hanakocz
e482a4cf55
Merge pull request #4 from M3wM3w/master
update
2020-02-27 16:25:59 +01:00
hanakocz
fd22555361
disabled desync 2020-02-25 15:47:10 +01:00
hanakocz
ee63daacfd
Add files via upload 2020-02-25 14:49:30 +01:00
MewMew
25adfe5279
Merge pull request #149 from manolck/master
update native_war
2020-02-24 16:21:38 +01:00
MewMew
c053dda9d3 one new room 2020-02-24 16:18:11 +01:00
MewMew
c988c42522 fix for missing markets 2020-02-24 15:55:59 +01:00
hanakocz
26fc4d261d
overgrowth - fix crashes 2020-02-24 07:17:31 +01:00
hanakocz
4fb93c7695
Add files via upload 2020-02-24 07:13:38 +01:00
hanakocz
ff5c79cfc6
Merge pull request #3 from M3wM3w/master
update from main
2020-02-24 06:39:29 +01:00
hanakocz
f6c9ec8fba
reworking the structure 2020-02-24 00:39:58 +01:00
manolck
770ad4e02d
Add files via upload 2020-02-23 22:44:20 +01:00
manolck
9ca253f6e9
Add files via upload 2020-02-23 22:38:29 +01:00
hanakocz
60d8b70ad8
Add files via upload 2020-02-23 18:33:37 +01:00
hanakocz
ac3b5954ed
fixes 2020-02-23 16:51:07 +01:00
manolck
19c442c77d
Add files via upload 2020-02-23 04:02:58 +01:00
manolck
17def939a6
Update main.lua 2020-02-22 20:51:56 +01:00
manolck
45323c528c
Add files via upload 2020-02-22 17:56:26 +01:00
hanakocz
59a5bf92c4
Win condition added
- final level unlocking starts at jump 15, can be absolutely unlocked at jump 25.
2020-02-21 22:58:14 +01:00
hanakocz
0a76381307
wagons remember filters, tiny cleanup 2020-02-21 06:25:19 +01:00
hanakocz
a7bf8c3f17
New update
- difficulty vote (default is NORMAL!)
- poison upgrade operated by comfylatron 
- can open output wagons directly
- some fixes
2020-02-20 23:19:00 +01:00
MewMew
0a5c2aa938 update
fixed tile placements inside oasis
resource placements redone
biter placements redone
mostly only railways are now placeable in the sands
starter gear redone
2020-02-19 15:24:11 +01:00
hanakocz
2ff8375efd
updates
- lava planet fires happen only when no pavement
- new planet
-if staying for too long, biters on next planets can evolve
2020-02-19 15:15:16 +01:00
hanakocz
fe257962a5
forgot to add 2020-02-18 02:45:37 +01:00
hanakocz
2543abbc72
updates 2020-02-18 02:43:22 +01:00
hanakocz
e0cf887347
new stuff, fixes 2020-02-17 17:37:22 +01:00
hanakocz
8c68f18187
Upgrades, rebalance 2020-02-17 00:46:22 +01:00
MewMew
c7d5dd0a76 terrain tweaks 2020-02-15 16:32:51 +01:00
MewMew
40ab42e023 new map 2020-02-15 15:56:24 +01:00
hanakocz
0eb6a95d69
research fix 2020-02-14 22:02:42 +01:00
hanakocz
ec3d1538c8
Add files via upload 2020-02-14 21:06:52 +01:00
MewMew
61c84fc095 worm turret tier tweak 2020-02-10 18:08:20 +01:00
Masamune
b84eb35633 Merge remote-tracking branch 'upstream/master' into adminLogFixSwitchMutagen 2020-02-08 09:40:56 +01:00
Masamune
864eb97e88 fix for admin log bug which was always going back to mutagen log using dropdown 2020-02-08 09:40:28 +01:00
MewMew
506d3117e2 Merge pull request #137 from Masamune0/fixCrashMutagenLog
Fix crash mutagen log
2020-02-08 09:32:48 +01:00
MewMew
673b6b81bc update
unit spawners are saved in global
biter terrain changes
random attack angles removed
2020-02-08 09:32:10 +01:00
Masamune
e24d8547f5 Merge remote-tracking branch 'upstream/master' into fixCrashMutagenLog 2020-02-07 18:38:44 +01:00
Masamune
314c13e4a7 Update mutagen log : fix crash case 2020-02-07 18:37:36 +01:00
Masamune
a6342ba529 [MUTAGENLOG]Fixed the loop not always doing 7 iterations for all science 2020-02-06 20:40:05 +01:00
MewMew
c0b02ed725 gui + thingies 2020-02-03 10:33:27 +01:00
MewMew
4ce0a40327 progress 2020-02-03 09:57:10 +01:00
MewMew
b8ca5dfa6b new stuff 2020-02-03 08:35:20 +01:00
MewMew
4ea7ac8b1d
Merge pull request #133 from AwesomePatrol/improve-log
Fix feeding message formatting for discord
2020-02-03 07:22:56 +01:00
MewMew
5a87b8e01b
Merge pull request #127 from Masamune0/mutagenLogFilters
Mutagen log filters : bug fix and 3 filters added (force, science, evo jump)
2020-02-03 07:20:26 +01:00
MewMew
713fd5cc9f removal of unused 2020-02-03 07:10:58 +01:00
Aleksander Mistewicz
35ddd5cab3 Use simpler message format for discord 2020-02-02 17:27:57 +01:00
Aleksander Mistewicz
521cde4a6b Post feeding messages to discord 2020-02-02 02:13:35 +01:00
Masamune
958835c8e1 fix for error on heavy mode : frame refresh code update on mutagen log 2020-02-01 23:05:05 +01:00
Aleksander Mistewicz
01664d3b7f Post spectator-related messages to discord 2020-02-01 21:49:12 +01:00
Aleksander Mistewicz
d074ef7189 Post join message when switching forces to discord
When in tournament no messages are sent related to team management.
2020-02-01 21:48:55 +01:00
MewMew
ac91ef02b4
Merge pull request #128 from cogito123/planet_prison_1_1_0
Planet prison 1 1 0
2020-02-01 18:35:51 +01:00
MewMew
fba9c7df81 fix for mirrored entities glitch 2020-02-01 18:34:41 +01:00
Masamune
6e82163c9d Cleaned code 2020-02-01 11:22:44 +01:00
Masamune
7bfe38f69e Made dropdown_sers_choice global to remove desync 2020-02-01 11:15:43 +01:00
Masamune
5b38d03780 Added more loops in mutagen log for easier reading 2020-02-01 10:30:07 +01:00
cogito
2e7b66605d pp: bump to 1.1.0 2020-02-01 10:08:36 +01:00
cogito
4350efa9f6 pp: nerf robot followers count 2020-02-01 10:08:36 +01:00
cogito
42f28dc9e6 pp: balance merchant prices 2020-02-01 10:08:36 +01:00
cogito
9e5012c582 pp: add annihilation ending
Map will be reset, when this happens.
2020-02-01 10:08:36 +01:00
cogito
5ef9052b16 pp: change default player name template
Changes default player name template into something easier to memorize.
2020-02-01 10:08:36 +01:00
cogito
04ceb853dc pp: remove uranium and cliffs 2020-02-01 10:08:36 +01:00
cogito
e4abd83f9f pp: disable bandits flashlight
Bandits will have flashlights disabled.
2020-02-01 10:08:36 +01:00
cogito
7460989c13 pp: add raid event
Adds a quite complex system that calculates stuff within player
borders and sends raids based on given costs, just like in rimworld.
2020-02-01 10:08:36 +01:00
cogito
cffb655300 pp: common: make create_bounding_box_by_points more generic
This function was limited only to objects that had either
'bounding_box' or 'position'  datafield. This changes broades this
limitation.
2020-02-01 10:08:36 +01:00
cogito
284ed14b74 planet_prison: add claim system
Adds claim system to mark player bases.
2020-02-01 10:08:36 +01:00
cogito
cfd35eb9bd pp: fix map brightness for 0.18.1 2020-02-01 10:08:36 +01:00
cogito
e4d3469c5f pp: fix blood for 0.18.2 2020-02-01 10:08:36 +01:00
MewMew
e2b9f4d59a fixed water under silo glitch (once more); worm turrets are farther out 2020-01-31 05:52:01 +01:00
Masamune
2930bc9147 Merge remote-tracking branch 'upstream/master' into mutagenLogFilters 2020-01-30 17:26:15 +01:00
Masamune
92ad567236 Name change for sci : now use the original science name for mutagen logs 2020-01-30 17:23:05 +01:00
Aleksander Mistewicz
049e418e76 Remove unused variables 2020-01-29 17:20:20 +01:00
Matthias Neumayer
8af621aaf3 Remove caching and option 1 2020-01-29 17:20:20 +01:00
Matthias Neumayer
ace2e920ac Switch to Option 2 2020-01-29 17:20:20 +01:00
Matthias Neumayer
fe898b9252 Improve main_attack performance by 15x 2020-01-29 17:20:20 +01:00
MewMew
b0f8078661 0.18 particle compatibility 2020-01-29 05:55:30 +01:00
MewMew
20f9d809f6 tweak turret density 2020-01-28 16:29:51 +01:00
MewMew
834dbf77fe worm turrets density now increases with distance 2020-01-28 07:28:51 +01:00
Masamune
c52f19a450 Cleaned a debug game print, now summary has his vertical/horizontal information switched (less place taken) 2020-01-27 20:45:55 +01:00
Masamune
49de91204a Removed debug print, fixed no evo jump, filters are in table to be in same line 2020-01-27 18:07:28 +01:00
Masamune
3eb708ed2d Added passive value info in science logs 2020-01-26 12:59:56 +01:00
MewMew
66010d1258 personal solar panel works at night; placeable solar panel disabled 2020-01-26 12:07:00 +01:00
MewMew
8e976e00c7
Merge pull request #124 from cogito123/planet_prison_1_0_5
Planet prison 1 0 5
2020-01-26 11:43:27 +01:00
MewMew
b7f0b38ff9 things
temporary particle disables;
darkness for mountain fortress, can be toggled via darkness variable in main.lua
2020-01-26 11:43:07 +01:00
Masamune
c9c05e7492 Add science filter, team filter, evo jump filter, add bugfix for team name (now old lines will also show new name of team) 2020-01-26 11:39:00 +01:00
Masamune
ae7f135d39 Merge remote-tracking branch 'upstream/master' into mutagenLogFilters 2020-01-26 09:59:11 +01:00
cogito
05156de670 planet_prison: bump to 1.0.5 2020-01-22 19:59:13 +01:00
cogito
1769cc9fc5 planet_prison: harden merchant exploit check
Increase the radius of power pole check up to 18.
2020-01-22 19:59:13 +01:00
cogito
ff670c7ae4 planet_prison: prevent robots from building around merchant
Players could syphon energy from the merchant by using robots to build
power poles around him.
2020-01-22 19:59:13 +01:00
cogito
a574c797d1 planet_prison: fix invalid LuaEntity bug
Fixes invalid LuaEntity bug during merchant exploit check.
2020-01-22 19:59:13 +01:00
cogito
ae250026ab planet_prison: balance tech tree 2020-01-22 19:59:13 +01:00
MewMew
52c50d80a8 optimizations 2020-01-22 14:12:04 +01:00
MewMew
c37aa8cbba code tidy up 2020-01-22 08:30:41 +01:00
Masamune
35b638a022 Merge remote-tracking branch 'upstream/master' into mutagenLogFilters 2020-01-19 19:31:48 +01:00
MewMew
0b684ebd7e wrong requires fix 2020-01-19 16:42:18 +01:00
MewMew
f05c270997
Merge pull request #123 from cogito123/planet_prison_1_0_4
Planet prison 1 0 4
2020-01-19 16:35:07 +01:00
Masamune
a726a41d00 First implementation of summary of feeding and also fix for big feeding (threat was cut) 2020-01-19 14:13:23 +01:00
MewMew
b5893c9b85 things 2020-01-19 10:31:16 +01:00