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

837 Commits

Author SHA1 Message Date
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
MewMew
02f907f970 integration of biter extra lifes 2020-01-19 10:26:11 +01:00
cogito
05bb95b796 planet_prison: bump to 1.0.4 2020-01-18 08:58:28 +01:00
cogito
f4079a194f planet_prison: lower the size of water-shallow layer 2020-01-18 08:58:28 +01:00
cogito
667c24edc0 planet_prison: enable inserter capacity bonuses 2020-01-18 08:58:28 +01:00
cogito
f52e80aaf5 planet_prison: add blood effects
When character gets killed or damaged, some blood particles will
be shown.
2020-01-18 08:58:28 +01:00
cogito
a5be9ad3e4 planet_prison: balance adjustement 2020-01-18 08:58:28 +01:00
cogito
87eb854ace planet_prison: fix global variable miussage.
Fixes some 'global' variable missusage.
2020-01-18 08:58:28 +01:00
cogito
198b5fd17a planet_prison: add timer to player spawn
These generators from ships are way to op as you can easily place
radars around it. We'll explode the ships after 10 minutes, so they
don't clutter the map and don't give exploits.
2020-01-18 08:58:28 +01:00
cogito
bdcdc9ae96 planet_prison: add id to blueprint references
Adds blueprint to new blueprint references.
2020-01-18 08:58:28 +01:00
cogito
66d535d7f2 planet_prison: fix get_non_obstructed_position
Fixes get_non_obstructed_position function to do more exhaustive check
for position, so that out-of-map spawns become highly unlikely.
2020-01-18 08:58:28 +01:00
cogito
6eb1486574 planet_prison: add an afk timer
Adds an afk timer, 90 minutes. After that time you die.
2020-01-18 08:58:28 +01:00
cogito
1f12c2602f planet_prison: move layers to map configuration
Moves layers to map configuration for better managability.
2020-01-18 08:58:28 +01:00
cogito
be4e1dfa44 planet_prison: add bandits with shotguns
Adds randomly shotguns to bandits in 1 to 7 odds.
2020-01-18 08:58:28 +01:00
cogito
729a332d54 planet_prison: add camouflage to bandits
Default red color for a bandit looks bad. This patch changes it
to be in random shade of gray.
2020-01-18 08:58:28 +01:00
cogito
336b538545 planet_prison: common: mark "this" as global
There are upcoming commits that heavily use this module in closures
so mark "this" as global to prevent upvalue errors.
2020-01-18 08:58:28 +01:00
cogito
6d5f869e2b planet_prison: layers: add dependency injector
If some hook requires external variables it can inject them into layer
object at runtime. This should solve the upvalue problem.
2020-01-18 08:58:28 +01:00
cogito
c895ff729d planet_prison: fix the nil bug in on_gui_click
Some of the GUI elements become invalid suddenly. Let's make a
check for it.
2020-01-18 08:58:28 +01:00
cogito
01b55c8df1 planet_prison: rename "buddies" to "NAP"
Renames "buddies" to "non-aggressive pact", so it's less confusing.
2020-01-18 08:58:28 +01:00
MewMew
b7ee3fa039 unit raffle evo limits 2020-01-13 03:01:25 +01:00
cogito
fd97d1ef93 planet_prison: bump to 1.0.3 2020-01-11 19:34:30 +01:00
cogito
a147c050b2 planet_prison: limit the size of shallow water layer
It seems that shallow water layer is too big. Let's tweak it
a little.
2020-01-11 19:34:30 +01:00
cogito
86e9da6549 planet_prison: allow fast inserter
Looks like people dislike idea of having to buy inserters from
merchant. Fast inserter tech will be now permitted.
2020-01-11 19:34:30 +01:00
cogito
7760fced0c planet_prison: allow "merchant" button
If you get GPS receiver from the store it would cause "merchant"
button to disappear, which is annoying.
2020-01-11 19:34:30 +01:00
cogito
16a391648b planet_prison: add "coins" section to manual
Player obviously now know what you get coins for. This patch adds the short
explanation to the manual.
2020-01-11 19:34:30 +01:00
cogito
01842c2bdb planet_prison: tweaks tech tree 2020-01-11 19:34:30 +01:00
cogito
98bbec451b planet_prison: maybe fix the nil perks
Hardly could reproduce, hopefully this will fix it.
2020-01-11 14:59:03 +01:00
cogito
1b42918315 planet_prison: enable flashlight by default
Forcing a player to buy a flashlight is a bad idea. This patch
removes possiblity of flashlight buying as he'll have it by default.
2020-01-11 14:59:03 +01:00
cogito
b1336833de planet_prison: fix the name generation
The get_random_id was always returning after first cycle. This
could casue more than a 1 player to be assigned under single force.
Added additional check and we return completely full name.
2020-01-11 14:59:03 +01:00
cogito
74d73c1b47 planet_prison: fix the buddy system
Bunch of fixes to buddy system.
2020-01-11 14:59:03 +01:00
cogito
6a07ed102e planet_prison: bump to 1.0.2 2020-01-10 17:39:44 +01:00
cogito
f40a011ff5 planet_prison: fix bp nil reference bug
Traversing objects.refs and removing items at the same time is dangerous.
Order of for loop was reversed to hopefully mitigate this problem.
2020-01-10 17:39:44 +01:00
cogito
fc02629820 planet_prison: increase chance of ore spawn by 2
Increases the chance of ore spawn by 2 (60 -> 30 rand pool)
2020-01-10 17:39:44 +01:00
cogito
a0e5ea0737 planet_prison: increase crude oil frequency
Increases frequency of oil crude to spawn to 1000.
2020-01-10 17:39:44 +01:00
cogito
17486c4053 planet_prison: optimize map gen
Optimizes map generation. Currently, 16kb were used per chunk for
internal processing geared towards update time and not save time.
Map generation was optimized in a such was that only 8 bytes are
used per chunk, but since we no longer have granular data as before,
occasional lag spikes may occur as much more data needs to get
processed right as we get it.
2020-01-10 17:39:44 +01:00
cogito
ea2eaf2a01 planet_prison: fix duplicated speech bubble
When loaded with comfy modules, two speech bubbles appear when player
talks in global chat. This removes local counterpart, so only comfy
flying text appears.
2020-01-10 17:39:44 +01:00
Masamune
ac101ebc66 Edited order of mutagen log by most recent first 2020-01-09 18:58:04 +01:00
MewMew
4863ca8270
Merge pull request #117 from cogito123/planet_prison_gen_fix
planet_prison: fix double chunk generation bug
2020-01-08 18:29:56 +01:00
MewMew
331b9d8d65
Merge pull request #113 from randomdud3/filter-events
Filter events so they are only triggered when it really matters
2020-01-08 18:26:52 +01:00
randomdud3
2f8f7c65b6
Fix typo 2020-01-07 20:17:00 +01:00
cogito
ef96d174b7 planet_prison: fix double chunk generation bug
Unknowingly, the on_chunk_generated event was permitted to be processed
on 2 surfaces instead of the "arena" one, thus producing a "double
pass" effect. Since now, we'll filter based on name, which surface is
getting processed.
2020-01-07 18:28:03 +01:00
randomdud3
51e86d6b2c Move all filters to the main map file 2020-01-07 04:14:27 +01:00
MewMew
d31e27c0c9
Merge pull request #111 from AwesomePatrol/post-join-team-on-discord
Send "join team" messages to discord
2020-01-07 02:05:20 +01:00
MewMew
2dff825805 less rocks 2020-01-07 01:57:03 +01:00
MewMew
3ec2142a47
Merge pull request #114 from mattNeumayer/perf_fix
Biter Battle: Improve terrain generation performance
2020-01-07 01:52:49 +01:00
MewMew
86c37d173a
Merge pull request #112 from cogito123/planet_prison
Add planet prison 1.0.0
2020-01-07 01:38:36 +01:00
randomdud3
160e7e29a5 Filter events so they are only triggered when it really matters 2020-01-06 19:38:43 +01:00
Aleksander Mistewicz
53082d19c2 Use to_discord_bold to be consistent 2020-01-06 03:21:55 +01:00
Aleksander Mistewicz
038f97d8ab Use table.concat instead of built-in 2020-01-06 03:21:54 +01:00
Aleksander Mistewicz
b3b44bcdce Post join team messages to discord 2020-01-06 03:21:54 +01:00
MewMew
fa79933880 removal of periodic biter removal 2020-01-05 21:52:12 +01:00
MewMew
98e68d6439 turret position more random 2020-01-05 20:09:26 +01:00
MewMew
a03f28aa40 worm turret addition to biter area and tweaks 2020-01-05 19:52:24 +01:00
Matthias Neumayer
499339e73a Undo workload per tick increase 2020-01-05 19:35:10 +01:00
Matthias Neumayer
95f14b9c1b Rename r to spawn_wall_radius
Remove magic numbers
2020-01-05 19:33:51 +01:00
Matthias Neumayer
d03910d2d9 Performance mirror_terrain 2020-01-05 19:07:32 +01:00
Matthias Neumayer
2150172d02 Perf improvements in terrain.lua 2020-01-05 19:07:32 +01:00
Matthias Neumayer
b9fd10395b Cleanup: generate_inner_spawn_circle
Fix: Don't generate fish in the center island
2020-01-05 19:07:32 +01:00
Matthias Neumayer
4ca41abc08 Refactor generate_circle_spawn 2020-01-05 19:07:32 +01:00
MewMew
6804b84d50 tweaks 2020-01-05 19:05:57 +01:00
cogito123
019f933fde maps/planet_prison: add scenario
This scenario must be ran with all comfy gui shutdown.
2020-01-04 21:54:17 +01:00
MewMew
3cf61967aa unused function removal 2020-01-04 20:38:24 +01:00
MewMew
a0d97a6b08 silo bug fix 2020-01-04 20:35:21 +01:00
Masamune
76b8bd9be9 Removed useless empty line 2020-01-04 12:13:54 +01:00
Masamune
4f6da7c1bc Update for mutagen log : code cleaning 2020-01-04 12:13:54 +01:00
Masamune
5ba5bfd24d Gui improvement on mutagen log 2020-01-04 12:13:24 +01:00
Masamune
e3753f29a7 Moved science logs tab to fish tab instead 2020-01-04 12:12:53 +01:00
Masamune
90aec356f0 update science log : added horizontal lines 2020-01-04 12:11:07 +01:00
Masamune
cb4374a33c WIP science logs 2020-01-04 12:11:07 +01:00
Masamune
1023abdb71 science logs work 2020-01-04 12:10:20 +01:00
Masamune
0d97b34d0b Added science logs to bb 2020-01-04 12:09:09 +01:00
Masamune
ab2c9b24e5 Gui improvement on mutagen log 2020-01-04 12:04:20 +01:00
Masamune
accefee8b2 Moved science logs tab to fish tab instead 2020-01-04 12:04:20 +01:00
Masamune
5999c8658e update science log : added horizontal lines 2020-01-04 12:02:00 +01:00
Masamune
f4db9b3d54 WIP science logs 2020-01-04 12:02:00 +01:00
Masamune
de0fdf2beb science logs work 2020-01-04 12:02:00 +01:00
Masamune
d0584c1191 Added science logs to bb 2020-01-04 12:02:00 +01:00
MewMew
958309b019 tweak 2020-01-04 02:40:16 +01:00
MewMew
189cdc44ce hotfix 2020-01-02 16:28:12 +01:00
MewMew
8e1868fdcc restructure 2020-01-02 16:09:24 +01:00
MewMew
66470c193c small fixes 2020-01-01 23:56:38 +01:00
MewMew
34e11f891e new food values 2020-01-01 18:47:08 +01:00
MewMew
6a3f72052b updates
biter battles - evasion replaced with health boost
mountain map - collapse disabled by default
2020-01-01 18:25:14 +01:00
MewMew
99c7cb89c6 fix for blue beach map 2020-01-01 14:05:49 +01:00
MewMew
933de60cae
Merge pull request #99 from ETK03/patch-1
Fixed a small grammer mistake.
2019-12-28 14:02:41 +01:00
MewMew
9ee7acf841 updates 2019-12-24 12:43:47 +01:00
MewMew
e9d2268ade attack vectors 2019-12-21 00:22:01 +01:00
MewMew
d05339c31e updates 2019-12-20 14:46:20 +01:00
MewMew
f8bcc22d9e updates 2019-12-19 18:26:02 +01:00
MewMew
f491df7df4 some fixes 2019-12-18 19:08:09 +01:00
ETK03
9ffaf1f84f
Fixed a small grammer mistake. 2019-12-17 09:39:41 -06:00
MewMew
99e4336dd9 optimization of tick tasks; map pregen removal 2019-12-17 13:45:15 +01:00