games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Code Issues Releases Activity
3,242 Commits 2 Branches 467 Tags 31 MiB
dc880881a1
Commit Graph

759 Commits

Author SHA1 Message Date
Gerkiz
01d0aa2617 biter health booster fix 2021-04-04 19:30:47 +02:00
Gerkiz
f76af8c582 debug and desync fixes 2021-04-04 13:51:27 +02: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
fdcb1425a5 update thirst module 2021-03-22 22:34:55 +01:00
Gerkiz
56a968c934 autostash - fix 2021-03-21 01:57:02 +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
717d838f39 Event - on_configuration_changed 
Added support to handle multiple handlers
 2021-03-16 22:44:40 +01:00
Gerkiz
f213de2e74 Autostash 
Fixed that stone was inserted when count equals 1.
 2021-03-16 20:09:21 +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
3897c25ba4 fix to calculate hp when no cause (scripted dmg, magic, etc) 2021-03-09 06:40:40 +01:00
hanakocz
da93894188 dungeons fixes (should work on 1.1+ now) + glob table 2021-03-09 02:58:52 +01:00
Quadrum
b9cc23db95
Empty line at end 
Github was sad it didn't exist
 2021-03-08 17:02:15 +01:00
Quadrum
b5a8182160
Add files via upload 2021-03-08 16:55:51 +01:00
Gerkiz
cde421c991 biter health booster - more setters 2021-03-03 20:42:32 +01:00
Gerkiz
ee75821fd7 rpg - minor change to range check when melee 2021-03-01 22:22:50 +01:00
Gerkiz
b7ccdf5a1d mtn fortress - minor changes 2021-03-01 22:04:55 +01:00
Gerkiz
9c97d54f6a rpg - fix xp modifiers and return lowest xp if xp is below 2021-03-01 21:50:49 +01:00
Gerkiz
291b71ae78 wave defense - more logging and minor changes to health boosting 2021-03-01 21:49:30 +01:00
Gerkiz
e0c6c790bf wave defense - change how many units spawn 2021-03-01 21:47:58 +01:00
Gerkiz
2ac677d322 rpg - mana incremental 2021-03-01 21:47:45 +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
ff737e1f62 Added get_speed to module collapse. 2021-02-26 00:05:32 +01:00
Gerkiz
0881cc7cd9 Added get_amount to collapse module. 2021-02-26 00:04:20 +01:00
Gerkiz
a01e0435f3 rpg and mtn v3 changes 2021-02-25 23:59:33 +01:00
Gerkiz
73db3b33a0 biter health booster - xp reward fix 2021-02-25 21:33:37 +01:00
Gerkiz
9f1b31248e documentation added 2021-02-18 22:53:44 +01:00
Gerkiz
15a8fdb7f8 minor changes 2021-02-18 22:44:32 +01:00
Gerkiz
7d516688d6 Wave defense - compatible with Bob Enemies 2021-02-15 22:37:15 +01:00
Gerkiz
8aac247e10 Autostash compatible with krastorio 2 2021-02-15 22:36:20 +01:00
Gerkiz
f006ffa88a wave defense - changes to damage increase 2021-02-14 21:43:31 +01:00
Gerkiz
b1aecf9361 wave defense - changes to how many units are spawned 2021-02-14 21:34:03 +01:00
Gerkiz
921be447b7 changes to biter health booster v2 2021-02-14 21:33:46 +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
Jacob
656e30617d rpg update melee damage gui to show follower modifier 
+1 function to get the count
+en and zh-CN locale strings (only two with rpg.cfg)
 2021-02-11 17:45:21 -05:00
Gerkiz
4abdfa0ede health booster v2 - disable on entity died 2021-02-11 21:16:00 +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
e2513eedc2 minor fix 2021-02-10 21:31:43 +01:00
Gerkiz
9f15c0d3b5 rpg - fix bug 2021-02-10 21:31:26 +01:00
Gerkiz
fcd68fd222 rpg - use the new health booster module 2021-02-10 21:21:51 +01:00
Gerkiz
f84d6351aa wave defense - more set/get 2021-02-10 21:21:29 +01:00
Gerkiz
0f42e14eec health booster - rewrite 2021-02-10 21:21:05 +01:00
klugemonkey
f924f6a584 Fixed issue where on_player_built_tile would return tile name of "stone-path" whereas item to refund should be "stone-brick" 2021-02-08 19:06:16 -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
klugemonkey
c3354a4cb9 Initial Commit for Scrap Towny FFA Map 2021-02-06 12:42:10 -08:00
Gerkiz
727a895354 rpg - more health regen 2021-02-04 20:22:13 +01:00
Gerkiz
b9d0781332 rpg - health regen tweak 2021-02-04 20:21:48 +01:00
Gerkiz
7712532ac7 wave defense - option to toggle more damage from biters 2021-02-04 20:18:31 +01:00
Gerkiz
02a80e8708 mtn and rpg fixes 2021-02-04 19:19:58 +01:00
Gerkiz
943e3d3f35 rpg - one punch bug fixed 2021-02-04 12:27:10 +01:00
Gerkiz
dd10035c8d minor fixes to mtn fortress and rpg module 2021-02-03 11:42:06 +01:00
hanakocz
a5855b3082 RPG spell switcher + minifix for difficulty module 2021-02-03 11:22:44 +01:00
Gerkiz
39abac9f92 minor fixes 2021-02-01 20:01:07 +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
99c48cfd3b tweaks and changes 2021-01-26 20:17:52 +01:00
hanakocz
a99210219e Towny fixes (use scrap layout 2 for new scrap) + difficulty vote locale 2021-01-25 02:26:09 +01:00
Gerkiz
68b99f39f4 gui spam logging 2021-01-12 21:52:45 +01:00
Gerkiz
c12d41d604 minor bug fix 2021-01-12 12:55:09 +01:00
Gerkiz
eac1f62fe4 rpg spells - modify xp gain and disable blacklisted items 2021-01-11 15:59:07 +01:00
Gerkiz
5a49113958 minor tweaks 2020-12-31 18:43:49 +01:00
Gerkiz
45ab49d13a minor fix 2020-12-30 11:12:57 +01:00
Gerkiz
fd9940632e tweaks 2020-12-30 11:07:44 +01:00
Gerkiz
963f5d9a3b RPG - fixes 2020-12-29 13:46:42 +01:00
Gerkiz
4cd6b960d5 autostash - can now be used in bottom gui 
used with Public.buttom_button(value)
 2020-12-29 13:46:32 +01:00
Gerkiz
86ac2e0c21 mtn v3 and rpg spells changes 2020-12-28 10:48:25 +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
d23d62b8e6 we now check what game version is active 2020-12-14 18:02:26 +01:00
Gerkiz
33986059fc difficulty tweak 2020-12-14 18:01:46 +01:00
Gerkiz
6370ac3720 fullness bug fix 2020-12-05 18:11:23 +01:00
Gerkiz
07997af284 inventory bug 2020-12-05 18:10:59 +01:00
Gerkiz
8792fcedac wave defense spawn position fixes 2020-12-05 18:10:53 +01:00
Gerkiz
3e283b4483 resize buttons so they're all the same 2020-12-05 18:09:37 +01:00
Gerkiz
0af022f778 fix autostash lag 2020-12-04 01:09:59 +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
1533bb9ad2 fix for autostash 2020-11-29 02:23:42 +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
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
894e3bdf5c limit to effects 2020-11-20 14:37:47 +01:00
Gerkiz
3eb5a23dc1 minor changes to mtn fortress 2020-11-18 15:24:22 +01:00
Gerkiz
5235ad60b2 minor change on how biters spawn 2020-11-17 15:03:14 +01:00
Gerkiz
dc3b62ed85 wave defense table lookups 2020-11-17 12:45:47 +01:00
Gerkiz
88f46983af mtn fortress changes 2020-11-17 12:45:27 +01:00
Gerkiz
edf007feb3
Merge pull request #216 from jacobwatkinsgit/master 
die uses killed by force
 2020-11-16 22:05:15 +01:00
Gerkiz
1b2c7f6cd8 tweaks 2020-11-15 19:23:54 +01:00
Jacob
5a2ed60718 die uses killed by force 
event.entity.force was making the enemy force kill the biter with a character
 2020-11-14 04:20:00 -05:00
Zihao Zhang
2564873276
black list pipe exp until bonus fix 
please
 2020-11-13 23:13:56 -08:00
Gerkiz
d474dc2c71 difficulty vote 
fixed weird issue where key was nil
 2020-11-10 17:40:21 +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
abc8979745 fixed weird bug where fish_to_win tables were not init 2020-11-04 20:53:42 +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
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
hanakocz
a49ebb7981 dungeons update + fixes 2020-10-28 21:45:36 +01:00
MewMew
0dca8bdfd4 different tiles yield different ore 2020-10-28 05:18:02 +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
45127336a0 autostash fix 2020-10-22 13:33:53 +02:00
Gerkiz
c2a33b08e0 tweaks 2020-10-22 13:32:18 +02:00
Gerkiz
74107c39c7 changes to wave_defense 
biters will no longer search for {x=0,y=0} thanks to perfectwill
tracking unit_groups now with numbers for easy management
removed excessive commands which caused their command.compound to fail
switched to logical_and
 2020-10-22 12:44:14 +02:00
Gerkiz
8043d7fff7 minor fix 2020-10-22 00:35:36 +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
729c252a02 added UPS measurement 
this is done in the wrapper
 2020-10-21 13:34:59 +02:00
Gerkiz
4a1ce15e07 tweaks and fixes! 2020-10-19 20:21:27 +02:00
MewMew
96d554b0af new module 2020-10-19 18:26:24 +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
99769511cb
Merge pull request #201 from hanakocz/master 
rocket silo autolaunches if 100 fish inserted
 2020-10-18 13:07:13 +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
2bf2196798 more efficient checking 2020-10-18 02:39:38 -07:00
Zihao Zhang
64dfe41461 Add autostash to filtered cargo wagon 2020-10-17 16:43:18 -07:00
hanakocz
4f14d19a9a
Merge pull request #33 from M3wM3w/master 
update from main
 2020-10-13 09:35:01 +02:00
MewMew
ca11acb145 update 
fixed solar power
tweak to ore veins
blacklisted certain market price items
 2020-10-12 14:53:10 +02:00
Gerkiz
9d7a0a3060 tweaks and fixes 2020-10-11 10:51:58 +02:00
hanakocz
0289ad9d3e
Merge pull request #32 from M3wM3w/master 
update from main
 2020-10-04 20:26:25 +02: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
MewMew
1e120eed52 added miner tag, fixed wrong text position 2020-09-14 13:07:41 +02:00
MewMew
5d46444d69 clear tag button 2020-09-14 10:45:44 +02:00
MewMew
9c9bff153b module to quick select a tag icon 2020-09-14 09:27:07 +02:00
MewMew
3bac26ed87 cleanup, fixes and brief map descriptions 2020-09-13 13:01:16 +02:00
MewMew
f0adbf7b02 fixes and updates 2020-09-13 10:06:15 +02:00
Gerkiz
f4c5ea7703 fixes 2020-09-12 19:16:38 +02:00
MewMew
099397af0b new module 2020-09-09 22:24:49 +02:00
MewMew
ea1eb464ed fix and tweak 2020-09-09 11:47:27 +02:00
hanakocz
c809bf5da2 rocket silo autolaunches if 100 fish inserted 2020-09-06 05:52:03 +02:00
Gerkiz
75ed42bfc0 tweaks 2020-09-04 23:37:44 +02:00
Gerkiz
2c2a757099 localize things 2020-09-04 22:04:28 +02:00
Gerkiz
398d17820f Minor RPG tweak 2020-09-04 17:14:27 +02:00
Gerkiz
03ad5a166f Portable chest tweaks 2020-09-04 17:05:15 +02:00
Gerkiz
c781099666 infinity chest now supports limit 2020-09-04 17:04:59 +02:00
Gerkiz
0552cb3da9 soft_modded autofill 
Works either globally or per player
 2020-09-04 17:04:46 +02:00
Gerkiz
0de1d9d169 fix undefined HD.position 2020-09-04 16:57:26 +02:00
MewMew
f47b0019d4 updates 2020-09-03 16:11:44 +02:00
Gerkiz
07336111bf tweaks 2020-09-02 08:33:13 +02:00
MewMew
0e52cadfb9 update and fixes 2020-09-02 07:52:19 +02:00
MewMew
825e8466c5 new thingie 2020-09-02 04:51:12 +02:00
Gerkiz
7a07ac5cae fixes 2020-08-31 20:37:27 +02:00
Gerkiz
c9898b2ee9 tweaks 2020-08-31 09:03:18 +02:00
Gerkiz
a6bba87606 tweaks and desync fix 2020-08-27 13:27:34 +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
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
MewMew
e5bb7ee1af module 2020-08-18 09:28:12 +02:00
NekoBaron
821ab3243b
Update surrounded_by_worms.lua 
small edit allowing gamemode to set starting distance of worms via a global
 2020-08-17 23:03:49 +01:00
Gerkiz
85146ba28e tweaks to several files 2020-08-17 20:18:06 +02:00
MewMew
0243c214ef movable recipe window + gui things 2020-08-16 17:36:41 +02:00
MewMew
ad7f3d6edb fix for missing temperature in ingredients 2020-08-16 16:06:57 +02:00
Gerkiz
b5aa2e3cc6 remember your location 2020-08-15 13:47:54 +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
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
eac77097f1 tweaks and new module 2020-08-10 23:15:29 +02:00
Gerkiz
c5b9bc1346 wave_defense changes 2020-08-09 20:23:45 +02:00
Gerkiz
3613c37c1c changes to mtn and wave_defense 2020-08-09 20:22:33 +02:00
Gerkiz
0a5f986640 minor changes to mtn fortress 2020-08-04 12:10:15 +02:00
Gerkiz
1f2fa4d910 minor fixes 2020-07-30 22:27:38 +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
d6d5cfdeba minor tweak 2020-07-29 19:32:05 +02:00
Gerkiz
7836b4b61d magic fix 2020-07-29 19:29:29 +02:00
Gerkiz
9d0e808985 minor fix 2020-07-28 20:09:48 +02:00
Gerkiz
fb8c153cc5 tweaks 2020-07-28 19:55:28 +02:00
hanakocz
eda38113e8 WD - fix for player's spawners would block creating spawners 2020-07-28 13:35:32 +02:00
hanakocz
3318856a51
Merge pull request #23 from M3wM3w/master 
update from main
 2020-07-28 13:33:16 +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
hanakocz
49f434c089 nuclear landmines module 2020-07-25 20:54:54 +02:00
Gerkiz
0e8e6f4a02 refactor 2020-07-25 17:22:04 +02:00
Gerkiz
ae718e358d
Merge pull request #184 from hanakocz/master 
charging station and rpg small fixes
 2020-07-25 16:38:55 +02:00
Gerkiz
92cb69c367 tweaks and fixes 2020-07-24 17:33:28 +02:00
hanakocz
5b6b1d48b5 fix for RPG deleting unit from HP pool before granting XP for more HP 2020-07-24 15:10:20 +02:00
hanakocz
f6aaecdf36 charging station and rpg small fixes 2020-07-24 10:20:03 +02:00
Gerkiz
5b60da71d2 fixes 2020-07-22 18:58:42 +02:00
Gerkiz
2840367b0a minor changes 2020-07-21 14:41:39 +02:00
hanakocz
42c93a6825 new module - charging station (accumulators -> armor) 2020-07-21 04:56:09 +02:00
hanakocz
9966b58fa4 rpg fix for getting xp, bonus hp -> bonus xp even if killed by turret 2020-07-20 19:41:05 +02:00
hanakocz
874064afe0 rpg - personal tax variable + health bonused units always grant bonus xp 2020-07-19 16:43:56 +02:00
hanakocz
6a3e9253ef
Merge pull request #19 from M3wM3w/master 
minor adjustment
 2020-07-19 12:16:39 +02:00
Gerkiz
92c5373f31 minor adjustment 2020-07-19 12:06:53 +02:00
hanakocz
408893ca6e
Merge pull request #18 from M3wM3w/master 
update from main
 2020-07-19 05:07:32 +02:00