games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Code Issues Releases Activity
3,262 Commits 2 Branches 467 Tags 31 MiB
fa5e856b11
Commit Graph

3262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerkiz
fa5e856b11
Merge branch 'develop' into develop 2022-06-07 17:43:37 +02:00
Gerkiz
b6e0f74655
Merge pull request #274 from danielmartin0/develop 
Localisability for Pirates. Should be in the main comfy repo so translators know what to work with
 2022-06-07 17:43:29 +02:00
Gerkiz
2a4475da41
Merge branch 'develop' into develop 2022-06-07 17:42:30 +02:00
Gerkiz
410ed2710e
Merge pull request #275 from ComfyFactory/bugfixes 
Fixes
 2022-06-07 17:42:06 +02:00
Gerkiz
1e3f0ff811 fix bugs 2022-06-07 17:39:57 +02:00
danielmartin0
47c7be0a68 luacheck 2022-06-06 15:55:24 +01:00
danielmartin0
ffde08ffbb unrequire pirates for pr 2022-06-06 15:41:26 +01:00
danielmartin0
39d94709df some luacheck 2022-06-05 12:02:51 +01:00
danielmartin0
685b27cbe1 version number up 2022-06-05 11:58:45 +01:00
danielmartin0
cc39d1fcee make swamp slightly nicer 2022-06-04 16:53:46 +01:00
danielmartin0
86765d7984 partial revert of laser buff against krakens 2022-06-04 16:35:51 +01:00
danielmartin0
86aaab18b9 revert 2022-06-04 16:15:40 +01:00
danielmartin0
804363c725 revert 2022-06-04 16:14:45 +01:00
danielmartin0
a4b805819a reverse some of the cost increase 2022-06-04 16:06:05 +01:00
danielmartin0
c37a1a3f3e furnace structures more common 2022-06-04 15:26:56 +01:00
danielmartin0
7175b9efe0 and again 2022-06-04 15:23:51 +01:00
danielmartin0
b5baba7a20 more pollution from silo charging hits immediately 2022-06-04 15:23:18 +01:00
danielmartin0
57bd49d2c5 comment fix 2022-06-04 15:17:41 +01:00
danielmartin0
a527b08f70 debug off 2022-06-04 14:43:21 +01:00
danielmartin0
3202f9d5cf cleanup; more treasure chests; harder electronic circuit leaving costs 2022-06-04 14:43:08 +01:00
danielmartin0
e7b3e76177 fix 2022-06-03 21:58:10 +01:00
danielmartin0
2c5e4fb46a fix: locale 2022-06-03 21:53:01 +01:00
danielmartin0
bbb9892790 in-progress changelog writeup, plus typo fix 2022-06-03 21:47:10 +01:00
danielmartin0
fa206b170b variable rename 2022-06-03 21:02:30 +01:00
danielmartin0
e955b9e6e1 debug fix 2022-06-03 20:56:55 +01:00
danielmartin0
dc5f862dc4 manual merge fix 2 2022-06-03 20:55:57 +01:00
danielmartin0
62cda272c5 manual merge issue 1 2022-06-03 20:53:31 +01:00
danielmartin0
7af59ec7ff Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop 2022-06-03 20:50:33 +01:00
danielmartin0
6ca581877b adjust: cannon resistance again 
we need to make cannon HP go up with the dock upgrade
 2022-06-03 20:48:23 +01:00
danielmartin0
cfad373816
Merge pull request #5 from Piratux/develop 
Class related update
 2022-06-03 20:47:53 +01:00
danielmartin0
26f00e7578 also start with a gun turret 2022-06-03 20:43:05 +01:00
Piratux
0ba747baaf Merge branch 'develop' of https://github.com/Piratux/ComfyFactorio-Pirates into develop 2022-06-03 22:42:35 +03:00
danielmartin0
bfa40aa3e0 fix: waves would sometimes try to use boat spawners 2022-06-03 20:39:37 +01:00
Piratux
214cdd9b23 requested changes for class update PR 2022-06-03 22:38:46 +03:00
danielmartin0
ccbfff87a3 buff starting items for each player 2022-06-03 20:27:47 +01:00
danielmartin0
5d32ab5e8f fix: situation in which a player joins an empty crew but isn't made captain 2022-06-03 18:59:17 +01:00
danielmartin0
31e67645bb Merge branch 'develop' of https://github.com/danielmartin0/ComfyFactorio-Pirates into develop 2022-06-03 15:18:20 +01:00
danielmartin0
19530d91e5 fix banning furnaces from walkways map 2022-06-03 15:18:00 +01:00
danielmartin0
7dda920daf
Merge pull request #4 from dwightkung/develop 
chinese localisation for v1.2.12
 2022-06-03 14:58:40 +01:00
Piratux
918fb6476a
Merge branch 'develop' into develop 2022-06-03 16:57:06 +03:00
danielmartin0
c14ca7c37c slightly faster mining on maze island 2022-06-03 14:54:43 +01:00
Piratux
e21483149d class related update 
- Damage reduction for players work even with "lethal blows" (except when player is about to be one shotted and regenerates slight amount of health to still get oneshotted, but that's quite rare against biters, although if damage reduction works against uranium grenades, this last_health maybe should be updated every now and then (perhaps every 30 or 60 seconds))
- Moved a lot of class related hard coded constants to Balance.lua
- New command: /classinfofull <class>
- Samurai and Hatamoto classes melee damage now also scales from 'physical projectile damage' research bonus
- Other various code related changes
 2022-06-03 16:41:49 +03:00
danielmartin0
1adf30c5c5 easy made easier, hard made harder 2022-06-03 14:33:26 +01:00
danielmartin0
5aeaa5e2fb trivial rewrite 2022-06-03 14:15:42 +01:00
danielmartin0
8ad28a2ab5 fix sometimes giving zero wood 2022-06-03 12:50:17 +01:00
danielmartin0
899e5ec9cb buff cannon hp 2022-06-03 12:10:50 +01:00
dwightkung
6a71320d54
Update pirates.cfg 2022-06-03 17:01:54 +08:00
danielmartin0
3c1ef89ff8 reduced kraken resistance to lasers 2022-06-03 09:55:13 +01:00
danielmartin0
9da8e2f4af un-localise default crew name 2022-06-03 09:53:14 +01:00
dwightkung
8ffb516148
Update pirates.cfg 2022-06-03 16:35:40 +08:00