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

2602 Commits

Author SHA1 Message Date
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
fd8c9411d1
Merge pull request #97 from Astorin/develop
Update RU locale
2021-07-20 22:25:44 +02:00
Gerkiz
d5395f90a9
Merge branch 'develop' into develop 2021-07-20 22:24:43 +02:00
Gerkiz
0ea8cccf3a
Merge pull request #98 from ComfyFactory/bugfixes
Bugfix
2021-07-20 22:20:33 +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
Shadow_Man
fdc425493a
Merge branch 'develop' into develop 2021-07-18 17:26:13 +02:00
Shadow_Man
7f17f5af22
Update RU locale
Fully checked & translated to Russian language.

P.S. I cannot find "Journey" scenario localization strings. Is it available for translation?
2021-07-18 17:22:18 +02:00
Gerkiz
98c4beac87
Merge pull request #96 from NekoBaron/develop
fish tweeks
2021-07-18 16:04:47 +02:00
Gerkiz
9e5835a412
remove unused vars 2021-07-18 16:03:59 +02:00
Gerkiz
e472043998
make luacheck happy 2021-07-18 16:02:53 +02:00
Gerkiz
e9176c1360
make luacheck happy 2021-07-18 16:01:56 +02:00
NekoBaron
74bad8e026
Update table.lua
changed starting gun turret limit to 3 to try ease low player count defending early game, tweeked difficulties but left normal as is
2021-07-18 14:36:56 +01:00
NekoBaron
8e362e4113
Update main.lua
slight increase in starting items, tweeks to terrain ores and attempt at lowering chance of too dense trees while still giving em a good chance to spawn, the commented code is a side test that creates mutiple spawn area ore piles
2021-07-18 14:35:01 +01:00
NekoBaron
0f4eeb7fe1
Update terrain.lua
add rocks to stone area at start plus increase in starting ores amounts and tiny size increase.
2021-07-18 14:31:34 +01:00
hanakocz
3292db2e23
Merge pull request #95 from ComfyFactory/dungeons_fixes
fixes to renamed vars, function name conflict, removed unused stuff
2021-07-17 22:00:10 +02:00
hanakocz
b33d85bd7d fixes to renamed vars, function name conflict, removed unused stuff 2021-07-17 21:57:24 +02:00
Gerkiz
a9b10eed75
Merge pull request #93 from Astorin/patch-1
Updated RU locale
2021-07-17 20:42:30 +02:00
Gerkiz
a3376841a0
Merge branch 'develop' into patch-1 2021-07-17 20:41:06 +02:00
Gerkiz
01f8706df6
Merge pull request #94 from ComfyFactory/jail_data
Improved jail_data and how it handles different scenarios
2021-07-17 20:40:51 +02:00
Gerkiz
64705020fd Improved jail_data and how it handles different scenarios 2021-07-17 20:39:41 +02:00
Shadow_Man
a184e24d19
Update RU locale 2021-07-15 18:46:04 +02:00
Shadow_Man
e78900315c
Update chronosphere.cfg 2021-07-15 18:44:17 +02:00
Gerkiz
9687cc85fe
Merge pull request #90 from astral17/develop
rpg magic fixes and improvement
2021-07-14 22:16:19 +02:00
Gerkiz
fa528af813
removal of whitespace and make luacheck happy 2021-07-14 22:15:14 +02:00
Gerkiz
f40c8ed9bb
Merge branch 'develop' into develop 2021-07-14 22:12:09 +02:00
Gerkiz
f16f8aceb5
Merge pull request #92 from ComfyFactory/mtn_v3
minor adjustment to locomotive in mtn v3
2021-07-14 22:11:30 +02:00
Gerkiz
edfacd6320 minor adjustment to locomotive in mtn v3 2021-07-14 22:07:57 +02:00
Gerkiz
095042a95e
Merge pull request #91 from ComfyFactory/prestige_system
changes to prestige system
2021-07-14 21:35:47 +02:00
Gerkiz
e2707f68d6 changes to prestige system 2021-07-14 21:34:48 +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
e25374d7d7
Merge pull request #81 from gyorokpeter/develop
fix spelling
2021-07-12 17:01:39 +02:00
Gerkiz
1beb542903
Merge branch 'develop' into develop 2021-07-12 16:57:17 +02:00
Gerkiz
096925c2e2
Merge pull request #89 from ComfyFactory/prestige_system
minor changes to prestige system
2021-07-12 16:54:37 +02:00
Gerkiz
9f9c20de39 minor changes to prestige system 2021-07-12 16:50:58 +02:00
Gerkiz
7e7b668f6a
Merge pull request #88 from ComfyFactory/modules_changes
two new modules and changes to scenario
2021-07-12 16:19:42 +02:00
Gerkiz
7ce9894a15 two new modules and changes to scenario 2021-07-12 16:15:55 +02:00
Gerkiz
a1816f6839
Merge pull request #87 from ComfyFactory/various_fixes
various fixes to modules
2021-07-07 12:24:13 +02:00
Gerkiz
0396c40e76 various fixes to modules 2021-07-07 12:22:22 +02:00
Gerkiz
3ed0199b2b
Merge pull request #86 from ComfyFactory/various_tweaks_to_scenario
various tweaks
2021-07-02 10:53:31 +02:00
Gerkiz
d3880c78a6 various tweaks 2021-07-02 10:52:27 +02:00
Gerkiz
35f7a25ce8
Merge pull request #85 from ComfyFactory/fix_mtn_v3_not_pushed
fix weirdness
2021-07-02 10:12:05 +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
ed56df94e0
Merge pull request #84 from ComfyFactory/minor_changes
minor changes to mtn, rpg and sessions
2021-07-01 21:36:01 +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
gyorokpeter
d1ff33f689 fix spelling 2021-06-26 07:53:58 +01:00