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

2824 Commits

Author SHA1 Message Date
Gerkiz
8d419ad5ad
Merge branch 'develop' into patch-2 2021-11-09 23:10:03 +01:00
Gerkiz
84c8659406
Merge branch 'develop' into develop 2021-11-09 23:10:00 +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
34c630da7b
Merge pull request #160 from ComfyFactory/mtn_v3
mtn v3 - minor locale change
2021-11-08 22:02:06 +01:00
Gerkiz
414361fcee mtn v3 - minor locale change 2021-11-08 21:59:54 +01:00
Gerkiz
b5c17c8e5e
Merge pull request #159 from ComfyFactory/rpg_fish_heal
rpg - fish heal
2021-11-08 19:23:11 +01:00
Gerkiz
0e33f6ce3f rpg - fish heal 2021-11-08 19:20:58 +01:00
Gerkiz
12e57cb2ca
Merge pull request #157 from Agocelt/Small-locale-fix
Small locale fix
2021-11-08 09:16:41 +01:00
Gerkiz
ea7186de4d
Merge branch 'develop' into Small-locale-fix 2021-11-08 08:46:09 +01:00
Gerkiz
aa188ce2e4
Merge pull request #158 from ComfyFactory/mtn_v3
Minor change to Biter health booster and Mtn v3
2021-11-07 23:38:21 +01:00
Gerkiz
3ab95c11b3 mtn v3 - minor change 2021-11-07 23:08:42 +01:00
Gerkiz
2b521d1c16 biter health booster - remove stun effect from discharge 2021-11-07 23:08:24 +01:00
Agocelt
4f05565dd2
Small locale fix 2021-11-07 21:07:53 +01:00
Gerkiz
d9308448b8
Merge pull request #156 from ComfyFactory/mtn_v3_breached_wall
mtn v3 - don't let players explore too much
2021-11-07 20:41:57 +01:00
Gerkiz
c732517276 mtn v3 - don't let players explore too much
Exploring too much causes the map to become laggy and players with slower PCs can't play.
2021-11-07 20:40:37 +01:00
Gerkiz
793dea005f
Merge pull request #155 from ComfyFactory/mtn_v3
Mtn v3 - refactor files and minor change
2021-11-07 02:40:54 +01:00
Gerkiz
4b4ce8a38f fix weird formatting 2021-11-07 02:40:04 +01:00
Gerkiz
3cb1d3b7b9 mtn v3 - minor change 2021-11-07 02:37:03 +01:00
Gerkiz
5de6913959 mtn v3 - refactor 2021-11-07 01:18:33 +01:00
Gerkiz
f556a14c93
Merge pull request #154 from ComfyFactory/mtn_v3
mtn v3 - changes to spells and mystical chest
2021-11-07 00:16:06 +01:00
Gerkiz
cdb04ac65c mtn v3 - changes to spells and mystical chest 2021-11-07 00:15:06 +01:00
Gerkiz
17780c5757
Merge pull request #152 from ComfyFactory/poll
poll - fix weird bug
2021-11-06 13:39:12 +01:00
Gerkiz
e280af0e0e
Merge branch 'develop' into poll 2021-11-06 13:37:49 +01:00
Gerkiz
0b5219c540 poll - fix weird bug 2021-11-06 12:44:19 +01:00
hanakocz
a89a2a6288
Merge pull request #151 from ComfyFactory/autostash_fix_for_chest_mixing
fix for misaligned chest indexes in filtered chests
2021-11-05 23:29:10 +01:00
hanakocz
a5c744b1de fix for misaligned chest indexes in filtered chests 2021-11-05 23:24:21 +01:00
Gerkiz
3c728dffff
Merge pull request #150 from ComfyFactory/turret_bug
mtn v3 - fix turret bug
2021-11-05 22:56:42 +01:00
Gerkiz
8175126d75 mtn v3 - fix turret bug 2021-11-05 22:54:00 +01:00
hanakocz
816441ffa2
Merge pull request #149 from ComfyFactory/autostash_optimization
autostash - 33-66% faster execution, respects forces, added white chest
2021-11-02 08:52:41 +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
08ea17b58c
Merge pull request #148 from ComfyFactory/mtn_v3_fix_turrets
Mtn v3 - fix spawning wrong turrets
2021-11-01 17:28:20 +01:00
Gerkiz
f8816dc24d mtn v3 - insert ammo instantly when placing entity 2021-11-01 17:18:08 +01:00
Gerkiz
71f901a584 Mtn v3 - fix spawning wrong turrets
As I and Agocelt spoke through discord, having on_nth_tick refillment for laser-turret is UPS heavy and is not desync save since arbitrary numbers (consumption of the laser-turrets)

Changing this single line will spawn gun-turrets which will be refilled once their ammo depletes.
2021-11-01 16:48:44 +01:00
Gerkiz
737e09d2f6
Merge pull request #147 from ComfyFactory/mtn_v3_icw
Mtn v3 - ICW fix weird bug
2021-11-01 16:48:08 +01:00
Gerkiz
e7061ce2c4 mtn v3 - icw
Fix weird bug
2021-10-29 19:57:02 +02:00
Gerkiz
0545b5c99a
Merge pull request #145 from ComfyFactory/mtn_v3
mtn v3 - minor adjustments
2021-10-29 01:03:02 +02: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
7e4fbfcf5b
Merge pull request #144 from ComfyFactory/mtn_v3
Mtn v3
2021-10-29 00:09:15 +02:00
Gerkiz
0d724fb46d remove unused message 2021-10-29 00:07:45 +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
fd886a4ef2
Merge pull request #142 from ComfyFactory/mtn_v3_changes
mtn v3 - changes
2021-10-24 21:54:39 +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
7ef66fc832
Merge pull request #141 from ComfyFactory/minor_changes
Minor changes to mtn v3 and RPG
2021-10-24 18:11:21 +02:00
Gerkiz
ee2567f899 rpg - tooltip to rpg gui 2021-10-24 18:09:41 +02:00
Gerkiz
711fb9933a rpg - modify the raw-fish of how much it heals 2021-10-24 18:08:37 +02:00
Gerkiz
e56d7ce727 mtn v3 - add coin as a trap
It does not make sense, but here we are
2021-10-24 18:08:15 +02:00