Fabian Dill
7f020857d1
CommonClient.py UI: Add info on "Server:" label hover
...
CommonClient.py UI: prevent freeze if UI is closed while waiting on text user input
2021-10-29 10:03:51 +02:00
pepperpow
fc62b4e0bd
Bartering Update
2021-09-03 13:26:30 -05:00
Kono Tyran
0668f94461
- change minecraft clients icon.
2021-08-14 23:05:15 +00:00
Fabian Dill
abf4e82737
Move Factorio data from /data/factorio to /worlds/factorio/data, to contain it in its world folder
2021-07-31 15:13:55 +02:00
Fabian Dill
096e682b18
FactorioClient: implement JSONPrint in the client
2021-07-30 20:18:03 +02:00
Fabian Dill
884dece54c
Factorio: move prints from /sc (silent command) to /ap-print, to prevent two warnings getting printed by Factorio
2021-07-27 14:59:24 +02:00
Fabian Dill
a503134533
remove Gui.py, GuiUtils.py, ER_hint_reference.txt and icon.ico from root directory
2021-07-21 09:18:28 +02:00
black-sliver
10c6a70696
Auto-validate Option.schema, Factorio: allow setting pollution values
2021-07-20 18:39:01 +00:00
Fabian Dill
573fde4bbc
Merge together FactorioClient.py and FactorioClientGUI.py
...
Add cmd arguments
Add kivy style file, allowing users to modify it
2021-07-19 21:52:08 +02:00
Fabian Dill
bc83dfa9e2
Factorio: allow artillery-shell stack to 10
2021-07-13 05:13:38 +02:00
Fabian Dill
babd809fa6
Factorio: fix certain recipes (like steel-plate) not getting their crafting time adjusted correctly.
2021-07-10 08:01:39 +02:00
Fabian Dill
9db506ef42
Factorio: recipe randomization (rocket-part and science-packs only for now)
2021-07-07 10:14:58 +02:00
Fabian Dill
1b5525a8c5
Factorio: fix uranium-ore recipe writing to mod
2021-07-06 23:55:30 +02:00
Fabian Dill
22d45b9571
Factorio: remove loaders from recipe list
2021-07-06 13:15:03 +02:00
Fabian Dill
b650d3d9e6
Factorio: include recipe amounts in Recipe data
2021-07-06 12:35:27 +02:00
Fabian Dill
e58ae58e24
Factorio: add Progressive Option
2021-07-04 22:21:53 +02:00
Fabian Dill
c669bc3e7f
Factorio: correctly display player names with spaces and detect desyncs
2021-07-04 15:25:56 +02:00
Fabian Dill
85ce2aff47
Factorio: RIP Bridge File
2021-07-02 20:52:06 +02:00
Fabian Dill
97f45f5d96
FactorioClient:
...
fix reconnect
add auto-world-gen
todo:
move remaining script output bridge to rcon
2021-07-02 01:58:03 +02:00
Fabian Dill
0a64caf4c5
add Factorio world gen settings
2021-07-02 01:29:49 +02:00
Fabian Dill
5fdcd2d7c7
Factorio: locale formatting fixes
2021-06-26 00:54:27 +02:00
Fabian Dill
878ab33039
Factorio: fix incomplete crafting category copy
2021-06-25 22:09:09 +02:00
Fabian Dill
20729242f9
allow nested dictionaries in dict_to_lua
2021-06-25 01:55:58 +02:00
Fabian Dill
91655a855d
Factorio: exclude science packs and rocket-part from free samples
2021-06-25 01:31:48 +02:00
Fabian Dill
9f2f343f76
Factorio: always display static nodes with full info
2021-06-24 23:51:42 +02:00
Fabian Dill
937fee9019
Factorio: fix locale file formatting
2021-06-22 02:00:35 +02:00
Fabian Dill
023a798ac1
Factorio: refactor visibility option into tech_tree_information
...
set vanilla technologies to be hidden instead of disabled
fix advancement icon still showing when no information in tech was supposed to be given
2021-06-21 22:25:49 +02:00
Fabian Dill
f8fd8b3585
Factorio: add toggle to disable imported blueprints
2021-06-19 01:00:21 +02:00
Fabian Dill
d9824d26d2
make Factorio rocket silo a static (and therefore local) node
2021-06-15 15:32:40 +02:00
Fabian Dill
2c4c899179
move more Factorio stuff around
2021-06-11 18:02:48 +02:00
Fabian Dill
46bb2d1367
Factorio: add chaos recipe time and use random.triangular distribution
2021-06-06 21:38:53 +02:00
Fabian Dill
403ddd603f
Factorio: implement random recipe times
2021-06-06 21:11:58 +02:00
Fabian Dill
1d84346705
Factorio: Don't trigger bridge file on receiving a technology from server
2021-05-29 20:02:36 +02:00
Fabian Dill
573931930c
remove debugging helper
2021-05-25 01:06:15 +02:00
Fabian Dill
252bb69808
FactorioClient: Read Bridge file after a server log indicates that the file was written
2021-05-25 01:03:04 +02:00
Fabian Dill
4b04f2b918
update icons
2021-05-24 12:48:18 +02:00
Fabian Dill
3df78fa387
Factorio add ap_unimportant.png
2021-05-23 20:13:19 +02:00
Fabian Dill
d8e33fe596
Factorio: Differentiate advancement items.
2021-05-22 10:46:27 +02:00
Fabian Dill
80b7e2e188
Factorio: Build logic for rocket launch, allow beatable only to work correctly
...
Convert Science requirements to Event of "automate <pack>"
2021-05-22 10:06:21 +02:00
Fabian Dill
14b430a168
Factorio: simplify resulting data-final-fixes.lua after templating a bit.
2021-05-22 08:08:37 +02:00
Fabian Dill
22aa4cbb9f
Factorio: Fix Rocket Launch event getting encoded into mod
2021-05-22 07:54:12 +02:00
Fabian Dill
e1b4975a11
Add Crafting Machine awareness to Factorio logic
...
(should have no effect on vanilla, mostly for modded gameplay)
2021-05-19 06:52:53 +02:00
Fabian Dill
3e1941a561
allow Factorio Client to recognize if it's trying to connect to the wrong multiworld.
2021-05-16 00:21:00 +02:00
Fabian Dill
b2f3fd56f4
bunch of fixes after testing round
2021-05-14 01:25:41 +02:00
Fabian Dill
382c6d0445
Factorio: Fix free samples still preventing starting items
2021-05-09 20:39:42 +02:00
Fabian Dill
4efd27694a
Factorio: no longer lock starting_items behind free_samples
2021-05-09 18:13:29 +02:00
Fabian Dill
c55983af5f
Factorio: add starting_items
2021-05-09 17:46:26 +02:00
Fabian Dill
9c3d12dc55
Factorio: Embed slot name into mod
2021-05-09 17:26:53 +02:00
Fabian Dill
37755cd362
Factorio: Automatically find and force create bridge file
2021-05-09 16:49:47 +02:00
Fabian Dill
298f2f652a
Factorio: add rocket recipe scaling by max science
2021-05-07 21:58:46 +02:00
Fabian Dill
77d3bf9172
Factorio: Allow assembling machine 1 to use fluids
...
Should improve the flow of the game a bit, no longer having to wait for automation-2 to get started with rocket fuel, processing units and others.
2021-05-03 18:06:21 +02:00
Fabian Dill
97030590c2
Factorio: send goal completion
2021-04-29 04:34:47 +02:00
Fabian Dill
b8c7d6a72f
remove remaining sprite data
2021-04-27 07:19:53 +02:00
Fabian Dill
569e0e3004
Factorio: add option: random tech ingredients
2021-04-24 01:16:49 +02:00
Daniel Grace
65df153947
Overhauls control.lua template ( #1 )
...
* Overhauls control.lua template
- Adds buffering of received free-samples items.
- Players with a full inventory will receive new items as space becomes
available.
- Players who do not yet exist in the world will receive all free samples
upon joining.
- When receiving new technologies, announce the technology BEFORE marking
it as researched so that it appears before its free samples in the log.
- If receiving a half-stack of free samples, use math.ceil on the division
in case a mod uses an odd number as a stack size... or a stack size of 1
- Handle free_samples logic in the Lua side rather than as part of a Jinja
template. This makes this hopefully more adaptable to a future setup
where all the rando information is shipped as startup settings.
* Apparently, I'm supposed to give myself credit. Or something.
2021-04-18 06:06:53 +02:00
Fabian Dill
063997610d
use rich text for received technologies
2021-04-14 18:38:06 +02:00
Fabian Dill
432ae5865d
Factorio: Filter bridged technologies correctly
...
Turns out, lua does not use regex, nor simple string matching, but its own invention.
2021-04-14 17:51:11 +02:00
Fabian Dill
a7c9474a37
Factorio: fix sending
2021-04-14 04:14:37 +02:00
Fabian Dill
7884c6cd97
Factorio: add mod thumbnail.png
2021-04-13 12:36:40 +02:00
Fabian Dill
4fe10b88b3
Factorio: move info dump to https://mods.factorio.com/mod/archipelago-extractor
2021-04-13 12:35:42 +02:00
Fabian Dill
b7327138f3
Factorio: Show item source and enable research queue
2021-04-13 11:14:05 +02:00
Fabian Dill
0586b24579
Factorio: add small_diamonds tech tree layout
2021-04-10 03:03:46 +02:00
Fabian Dill
4461cb67f0
fix ap-sync and remove infinite techs from randomization
2021-04-09 00:33:32 +02:00
Fabian Dill
f0a6b5a8e4
Factorio:
...
add visibility option
fix tech_cost using the wrong variable name
fix yaml defaults not init'ing the Option class
LttP:
fix potential pathing confusion in maseya palette shuffler
Server:
Minimum version per team made no sense, removed
2021-04-08 19:53:24 +02:00
Fabian Dill
4c71662719
factorio: award free samples to entire force
2021-04-07 01:55:53 +02:00
Fabian Dill
96a28ed41e
implement Factorio option "free_samples"
2021-04-06 21:16:25 +02:00
Fabian Dill
bc1d0ed583
Update Factorio mod to give free samples
...
(for now always, probably an option later)
2021-04-06 02:20:13 +02:00
Fabian Dill
91bcd59940
implement Factorio options max_science_pack and tech_cost
...
also give warnings about deprecated LttP options
also fix FactorioClient.py getting stuck if send an unknown item id
also fix !missing having an extra newline after each entry
also default to no webui
2021-04-03 14:47:49 +02:00
Fabian Dill
d24ee45462
Merge branch 'main' into Archipelago_Main
...
# Conflicts:
# BaseClasses.py
# LttPAdjuster.py
# Main.py
# Mystery.py
# Utils.py
# WebHostLib/generate.py
# playerSettings.yaml
2021-04-01 11:44:37 +02:00
Fabian Dill
dc73fa0f33
Factorio integration
2021-04-01 11:40:58 +02:00
CaitSith2
9fe4fa1098
Disable glitching to Triforce except in no logic or when ganon is vulnerable.
2021-03-22 03:46:15 -07:00
Chris Wilson
37d33b19fc
Update node.js dependencies for WebUI
2021-03-21 12:18:17 -04:00
Fabian Dill
6455dc3ffc
Merge branch 'main' into breaking_changes
...
# Conflicts:
# README.md
2021-03-13 23:34:38 +01:00
CaitSith2
8d25965f5c
Whoops, HC Big key was being counted when it shouldn't.
2021-03-08 11:50:10 -08:00
Fabian Dill
0d576eefbb
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Main.py
# worlds/alttp/EntranceRandomizer.py
2021-03-03 01:54:52 +01:00
pepperpow
1ee26a843f
Updated rom to latest, removed AdjusterMain
2021-02-26 16:45:44 -06:00
pepperpow
222784dbb6
Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes
2021-02-22 22:44:43 -06:00
Fabian Dill
122e360ec8
Merge branch 'main' into breaking_changes
...
# Conflicts:
# MultiClient.py
# Utils.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
# worlds/alttp/Shops.py
2021-02-19 13:45:50 +01:00
CaitSith2
26d69032e9
Base rom changes
...
* Stop resuing the memory region that was used formerly for compass stats.
* Add flags for dungeon prize collected. 7EF46B-7EF46C, same bit ordering as maps/compass/big key. Something useful for auto-tracking, so that it can know that you actually collected the Swamp Palace prize, even if duped out of another dungeon.
2021-02-10 09:31:53 -08:00
pepperpow
1d1abb7d22
Removed remnants of team stuff, make hide_goal default
2021-02-05 20:37:27 -06:00
CaitSith2
100ac7634e
Merge branch 'inverted_flut' into main
2021-02-03 06:43:41 -08:00
Chris Wilson
db6642f290
Update WebUI to show unique items as a different color, and with a drop-shadow
2021-02-02 22:58:22 -05:00
pepperpow
3d9085e98a
put that sign back where i found it
2021-02-02 21:48:08 -06:00
pepperpow
36de78dddd
Moved inverted goal sign to castle lawn
2021-02-01 20:26:07 -06:00
pepperpow
99468e6d46
Fixed flute working in both worlds instead of just dark
2021-01-31 21:42:44 -06:00
pepperpow
6b737775a2
Added hash/inverted sign message
2021-01-31 20:57:18 -06:00
pepperpow
4aedf3a8ed
inverted_flute
2021-01-31 18:26:49 -06:00
CaitSith2
77a0e6f9cf
Triforce at pedestal / Trinexx now correctly counts towards final total.
2021-01-31 00:54:31 -08:00
Fabian Dill
a646594f08
Merge branch 'main' into breaking_changes
...
# Conflicts:
# BaseClasses.py
# Fill.py
# MultiClient.py
# MultiServer.py
# Utils.py
# test/dungeons/TestDungeon.py
# test/inverted/TestInverted.py
# test/inverted_minor_glitches/TestInvertedMinor.py
# test/inverted_owg/TestInvertedOWG.py
# test/minor_glitches/TestMinor.py
# test/owg/TestVanillaOWG.py
# test/vanilla/TestVanilla.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
2021-01-30 23:29:32 +01:00
CaitSith2
ad8427c15a
Fix shop tracking.
2021-01-29 22:52:10 -08:00
CaitSith2
90c3fe9df3
Count take-any caves into final total.
2021-01-29 15:42:28 -08:00
pepperpow
82fc2aba20
Added triforce hud options, expanded triforce requirement
2021-01-29 15:42:00 -06:00
CaitSith2
96e12088d7
Shop-sanity shops now marked as counting towards end-game credits.
...
Retro single arrow now marks itself as purchased from every single shop location on initial purchase. (Nothing prevents you from buying your 'first' quiver if you already have one, however, its 6 hint points for the price of one in shop sanity.)
2021-01-29 00:25:13 -08:00
CaitSith2
2a5115bc91
Good Bee shop item now fills bottles.
2021-01-23 11:59:32 -08:00
CaitSith2
5b223c3d9f
Update base rom.
2021-01-22 15:33:58 -08:00
CaitSith2
ecf05dc29e
Base rom update
2021-01-21 23:05:34 -08:00
CaitSith2
60afd0112c
Update basepatch
2021-01-21 12:41:14 -08:00
pepperpow
62435c8349
Added overworld bee trap disguises, shop indicators and new shop items
2021-01-20 04:22:26 -06:00
Fabian Dill
e36c6e97c1
Merge remote-tracking branch 'pepper/multishop-all' into multishop
...
# Conflicts:
# EntranceRandomizer.py
# Rom.py
# WebHostLib/static/static/playerSettings.json
# data/basepatch.bmbp
2021-01-09 16:03:59 +01:00
Fabian Dill
08ca4245c1
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Adjuster.py
# AdjusterMain.py
# BaseClasses.py
# MultiClient.py
# MultiServer.py
# Mystery.py
# Utils.py
# WebHostLib/downloads.py
# WebHostLib/generate.py
# dumpSprites.py
# test/TestBase.py
# worlds/alttp/EntranceRandomizer.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
2021-01-03 13:13:59 +01:00