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
4,356 Commits 2 Branches 467 Tags 31 MiB
50b1acc6cc
Commit Graph

899 Commits

Author SHA1 Message Date
blubFisch
dee19c04ce Remove unused variable 2022-09-28 11:12:47 +01:00
blubFisch
e413bd23bf Reactivate member limit (at least for now until we have proper solution) 2022-09-28 10:58:09 +01:00
blubFisch
c7ea88d6db Show player numbers in scoreboard instead of info section 2022-09-28 10:27:58 +01:00
blubFisch
fe5824af78
Merge branch 'develop' into develop 2022-09-28 09:48:14 +01:00
Gerkiz
9b1df4aa7e Towny - disable show_inventory and where command. 2022-09-26 19:48:50 +02:00
blubFisch
22e70ca40c Branch off worms_create_oil_patches for Towny and rebalance for oil scarcity 2022-09-23 12:46:44 +01:00
Gerkiz
44cd85e9ed Towny fixes 2022-09-22 22:14:23 +02:00
Gerkiz
3d856551b4 Towny - merge upstream changes 
Changes done by blubFisch
 2022-09-22 20:20:05 +02:00
Gerkiz
6379675a75 Fix weird gui on launch fish to win module 2022-09-15 00:01:51 +02:00
Gerkiz
c788309d63 Wave defense - minor fix 2022-09-07 21:37:15 +02:00
Gerkiz
1369566160 Wave defense - pause without votes 2022-09-03 21:25:56 +02:00
Gerkiz
5f699f3f07 RPG - fix a weird migration issue 2022-08-29 16:35:24 +02:00
Gerkiz
b6e74d636d RPG - remove debug settings 2022-08-14 21:57:50 +02:00
Gerkiz
02f0cda608 RPG - fix level issue 2022-08-14 21:56:11 +02:00
Gerkiz
e3875bee28 Rpg - fix weird spell gui 2022-08-14 16:45:25 +02:00
Gerkiz
6d702f3af0 Wave defense - add more targets to biters 2022-08-12 19:12:39 +02:00
Gerkiz
a59ccf6c12 RPG 
Fixes that some spells couldn't spawn aoe spells.
Fixes that you only see spells that you actually have unlocked by level.
 2022-08-12 19:12:15 +02:00
Gerkiz
65fb220488 Autostash - fix weird event bug when mods call raise_event 2022-08-12 19:11:27 +02:00
hanakocz
65908c5331 Backpack - fixed the collision with toolbelt tech not accounted 2022-08-08 00:08:04 +02:00
hanakocz
e5f66882f1 Satellite score fix for size of icon and bar graphics, global into Token 2022-08-08 00:06:33 +02:00
Gerkiz
f4ac35a5eb fix autostash 2022-08-04 20:34:37 +02:00
Gerkiz
664b400198 new module and changes to rpg and mtn v3 2022-07-19 00:25:42 +02:00
Gerkiz
1f0a6577a3 minor changes 2022-07-11 00:14:21 +02:00
Gerkiz
e12bf74822 mtn v3 - more difficulty fixes 2022-07-10 21:53:18 +02:00
Gerkiz
2f54542c2f rename module 2022-07-10 21:37:11 +02:00
Gerkiz
897360c70c update module 2022-07-10 20:27:18 +02:00
Gerkiz
f2baab5978 minor changes 2022-07-10 19:42:07 +02:00
Gerkiz
b30f814d3a difficulty fix 2022-07-10 19:41:54 +02:00
Gerkiz
1b1b7b620b new module 2022-07-10 19:41:43 +02:00
Gerkiz
fdcc742914 rpg - fixes 2022-07-06 18:26:28 +02:00
Gerkiz
12edab06f0 Fix minor log issue 2022-06-27 00:17:03 +02:00
Gerkiz
4e1a5d279b Minor change to clear_vacant_players 2022-06-26 23:35:20 +02:00
Gerkiz
3ee2795ebc New module - clear vacant players 2022-06-26 23:33:05 +02:00
Gerkiz
a4193242f3 RPG - fix capsule history 2022-06-26 22:37:51 +02:00
Gerkiz
980d616e16 WD - log wave to discord 2022-06-26 22:37:41 +02:00
Gerkiz
ac403cf52f Luacheck - make ya happy! 2022-06-25 23:41:39 +02:00
Gerkiz
0bf4f9fb5a fix autostash 
from profiler: 2959x C function "can_insert". Total Duration: 10693.515400ms
 2022-06-25 23:39:04 +02:00
Gerkiz
e85271ef2b small fixes 2022-06-10 22:06:47 +02:00
Gerkiz
bd3aaeb131 Vote - fix that players could vote when timer ended 2022-06-09 00:06:38 +02:00
Gerkiz
1e3f0ff811 fix bugs 2022-06-07 17:39:57 +02:00
Gerkiz
0d1773ef91 rpg - fix xp bug 2022-05-25 21:55:52 +02:00
Gerkiz
30a6264041 rpg - minor fix 2022-05-20 10:33:11 +02:00
hanakocz
50469c804b bp requesting - player can disable the feature in config menu 2022-05-16 01:02:25 +02:00
hanakocz
49781aef5c
Merge branch 'develop' into blueprint_requesting 2022-05-15 01:03:22 +02:00
hanakocz
f121bbd8ca module to set requests in logi chests to blueprint total costs 2022-05-15 00:55:36 +02:00
Gerkiz
c2d272e8bb Collapse fix 2022-05-14 19:15:51 +02:00
Gerkiz
f0560c1d27 misc fixes 2022-05-12 22:22:03 +02:00
Gerkiz
e50243a20b wave defense - fixes 2022-05-12 22:19:00 +02:00
Gerkiz
d7a502d8fb Rpg spells - fix capsules 2022-05-08 10:51:48 +02:00
Gerkiz
304b3402fc
Merge branch 'develop' into master 2022-04-25 08:12:32 +02:00
Eric Anderson
7e55d2453e Disable start_now in collapse rather than adding disable feature. 
It looks like this works to keep the collapse logic from running.
It relies on the dungeons on_init function running after the collapse
one.
 2022-04-24 19:50:50 -07:00
Gerkiz
12cee19db9 remove test file 2022-04-23 18:25:24 +02:00
Gerkiz
984b73b365 fix minor gui issues 2022-04-23 18:22:00 +02:00
Gerkiz
8bc93d8d6c rpg and autostash fixes 2022-04-23 17:10:15 +02:00
Eric Anderson
7cc268fab6 use type (red/blue chest) instead of position for identifying valid autostash targets for dungeons 2022-04-23 03:29:07 -07:00
Gerkiz
e33409e7a1 rpg - fix issues 2022-04-21 21:05:02 +02:00
Gerkiz
083c9f0d06 small fix 2022-04-18 18:48:23 +02:00
Gerkiz
b31379378c minor fixes 2022-04-18 18:46:19 +02:00
Gerkiz
766003c8c7 make luacheck happy 2022-04-18 01:20:26 +02:00
Gerkiz
1ccbbb6c0e minor change to diff gui 2022-04-18 01:18:58 +02:00
Gerkiz
a3cd26b88f fix rpg 2022-04-18 01:18:25 +02:00
Gerkiz
378dfe373d fix gui issues 2022-04-18 01:18:06 +02:00
Gerkiz
11a0f7f7ca wave defense fixes 2022-04-18 01:17:16 +02:00
Gerkiz
9bf24f6659 fix minor issue with rpg 2022-04-11 21:13:33 +02:00
Gerkiz
8c50414566 rpg - add callbacks instead of messy function 2022-04-08 22:00:39 +02:00
Eric Anderson
938528798b Update changelog module and tiered dungeon to handle move of comfy_panel to utils.gui 2022-04-07 21:50:05 -07:00
Eric Anderson
b8158f1f01 Merge remote-tracking branch 'gh/develop' into master 2022-04-07 21:05:59 -07:00
Eric Anderson
26f34ea8d5 Review fixes. 
* Clearing corpses remains trusted only.
* Remove spurious debugging code.
 2022-04-07 20:54:22 -07:00
Gerkiz
5a6539b6db fix gui issue 2022-04-07 16:11:26 +02:00
Gerkiz
4ce2342629 rpg - revert inventory bonus 2022-04-07 16:10:40 +02:00
Gerkiz
29b865fe3b rename one punch to aoe punch 2022-04-05 20:02:13 +02:00
Gerkiz
95f2e90e55 refactor more gui 2022-04-05 19:28:08 +02:00
Gerkiz
a51d361824 tweaks and changes 2022-04-05 12:00:13 +02:00
Eric Anderson
9abbd226da Fix issues found by luacheck 2022-03-29 22:44:51 -07:00
Eric Anderson
79e9bdee7e Merge https://github.com/eric-anderson/ComfyFactorio into master 2022-03-29 22:15:56 -07:00
Gerkiz
7cf25ff1c0 Fix minor gui issue 2022-03-29 22:24:58 +02:00
Gerkiz
e5611d8a3c minor fix 2022-03-29 21:35:00 +02:00
Eric Anderson
e91d492a93 Fix sundry bugs in the changelog implementation 2022-03-15 00:01:32 -07:00
Eric Anderson
87a9c5de43 Add changelog module to the panel 2022-03-13 21:18:42 -07:00
Eric Anderson
73b5d03276 Add ability to entirely disable collapse. It is used by RPG and causes log spamming (12G log when noticed) because it can not collapse in tiered dungeon 2022-03-06 23:37:16 -08:00
Gerkiz
4edfd949d1 fix hunger games 2022-03-06 00:34:05 +01:00
Gerkiz
1a7d6f1c77 make luacheck happy 2022-03-01 19:33:13 +01:00
Gerkiz
0191cf5e5d scrap towny ffa fixes 2022-03-01 19:31:57 +01:00
Gerkiz
f065a745bb more fixes 2022-03-01 19:16:44 +01:00
Gerkiz
0837a8d329 scrap towny ffa fixes 
Rebase from the running save
 2022-03-01 18:55:02 +01:00
Gerkiz
8cae376904 wave defense - minor issue fix 2022-02-28 22:16:16 +01:00
Eric Anderson
e87adce867 Handle the case where player is dead 2022-02-25 21:46:23 -08:00
Eric Anderson
d0736d4fb5 Add hook to enable autostash into the dungeons linked chests 2022-02-25 19:41:20 -08:00
Eric Anderson
bc5729313e add lots of missing locals, fix print to use proper quoting 2022-02-24 02:14:35 -08:00
Eric Anderson
64b0a33073 Add support for a button to put character in melee mode so that guns/ammo will not go into weapon/ammo slots 2022-02-23 03:51:51 -08:00
Gerkiz
222c81980e Map update and module fix 2022-02-22 21:26:00 +01:00
Gerkiz
8ae1318c50 Don't check for entity ghosts when checking fullness 2022-02-13 23:33:10 +01:00
Gerkiz
ebb95ee000 Spam check players 2022-02-13 23:32:57 +01:00
Gerkiz
49f342d3fd rpg - future fix 2022-01-14 22:53:27 +01:00
Gerkiz
d909dc42ba Wave defense - minor change 2022-01-14 22:50:49 +01:00
Gerkiz
7750b47722 Wave defense - user requested feature 
Prints a popup to pause the wave defense waves for 5 minutes. Requires 50% of connected players to have voted.
 2022-01-14 21:58:43 +01:00
hanakocz
dfa4b2598b New module - automatically fill placed turrets with ammo 2021-12-25 23:54:27 +01:00
Gerkiz
eddab8b0b0 Range buffs 
Remove logging
 2021-12-18 14:12:41 +01:00
Gerkiz
8a91c249f1 Explosives 
Added cliff-explosives to explosives.
 2021-12-18 14:04:02 +01:00
Gerkiz
66fd4b6f9c RPG 
Added buffs to weapon ranges. Hard limited to 5 as of now.
 2021-12-18 14:03:48 +01:00
Gerkiz
da85c08300 Wave defense 
Bosses are boosted when wave is above 50
Units are boosted only when wave is above 200
Adjusted unit group sizes
 2021-12-18 14:03:22 +01:00
Gerkiz
6b543ae2b2 RPG - Range buff 
Adds buffs  to ranged weapons
 2021-12-18 14:02:45 +01:00
Gerkiz
b86b81c830 fix wave defense 2021-12-10 23:02:33 +01:00
Gerkiz
c1536fe5b4 Biter health booster - more checks 2021-12-10 22:47:30 +01:00
Johny
02bb30997d Balance worm health and gun turrets 2021-12-06 16:22:25 +01:00
Johny
64f1a845b4 Balance biter health 2021-12-06 10:19:08 +01:00
Gerkiz
a837a97100 minor fix 2021-12-05 22:35:53 +01:00
Gerkiz
7ccec23e28 minor gui changes 2021-12-05 22:26:18 +01:00
Gerkiz
966dcf220a Move files in main folder to utils 2021-12-05 22:15:49 +01:00
Gerkiz
a9cbdbd270 add wintery mode 2021-11-28 21:20:23 +01:00
Gerkiz
495b6416d2 balance tweaks and bug fixes 2021-11-28 20:42:38 +01:00
Gerkiz
04cabd81ad rpg - fix one punch causing lag 2021-11-26 08:52:31 +01:00
Gerkiz
18d126463f minor fixes 2021-11-23 20:30:34 +01:00
Gerkiz
a4f45b8734 Changes to modules and map 2021-11-22 20:16:33 +01:00
Gerkiz
8e5d86506a minor fixes 2021-11-20 20:04:13 +01:00
Gerkiz
9848941de2 rpg - add more buttons 2021-11-20 00:37:35 +01:00
Gerkiz
7150c04318 autostash - check if a player is spamming 2021-11-20 00:37:15 +01:00
Gerkiz
efcd112a06 wave defense - add a different boss health scale 
Does not scale as fast as the previous one.
 2021-11-19 22:22:17 +01:00
Gerkiz
e35e9122dc wave defense - minor fixes 
Fixes that unit_group_pos contained infinite entries
Fixes boss health, scales it way better
Fix and use the old set_enemy_evolution set by mewmew
 2021-11-19 22:21:31 +01:00
Gerkiz
b2cac3faa5 minor non game breaking changes 2021-11-18 00:58:54 +01:00
Gerkiz
22fe44732b scrap towny - fix desync 2021-11-16 23:13:36 +01:00
Gerkiz
447c232317 minor fix 2021-11-14 22:08:53 +01:00
Gerkiz
b679e32dc5 more refactor 2021-11-14 21:01:01 +01:00
Gerkiz
2501240d53 refactor 2021-11-14 13:02:00 +01:00
Gerkiz
39908a9f72 rpg - use local where we can 2021-11-13 02:11:17 +01:00
Gerkiz
e95b30db5c wave defense - fix that biter_health_boost was always a static value 2021-11-13 02:09:19 +01:00
Gerkiz
c3f52d46f8 wave defense - minor fix 2021-11-12 23:27:51 +01:00
Gerkiz
b4becfd882 mtn v3 - minor changes 
Chemical plants now produce explosives out in the wild.
Fixed stack error of wave defense.
Modified so worms and spawners that are spawned when threat is high, to also be included in the scalement of health.
 2021-11-12 18:09:24 +01:00
Gerkiz
a983d0bf78 biter health booster - restored stun effect 
Biters now have a chance to recover from stun-effect and get slowed instead.
 2021-11-11 01:56:52 +01:00
Gerkiz
2e277143f6 rpg - use local values 2021-11-11 01:56:14 +01:00
Gerkiz
336cc6c77d wave defense - minor changes 
Fixed a bug that made so spawners did not spawn.
Modified so biters have the ability to spawn within a radius.
 2021-11-11 01:56:03 +01:00
Jacob
f088fd215c inserter_drops_pickup player must have inventory 
event may error if player does not have an inventory
 2021-11-09 00:28:49 -05:00
Jacob
a2bac17e91 new module inserter_drops_pickup 
Small QoL addition to pick up an item an inserter put down on the ground. If the inventory is full after mining the item, the inserter is left behind as an item-on-ground (versus not mined at all when the inventory is full)
 2021-11-08 21:58:32 -05:00
Gerkiz
0e33f6ce3f rpg - fish heal 2021-11-08 19:20:58 +01:00
Gerkiz
2b521d1c16 biter health booster - remove stun effect from discharge 2021-11-07 23:08:24 +01:00
Gerkiz
cdb04ac65c mtn v3 - changes to spells and mystical chest 2021-11-07 00:15:06 +01:00
hanakocz
a5c744b1de fix for misaligned chest indexes in filtered chests 2021-11-05 23:24:21 +01:00
hanakocz
2ec1a1d426 final fixes for all possible cases 2021-11-02 08:45:14 +01:00
hanakocz
45afbd20dc autostash - 33-66% faster execution, respects forces, added white chest 2021-11-02 07:08:30 +01:00
Gerkiz
8a5a00d036 mtn v3 - minor adjustments 
RPG - enable one_punch and stone_path once.
Locomotive Market - change visual bug
 2021-10-29 00:56:12 +02:00
Gerkiz
6f15ee4d34 mtn v3 - mystical chest adjustments 2021-10-29 00:06:35 +02:00
Gerkiz
87d019dd24 mtn v3 - minor change to fish healing 2021-10-28 18:58:00 +02:00
Gerkiz
40638634d7 make luacheck happy 2021-10-24 21:53:49 +02:00
Gerkiz
8c6d54ac85 mtn v3 - changes 2021-10-24 21:50:48 +02:00
Gerkiz
711fb9933a rpg - modify the raw-fish of how much it heals 2021-10-24 18:08:37 +02:00
Gerkiz
ff951394bb explosives - minor change 
Whenever collapse is active make sure that we don't fill with landtile below it.
 2021-10-24 15:43:43 +02:00
Gerkiz
6b7316874d
Merge branch 'develop' into Inventory-fullness-flying-text 2021-10-23 00:07:42 +02:00
Gerkiz
a97ce5f60b update fjei to latest 2021-10-23 00:04:17 +02:00
Gerkiz
11e3fd773a update fjei to latest 2021-10-23 00:04:01 +02:00
Agocelt
14090acbb6
Turning fullness warning into flying text 2021-10-19 16:56:44 +02:00