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

1615 Commits

Author SHA1 Message Date
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
Gerkiz
47322b6d9b mtn - minor tweak 2020-12-14 18:05:33 +01:00
Gerkiz
d23d62b8e6 we now check what game version is active 2020-12-14 18:02:26 +01:00
Gerkiz
19ef1409de mtn v3 - resource generator fixes 2020-12-14 18:01:40 +01:00
Gerkiz
532acd7444 tweaks to mtn fortress 2020-12-09 19:59:49 +01:00
Gerkiz
a4e5da99fd mountain fortress fixes 2020-12-05 18:09:09 +01:00
Gerkiz
24ddb0154c adjust corpse size of offline_players 2020-12-04 01:20:26 +01:00
Gerkiz
9c6a2476b7 refactor mtn fortress 2020-12-04 01:09:52 +01:00
Gerkiz
31db1ba9b6 Updates to Mountain Fortress
Removed rerolls
Removed Nightmare diff
Fixes by perfectwill
2020-12-02 22:59:39 +01:00
Gerkiz
9f4890c218 mtn fortress tweaks 2020-12-02 09:20:35 +01:00
Gerkiz
51e2971958 minor changes to mtn fortress 2020-11-29 02:23:33 +01:00
Gerkiz
4b8e8ca326 minor tweaks 2020-11-25 21:29:19 +01:00
Gerkiz
41f49ad943 mtn fortress tweaks and wd gui fix 2020-11-25 19:55:51 +01:00
MewMew
ba75be24a0 fix for 1.1 2020-11-24 11:15:46 +01:00
Gerkiz
0eef7c588d mtn fortress tweaks 2020-11-23 22:10:45 +01:00
Gerkiz
77b331dc4d 1.1 fixes
removal of crash-site entities
removal of scrap
removal of plane
removal of railgun
rename techs
rename defines
2020-11-23 22:10:32 +01:00
MewMew
cd474fe19e tweak 2020-11-23 00:50:09 +01:00
Gerkiz
3eb5a23dc1 minor changes to mtn fortress 2020-11-18 15:24:22 +01:00
Gerkiz
af6ba53cd2 tweaks to mtn fortress 2020-11-17 15:03:05 +01:00
Gerkiz
88f46983af mtn fortress changes 2020-11-17 12:45:27 +01:00
Gerkiz
1b2c7f6cd8 tweaks 2020-11-15 19:23:54 +01:00
Gerkiz
f80196c612 fish defender v2 minor tweak 2020-11-11 22:19:30 +01:00
Gerkiz
11dc37ad96 mtn changes 2020-11-10 17:39:40 +01:00
Gerkiz
ab1e4c4a84 fish_v2 changes 2020-11-10 17:39:33 +01:00
MewMew
0226c27e3c tweaks 2020-11-10 14:41:45 +01:00
MewMew
9f976d2579 terrain stuff 2020-11-07 07:40:36 +01:00
MewMew
7affbd2be1 new mining event 2020-11-07 06:43:29 +01:00
Gerkiz
58c5c21a28 changes
added command module for biter battles, to reload and restart scenario
added changes to fish_defender_v2
2020-11-06 10:26:15 +01:00
MewMew
0143e1ae5e update
fix for treasure alerts
biters on source surface are no longer active
random fish drop while mining
2020-11-06 08:12:09 +01:00
Gerkiz
2ab7fb055f fishy fixes 2020-11-04 20:53:19 +01:00
Gerkiz
a76fafa944 lag feista and tweaks 2020-11-04 17:14:30 +01:00
MewMew
221def8ef2 small tweaks 2020-11-02 04:54:56 +01:00
Gerkiz
fd7f4b9c95 minor changes 2020-11-01 16:43:58 +01:00
Gerkiz
50acabfe8c more wonderful tweaks 2020-10-30 22:05:05 +01:00
Gerkiz
8a18e6ef8a
Merge pull request #209 from hanakocz/master
dungeons update + fixes
2020-10-30 18:42:32 +01:00
Gerkiz
75ebb4a3b2 more modules and tweaks 2020-10-30 17:32:40 +01:00
Gerkiz
24831460d3 mtn fortress changes 2020-10-30 10:45:12 +01:00
MewMew
3e35376e50 update
treasure notifications are now alerts
chance & terrain tweaks
2020-10-30 00:16:03 +01:00
MewMew
bcf2280538 new explosives & tweaks 2020-10-29 23:52:45 +01:00
Gerkiz
6470842b72 minor tweaks 2020-10-29 13:07:42 +01:00
MewMew
6506bb7df8 major tweaking 2020-10-29 00:51:52 +01:00
hanakocz
a49ebb7981 dungeons update + fixes 2020-10-28 21:45:36 +01:00
MewMew
e90ddec69f tweaks 2020-10-28 08:02:25 +01:00
MewMew
97d009ac71 tweaks 2020-10-28 06:33:21 +01:00
MewMew
6e151a2439 tweaks 2020-10-28 06:08:20 +01:00
MewMew
0dca8bdfd4 different tiles yield different ore 2020-10-28 05:18:02 +01:00
MewMew
673f068b92 update
randomized markets
another mining event
pond biome
2020-10-28 04:38:20 +01:00
MewMew
7a66e25d72 more random events 2020-10-28 02:47:25 +01:00
MewMew
c3cc9cb031 more mining things 2020-10-28 02:14:47 +01:00
MewMew
6d791ed221 more mining events 2020-10-28 00:49:03 +01:00
Gerkiz
06fed5875c super minor tweak 2020-10-27 09:27:30 +01:00
MewMew
8605e31a91 updates 2020-10-27 01:28:24 +01:00
Gerkiz
da8f82ba29 changes
added export_stats so web panel can fetch data from instance
and minor tweaks
2020-10-26 23:55:06 +01:00
MewMew
2f8137daea update
darkness tweaks
reveal terrain around broken container
2020-10-26 22:27:46 +01:00
MewMew
bc9517b8d8 update
better tier for pet rolls
terrain stuffs
2020-10-25 21:12:36 +01:00
Gerkiz
d746d760ae minor changes 2020-10-25 17:02:37 +01:00
Gerkiz
bef4bfea55 tweaks and fixes 2020-10-24 14:46:14 +02:00
Gerkiz
736f556d82 tweaks 2020-10-22 17:39:23 +02:00
Gerkiz
c2a33b08e0 tweaks 2020-10-22 13:32:18 +02:00
Gerkiz
30fdb4b8ad minor tweaks 2020-10-22 12:44:27 +02:00
Gerkiz
3a96edfa03 tweaks 2020-10-22 00:32:34 +02:00
Gerkiz
92fbf5efd8 minor tweaks to files 2020-10-21 23:17:17 +02:00
MewMew
ed7a4b6c90 update
market prices tweaks
new backpack upgrade
fixed reroll chat spam
2020-10-21 21:23:15 +02:00
Gerkiz
fa269da6ee Tweaks 2020-10-21 17:10:13 +02:00
Gerkiz
85c138c1a2 more tweaks 2020-10-20 11:17:25 +02:00
Gerkiz
4a1ce15e07 tweaks and fixes! 2020-10-19 20:21:27 +02:00