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
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
MewMew
ee3f81898f landmine balance 2019-12-17 12:50:42 +01:00
MewMew
0b79888ffb Update
Border river width increased.
Config setting for river width now sets the minimum width, instead of average width.
Spawn ores increased.
Silo offset increased.
Player spawn position adjusted.
2019-12-15 09:45:53 +01:00
MewMew
6f5c0a661b boss wave name translation 2019-12-05 12:29:17 +01:00
MewMew
70c613e839 more translation 2019-12-05 09:09:08 +01:00
MewMew
82d541f9b4 translations 2019-12-05 08:58:26 +01:00
Gerkiz
391aefd370
minor change 2019-12-01 01:05:44 +01:00
Gerkiz
b48bd0258a
minor change 2019-12-01 00:52:08 +01:00
MewMew
d2ee5b254a map settings tab for bb 2019-11-29 05:56:24 +01:00
MewMew
c7d607193d tourney mode disables difficuly voting for non-admins 2019-11-29 04:38:33 +01:00
MewMew
8d60989526 difficulty tweaks 2019-11-28 03:53:19 +01:00
MewMew
2411848b34 threat income tweak 2019-11-26 05:24:51 +01:00
MewMew
29f02cdc47 Terrain tweaks 2019-11-26 04:17:23 +01:00
MewMew
eb14713db3 update 2019-11-26 01:31:00 +01:00
MewMew
95bc3d473a unit group tweaks 2019-11-24 00:09:45 +01:00
MewMew
8986cac385 balance update 2019-11-23 23:27:57 +01:00
MewMew
d1d8f60d67 comfy panel tabs fix for spectators 2019-11-23 11:45:43 +01:00
MewMew
6a606b88f8 fish pond added to cargo wagon room 2019-11-22 21:55:58 +01:00
MewMew
f7eb7582f8 fix for player rejoining inside cargo wagon 2019-11-21 07:02:39 +01:00
MewMew
5cf46329c7 update 2019-11-20 20:43:50 +01:00
MewMew
e327d08280 cargo wagon update 2019-11-20 19:26:34 +01:00
MewMew
b8e973f2df new base mutagen values 2019-11-20 03:40:54 +01:00
MewMew
034645c15c update
resource frequency and amount increased;
mirroring performance tweaks;
spawn wall radius is increased and has more turrets, but is more run down;
2019-11-17 23:29:11 +01:00
MewMew
ac249f49df fix for players getting stuck in the void after joining 2019-11-17 19:17:15 +01:00
MewMew
b8816f5093 collapse fixes 2019-11-16 20:50:34 +01:00
MewMew
180b166427 prefer positions closer to south 2019-11-15 19:00:06 +01:00
MewMew
42ad8b6557 fixing 2019-11-15 00:03:38 +01:00
MewMew
535c8802dd fix 2019-11-14 23:29:47 +01:00
MewMew
ca9ef3c2cc improvements 2019-11-14 23:06:15 +01:00
MewMew
1f04171a7c fixed glitch where player could create tiles outside the map border 2019-11-14 19:24:42 +01:00
MewMew
db958eaf96 ground collapse update 2019-11-14 18:48:03 +01:00
MewMew
e209c9f518 charting of last positions 2019-11-14 18:06:59 +01:00
MewMew
d85f7cfc22 map now collapses 2019-11-14 17:54:28 +01:00
MewMew
dc5e9e696c wip 2019-11-14 16:44:08 +01:00
MewMew
d9190241ba usage of LuaForce.play_sound 2019-11-11 13:14:29 +01:00
MewMew
e4a5279f8b group size limit; alerts 2019-11-11 13:06:02 +01:00
MewMew
c9bed5c5e2 small tweak 2019-11-11 12:16:39 +01:00
Gerkiz
ae94ef6dae command update and player_modifier removed from global 2019-11-10 22:02:45 +01:00
Gerkiz
8bdd53830c minor changes 2019-11-10 12:43:58 +01:00
MewMew
7b1f2ca20e update 2019-11-10 02:46:29 +01:00
MewMew
c282923649 explosives addition 2019-11-10 00:29:17 +01:00
MewMew
fb2ba1d49d new map 2019-11-09 23:53:27 +01:00
MewMew
c466ea9432 update
wave defense boss biters
non-local to local
2019-11-09 15:46:18 +01:00
Gerkiz
7cc9e7ed5c changes 2019-11-09 11:22:57 +01:00
Gerkiz
97983caca7 nerf exposives 2019-11-08 23:58:28 +01:00
Gerkiz
8a1b8f94ec fixes 2019-11-08 23:53:16 +01:00
Gerkiz
9866e88fd8 hardmode on 2019-11-07 21:24:58 +01:00
Gerkiz
2900491bc8 smol change again 2019-11-07 16:03:53 +01:00
Gerkiz
bf75b93b87 smol change 2019-11-07 16:00:36 +01:00
Gerkiz
d91f8281d9 new map 2019-11-07 15:38:11 +01:00
Gerkiz
9d5eec2235 junkyard map info 2019-11-06 20:36:18 +01:00
MewMew
9227fda072 food balance 2019-11-06 17:54:54 +01:00
MewMew
8d171d8ae8 highscore fix 2019-11-06 13:54:34 +01:00
MewMew
f76398370a spectator spawn, border beams 2019-11-06 13:02:26 +01:00
MewMew
ed8aefc867 mirror terrain 2019-11-06 12:36:31 +01:00
MaemiKozue
bde41e99e8 Merge remote-tracking branch 'upstream/master' 2019-11-05 17:27:40 +01:00
MaemiKozue
b74c15a90d Biter Battles: Added technology view for spectators 2019-11-05 17:21:04 +01:00
MewMew
ec6f6aab01
Merge pull request #73 from muppet9010/Biter_Battle_Training_Mode
Biter Battles V2 - Training Mode
2019-11-05 17:05:35 +01:00
MewMew
3ca5c77950 unit and turret limit, unit health boost + gui 2019-11-05 00:52:50 +01:00
MewMew
486f995872 added highscores 2019-11-04 19:57:02 +01:00
MewMew
3f1df45b87 tweaks and fix 2019-11-04 16:43:26 +01:00
MewMew
f00c984724 unit position tweaks, chat sharing 2019-11-04 14:55:58 +01:00
MewMew
56e096adfc feeding may now spawn friendly worm turrets 2019-11-04 14:14:03 +01:00
MewMew
0cad7b367f turrets at biter spawn, terrain tweak 2019-11-04 13:04:43 +01:00
MewMew
80d76c13c8 spectator fixes 2019-11-04 12:48:08 +01:00
MewMew
6bc0f63db0 small symetry fix 2019-11-04 03:53:23 +01:00
MewMew
ff2ee0a2e9 terrain update 2019-11-04 03:36:47 +01:00
MewMew
722eda8388 fixes and tweaks 2019-11-04 02:21:57 +01:00
MewMew
cfa055e4e4 spectator fixes 2019-11-04 01:46:23 +01:00
MewMew
6753ae3333 spectator mode 2019-11-04 01:24:09 +01:00
MewMew
e9dc451f6f half research cost / fixes 2019-11-04 00:20:52 +01:00
MewMew
34de036281 update
hatchery regeneration
desync fix
lost won sounds
2019-11-03 23:31:52 +01:00
muppet9010
d5f92eb5bd undo the GUI blocking of joining team south made previously in this pull and all affects of Training mode will affect both north and south.
remove the ghost-spectate button from Team Manager and the functionaility it triggered
added Training Mode button to Team manager to toggle on/off behaviour.

When turned on:
Teams will feed themselves instead of the enemy while enabled (messages updated for this).
Empty teams will not get sent any attacking groups and won't get threat & evo increases (as it looks odd)
Team balance and Lobby minimum player counts not active
2019-11-03 21:26:34 +00:00
MewMew
c76ebe203c starting items 2019-11-03 21:11:33 +01:00
muppet9010
d9fcda9b24 Merge branch 'master' into Biter_Battle_Training_Mode 2019-11-03 20:04:22 +00:00
MewMew
0f5b8e3846 floaty feed texts 2019-11-03 20:48:17 +01:00
MewMew
a6d956371b spawn positions fix 2019-11-03 20:29:19 +01:00
MewMew
c9c22265e6 Construction robot restriction 2019-11-03 20:09:51 +01:00
MewMew
b33e2c6c01 spawn ores 2019-11-03 19:52:01 +01:00
MewMew
d6cb33b8b7 center river, map description 2019-11-03 19:34:36 +01:00
MewMew
4f6dde5090 WIP
added soft reset, unit commands
2019-11-03 18:57:36 +01:00
MewMew
aa5f310174 WIP 2019-11-03 17:46:18 +01:00
MewMew
98c166ed82 Update
Fused boss units into biter_health_booster.
Unit evasion replaced with custom unit health pool.
Boss Units no longer update their healthbar infinitely fast.
Map Intro moved into the main panel.
some globals to locals
2019-11-03 13:35:19 +01:00
MewMew
50e0741623 hotfix 2019-11-02 18:41:17 +01:00
MewMew
3491cfdcd4 terrain update and optimizations 2019-11-02 16:09:58 +01:00
Gerkiz
89dd79bdb3 removed event that is not in use 2019-11-01 19:13:03 +01:00
Gerkiz
bdfb4131ed refactor global.rpg to rpg_t 2019-11-01 19:00:46 +01:00
MewMew
aa15dc585b optimizations 2019-11-01 16:24:44 +01:00
MewMew
797b5dd25f difficulty tweaks 2019-11-01 11:46:28 +01:00
MewMew
b73d4b7eb8 tweaks 2019-10-31 16:18:17 +01:00
MewMew
3eea0e663c Config Tab; Fixes and tweaks 2019-10-31 10:13:47 +01:00
MewMew
d56f14ee03 terrain update
3 more levels
2019-10-30 20:00:32 +01:00
MewMew
0255c0ab18 update
added chat color and symbols for ore vein findings;
wave defense difficulty progression is no longer linear;
wave defense - fixed wrong worm turret rolls;
smol flame turret buff;
less angry trees;
2019-10-30 17:29:15 +01:00
MewMew
a17987e264 fix 2019-10-29 20:07:19 +01:00
MewMew
31cfcf13ff give a coin for each rock mined 2019-10-29 15:35:01 +01:00
MewMew
9f5a5afada re-enabled fish tag for cargo 2019-10-29 12:40:51 +01:00
MewMew
6de15cfd2a update
sci packs added to loot
spawners contain inhabitants for wd
2019-10-29 12:14:28 +01:00
MewMew
a88e476687 updates, fixes and angry trees 2019-10-29 11:26:59 +01:00
Gerkiz
eb299b4421 new module system and removal from _G 2019-10-28 17:38:36 +01:00
MewMew
9db9d71c33 display of threat / minute 2019-10-28 13:29:15 +01:00
MewMew
a569571a5a soft reset fix for not refreshing player modifiers 2019-10-28 11:15:39 +01:00