1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-30 23:17:53 +02:00
Commit Graph

71 Commits

Author SHA1 Message Date
Eric Anderson
7178bd2a41 Fix merge conflict 2022-05-01 14:27:29 -07:00
Eric Anderson
60f5f545bf Merge branch 'master' into dungeons_1.1.1 2022-05-01 14:20:58 -07:00
hanakocz
f26efb12c3 small refactor of duplicated code in dungeons 2022-05-01 20:31:47 +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
Eric Anderson
418d8ea3ee Rebalance based on main Comfy server playthrough.
* Evolution goes up faster with floor level 0.05/level -> 0.06/level;
  e.g. floor 20 now like floor 24 before
* Now require 100 open rooms to descend
* Treasure rooms
  * Occur less frequently as each subsequent one is found. was 1 in 30
    10*Nfound now 1 in 30 + 15*Nfound
  * Rebalanced ores to match end-game science needs. Was very low on
    copper
* Loot
  * Ammo/follower robot frequency ~0.5x previous
  * Loot is calculated at floor evolution * 0.9
  * Loot/box down by 0.75x
* Rocks
  * Ore from rocks from 25 + 25*floor to 40 + 15*floor capped at
    floor 15
  * Rebalanced to include ~10% more coal to give coal for
    power
  * Require getting to room 100 before you can descend
  * Science from rooms 40-160+2.5*floor to 60-300+2.5*floor
  * Atomic bomb research moved to 40-50
2022-04-23 03:21:45 -07:00
Eric Anderson
4c9204747f BUGFIX: code incorrectly handled floors without research 2022-04-10 14:21:44 -07: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
29b865fe3b rename one punch to aoe punch 2022-04-05 20:02:13 +02:00
Eric Anderson
9abbd226da Fix issues found by luacheck 2022-03-29 22:44:51 -07:00
Eric Anderson
72eaf30140 Rebalance item loot so treasure rooms are also limited on available loot 2022-03-29 22:11:30 -07:00
Eric Anderson
b724de5fbb bugfix: change to have more resources accidentally applied to corridors 2022-03-28 22:02:22 -07:00
Eric Anderson
e44d0ef3f6 tweak resources in treasure biome down by 2x it was too high 2022-03-28 22:00:13 -07:00
Eric Anderson
43e7be2337 Make treasure rooms unbounded but lower frequency the more that appear 2022-03-15 00:02:05 -07:00
Eric Anderson
212447a654 Bugfix: not op binds more tightly than >, so not abs(v) < w becomes (not abs(v)) < w which makes lua sad.
Also fix island to have water all around the outside. After refactor it
became clear the logic was probably missing the second not.
2022-03-14 23:58:24 -07:00
Eric Anderson
c99d36f40d Rebalance ores, noop spaghetti mode, add changelog 2022-03-13 21:25:58 -07:00
Eric Anderson
c737a8a679 Disable collapse and spaghetti mode 2022-03-06 23:40:37 -08:00
Eric Anderson
1a080bb95a Nerf ore from rocks. Old formula hit its maximum on floor 2, new formula hits max on floor 19. Tweak resoruce distribution so less stone is generated on the lower levels and the distribution is closer to the all-science distribution 2022-03-06 23:40:11 -08:00
Eric Anderson
f526609a5b Lots more tweaking of the distribution so it is more even across floors. Special case automation so it is always found first on floor 0. 2022-03-06 23:35:30 -08:00
Eric Anderson
864a60ea6b BUGFIX: need to teleport character to dungeon floor before creating character, otherwise creation fails 2022-02-25 21:47:30 -08:00
Eric Anderson
b6ac26fb03 enable dungeons autostash, enable everyone to clear corpses 2022-02-25 19:42:24 -08:00
Eric Anderson
0a4cedeb01 relock research that is incorrectly enabled 2022-02-25 19:39:43 -08:00
Eric Anderson
fe2943bf2f reduce mindist for hard rooms, 200 was too far out. move tech multiplier into research module 2022-02-24 02:17:38 -08:00
Eric Anderson
35308dc65a maybe fix bool/int error in log with parens, if not, will get better line number next time 2022-02-24 02:16:48 -08:00
Eric Anderson
b84e59bf80 tweak recipe unlock pattern to be more controllable. Change research scaling to start hard and scale down as research is found on floors 2022-02-24 02:15:39 -08:00
Eric Anderson
9ae73f34da enable melee mode, move doom rooms under the enable_hard_rooms if test 2022-02-23 03:52:27 -08:00
Eric Anderson
2c0cd0ce94 fix nil dereference 2022-02-23 03:50:42 -08:00
Eric Anderson
3f6ae6210a Enable autostash and corpse clearing lower buttons 2022-02-22 20:19:24 -08:00
Eric Anderson
b647973ff1 Enable randomized technology on all floors 2022-02-21 21:47:11 -08:00
Eric Anderson
ae963fd774 Make hard rooms (acid/concrete) only appear farther out from the center on upper levels 2022-02-21 21:46:06 -08:00
Eric Anderson
cc37d6381d Bound number of spawners and worms in dirtlands; more gradual difficulty curve 2022-02-19 21:02:50 -08:00
Eric Anderson
bebb71b869 Refactor to move research unlock logic to a separate module 2022-02-19 00:33:12 -08:00
hanakocz
b33d85bd7d fixes to renamed vars, function name conflict, removed unused stuff 2021-07-17 21:57:24 +02:00
Gerkiz
dab23f969a refactor 2021-05-25 22:19:20 +02:00
Gerkiz
52f3976337 luacheck fixes 2021-03-24 20:23:53 +01:00
Gerkiz
9d033903fb more luachecks 2021-03-24 18:22:45 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +01:00
hanakocz
8d00522194 more fixes 2021-03-09 04:53:24 +01:00
hanakocz
a1b4d675a8 fix 2021-03-09 03:26:36 +01:00
hanakocz
aefd0c095f actually use the new booster 2021-03-09 03:11:14 +01:00
hanakocz
da93894188 dungeons fixes (should work on 1.1+ now) + glob table 2021-03-09 02:58:52 +01:00
Gerkiz
77b331dc4d 1.1 fixes
removal of crash-site entities
removal of scrap
removal of plane
removal of railgun
rename techs
rename defines
2020-11-23 22:10:32 +01:00
hanakocz
a49ebb7981 dungeons update + fixes 2020-10-28 21:45:36 +01:00
hanakocz
975906ebab Dungeons fixes for gulag/spidertron 2020-10-18 14:36:37 +02:00
MewMew
a0770e2299
Merge pull request #189 from NekoBaron/patch-2
Update boss_arena.lua
2020-08-18 02:20:22 +02:00
Gerkiz
c60704303f minor fixes
fixed gui bug where you had to click twice
refactored rpg from .left to .screen
2020-08-15 13:32:47 +02:00
NekoBaron
455b018c20
Update boss_arena.lua
Fixed arena cleanup, randomised the player/boss spawn position, added delay to entering/exiting arena, possibly fixed the arena rare crash.
2020-08-11 23:02:08 +01:00
hanakocz
a25e6d1e54 dungeons tiny update 2020-08-08 13:17:36 +02:00
hanakocz
6716201d71 MultiDungeons 2020-07-29 21:28:48 +02:00