1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Commit Graph

1697 Commits

Author SHA1 Message Date
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
hanakocz
594c850839
Merge pull request #21 from M3wM3w/master
update from main
2020-07-24 02:50:10 +02:00
MewMew
0f4cf43078 more config options 2020-07-23 09:00:36 +02:00
Gerkiz
aa340491d5
Merge pull request #183 from llorephie/CraftingGriefPrevention-20200721
Make crafting grief prevention more aggressive! (and not abusive to server)
2020-07-22 19:13:55 +02:00
Gerkiz
5b60da71d2 fixes 2020-07-22 18:58:42 +02:00
MewMew
4a6559e342 map ping on token use 2020-07-22 14:47:12 +02:00
MewMew
caba716520 map ping when chest is unlocked 2020-07-22 12:25:33 +02:00
MewMew
ca7fd371d1 leavers drop their tokens 2020-07-22 09:12:04 +02:00
MewMew
93f883ddd1 map description 2020-07-22 06:12:45 +02:00
MewMew
162d1e1e9a update 2020-07-22 05:59:32 +02:00
hanakocz
8bc260c276
Merge pull request #20 from M3wM3w/master
update from main
2020-07-21 20:44:10 +02:00
MewMew
1a32dfd061 fix 2020-07-21 19:52:35 +02:00
MewMew
23d5c1aefb tweak & fix 2020-07-21 19:25:00 +02:00
MewMew
6b94bf1737 new map 2020-07-21 17:42:38 +02:00
MewMew
383aeb787c wip map 2020-07-21 15:40:59 +02:00
Gerkiz
2840367b0a minor changes 2020-07-21 14:41:39 +02:00
Gerkiz
f25c81ee6b
Merge pull request #182 from hanakocz/master
rpg fix for getting xp, bonus hp -> bonus xp even if killed by turret
2020-07-21 14:39:09 +02:00
Maxim Martyanov
e3837464b0
Count in addition to inventory full player's inventory size to be sure it can hold everything without invalidation. 2020-07-21 15:14:54 +03:00
Maxim Martyanov
81f810aab8
One more thing to fix - dual queuing (copper plates and iron plates, for example), and count only empty slots in player's inventory 2020-07-21 15:12:09 +03:00
Maxim Martyanov
340ee13fb9
Renamed variables to match codestyle and moved block to it's logical location 2020-07-21 14:00:13 +03:00
Maxim Martyanov
621c1486bf
Make grief prevention more aggressive: kill player's character and hold all crafting queue in corpse (via pre-death inventory resize by bonus multiplier, same used in RPG system and returned by this system back to normal sizes), instead relying on Factorio's item placement, so no items are lost from team.
Corrected shown message on player abuse attempt.
P.S. Not a Lua developer at all, so styleguide may be broken.
2020-07-21 09:40:32 +03: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
Gerkiz
2442340ed6
Merge pull request #181 from hanakocz/master
rpg - personal tax variable + health bonused units always grant bonus xp
2020-07-19 16:45:40 +02:00
hanakocz
874064afe0 rpg - personal tax variable + health bonused units always grant bonus xp 2020-07-19 16:43:56 +02:00
Gerkiz
790c334dda
Merge pull request #180 from hanakocz/master
fix for biter_health_booster deleting worms and spawners from the table
2020-07-19 16:37:24 +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
Gerkiz
b5b9cf4437 move rpg to modules and rename to rpg_v2 2020-07-18 22:18:57 +02:00
hanakocz
7281f40cfe
Merge pull request #17 from M3wM3w/master
update from main
2020-07-18 17:59:32 +02:00
hanakocz
7e90fe9ae7 health_pool fix 2020-07-18 17:55:02 +02:00
Gerkiz
b8d9f5bbae cave choppy fixes 2020-07-18 17:08:56 +02:00
Gerkiz
4d06dbc2cb flamethrower bug fix 2020-07-18 16:36:24 +02:00
Gerkiz
8bc37712ff fixes 2020-07-17 16:59:15 +02:00
hanakocz
f220b2ddda
Merge pull request #16 from M3wM3w/master
update from main
2020-07-16 03:27:30 +02:00
Gerkiz
7da400db14 minor changes 2020-07-14 21:51:04 +02:00
Gerkiz
1f017f687a refactor and new map 2020-07-14 21:50:56 +02:00
Gerkiz
c2829984fe minor fix 2020-07-12 21:11:43 +02:00
Gerkiz
92ced6c64a minor fix 2020-07-12 21:01:11 +02:00
Gerkiz
a5061c02ba revert fish_defender to old version 2020-07-12 20:57:41 +02:00
Gerkiz
22a40f19fa fish_defender_v2 2020-07-12 20:54:44 +02:00
Gerkiz
383f172661 remove unused function 2020-07-12 18:59:30 +02:00
Gerkiz
edbef96f78 fixes 2020-07-12 18:58:00 +02:00
hanakocz
341879f7c9
Merge pull request #15 from M3wM3w/master
update from main
2020-07-12 06:22:26 +02:00
Gerkiz
e43cb5b7f2 refactor and move on_init to antigrief 2020-07-11 20:57:54 +02:00
Gerkiz
0aea9c28b4 tweaks and fixes 2020-07-11 17:04:53 +02:00