1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-28 23:06:38 +02:00
Commit Graph

383 Commits

Author SHA1 Message Date
Agocelt
1c90065dd4
Update main.lua 2021-10-06 16:41:38 +02:00
Gerkiz
02e07be286 mtn v3 - fix power dedup 2021-10-06 00:01:05 +02:00
Agocelt
77adad0491
Disabling research with no use 2021-10-03 20:50:53 +02:00
Gerkiz
af84582559
Merge branch 'develop' into mtn_v3 2021-10-02 21:40:02 +02:00
Gerkiz
01aa68efad mtn v3 - more fixes 2021-10-02 21:15:31 +02:00
Gerkiz
eaf20f1158 mtn v3 - fix of broken core feature 2021-10-02 21:04:15 +02:00
Agocelt
14b87531c3
Update locomotive.lua 2021-10-01 14:22:09 +02:00
Gerkiz
ebedcb2de4 mtn v3 - portable cars fix 2021-09-19 08:45:11 +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
2a8fb1e92f minor tweaks to mtn v3 2021-08-21 12:46:10 +02:00
Gerkiz
69650051a5 increase tick speed for terrain 2021-08-03 23:05:03 +02:00
Gerkiz
70bb37d7bf wagon out of map fix 2021-07-27 21:22:52 +02:00
Gerkiz
6a165c79cb Minor adjustments 2021-07-23 17:23:33 +02:00
Gerkiz
f60370d103 mtn v3 - reworked how generation is done 2021-07-23 16:38:23 +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
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
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
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
dab23f969a refactor 2021-05-25 22:19:20 +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
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
Gerkiz
5b8c1a2fee various tweaks 2021-05-12 20:52:29 +02:00
Gerkiz
45638522a7 mountain fortress and admin panel fixes 2021-05-09 17:11:18 +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
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
f634ecd69a mtn fortress -fix science bug 2021-04-30 09:11:03 +02:00
Gerkiz
80736a24d5 mtn fortress fixes 2021-04-04 13:50:17 +02:00
Gerkiz
92688aea74 minor changes to planet prison and mtn fortress 2021-03-27 13:44:32 +01:00
Gerkiz
5b88f8fdfc removed comfy_panel_tabs from _G and made it use tokens instead 2021-03-25 23:49:57 +01:00
Gerkiz
e2a33f9f30 luacheck more fixes 2021-03-24 20:14:55 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +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
Gerkiz
7483ae473c mountain fortress v3 - minor changes 2021-03-03 20:42:44 +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
Gerkiz
a01e0435f3 rpg and mtn v3 changes 2021-02-25 23:59:33 +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
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
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
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
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
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
Gerkiz
0eef7c588d mtn fortress tweaks 2020-11-23 22:10:45 +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
11dc37ad96 mtn changes 2020-11-10 17:39:40 +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
Gerkiz
a76fafa944 lag feista and tweaks 2020-11-04 17:14:30 +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
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
Gerkiz
6470842b72 minor tweaks 2020-10-29 13:07:42 +01:00
Gerkiz
06fed5875c super minor tweak 2020-10-27 09:27:30 +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
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
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
Gerkiz
931c175051
Merge pull request #204 from zzh8829/cargo-autostash
Add autostash to filtered cargo wagon
2020-10-18 13:08:29 +02:00
Gerkiz
853bfa1659 minor adjustments
added support for when mods try to call freeplay
fixes for mountain fortress
added more info to wave_defense module
2020-10-18 12:45:18 +02:00
Zihao Zhang
64dfe41461 Add autostash to filtered cargo wagon 2020-10-17 16:43:18 -07:00
Gerkiz
9d7a0a3060 tweaks and fixes 2020-10-11 10:51:58 +02:00
Gerkiz
26cc24d1c5 tweaks to mountain fortress
added pickaxe tiers
added reroll market items
some minor tweaks to various settings
2020-10-10 20:36:51 +02:00
Gerkiz
bc38e122a8
Merge pull request #203 from jacobwatkinsgit/master
mount_fortress_v3 - potential bug and logic bug
2020-10-02 08:52:35 +02:00
Gerkiz
9790e124d9 minor tweak 2020-10-02 08:43:28 +02:00
Jacob
e9f4d87142 mount_fortress_v3 - logic bugs
ic/functions - unused third argument in get_player_entity call

ic/main - logic error - spidertron is not a car and function would fail to create a surface. precedence error - 'not' is higher than '=='. double-error instead was calling create_car every time a player built an entity.
2020-10-02 00:48:16 -04:00
Gerkiz
1211765e56 tweaks 2020-09-25 11:08:15 +02:00
Gerkiz
e61f904699 tweaks and fixes 2020-09-17 09:14:07 +02:00
Gerkiz
37cafe0d9b
Merge pull request #202 from jacobwatkinsgit/master
Mountain Fortress v3 carriage order patch
2020-09-16 20:19:15 +02:00
Jacob
1026238187 Small update to train reversal patch
Without a break, choochoo will be encountered again, but the carriages will be in the desired order after a reversal, accomplishing nothing. Adding a break is a small optimization and is more logical to the desired behavior.
2020-09-14 15:42:00 -04:00
Jacob
e09a3b2c2c Mountain Fortress v3 carriage order patch
patch for the comfy choochoo's surface order reversing when train.carriage order reverses
2020-09-14 14:58:57 -04:00
Gerkiz
f4c5ea7703 fixes 2020-09-12 19:16:38 +02:00
Gerkiz
bd55ede971 fixes 2020-09-05 09:01:11 +02:00
Gerkiz
2c2a757099 localize things 2020-09-04 22:04:28 +02:00
Gerkiz
609f18700c fix weird issue with soft_reset 2020-09-04 16:57:39 +02:00
Gerkiz
1db039d601 updates 2020-09-02 17:36:04 +02:00
Gerkiz
07336111bf tweaks 2020-09-02 08:33:13 +02:00
Gerkiz
7a07ac5cae fixes 2020-08-31 20:37:27 +02:00
Gerkiz
ac6a0b2171 remove laggy function 2020-08-27 15:31:07 +02:00
Gerkiz
a6bba87606 tweaks and desync fix 2020-08-27 13:27:34 +02:00
Gerkiz
39bfe6edbf minor fix 2020-08-26 22:20:18 +02:00
Gerkiz
e4117f9648
Merge branch 'master' into locomotive-market-fix 2020-08-26 20:57:14 +02:00
Tom Fyuri
749a9b2cff market will not destroy your coin for trying to buy too much anymore. 2020-08-26 21:30:47 +03:00
Gerkiz
6e107f3b28 teleport the player safely 2020-08-26 20:15:40 +02:00
Gerkiz
e9a45f33f8 minor tweaks 2020-08-26 20:08:14 +02:00
Tom Fyuri
53c8942cf8 fixing the loco's market buttons 2020-08-26 19:57:12 +03:00
Gerkiz
450909d0ee more tweaks 2020-08-26 12:09:06 +02:00
Gerkiz
b5990868e4 minor tweaks 2020-08-26 11:08:43 +02:00
Gerkiz
7e2215ee3b minor fixes 2020-08-22 20:15:56 +02:00
Gerkiz
786dc954b6 added more config settings to mountain fortress 2020-08-22 18:08:39 +02:00
Gerkiz
72815d08d4 added global disable antigrief to config panel 2020-08-22 17:20:59 +02:00
Gerkiz
27a7e03461 jail surface and explosive gun update 2020-08-21 20:12:18 +02:00
Gerkiz
179400ded8 desync fix and tweaks 2020-08-21 13:56:01 +02:00
Gerkiz
062d63ca6e minor changes to rpg and mtn fortress 2020-08-20 11:35:52 +02:00
Gerkiz
85146ba28e tweaks to several files 2020-08-17 20:18:06 +02:00
Gerkiz
00cb50fc7d fix that when car died player got stuck in nauvis 2020-08-15 14:02:01 +02:00
Gerkiz
c60704303f minor fixes
fixed gui bug where you had to click twice
refactored rpg from .left to .screen
2020-08-15 13:32:47 +02:00
Gerkiz
00f2a9b0c3 minor changes 2020-08-14 23:57:00 +02:00
Gerkiz
632ca676e6 fixes 2020-08-14 22:53:59 +02:00
Gerkiz
cc90180237 minor changes 2020-08-14 22:41:45 +02:00
Gerkiz
e38baa3085 new modules and refactor 2020-08-14 22:07:54 +02:00
Gerkiz
376fbbd569 more tweaks 2020-08-14 17:16:04 +02:00
Gerkiz
9f0db44cc1 tweaks 2020-08-12 18:05:57 +02:00
Gerkiz
eac77097f1 tweaks and new module 2020-08-10 23:15:29 +02:00
Gerkiz
264caefddd tweaks 2020-08-09 20:43:42 +02:00
Gerkiz
6d21857adb more changes to mtn fortress 2020-08-09 20:31:50 +02:00
Gerkiz
3613c37c1c changes to mtn and wave_defense 2020-08-09 20:22:33 +02:00
Gerkiz
76db398831 minor changes 2020-08-05 21:36:20 +02:00
Gerkiz
0a5f986640 minor changes to mtn fortress 2020-08-04 12:10:15 +02:00
Gerkiz
3e92eb9dc0 minor changes 2020-07-31 12:04:46 +02:00
Gerkiz
1f2fa4d910 minor fixes 2020-07-30 22:27:38 +02:00
Gerkiz
9cbfbb0196 more fixes 2020-07-30 19:09:18 +02:00
Gerkiz
0e8945d7f7 tweaks and minor fixes 2020-07-30 17:47:50 +02:00
Gerkiz
e449e827ee added more functions to rpg 2020-07-29 20:24:32 +02:00
Gerkiz
106148f674 minor fixes 2020-07-29 19:30:45 +02:00
Gerkiz
4e75239efd bug fixes 2020-07-28 16:48:55 +02:00
Gerkiz
e36702e038 tweaks and fixes 2020-07-28 11:24:16 +02:00
Gerkiz
9d1653d687 tweaks and fixes 2020-07-27 11:07:32 +02:00
Gerkiz
c670ce2380 minor modifications 2020-07-26 22:06:19 +02:00
Gerkiz
fb97c7e6bc new module and minor changes 2020-07-26 17:14:57 +02:00
Gerkiz
ea5fea5c98 safe updates? 2020-07-25 22:22:21 +02:00
Gerkiz
0e8e6f4a02 refactor 2020-07-25 17:22:04 +02:00
Gerkiz
92cb69c367 tweaks and fixes 2020-07-24 17:33:28 +02:00