2222 Commits

Author	SHA1	Message	Date
blubFisch	f824fdeb5e	Cleanup and remove zones	2022-10-05 19:21:12 +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
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
Piratux	a228fa401a	Fixed uranium-ammo pre-requisites ... Changes: - Fixed uranium-ammo pre-requisites	2022-10-04 23:56:42 +03:00
blubFisch	051e00dd7d	Reformat	2022-10-04 20:45:05 +01:00
Piratux	079be7fe49	Explanatory text for sulfuric barrels in radioactive island ... Changes: - Changed message in radioactive island "2 [sulfuric barrels]" -> "Free resources granted for staying in this island. 2 [sulfuric barrels]"	2022-10-04 22:25:13 +03: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
Piratux	e75091009d	Added science packs to labs in radioactive island ... Changes: - Added science packs to labs in radioactive island.	2022-10-04 21:43:11 +03:00
Piratux	077df6c208	Raffle bandaid fix + added cave island to rotation ... Changes: - Made quest structures return random requirement item when raffle returns nil. This happens because some items have negative weights in lambda raffle. - Added Cave island to B and D island categories.	2022-10-04 21:28:35 +03:00
Gerkiz	f12a3d7d16	Towny - fix bugs	2022-10-04 17:51:22 +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
Piratux	8542a783cf	New cave island ... Changes: - New island: Mysterious caves - New market offers: logistic chests	2022-10-03 00:37:54 +03: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
blubFisch	b2006912dd	Shorten survival goal	2022-09-28 15:01:04 +01: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
Gerkiz	9b1df4aa7e	Towny - disable show_inventory and where command.	2022-09-26 19:48:50 +02:00
blubFisch	22e70ca40c	Branch off worms_create_oil_patches for Towny and rebalance for oil scarcity	2022-09-23 12:46:44 +01:00
Gerkiz	21c2375e5e	Fish v2 - fix error in difficulty	2022-09-23 10:38:52 +02:00
Gerkiz	44cd85e9ed	Towny fixes	2022-09-22 22:14:23 +02:00
Gerkiz	e9b7789f5a	Towny small changes	2022-09-22 20:42:46 +02:00
Gerkiz	8e79d3c800	Towny small fix	2022-09-22 20:25:08 +02:00
Gerkiz	3d856551b4	Towny - merge upstream changes ... Changes done by blubFisch	2022-09-22 20:20:05 +02:00
danielmartin0	4c6701ef39	Update merchants.lua	2022-09-18 14:43:30 +01:00
danielmartin0	4c68fe9b3b	Update merchants.lua	2022-09-18 14:43:18 +01:00
danielmartin0	5912ce09ea	Update merchants.lua	2022-09-18 14:43:08 +01:00
Johny	0cc4b2a05a	Stats GUI fix	2022-09-18 11:35:24 +02:00
Johny	10b1fb18de	Locale changes	2022-09-18 11:32:16 +02:00
Johny	eb2aabb731	Stats GUI shows coins spent on train upgrades	2022-09-18 11:10:58 +02:00
Johny	8e7c92df45	Fixing aura market limit and chest icon	2022-09-18 10:31:10 +02:00
danielmartin0	3880a5a446	luacheck	2022-09-13 22:10:53 +01:00
danielmartin0	b3fb6040a3	luacheck	2022-09-13 22:09:25 +01:00
danielmartin0	d10c9206c2	Merge branch 'develop' into develop	2022-09-13 22:03:59 +01:00
Gerkiz	7b7967cabc	Merge branch 'develop' into improv	2022-09-03 21:28:03 +02:00
Gerkiz	b4c5b42548	Misc - various nil checks	2022-09-03 21:26:20 +02:00
Johny	0f5ef9927a	Adding check for overheal	2022-08-29 18:18:07 +02:00
Johny	b7481c49ab	Purchasing train health heals it by the amount increased	2022-08-29 17:14:33 +02:00