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

844 Commits

Author SHA1 Message Date
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
Gerkiz
b550f3f1ee mtn v3 - features and changes 2021-10-15 16:59:25 +02:00
hanakocz
3e334dce4f fixes to spooky_forest map, outdated modules 2021-10-06 21:56:54 +02:00
hanakocz
8d7bf8865f refactor to ItemStacks, fixes armor modules, durability, deleting items 2021-07-28 22:32:50 +02:00
Gerkiz
10a524716c autostash fix 2021-07-27 21:22:56 +02:00
Gerkiz
034b127902 fix weird LuaInventory stutter 2021-07-26 21:53:57 +02:00
Gerkiz
ba4c612055 corpse marker - minor bug fix 2021-07-23 16:36:34 +02:00
Gerkiz
1e7751f8ba check if explosives are trying to blast void 2021-07-23 16:36:24 +02:00
Gerkiz
10fef17c52 nerf to RPG
This nerf is needed because players at level 200 can mine "safely" from being damaged by worms etc.
2021-07-23 16:36:06 +02:00
Gerkiz
e813e875d7 Bugfix
Fixed antigrief logging limit
Fixed autostash healing/increasing durability of items
Added two new functions to session_data
2021-07-20 22:17:49 +02:00
Gerkiz
fa528af813
removal of whitespace and make luacheck happy 2021-07-14 22:15:14 +02:00
astral17
21fa1854a5 add indicator to rpg spell gui 2021-07-13 18:39:38 +03:00
astral17
b83b7c008b fix medium-spitter tame effect 2021-07-13 17:37:01 +03:00
astral17
1b34a8a480 fix rpg aoe spells mana waste 2021-07-13 17:10:42 +03: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
479f2b36dc enable one_punch 2021-07-02 10:11:17 +02:00
Gerkiz
f9cde783e7 revert changes to rpg table 2021-07-02 10:10:44 +02:00
Gerkiz
0e789e8770 fix weirdness 2021-07-02 10:08:48 +02:00
Gerkiz
b3ffa965eb minor fix to rpg and session 2021-07-01 21:34:39 +02:00
Gerkiz
37710fac2c minor changes 2021-07-01 21:30:29 +02:00
Gerkiz
72f7c5106e minor change to autostash 2021-06-07 14:04:44 +02:00
Gerkiz
d39a8704a3 more fixes 2021-06-06 20:35:04 +02:00
Gerkiz
2e30470025 tweaks and bugfixes 2021-06-06 20:14:26 +02:00
Gerkiz
91935a8671 validate player before stepping onto next function 2021-05-30 21:01:41 +02:00
Gerkiz
3e029f3bac set last_user when refreshing corpse 2021-05-30 21:00:13 +02:00
Gerkiz
2729efa99e set last_user on corpse 2021-05-30 20:52:45 +02:00
Gerkiz
8dde316312 rpg and playerlist updates 2021-05-28 18:28:17 +02:00
Gerkiz
dab23f969a refactor 2021-05-25 22:19:20 +02:00
Gerkiz
08cb7c377a rpg and explosives tweak 2021-05-24 17:21:25 +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
0be0055eb7 minor adjustments done to rpg, wave defense and mtn v3 2021-05-23 02:02:11 +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
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
a94fcc98af Removal of global variables and removed laggy functions 2021-05-07 01:36:10 +02:00
Gerkiz
64e588128e Validate functions and log player messages. 2021-05-07 01:19:38 +02:00
Gerkiz
212ea49997 make luacheck happy 2021-05-04 19:53:40 +02:00
Gerkiz
2065118aca mountain fortress and rpg updates 2021-05-04 19:51:02 +02:00
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