1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Commit Graph

372 Commits

Author SHA1 Message Date
Piratux
69a46dd3fc Tweaked quest market item count formula
Changes:
- Changed quest item count formula using new philosophy: start lower, scale slightly faster. This results in ~30% on average smaller requirement for items to open the market in early game. The reasoning: it was observed that new players rarely complete the market quest, since they don't make items as fast as needed. As well as when players progress, they can craft items much faster (due to speed modules)
2022-10-12 22:02:12 +03:00
Piratux
7ebe940cbb Lumberjack buff
Changes:
- Lumberjack now gets ~4x more ore from chopping trees and ore amount scales with leagues to make it slightly more "relevant" in late game
2022-10-11 23:11:49 +03:00
Piratux
be900aa05b Officer check code cleanup
Changes:
- Cleaned up code that checks if player is officer and changed to is_officer()
2022-10-11 21:38:53 +03:00
Piratux
80cc3da1a5 Class check code cleanup
Changes:
- Cleaned up code that checks for player's class and changed to get_class() where possible
- Deprecated /setclass command (it was equivelant to /unlock + /take command as well as slightly outdated since class GUI was added)
2022-10-11 20:52:23 +03:00
Piratux
a58220a773 Ore generating class tweaks
Changes:
- Classes that generate ore now generate a constant amount (independent of crew size). Idea behind this is, that it's not fun being "punished" for having more members in your crew, as well as, with bigger crew you spend less time in islands.
2022-10-10 23:30:16 +03:00
Piratux
9cda27df02 Standardised island enum usage
Changes:
- Moved island enum to its own file to avoid dependency loops
- Standardised island enum usage to use IslandEnum.enum
2022-10-10 22:03:51 +03:00
Piratux
f3f5f0a1b0 Added scroll pane for crews window
Changes:
- Added scroll pane for crews window.
2022-10-10 20:39:08 +03:00
Piratux
f72a577b7d New private runs
Changes:
- Players now can create private runs protected by a password. This run becomes public if the crew is empty or inactive for 24 horus (Limit is currently 1 private run at a time).
2022-10-10 20:21:14 +03:00
Piratux
93636fd1c3 Cave terrain fixes 2022-10-09 16:48:16 +03:00
Piratux
72b5391ce8 Cars and nuclear enabled + cleanup
Changes:
- Car and nuclear fuel related technologies are now enabled.
- Cliff base now contains tank instead of car after 25 islands.
2022-10-06 14:47:17 +03:00
Piratux
a228fa401a Fixed uranium-ammo pre-requisites
Changes:
- Fixed uranium-ammo pre-requisites
2022-10-04 23:56:42 +03: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
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
Piratux
8542a783cf New cave island
Changes:
- New island: Mysterious caves
- New market offers: logistic chests
2022-10-03 00:37:54 +03: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
danielmartin0
3880a5a446 luacheck 2022-09-13 22:10:53 +01:00
danielmartin0
b3fb6040a3 luacheck 2022-09-13 22:09:25 +01:00
Piratux
24ff99c6b4 Merge remote-tracking branch 'upstream/develop' into develop 2022-07-31 23:39:19 +01:00
Piratux
c38d2db728 code cleanup 2022-07-31 23:38:57 +01:00
danielmartin0
9a920ef0e4 discord bugfix 2022-07-31 21:13:14 +01:00
danielmartin0
c535696c7a small balance changes 2022-07-31 15:07:53 +01:00
danielmartin0
353fce2dda bugfixes, more krakens near the end, unguarded silo threat 2022-07-31 13:08:22 +01:00
danielmartin0
2f3b74bd81 last island should have merchants with power armor 2022-07-31 10:43:51 +01:00
danielmartin0
27f8b940e8 tweaks 2022-07-31 10:40:10 +01:00
danielmartin0
de74e8d2b3 tweaks 2022-07-31 10:25:17 +01:00
danielmartin0
0cd02ed024 tweaks 2022-07-31 10:23:59 +01:00
danielmartin0
9774fd4254 v1.3.4 — kraken bugfix, other smoothings 2022-07-30 21:31:00 +01:00
danielmartin0
f580743cfc info tab fix 2022-07-30 15:28:28 +01:00
danielmartin0
732d52ca3d market rendering, allows cannons to be fortified when at max hp 2022-07-30 15:09:53 +01:00
danielmartin0
3b84445d34 fix bugs; remove chests; remove captain inventory slots 2022-07-30 14:55:03 +01:00
danielmartin0
9e9c063295 In-progress: markets not tested, also somehow dies when captain is passed? 2022-07-30 14:02:24 +01:00
danielmartin0
af41fa1aed
Merge pull request #13 from Piratux/develop 2022-07-30 10:30:08 +01:00
danielmartin0
64486c9b78 lots of small tweaks 2022-07-30 10:29:17 +01:00
Piratux
7a9aa90696 Warning fixes 2022-07-30 00:44:31 +01:00
Piratux
5811a2dc3d oil for pumpjacks + captainhood leave changes
Changes:
- Added crude oil underneath pumpjacks that spawn with special structures
- When captain leaves game/crew, captainhood is first offered to random officer (afterwards it will cycle through crew members)
2022-07-30 00:37:34 +01:00
Piratux
7aa1bbac7d Fixed crew GUI buttons
Changes:
- Fixed some captain's actions not working in crew GUI (like 'pass captain', 'make officer', etc.)
2022-07-29 15:30:32 +01:00
Piratux
c158395979 Warning fixes 2022-07-28 18:28:27 +01:00
Piratux
e37f74a7e3 Fixed class issues
Changes:
- Fixed class GUI issues
- added /remove_classes command (removes all classes)
- made /unlock <class> command available while not in debug as well (unlocks a class)
2022-07-28 18:15:31 +01:00
Piratux
81b81305b6 Previous commit fix + code cleanup
Changes:
- Fixed previous commit issues
2022-07-28 11:28:38 +01:00
Piratux
9f0158546d Disabled ore generation at sea
Changes:
- Classes that generate ore passively now don't generate ore when at sea
2022-07-26 21:59:42 +01:00
Piratux
58f46147a8 version + class data fix
Changes:
- Fixed version string to 1.3.1
- Fixed an issue, where if last player would leave the crew, the class wouldn't become spare
2022-07-26 18:45:43 +01:00
Piratux
d5bf2a1295 Slight covered market changes 2022-07-24 23:37:15 +01:00
Piratux
93116e0e56 class panel small fix
Changes:
- Fixed button update to enable/disable it when people pick the class
2022-07-24 22:24:06 +01:00
Piratux
db5e74f147 Merge remote-tracking branch 'upstream/develop' into develop 2022-07-24 21:14:14 +01:00
Piratux
c42953713d QuarterMaster fixes
Changes:
- Fixed QM nil value bug and fixed QM tooltip
- Buffed Quarter master nearby physical damage from 10% to 30% (players thought 10% was too low)
2022-07-24 21:09:03 +01:00
danielmartin0
46ea22ab17
Merge pull request #10 from Piratux/develop 2022-07-23 22:31:00 +01:00
Piratux
110f96e21b Gamebreaking bug fix
Changes:
- When artillery was destroyed, game wasn't ending, now should be fixed
2022-07-23 20:26:54 +01:00
danielmartin0
622f2b4ce1 version and info update 2022-07-21 20:22:37 +01:00
Piratux
52c233050e Added ore for mining structures
Changes:
- Mining base structures that spawn drillers, have ore underneath them
2022-07-18 15:50:18 +03:00
Piratux
42bcb51c4a 2 new classes: Soldier and Veteran
Changes:
- New class Soldier: When eating fish, they have 20% chance to summon defender to protect them.
- New class Veteran: When eating fish, they have 20% chance to summon destroyer to protect them. In addition, they have 10% chance to slow the enemy that hits them.
- When combat robots defeat enemies, the loot now goes straight to combat robot owner's inventory
2022-07-17 23:12:27 +03:00
Piratux
1db1b982b0 Market adjustments
- Added more items to some dock markets
- Adjusted prices and amounts slightly
- Made dock offer amount more dynamic
- Removed permanent pistol -> coins and drill -> plates offer and made them appear with 25% chance
2022-07-17 16:07:39 +03:00
Piratux
c052e2ddc4 New commands, class buffs and some fixes
Changes:
- Added damage reduction to Roc Eater that forgot to add before
- Fixed an issue where "placeability_function_optional" in "try_place" could be nil (it was causing crash in debug mode)
- Fixed an issue where arrival timer would continue ticking during kraken encounter past 20 seconds (this should result in kraken encounter  not being unintentionally skippable anymore when arrival timer ends)
- Fixed an issue where kraken spit sometimes would cause a crash in debug mode
- Added 4 new dev related commands
- Significantly buffed Dredger class loot
- Buffed Master Angler class
- Changed tick tack trap to troll emoji when nothing happens
2022-07-16 21:46:23 +03:00
Piratux
fa5b4a0fbc Warning fixes 2022-07-15 15:18:01 +03:00
Piratux
e782796af3 New class Roc Eater
Changes:
- New class: Roc Eater: When eating fish, if they have stone furnaces in their inventory, they will eat those instead. In addition, they receive 10% less damage.
2022-07-11 22:39:29 +03:00
Piratux
b6201765df Spectating fixes
Changes:
- When player from lobby spectates a crew that is at sea, it no longer crashes (in debug mode) and shows boat destination instead of marooned island
- When player from lobby spectates a crew that is at sea, and waiting for island to load, it now shows boat surface instead of island that is being loaded
2022-07-09 14:49:53 +03:00
Piratux
899ce22ed3 Parrot tip for burried treasure
Changes:
- When players find treasure map, but are unable to dig it, parrots will give them tip, when they will leave the island.
2022-07-08 23:06:35 +03:00
Piratux
383035aed1 Deprecated simple class explanations
Changes:
- Removed /classinfofull command and merged it onto /classinfo command
- Shops now show advanced explanation of classes
2022-07-08 15:53:31 +03:00
Piratux
150828987d New class: Chief
Changes:
- New Chief class: receives fish for every biter/worm kill
- Updated Samurai and Hatamoto class descriptions
2022-07-08 14:58:23 +03:00
Piratux
f826660619 New class GUI window
Changes:
- Fixed crash that could happen if player clicked on crew window button with middle mouse button while in lobby
- Removed "Pro..." text from Progress window button
- Moved class related info from crew window to new class window
- Added scroll pane for crew window
2022-07-07 23:01:45 +03:00
Piratux
5e2200f897 Fixed overlap between structures
Fixed overlap that could occur between special structures (small mining base, etc.) and "quest structures" (silo, market, etc.)
2022-07-03 17:58:44 +03:00
Piratux
487f509483 Easier fluid transportation
Added pair of storage tanks for deck and holds to easily transfer fluids between surfaces
2022-07-02 18:42:22 +03:00
Piratux
b8034ddafe added landfill for wooden boxes on lakes
- Wooden chests that spawn on lakes will have a landfill tile underneath them
2022-06-18 17:45:38 +03:00
Piratux
2944a907aa features+code cleanup
Changes:
- Changed requirements for placing structures on islands: instead of trying to squeeze in-between trees, now it needs a single corner to be on land (it still can't spawn in ocean). In result, islands with more dense forests should see special structures more often and more scattered around the island, rather than them spawning mostly on beaches (because they had no trees)
- When area in which structure is going to be placed contains water, it's replaced with landfill
- New structure: friendly small-cliff-base with cliffs, gun turrets and car
- Captain's cabin now contains cliff-explosives that can be placed in hold's chests to remove them
- Moved repeating code snippets into seperate functions
2022-06-16 00:00:18 +03:00
Piratux
e6663a737b warning fixes 2022-06-08 16:44:24 +03:00
Piratux
b4ed57025b damaged cannons and silo now plays alert sound 2022-06-08 16:26:49 +03:00
Piratux
d3cd4015cd Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 14:11:23 +03:00
Piratux
5ebadb4474 Fixed mining base drill placement position 2022-06-08 13:17:03 +03:00
Piratux
0c0c2b4944 localised commands.lua 2022-06-07 23:48:42 +03:00
Piratux
fd205f2647 Fixed empty fluid storage bug 2022-06-07 21:58:36 +03:00
Piratux
6236eec4d1 Allow automation-3 to be researched and crafted 2022-06-07 00:35:23 +03:00
Piratux
f9dbf54677 Improved kraken battle
list of changes:
- kraken now may choose to shoot at any spot in the ship instead of some player
- biters, that spawn around kraken, now swim towards the ship
2022-06-06 23:13:58 +03:00
danielmartin0
47c7be0a68 luacheck 2022-06-06 15:55:24 +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
Piratux
4dc9dbfdca purchasing artillery also increases max artillery hp 2022-06-04 21:52:55 +03: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
Piratux
0bc327ba50 Lesser restrictions for buying class
You now are able to buy class upgrades without being that class yourself. It upgrades the class wherever it is. In addition when you buy any class and you're using one already, it doesn't replace the class you're using with the newer one.
2022-06-04 17:01:34 +03: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
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
19530d91e5 fix banning furnaces from walkways map 2022-06-03 15:18:00 +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
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
danielmartin0
f8fffc1957 tweak maze traps, BP timeout, 'large' crew size 2022-06-03 00:15:54 +01:00
Piratux
4b1f9a7f8c Merge remote-tracking branch 'upstream/develop' into develop 2022-06-02 22:14:19 +03:00
Piratux
776a91fad2 In progress again 2022-06-02 22:08:55 +03:00
danielmartin0
d331c665f5 fix: command memory setting 2022-06-02 19:54:47 +01:00
danielmartin0
eb9dcbc60f wave frequency patch 2022-06-02 18:06:38 +01:00
danielmartin0
b817512a43 lab productivity fix 2022-06-02 17:55:56 +01:00
danielmartin0
afc155da13 luacheck 2022-06-02 17:49:05 +01:00
danielmartin0
f10094d57e small rewrite 2022-06-02 17:47:32 +01:00
danielmartin0
3224e5b614 balance 2022-06-02 17:25:04 +01:00
danielmartin0
e9854f358e balance wave frequency 2022-06-02 16:31:30 +01:00
danielmartin0
513c9559bf version update: v1.2.12 2022-06-02 16:15:28 +01:00
danielmartin0
84e98435d3 more specific 'Granted' messages 2022-06-02 16:11:45 +01:00
danielmartin0
a170a05bc9 fix: all silos should die, not just one 2022-06-02 15:32:27 +01:00
danielmartin0
2b1055dfec rebalance red_desert ores 2022-06-02 15:29:24 +01:00
danielmartin0
4aa59d687b locale for support toast 2022-06-02 14:51:56 +01:00
danielmartin0
7f5fc7f5e5 luacheck 2022-06-02 14:49:18 +01:00
danielmartin0
b728cad8bc add: new admin command to force the ship to set sail 2022-06-02 14:47:23 +01:00
Piratux
96f1463adb Merge branch 'develop' of https://github.com/Piratux/ComfyFactorio-Pirates into develop 2022-06-02 16:18:53 +03:00
Piratux
ce1a603bfa In progress 2022-06-02 16:07:17 +03:00
danielmartin0
b7c0c6697a rocket now blows up after you launch it 2022-06-02 13:36:44 +01:00
danielmartin0
dd4f5491a1 wave _frequency_ now depends on pollution 2022-06-02 13:34:22 +01:00
danielmartin0
3a51bb85cd disable prospector, rework lumberjack 2022-06-02 13:19:55 +01:00
danielmartin0
2ffbcb2038 coin economy rescale 2022-06-02 12:57:15 +01:00
danielmartin0
612ab5b6d8 9000->10000 at dock 2022-06-02 12:47:59 +01:00
danielmartin0
dfd171e296 reduce class cost; bugfix ore generation 2022-06-02 12:46:05 +01:00
danielmartin0
b5b4802c70 luacheck 2022-06-02 12:40:32 +01:00
danielmartin0
d25759bda1 market refunds stone furnaces 2022-06-02 12:38:51 +01:00
danielmartin0
ab7fa21fea main tick reordering 2022-06-01 22:13:09 +01:00
danielmartin0
6b44d5a4fe patches 2022-06-01 21:01:00 +01:00
danielmartin0
de538a2221 patch 2022-06-01 20:51:35 +01:00
danielmartin0
88d4da397e boat now pauses after each destination 2022-06-01 20:45:13 +01:00
danielmartin0
281d22bb94 header on each file; clamp function; locale fixes 2022-06-01 19:50:36 +01:00
danielmartin0
90d7fe9aea patch number change 2022-05-31 00:33:31 +01:00
danielmartin0
8b02ea5b8f patch parrot silo warning 2022-05-31 00:11:03 +01:00
danielmartin0
e1faf0a5d8 luacheck 2022-05-30 16:52:55 +01:00
danielmartin0
fc08a81da3 locale fix, improvements
- reorder lines in locale file for clarity
- localise a few additional renderings
- players in the cabin now see the large 'outside world minimap' rather than the small spontaneous camera
- play sounds along with error messages
- correctly print info message when player joins a game with _DEBUG=true
2022-05-30 16:51:08 +01:00