Piratux
a4d591eba5
temp commit
...
note to myself: don't forget to mention changes made here
2022-11-18 15:49:03 +02:00
Piratux
ae2f15aff4
Merge remote-tracking branch 'upstream/develop' into develop
2022-11-18 15:43:17 +02:00
Shadow_Man
bb115d714a
Minor fixes in mtn_fortress RU locale
2022-11-18 13:39:22 +02:00
Gerkiz
9bd9aa7309
Merge pull request #361 from ComfyFactory/mtn_v3
...
Mtn v3 - fix update minimap issue
2022-11-18 01:54:22 +01:00
Gerkiz
c4086bc601
Mtn v3 - fix update minimap issue
2022-11-18 01:52:48 +01:00
Gerkiz
a50ce92989
Merge pull request #360 from Astorin/develop
...
More relevant Journey satellites count comparison
2022-11-17 00:35:09 +01:00
Shadow_Man
46383fc354
More relevant Journey satellites count comparison
...
Small fix for future to easily change maximum satellites count if needed (not hardcoded to 3).
2022-11-17 01:28:36 +02:00
Gerkiz
4606de6207
Merge pull request #359 from ComfyFactory/journey_sat
...
Journey - set max satellites to 3
2022-11-16 23:03:45 +01:00
Gerkiz
4d10581d49
Journey - set max satellites to 3
2022-11-16 22:56:46 +01:00
hanakocz
5cea0c5db5
Merge pull request #358 from ComfyFactory/journey_pollution
...
Pollution diffusion needs to be capped to avoid map corruption
2022-11-16 21:01:28 +01:00
hanakocz
7f7564b0a4
Pollution diffusion needs to be capped to avoid map corruption
2022-11-16 20:48:18 +01:00
Gerkiz
7a7a94ad04
Merge pull request #357 from ComfyFactory/journey
...
Journey - send notifications to discord on world advance
2022-11-16 20:40:31 +01:00
Gerkiz
a776edcdcb
Journey - send notifications to discord on world advance
2022-11-16 20:22:41 +01:00
Gerkiz
fae172e856
Labyrinth - small fix
2022-11-15 22:40:38 +01:00
Gerkiz
76ee1c12b8
Merge pull request #355 from danielmartin0/develop
...
small balance patch to pirates
2022-11-13 23:19:05 +01:00
Gerkiz
385fef72ce
Merge branch 'develop' into develop
2022-11-13 22:53:19 +01:00
Gerkiz
25eb4ffa0e
Merge pull request #352 from Astorin/develop
...
RU locale update
2022-11-13 22:52:23 +01:00
Gerkiz
ac28e269b2
Merge branch 'develop' into develop
2022-11-13 22:49:51 +01:00
danielmartin0
53823b51e5
Update overworld.lua
2022-11-13 21:21:02 +00:00
danielmartin0
273623fa4d
Merge remote-tracking branch 'upstream/develop' into develop
2022-11-13 21:18:25 +00:00
danielmartin0
ce6c9d7a23
small balance patch
2022-11-13 21:17:46 +00:00
Gerkiz
482d83bc7e
Merge pull request #354 from ComfyFactory/pirates
...
Pirates - add the ability to toggle crew disband via config
2022-11-08 22:17:46 +01:00
Gerkiz
dbf857b75e
Merge branch 'develop' into develop
2022-11-08 22:00:47 +01:00
Gerkiz
01bdf4a607
Config - small text edit
2022-11-08 21:56:39 +01:00
Gerkiz
bfaea6e5c8
Pirates - add the ability to toggle crew disband via config
2022-11-08 21:55:40 +01:00
Gerkiz
dd5f9b85e3
Merge pull request #353 from ComfyFactory/mtn_v3_fixes
...
Mtn v3 - minor fixes
2022-11-08 00:11:06 +01:00
Gerkiz
bc45c4a165
Mtn v3 - minor fixes
2022-11-08 00:09:19 +01:00
hanakocz
c6c42f8d2a
Merge branch 'develop' into develop
2022-11-07 14:59:15 +01:00
Gerkiz
c8db36bc4f
Jaildata - fix date issue
2022-11-04 22:39:29 +01:00
Gerkiz
db618b4db8
Merge remote-tracking branch 'origin/develop' into develop
2022-11-04 19:01:31 +01:00
Gerkiz
0d91a9015a
Jaildata - fix date issue
2022-11-04 19:01:11 +01:00
Shadow_Man
3ec6e2c609
RU locale update
...
Minor updates to locale, mtn_fortress_v3, rpg, wave_defense and HUGE update for pirates.
2022-11-03 17:43:32 +02:00
Piratux
a8f45265b4
Description fix
...
Changes:
- Fixed cannon description in dock market
2022-11-01 20:04:08 +02:00
Gerkiz
bbddb0328f
Merge pull request #350 from Piratux/develop
...
Bug fixes and dock market offer tweaks
2022-10-31 12:18:27 +01:00
Piratux
c472de54be
Bug fixes and dock market offer tweaks
...
Changes:
- Cannon upgrade is now more expensive and appears less often.
- Rocket/merchant upgrades are now on fixed location (600L: rockets, 760L: merchants).
- Fixed an error that would upgrade cannons when buying rocket/merchant upgrade in dock.
- Fixed power upgrade appearing in dock.
- Fixed an error when player killed itself.
- Fixed derp emoji not working on discord.
- Fixed respawn speed bonus not working.
2022-10-30 23:25:30 +02:00
Gerkiz
94a8a2e72d
Merge pull request #349 from Piratux/develop
...
Merge fix
2022-10-29 12:40:14 +02:00
Piratux
81905d9d7c
Merge branch 'develop' of https://github.com/Piratux/ComfyFactorio-Pirates into develop
2022-10-29 13:30:17 +03:00
Piratux
00395ecc6c
Merge fix
2022-10-29 13:30:06 +03:00
Gerkiz
0cee6f5f73
Merge pull request #348 from Piratux/develop
...
Pirate ship 1.4.0 update
> > @danielmartin0 are these changes OK to merge? 🦖
>
> Yep, happy to trust @Piratux's judgement. (I also don't have capacity to review atm)
Great to hear! I'll merge these changes.
2022-10-29 11:59:05 +02:00
Piratux
f02d9274cf
Merge branch 'develop' into develop
2022-10-28 17:12:57 +03:00
Piratux
6c14997498
Merge remote-tracking branch 'upstream/develop' into develop
2022-10-28 16:53:02 +03:00
Piratux
9dc0a145ed
Warning fixes
2022-10-28 16:22:59 +03:00
Piratux
595f6d2cf3
Discord tech print fix + green water for radioactive island
...
Changes:
- Radioactive island now has green water (as well as small green brightness that's only seen at night slightly).
- Reduced base amount of resource count quest item requirement by 10%.
- Fixed research tech unintentionally printing to discord when crew disbands.
2022-10-28 15:21:31 +03:00
Gerkiz
dc6a3a4e36
Mtn v3 - fix minor issue
2022-10-27 15:51:17 +02:00
Gerkiz
c42591effd
Merge pull request #347 from ComfyFactory/mtn_v3
...
Refactor and fixes
2022-10-26 00:27:42 +02:00
Gerkiz
9b2e4a2675
Soft reset - minor fix
2022-10-26 00:26:33 +02:00
Gerkiz
5410f00758
Fix luacheck
2022-10-26 00:22:57 +02:00
Gerkiz
6cf1e9eea0
Mtn v3 - final fixes
2022-10-26 00:21:53 +02:00
Gerkiz
e2ee3d6446
Mtn v3 - more fixes
2022-10-26 00:05:47 +02:00
Gerkiz
1dc46a00d4
Mtn v3 - refactor and make one single module
2022-10-25 23:29:40 +02:00
