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
063997610d
use rich text for received technologies
2021-04-14 18:38:06 +02:00
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
a7c9474a37
Factorio: fix sending
2021-04-14 04:14:37 +02:00
7884c6cd97
Factorio: add mod thumbnail.png
2021-04-13 12:36:40 +02:00
4fe10b88b3
Factorio: move info dump to https://mods.factorio.com/mod/archipelago-extractor
2021-04-13 12:35:42 +02:00
b7327138f3
Factorio: Show item source and enable research queue
2021-04-13 11:14:05 +02:00
0586b24579
Factorio: add small_diamonds tech tree layout
2021-04-10 03:03:46 +02:00
4461cb67f0
fix ap-sync and remove infinite techs from randomization
2021-04-09 00:33:32 +02:00
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
4c71662719
factorio: award free samples to entire force
2021-04-07 01:55:53 +02:00
96a28ed41e
implement Factorio option "free_samples"
2021-04-06 21:16:25 +02:00
bc1d0ed583
Update Factorio mod to give free samples
...
(for now always, probably an option later)
2021-04-06 02:20:13 +02:00
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
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
dc73fa0f33
Factorio integration
2021-04-01 11:40:58 +02:00
9fe4fa1098
Disable glitching to Triforce except in no logic or when ganon is vulnerable.
2021-03-22 03:46:15 -07:00
37d33b19fc
Update node.js dependencies for WebUI
2021-03-21 12:18:17 -04:00
6455dc3ffc
Merge branch 'main' into breaking_changes
...
# Conflicts:
# README.md
2021-03-13 23:34:38 +01:00
8d25965f5c
Whoops, HC Big key was being counted when it shouldn't.
2021-03-08 11:50:10 -08:00
0d576eefbb
Merge branch 'main' into breaking_changes
...
# Conflicts:
# Main.py
# worlds/alttp/EntranceRandomizer.py
2021-03-03 01:54:52 +01:00
1ee26a843f
Updated rom to latest, removed AdjusterMain
2021-02-26 16:45:44 -06:00
222784dbb6
Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes
2021-02-22 22:44:43 -06:00
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
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
1d1abb7d22
Removed remnants of team stuff, make hide_goal default
2021-02-05 20:37:27 -06:00
100ac7634e
Merge branch 'inverted_flut' into main
2021-02-03 06:43:41 -08:00
db6642f290
Update WebUI to show unique items as a different color, and with a drop-shadow
2021-02-02 22:58:22 -05:00
3d9085e98a
put that sign back where i found it
2021-02-02 21:48:08 -06:00
36de78dddd
Moved inverted goal sign to castle lawn
2021-02-01 20:26:07 -06:00
99468e6d46
Fixed flute working in both worlds instead of just dark
2021-01-31 21:42:44 -06:00
6b737775a2
Added hash/inverted sign message
2021-01-31 20:57:18 -06:00
4aedf3a8ed
inverted_flute
2021-01-31 18:26:49 -06:00
77a0e6f9cf
Triforce at pedestal / Trinexx now correctly counts towards final total.
2021-01-31 00:54:31 -08:00
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
ad8427c15a
Fix shop tracking.
2021-01-29 22:52:10 -08:00
90c3fe9df3
Count take-any caves into final total.
2021-01-29 15:42:28 -08:00
82fc2aba20
Added triforce hud options, expanded triforce requirement
2021-01-29 15:42:00 -06:00
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
2a5115bc91
Good Bee shop item now fills bottles.
2021-01-23 11:59:32 -08:00
5b223c3d9f
Update base rom.
2021-01-22 15:33:58 -08:00
ecf05dc29e
Base rom update
2021-01-21 23:05:34 -08:00
60afd0112c
Update basepatch
2021-01-21 12:41:14 -08:00
62435c8349
Added overworld bee trap disguises, shop indicators and new shop items
2021-01-20 04:22:26 -06:00
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
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
41fd85e8be
Add Vanilla tile order
2020-12-22 20:05:19 -08:00
d090a02d81
Implement tile shuffle
2020-12-22 01:05:48 -08:00
b0681627f4
Bump ini from 1.3.5 to 1.3.8 in /data/web
...
Bumps [ini](https://github.com/isaacs/ini ) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases )
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8 )
Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit eb6e094157ac65cbea3aa1b284d2fc86da1aa9f8)
2020-12-19 19:35:54 +01:00
360fcbea9e
Add new patch, disallow single bee traps from shops
2020-12-02 20:00:08 -06:00
Daniel Grace
Fabian Dill
CaitSith2
Chris Wilson
pepperpow
dependabot[bot]