3658 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
blubFisch	58dcf78831	Merge branch 'town-protection' of github.com:blubFisch/ComfyFactorio into town-protection	2022-10-05 20:17:34 +01:00
blubFisch	db2060b93d	Fix global var	2022-10-05 20:16:53 +01:00
Gerkiz	c21ae239e8	Merge branch 'develop' into town-protection	2022-10-05 21:15:22 +02:00
blubFisch	b3ee0a4de2	Increase zone size	2022-10-05 20:13:07 +01:00
blubFisch	df0eb28925	Force check and polishing	2022-10-05 20:10:45 +01:00
blubFisch	6349c7663b	Display protection	2022-10-05 20:02:35 +01:00
Gerkiz	63d085b8b9	Merge pull request #321 from blubFisch/develop-blub ... Disable artillery	2022-10-05 20:48:40 +02:00
blubFisch	bce447cf96	Comment out arty for luacheck	2022-10-05 19:38:19 +01:00
blubFisch	94f8d3befc	Zone lifetime	2022-10-05 19:33:59 +01:00
blubFisch	f824fdeb5e	Cleanup and remove zones	2022-10-05 19:21:12 +01:00
blubFisch	6d09cc29fa	Merge branch 'ComfyFactory:develop' into develop-blub	2022-10-05 18:24:32 +01:00
blubFisch	b4246578cd	Disable artillery	2022-10-05 18:23:48 +01:00
blubFisch	6cc6d84ed4	Cleanup	2022-10-05 18:21:32 +01:00
blubFisch	f225b21c50	Basic Zone mechanics working	2022-10-05 17:32:44 +01:00
Gerkiz	838007bcfd	Merge pull request #320 from blubFisch/develop-blub ... Remove fallen town's entity ghosts (maybe desync fix) + random small stuff	2022-10-05 18:30:49 +02:00
blubFisch	792a795840	Override natural deep water "walls" to make map edges less OP	2022-10-05 09:24:14 +01:00
blubFisch	0e706a61de	Fix losing map at 2nd join (can't test though, might not be 100% correct)	2022-10-05 09:17:51 +01:00
blubFisch	87c48b61ac	Merge branch 'develop' into develop-blub ... # Conflicts: # maps/scrap_towny_ffa/team.lua	2022-10-05 09:12:30 +01:00
blubFisch	bc27bbe2ea	Recreate hint to not attack biters as outlander	2022-10-05 09:09:28 +01:00
blubFisch	051e00dd7d	Reformat	2022-10-04 20:45:05 +01:00
blubFisch	2968892a2b	Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub	2022-10-04 20:14:06 +01:00
blubFisch	12c35b40d4	Remove fallen town's entity ghosts (maybe desync fix)	2022-10-04 20:13:42 +01:00
Gerkiz	2589a68ad8	Merge pull request #319 from ComfyFactory/towny ... Towny - fix bugs	2022-10-04 17:53:23 +02:00
Gerkiz	f12a3d7d16	Towny - fix bugs	2022-10-04 17:51:22 +02:00
Gerkiz	08dea44480	Merge pull request #318 from blubFisch/develop-blub ... Cleanup and re-import resource balance	2022-10-04 17:50:10 +02:00
Gerkiz	8bd87edf62	Remove XDB logging as it fills the log.	2022-10-04 17:48:39 +02:00
blubFisch	25781a5288	Reduce rock ores	2022-10-04 16:44:42 +01:00
blubFisch	30b21af2da	Add hint about mining productivity upgrade	2022-10-04 16:37:29 +01:00
blubFisch	ca2a7f449c	Restore MGS settings: low-yield generated patches	2022-10-04 16:32:28 +01:00
blubFisch	557ab6621b	More scrap	2022-10-04 16:12:06 +01:00
blubFisch	95c1f5b1ea	Refactor - move last of the custom scripts to towny map	2022-10-04 16:03:00 +01:00
blubFisch	f2d00b122b	Merge branch 'develop' into develop-blub	2022-10-04 15:56:38 +01:00
Gerkiz	b221cd1cf8	Merge pull request #317 from ComfyFactory/vacant_players ... Clear vacant players - fix breaking iterator	2022-10-04 11:22:01 +02:00
Gerkiz	7d4ac6dedb	Clear vacant players - fix breaking iterator	2022-10-04 11:19:32 +02:00
Gerkiz	46a0bf09a3	Merge pull request #316 from ComfyFactory/tweaks ... Refactor and minor changes	2022-09-30 22:26:23 +02:00
Gerkiz	b7c5fb9ffe	Remove unused modules	2022-09-30 22:24:10 +02:00
Gerkiz	1b57f00a53	Mtn v3 - only post when wave is >= 1000 to discord	2022-09-30 22:24:01 +02:00
Gerkiz	30f207da55	Refactor Scrap Towny and ix desync issues	2022-09-30 22:23:37 +02:00
Gerkiz	4aa1a1b190	Update luacheckrc	2022-09-30 22:18:31 +02:00
blubFisch	4f800fe21e	Text updates and debug info	2022-09-28 15:40:01 +01:00
Gerkiz	7be027fe0c	Merge pull request #314 from blubFisch/develop-blub ... Show player numbers in scoreboard instead of info section + Player limit	2022-09-28 16:02:47 +02:00
blubFisch	b2006912dd	Shorten survival goal	2022-09-28 15:01:04 +01:00
blubFisch	dde456958e	Remove unused variable	2022-09-28 15:00:04 +01:00
blubFisch	dee19c04ce	Remove unused variable	2022-09-28 11:12:47 +01:00
blubFisch	d187b91952	Merge branch 'develop-blub' of github.com:blubFisch/ComfyFactorio into develop-blub	2022-09-28 10:58:25 +01:00
blubFisch	e413bd23bf	Reactivate member limit (at least for now until we have proper solution)	2022-09-28 10:58:09 +01:00
Gerkiz	db6e54cf02	Merge branch 'develop' into develop-blub	2022-09-28 11:32:01 +02:00
Gerkiz	598507ee9d	Merge pull request #313 from blubFisch/develop ... Branch off worms_create_oil_patches for Towny to rebalance for oil amount	2022-09-28 11:31:39 +02:00
blubFisch	c7ea88d6db	Show player numbers in scoreboard instead of info section	2022-09-28 10:27:58 +01:00
blubFisch	fe5824af78	Merge branch 'develop' into develop	2022-09-28 09:48:14 +01:00