1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-24 03:47:58 +02:00

50 Commits

Author SHA1 Message Date
blubFisch
1411dae640 Show protection info to other forces 2022-10-07 08:50:58 +01:00
blubFisch
8965ff94b5 Cheaper lasers 2022-10-07 08:50:19 +01:00
blubFisch
7bde2a7f9f Start with 20 laser slots 2022-10-07 08:46:29 +01:00
blubFisch
34290d4d11 Fix for failed zone removal 2022-10-06 07:56:30 +01:00
blubFisch
f853abd030 Fix towny start research 2022-10-06 07:41:10 +01:00
blubFisch
c56de7dd7d Fix a non-update of protection zones and text updates 2022-10-06 07:34:41 +01:00
blubFisch
ff3535205b Rework starting items 2022-10-05 21:03:01 +01:00
blubFisch
f27c7519fc Don't use callback in global to fix desync 2022-10-05 20:45:40 +01:00
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
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
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
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
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
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
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
Gerkiz
95f2e90e55 refactor more gui 2022-04-05 19:28:08 +02:00
Gerkiz
0837a8d329 scrap towny ffa fixes
Rebase from the running save
2022-03-01 18:55:02 +01:00
Gerkiz
cd8f5105e2 first attempt to make luacheck happy 2021-03-24 16:46:00 +01:00
klugemonkey
29b3a89b33 Fixed issue with invalid force for limited radar
Fixed issue with determining if market is placeable
Allow entities to be placed within the initial town square
Fixed info to remove reference to small plane
Fixed issue with no messages when can't place item due to building restrictions
Fixed issue with inability to place new towns near enemy spawners or turrets
Fixed issue with market listings breaking when special features disabled due to deprecation of computer item
Fixed issue with mining sound missing for big-crash-site-# entities (in mod)
Default to showing entity info for players (alt-info on chests)
2021-02-07 23:01:20 -08:00
klugemonkey
c3354a4cb9 Initial Commit for Scrap Towny FFA Map 2021-02-06 12:42:10 -08:00