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

1680 Commits

Author SHA1 Message Date
Gerkiz
52222b64b8
Merge branch 'develop' into patch-2 2021-09-17 22:29:27 +02:00
Gerkiz
dd39386717 mtn v3 - enable decon 2021-09-17 22:28:18 +02:00
Gerkiz
09b060b5ac mtn v3
Added "Deconstruction" on Config tab
Enables deconstruction on cars/tanks/trains.
2021-09-17 22:26:13 +02:00
Gerkiz
56bdf9d55c
Merge branch 'develop' into patch-2 2021-08-21 12:48:20 +02:00
Gerkiz
2a8fb1e92f minor tweaks to mtn v3 2021-08-21 12:46:10 +02:00
Shadow_Man
5c9b0a2536
Merge branch 'develop' into patch-2 2021-08-04 21:24:10 +02:00
Shadow_Man
21a5da3a52
Merge branch 'develop' into develop 2021-08-04 21:22:13 +02:00
Gerkiz
69650051a5 increase tick speed for terrain 2021-08-03 23:05:03 +02:00
Shadow_Man
43d9a96cce
Fix wrong "world number selection" to Discord 2021-08-02 10:44:17 +02:00
Shadow_Man
1e7ad1d692
Merge branch 'develop' into develop 2021-07-30 15:12:37 +02:00
Gerkiz
70bb37d7bf wagon out of map fix 2021-07-27 21:22:52 +02:00
Gerkiz
8da00da125
Merge branch 'develop' into develop 2021-07-26 21:55:42 +02:00
Gerkiz
6a165c79cb Minor adjustments 2021-07-23 17:23:33 +02:00
Gerkiz
001eb38062
Merge branch 'develop' into develop 2021-07-23 16:40:05 +02:00
Gerkiz
f60370d103 mtn v3 - reworked how generation is done 2021-07-23 16:38:23 +02:00
Shadow_Man
a6665b0fec
RU locale fixes
1. Russian locale update for RPG
2. Minor fixes to RU Mountain Fortress v3
3. Start working for localization "Journey" map
2021-07-21 03:13:29 +02:00
Gerkiz
9e5835a412
remove unused vars 2021-07-18 16:03:59 +02:00
Gerkiz
e472043998
make luacheck happy 2021-07-18 16:02:53 +02:00
Gerkiz
e9176c1360
make luacheck happy 2021-07-18 16:01:56 +02:00
NekoBaron
74bad8e026
Update table.lua
changed starting gun turret limit to 3 to try ease low player count defending early game, tweeked difficulties but left normal as is
2021-07-18 14:36:56 +01:00
NekoBaron
8e362e4113
Update main.lua
slight increase in starting items, tweeks to terrain ores and attempt at lowering chance of too dense trees while still giving em a good chance to spawn, the commented code is a side test that creates mutiple spawn area ore piles
2021-07-18 14:35:01 +01:00
NekoBaron
0f4eeb7fe1
Update terrain.lua
add rocks to stone area at start plus increase in starting ores amounts and tiny size increase.
2021-07-18 14:31:34 +01:00
hanakocz
b33d85bd7d fixes to renamed vars, function name conflict, removed unused stuff 2021-07-17 21:57:24 +02:00
Gerkiz
edfacd6320 minor adjustment to locomotive in mtn v3 2021-07-14 22:07:57 +02:00
Gerkiz
e2707f68d6 changes to prestige system 2021-07-14 21:34:48 +02:00
Gerkiz
1beb542903
Merge branch 'develop' into develop 2021-07-12 16:57:17 +02:00
Gerkiz
9f9c20de39 minor changes to prestige system 2021-07-12 16:50:58 +02:00
Gerkiz
7ce9894a15 two new modules and changes to scenario 2021-07-12 16:15:55 +02:00
Gerkiz
0396c40e76 various fixes to modules 2021-07-07 12:22:22 +02:00
Gerkiz
d3880c78a6 various tweaks 2021-07-02 10:52:27 +02:00
Gerkiz
37710fac2c minor changes 2021-07-01 21:30:29 +02:00
gyorokpeter
d1ff33f689 fix spelling 2021-06-26 07:53:58 +01:00
Gerkiz
6b54f4e5c4 fish defender v2 update 2021-06-18 21:12:30 +02:00
Gerkiz
1449c0a71e minor bug fixes 2021-06-13 13:54:19 +02:00
Gerkiz
2e30470025 tweaks and bugfixes 2021-06-06 20:14:26 +02:00
MewMew
f5115e240e update
Faster capsule drops and shuffled.
Built silos always have auto-launch toggled off.
Rocket silos will attempt to auto-launch every 30 seconds.
Max satellites stored is now 1 + 1 every third world.
Mothership will now answer your questions.
Teleports now always lead to 0,0.
Chunk deletion made a bit slower.
50 % less research cost in quantum anomaly.
Only units are now affected in undead plague.
Replicant fauna nerf.
Ghosts, pipes, containers and walls are now minable in tarball.
Laser turrets are broken in matter anomaly.
Biters only spawn from rocks and trees in infested.
New World types ribbon, wasteland, oceanic, lazy bastard and abandoned library.
2021-05-28 22:19:24 +02:00
Gerkiz
82f03ed723 fix bonus speed on respawn 2021-05-28 20:37:25 +02:00
Gerkiz
8dde316312 rpg and playerlist updates 2021-05-28 18:28:17 +02:00
Gerkiz
2c7f3088db minor adjustment 2021-05-26 09:45:37 +02:00
Gerkiz
126ff22f1b
Merge branch 'develop' into refactor 2021-05-25 22:19:55 +02:00
Gerkiz
dab23f969a refactor 2021-05-25 22:19:20 +02:00
MewMew
1076fbf66e Update
Print more messages to discord.
Resource modifiers only apply to richness.
Generate a tiny amount of power from solar in the eternal night and pitch black.
Always reward 1000 white science flasks.
Disabled the auto-launch via permissions.
Capsule drop radius further reduced.
Terrain segmentation a bit more random.
Fuel progress bar, +25 to +50 fuel requirement per world.
Add mixed ore to all worlds.
Add mixed ore modifier.
Satellites as a reroll token, mothership dispatches the satellite and rerolls the selectors.
Reroll is triggered at the top part of ship.
2021-05-25 22:12:08 +02:00
Gerkiz
a576aaa2c3 new rpg spells 2021-05-23 21:13:21 +02:00
Gerkiz
fbaa411073 refactor and changes 2021-05-23 17:03:52 +02:00
Gerkiz
67e69158ee minor tweak 2021-05-23 02:04:31 +02:00
Gerkiz
0be0055eb7 minor adjustments done to rpg, wave defense and mtn v3 2021-05-23 02:02:11 +02:00
Gerkiz
b1c18815e2 mtn v3 - fixes 2021-05-22 16:21:23 +02:00
MewMew
83561ee45b make ignore lua 2021-05-21 01:02:48 +02:00
MewMew
b7c7cff886 update
16 unique world traits added.
Positive world modifiers halfed.
Starting area modifier removed.
Reduce capsule drop radius.
Reduced worm spawn radius in mothership surface.
Fix for game freeze on entering next world.
Fix for random high tier biters in next world.
Fix for being stuck in chunk destroy phase when a player joins.
Added modifiers for pollution diffusion, biter group size and tree durability.
2021-05-21 01:01:48 +02:00
Gerkiz
54a777deb3 fish defender v2
fix that players could build entities beyond the lightning wall
2021-05-18 23:26:53 +02:00
Gerkiz
376c101484 fix local variable shadowing 2021-05-18 21:13:08 +02:00
Gerkiz
89223f5dbd fix broken session time 2021-05-18 21:11:28 +02:00
Gerkiz
df75d37a4a desync fix to mtn fortress 2021-05-18 00:20:15 +02:00
Gerkiz
fd58a2b4fc mor changes to mtn fortress 2021-05-16 14:57:42 +02:00
Gerkiz
de4ff3b2e1 more changes to mtn fortress 2021-05-16 14:42:15 +02:00
Gerkiz
049f1162af minor changes to mtn fortress 2021-05-16 13:48:50 +02:00
Gerkiz
01762f6f81 removal of conditionals and fixes 2021-05-15 16:01:07 +02:00
MewMew
1b36ee8388
Merge branch 'develop' into journey 2021-05-13 11:27:26 +02:00
MewMew
6dd88c505d Update
Remove offline players to shrink save file.
Delete chunks slowly during the world selection phase.
Randomize daytime of created worlds.
Artillery that sometimes shoots.
2021-05-13 11:25:27 +02:00
Gerkiz
5b8c1a2fee various tweaks 2021-05-12 20:52:29 +02:00
MewMew
463cea090d Update
Make entities in the ship indestructible.
Add msg after capsule drops completed.
Restrict capsule drop radius.
2021-05-11 19:30:07 +02:00
MewMew
65bdc58d07 small fix 2021-05-09 19:26:14 +02:00
MewMew
ae256c42c9 custom teleporter 2021-05-09 19:09:48 +02:00
Gerkiz
45638522a7 mountain fortress and admin panel fixes 2021-05-09 17:11:18 +02:00
MewMew
33935dd3dd New Map 2021-05-09 15:47:39 +02:00
Gerkiz
6621d854e2 new map - pigeotto 2021-05-08 15:12:33 +02:00
Gerkiz
617d99eac1 Mtn - remove lights inside icw 2021-05-08 11:34:13 +02:00
Gerkiz
1644b024cf Fix gui config when clicking poll and remove unused functions 2021-05-08 02:03:38 +02:00
Gerkiz
6d9aa6645a Fix Territorial Control 2021-05-07 01:46:27 +02:00
Gerkiz
a94fcc98af Removal of global variables and removed laggy functions 2021-05-07 01:36:10 +02:00
Gerkiz
beaca0fc82 minor changes to cave choppy 2021-05-04 19:51:11 +02:00
Gerkiz
2065118aca mountain fortress and rpg updates 2021-05-04 19:51:02 +02:00
Gerkiz
eea184ba1e Mtn Fortress - Make ICW interior more pretty 2021-05-04 18:55:32 +02:00
Gerkiz
99abacb36e push latest minesweeper 2021-05-01 21:22:10 +02:00
Gerkiz
f634ecd69a mtn fortress -fix science bug 2021-04-30 09:11:03 +02:00
Gerkiz
6eb2547e49 make luacheck happy 2021-04-20 15:45:12 +02:00
MewMew
8825d3fe02 NEW MAP 2021-04-19 21:09:00 +02:00
hanakocz
328e292be5 fix for gui crash + poison hidden upgrade spam 2021-04-14 18:31:38 +02:00
Gerkiz
eef1c3f57a planet prison fixes 2021-04-04 13:50:24 +02:00
Gerkiz
80736a24d5 mtn fortress fixes 2021-04-04 13:50:17 +02:00
Gerkiz
164a911f42 make luacheck happy 2021-04-01 22:10:19 +02:00
Gerkiz
fbda17b3aa removed unused functions and fixed so water is not generated near spawn 2021-04-01 22:07:46 +02:00
Gerkiz
cfed977076 planet prison fixes 2021-04-01 22:06:44 +02:00
Gerkiz
61462ddd80 planet_prison fixes 2021-03-30 16:11:39 +02:00
Gerkiz
bbb5b4f5e2 biter_battle_v2 - added some options to config 2021-03-30 16:10:10 +02:00
Gerkiz
9f0c17eac5
Merge branch 'develop' into planet_prison_fixes 2021-03-28 17:00:12 +02:00
Gerkiz
022a8a31ef more minor changes to planet prison 2021-03-28 16:59:14 +02:00
Gerkiz
3475bc8373 planet prison fixes 2021-03-28 16:58:54 +02:00
Gerkiz
eba5098af9
Merge branch 'develop' into junkyard-fix 2021-03-27 14:52:52 +01:00
Gerkiz
7af801b21d remove unused local 2021-03-27 14:49:13 +01:00
Gerkiz
3e0e4841a1 planet_prison minor adjustments 2021-03-27 14:47:47 +01:00
Gerkiz
92688aea74 minor changes to planet prison and mtn fortress 2021-03-27 13:44:32 +01:00
Quadrum
36fa0f3b68 Fixing weird formatting 2021-03-26 17:53:46 +01:00
Quadrum
1a48cbdf60 Update junkyard to 1.1 2021-03-26 17:47:30 +01:00
Gerkiz
5b88f8fdfc removed comfy_panel_tabs from _G and made it use tokens instead 2021-03-25 23:49:57 +01:00
hanakocz
c40f8c97ee plsss 2021-03-25 20:45:04 +01:00
hanakocz
11449f0302 plss 2021-03-25 20:41:22 +01:00
hanakocz
b3423a9c83 pls 2021-03-25 20:37:35 +01:00
hanakocz
35ccbaf258 last luacheck fixes 2021-03-25 20:34:51 +01:00
hanakocz
9f8a7de980 more lua fixes 2021-03-25 03:49:03 +01:00
hanakocz
09bac50da6 fix luacheck in chrono 2021-03-25 03:39:07 +01:00
Gerkiz
52f3976337 luacheck fixes 2021-03-24 20:23:53 +01:00
Gerkiz
e2a33f9f30 luacheck more fixes 2021-03-24 20:14:55 +01:00
Gerkiz
b582b3cb9b luacheck fixes 2021-03-24 19:18:46 +01:00
Gerkiz
3e297f96d1 Merge remote-tracking branch 'origin/develop' into attempt_to_fix_luacheck_warnings 2021-03-24 19:18:30 +01:00
Gerkiz
9d033903fb more luachecks 2021-03-24 18:22:45 +01:00
hanakocz
2c8a585c38 Chronotrain updates, tiny balance changes 2021-03-24 17:19:47 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +01:00
Gerkiz
dedf2a6857 Log if we're trying to write something that is not in global 2021-03-23 23:11:16 +01:00
Gerkiz
1dce46cbaa planet prison fixes 2021-03-22 22:34:45 +01:00
Gerkiz
876c63fc30 minor change to planet prison 2021-03-22 13:07:30 +01:00
Gerkiz
b3e938ddf9 make functions local where we can 2021-03-22 12:57:58 +01:00
Gerkiz
9e08248edf more tweaks 2021-03-22 12:46:02 +01:00
Gerkiz
04537e426a various tweaks and fixes to prison planet 2021-03-22 12:40:46 +01:00
Gerkiz
3e0bbb2946 more changes 2021-03-22 11:33:54 +01:00
Gerkiz
43beed887a more changes to planet prison 2021-03-22 00:28:03 +01:00
Gerkiz
fe432ae000 more changes to planet prison 2021-03-21 23:56:56 +01:00
Gerkiz
fa8c72fb46 planet prison fix
removed over 60 global functions
removed obsolete entities
2021-03-21 23:31:53 +01:00
Gerkiz
f07c77d421 minor changes
autostash now has priority
send pings to map channels instead of announcements
2021-03-19 16:17:38 +01:00
Gerkiz
3e74bd8165 mtn fortress - minor adjustment 2021-03-17 16:39:56 +01:00
Gerkiz
5cddfdbc59 added ping role support
allows a given role to be pinged by the webpanel
2021-03-17 16:39:03 +01:00
Gerkiz
6e441730d4 mtn fortress - various fixes 2021-03-14 22:49:18 +01:00
Gerkiz
6bc884d12c mtn fortress - fix inf health 2021-03-14 19:47:35 +01:00
Gerkiz
141acc5daa Update to mtn and module
Fixed some functions that were hogging UPS.
2021-03-14 01:02:07 +01:00
Gerkiz
25050bbefe minor tweaks 2021-03-11 21:53:12 +01:00
hanakocz
8d00522194 more fixes 2021-03-09 04:53:24 +01:00
hanakocz
a1b4d675a8 fix 2021-03-09 03:26:36 +01:00
hanakocz
aefd0c095f actually use the new booster 2021-03-09 03:11:14 +01:00
hanakocz
da93894188 dungeons fixes (should work on 1.1+ now) + glob table 2021-03-09 02:58:52 +01:00
Gerkiz
7483ae473c mountain fortress v3 - minor changes 2021-03-03 20:42:44 +01:00
Gerkiz
697e92ef0b fish defender v2 - minor changes 2021-03-03 20:42:16 +01:00
Gerkiz
302e5e1528 fish defender - fix weird time bug 2021-03-02 19:53:42 +01:00
Gerkiz
43e145a94a mtn fortress - more changes 2021-03-01 22:12:36 +01:00
Gerkiz
b7ccdf5a1d mtn fortress - minor changes 2021-03-01 22:04:55 +01:00
Gerkiz
8ada2bbeb9 minor fixes
fixed bug in mtn fortress
enabled soft-resets for fish defender
auto center difficulty gui
2021-02-28 20:55:06 +01:00
hanakocz
718168b9b7 soft reset being timescheduled and globaltabled 2021-02-27 22:40:15 +01:00
Gerkiz
a01e0435f3 rpg and mtn v3 changes 2021-02-25 23:59:33 +01:00
Gerkiz
96638298e3
Merge pull request #231 from hanakocz/master
AI tweak and fixes - chrono
2021-02-25 21:41:17 +01:00
Gerkiz
15a8fdb7f8 minor changes 2021-02-18 22:44:32 +01:00
Gerkiz
e793d827fa mtn fortress - is now compatible with Krastorio 2 2021-02-15 22:34:24 +01:00
Gerkiz
84dead05f1 various tweaks and fixes 2021-02-13 13:04:22 +01:00
hanakocz
dede244279
Merge pull request #50 from M3wM3w/master
update from main
2021-02-13 07:39:55 +01:00
hanakocz
2b4104150c AI tweak and fixes 2021-02-13 07:34:31 +01:00
Gerkiz
307bbe5260 fix weird crash-to-desktop bug 2021-02-12 21:02:57 +01:00
Gerkiz
fba31809c2 minor fixes
removed unused function in poll
fixed rpg exp gui not updating
fixed rpg boss biters not giving xp
fixed spam_protection activated in events it shouldn't
2021-02-12 00:48:56 +01:00
Gerkiz
8f62d1ef9d minor fixes 2021-02-11 23:19:04 +01:00
Gerkiz
48a62d40c3 mtn fortress and wave defense - fixes 2021-02-10 22:08:07 +01:00
Gerkiz
739b99c050 minor tweaks 2021-02-10 21:45:55 +01:00
Gerkiz
ffc737a1f9 mtn fortress - fixes and tweaks 2021-02-10 21:21:19 +01:00
MewMew
4f79a260e8
Merge pull request #227 from itamzxm/master
Add montian defense map
2021-02-10 09:08:30 +01:00
MewMew
a80fa1c9af
Merge pull request #228 from klugemonkey/master
Initial Commit for Scrap Towny FFA Map
2021-02-10 09:06:38 +01:00
itamzxm
899054fd0a
Update main.lua 2021-02-09 18:55:57 +08:00
klugemonkey
29b3a89b33 Fixed issue with invalid force for limited radar
Fixed issue with determining if market is placeable
Allow entities to be placed within the initial town square
Fixed info to remove reference to small plane
Fixed issue with no messages when can't place item due to building restrictions
Fixed issue with inability to place new towns near enemy spawners or turrets
Fixed issue with market listings breaking when special features disabled due to deprecation of computer item
Fixed issue with mining sound missing for big-crash-site-# entities (in mod)
Default to showing entity info for players (alt-info on chests)
2021-02-07 23:01:20 -08:00
itamzxm
db9b176383
Add files via upload 2021-02-08 13:58:24 +08:00
hanakocz
588b87658c
Merge pull request #49 from M3wM3w/master
update from main
2021-02-07 12:56:04 +01:00
hanakocz
2b1e5bb532 Chronotrain update to 1.1 2021-02-07 12:54:25 +01:00
klugemonkey
c3354a4cb9 Initial Commit for Scrap Towny FFA Map 2021-02-06 12:42:10 -08:00
itamzxm
a7cc41e6a0
Add files via upload 2021-02-06 11:16:29 +08:00
itamzxm
e5cae17f70
Add files via upload 2021-02-06 11:15:20 +08:00
itamzxm
4612ac4d30
Merge pull request #2 from M3wM3w/master
nice
2021-02-05 20:56:22 +08:00
Gerkiz
598391931c mtn fortress - tweaks from suggestions 2021-02-04 20:23:07 +01:00
Gerkiz
02a80e8708 mtn and rpg fixes 2021-02-04 19:19:58 +01:00
Gerkiz
dd10035c8d minor fixes to mtn fortress and rpg module 2021-02-03 11:42:06 +01:00
Gerkiz
6f891e47ff mtn fortress - locale changes 2021-02-01 00:09:59 +01:00
Gerkiz
09976010a2 mtn fortress - minor change 2021-02-01 00:05:45 +01:00
Gerkiz
f6b94654c5 mtn fortress - new command
added a command that allows for an admin to disable the wave_defense module
2021-02-01 00:00:29 +01:00
Gerkiz
1bba0eb9bf mtn fortress - player suggestions added 2021-01-31 23:59:49 +01:00
hanakocz
41bde225ab ICW surface sizes fix + rpg magic distances cap 2021-01-30 21:09:31 +01:00
Gerkiz
8f828bd86a minor changes to mnt fortress 2021-01-30 20:43:53 +01:00
Gerkiz
99c48cfd3b tweaks and changes 2021-01-26 20:17:52 +01:00
Gerkiz
816a4a51cb
Merge pull request #223 from hanakocz/master
Quarters map fix + Towny module fix + updated scrap layout + localizations
2021-01-26 19:12:24 +01:00
Gerkiz
5859c2b52b
Merge pull request #221 from ParrotParrot/master
Fix pickaxe level overflow in Cave Miner
2021-01-26 19:11:49 +01:00
hanakocz
acb91e4dfd Quarters map Fixes 2021-01-25 01:37:17 +01:00
itamzxm
fefeeb7862
Merge pull request #1 from M3wM3w/master
111
2021-01-19 19:27:26 +08:00
Gerkiz
01c33a4fe0 more bug fixes 2021-01-12 21:53:19 +01:00
Gerkiz
68b99f39f4 gui spam logging 2021-01-12 21:52:45 +01:00
Gerkiz
0742e6c5af whitespace fix 2021-01-11 16:00:22 +01:00
Gerkiz
507ad4e65e mtn - requested changes 2021-01-11 15:58:12 +01:00
itamzxm
4f8a0456d1
Add files via upload 2021-01-08 00:02:57 +08:00
itamzxm
bc2c5defe4
Delete 1.txt 2021-01-08 00:02:25 +08:00
itamzxm
284a423ff9
Add files via upload 2021-01-08 00:01:31 +08:00
itamzxm
cb6effecab
Add files via upload 2021-01-07 23:52:05 +08:00
itamzxm
2017df0833
Create 1.txt 2021-01-07 23:50:48 +08:00
itamzxm
4eb7c05690
Delete 1.txt 2021-01-07 23:49:36 +08:00
itamzxm
c6040cdaed
Add files via upload 2021-01-07 23:48:24 +08:00
itamzxm
bf23d7f6d0
1
1
2021-01-07 23:47:30 +08:00
ParrotParrot
ea0ede3da6 Fix pickaxe level overflow in Cave Miner
Check to see if the next level is defined when the offer is bought, otherwise do not let it go through.
2021-01-04 02:36:04 +01:00
Gerkiz
db337754cb minor fix 2021-01-03 10:51:49 +01:00
Gerkiz
ee0719442e minor fixes 2021-01-03 10:46:59 +01:00
Gerkiz
0bcd113d1f minor fixes 2020-12-30 22:46:56 +01:00
Gerkiz
fd9940632e tweaks 2020-12-30 11:07:44 +01:00
Gerkiz
ac5b568add commands - buttons need to be activated to be able to use them 2020-12-29 16:19:34 +01:00
Gerkiz
c8eee553ca mtn v3 - fixes 2020-12-29 13:46:53 +01:00
Gerkiz
25b2551976 mtn v3 - highscore tweak 2020-12-29 00:10:07 +01:00
Gerkiz
b64561bbef mtn v3 - changes 2020-12-29 00:09:18 +01:00
Gerkiz
86ac2e0c21 mtn v3 and rpg spells changes 2020-12-28 10:48:25 +01:00
Gerkiz
fcb6b89f6f mtn v3 - minor tweaks 2020-12-20 20:40:12 +01:00
Gerkiz
70c64a2210 mtn v3 - tweaks and fixes 2020-12-20 19:56:26 +01:00
MewMew
03e81fd39b tweaks 2020-12-15 05:00:11 +01:00
Gerkiz
3a13d261e2 make gui handlers utilize anti-spam 2020-12-14 19:36:37 +01:00