Commit Graph

2475 Commits

Author SHA1 Message Date
KonoTyran fa24fd31d0
re-added stuff (#7)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* update readme to relfect removal of name field from connect command.

* re-added explenations in yaml manualy wrapped the lines to stop them from looking weird on the web page.
2021-05-09 18:06:51 +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
KonoTyran eb02d65dbb
minecraft setup tutorial changes. (#6)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* update readme to relfect removal of name field from connect command.
2021-05-08 19:51:12 +02:00
Fabian Dill 4d38f44da3 fix defaults for Factorio and Minecraft 2021-05-08 19:11:08 +02:00
Fabian Dill 212abc2b5a increment version 2021-05-08 13:42:18 +02:00
Fabian Dill 3797c20488 update README.md 2021-05-08 13:40:23 +02:00
espeon65536 2f7e532f4f
Minecraft Randomizer
Squash merge, original Commits:

* Minecraft locations, items, and generation without logic

* added id lookup for minecraft

* typing import fix in minecraft/Items.py

* fix 2

* implementing Minecraft options and hard/postgame advancement exclusion

* first logic pass (75/80)

* logic pass 2 and proper completion conditions

* added insane difficulty pool, modified method of excluding item pools for easier extension

* bump network_data_package version

* minecraft testing framework

* switch Ancient Debris to Netherite Scrap to avoid advancement triggering on receiving that item

* Testing now functions, split tests up by advancement pane, added some story tests

* Newer testing framework: every advancement gets its own function, for ease of testing

* fixed logic for The End... Again...

* changed option names to "include_hard_advancements" etc.

* village/pillager-related advancements now require can_adventure: weapon + food

* a few minecraft tests

* rename "Flint & Steel" to "Flint and Steel" for parity with in-game name

* additional MC tests

* more tests, mostly nether-related tests

* more tests, removed anvil path for Two Birds One Arrow

* include Minecraft slot data, and a world seed for each Minecraft player slot

* Added new items: ender pearls, lapis, porkchops

* All remaining Minecraft tests

* formatting of Minecraft tests and logic for better readability

* require Wither kill for Monsters Hunted

* properly removed 8 Emeralds item from item pool

* enchanting required for wither; fishing rod required for water breathing; water breathing required for elder guardian kill

* Added 12 new advancements (ported from old achievement system)

* renamed "On a Rail" for consistency with modern advancements

* tests for the new advancements

* moved slot_data generation for minecraft into worlds/minecraft/__init__.py, added logic_version to slot_data

* output minecraft options in the spoiler log

* modified advancement goal values for new advancements

* make non-native Minecraft items appear as Shovel in ALttP, and unknown-game items as Power Stars

* fixed glowstone block logic for Not Quite Nine Lives

* setup for shuffling MC structures: building ER world and shuffling regions/entrances

* ensured Nether Fortresses can't be placed in the End

* finished logic for structure randomization

* fixed nonnative items always showing up as Hammers in ALttP shops

* output minecraft structure info in the spoiler

* generate .apmc file for communication with MC client

* fixed structure rando always using the same seed

* move stuff to worlds/minecraft/Regions.py

* make output apmc file have consistent name with other files

* added minecraft bottle macro; fixed tests imports

* generalizing MC region generation

* restructured structure shuffling in preparation for structure plando

* only output structure rando info in spoiler if they are shuffled

* Force structure rando to always be off, for the stable release

* added Minecraft options to player settings

* formally added combat_difficulty as an option

* Added Ender Dragon into playthrough, cleaned up goal map

* Added new difficulties: Easy, Normal, Hard combat

* moved .apmc generation time to prevent outputs on failed generation

* updated tests for new combat logic

* Fixed bug causing generation to fail; removed Nether Fortress event since it should no longer be needed with the fix

* moved all MC-specific functions into gen_minecraft

* renamed "logic_version" to "client_version"

* bug fixes
properly flagged event locations/items with id None
moved generation back to Main.py to fix mysterious generation failures

* moved link_minecraft_regions into minecraft init, left create_regions in Main for caching

* added seed_name, player_name, client_version to apmc file

* reenabled structure shuffle

* added entrance tests for minecraft

Co-authored-by: achuang <alexander.w.chuang@gmail.com>
2021-05-08 13:38:57 +02:00
Fabian Dill eb2a3009f4 Add dungeonscrossed to sample yaml 2021-05-08 12:08:55 +02:00
Fabian Dill 5c9aa09c80 LttP: implement dungeonscrossed ER 2021-05-08 12:04:03 +02:00
Fabian Dill e5bbcb8d27 merge of 6bf02455e6 2021-05-08 01:49:30 +02:00
Fabian Dill cf488e5a5d convert parse_zspr to staticmethod 2021-05-08 01:44:37 +02:00
Fabian Dill 36ef9e8a72 LttP: Read author game display name from zspr 2021-05-07 22:34:02 +02:00
Fabian Dill e7d254aed7 Factorio: make automation science pack rocket recipe consistent with the others 2021-05-07 22:09:04 +02:00
Fabian Dill 298f2f652a Factorio: add rocket recipe scaling by max science 2021-05-07 21:58:46 +02:00
Fabian Dill 5cb2689609 LttP: speed up ER shuffling caves 2021-05-07 21:01:13 +02:00
Fabian Dill 9ab5ec426d remove leftover from when recipes were events 2021-05-06 12:53:57 +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 328f132498 include player name in factorio mod name. 2021-05-03 16:29:05 +02:00
Fabian Dill de2ead3a9b Embed Minecraft tutorial in menu 2021-05-03 12:30:09 +02:00
KonoTyran ff96b391b9
Mincraft Tutorial (#4)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.
2021-05-03 12:26:35 +02:00
Fabian Dill 4a75d27261 don't precollect Hollow Knight items 2021-05-01 02:16:19 +02:00
Chris Wilson 05e464e379 Update my copyright notice in the LICENSE 2021-04-29 21:09:26 -04:00
Chris Wilson e8e141b206 Update copyright year on the WebHost to 2021 2021-04-29 20:09:10 -04:00
Fabian Dill bed8fe82cf speed up can_beat_game 2021-04-29 09:54:49 +02:00
Fabian Dill 3a1d33f499 Allow removing non-LttP Progressive items from CollectionState 2021-04-29 08:25:06 +02:00
Fabian Dill 6ea68dd290 Count non-LttP Progressive items during playthrough creation
(there seem to be more problems hiding though)
2021-04-29 08:14:09 +02:00
Fabian Dill 97030590c2 Factorio: send goal completion 2021-04-29 04:34:47 +02:00
Fabian Dill 60f64cc46b rename get_location_name_from_address to get_location_name_from_id 2021-04-28 15:48:11 +02:00
KonoTyran 5087b78c28
fixed !missing to point to location table not item. (#2) 2021-04-28 15:46:54 +02:00
Fabian Dill 95358bc523 Never download a sprite with Author "Nintendo" 2021-04-28 10:31:24 +02:00
Fabian Dill 4fc1ce77ac only build vanilla sprite data once correctly 2021-04-28 02:39:55 +02:00
Fabian Dill b8c7d6a72f remove remaining sprite data 2021-04-27 07:19:53 +02:00
Fabian Dill e04fbd1d77 update setup for newer cx_Freeze #2 2021-04-27 05:26:27 +02:00
Fabian Dill fb8229fda5 update setup for newer cx_Freeze 2021-04-25 04:02:38 +02:00
Fabian Dill 569e0e3004 Factorio: add option: random tech ingredients 2021-04-24 01:16:49 +02:00
Fabian Dill 73ed18c11d Move update_sprites as --update_sprites to LttPAdjuster 2021-04-21 23:53:59 +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 2dd6dcab20 remote now unneccessary line 2021-04-17 22:01:34 +02:00
Fabian Dill 4494207717 generalize LocationScout and make LttP remote items break entirely 2021-04-17 22:00:45 +02:00
Fabian Dill 88265c5585 flatten and integer cast HK options per request 2021-04-17 21:16:09 +02:00
Fabian Dill 501c55cc26 add per-slot data and embed HK options in it 2021-04-17 21:03:57 +02:00
Fabian Dill a5efed83b9 Set non-LttP Shop prices to 5 to 140 Rupee range 2021-04-16 21:41:19 +02:00
Fabian Dill e7a746c06c fix unittest local path 2021-04-15 04:01:25 +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 73bc5fb376 restore sanity check for exported technologies 2021-04-14 04:19:44 +02:00
Fabian Dill a7c9474a37 Factorio: fix sending 2021-04-14 04:14:37 +02:00
Fabian Dill 0cf9baef4b Factorio: add document visibility option to playerSettings.yaml 2021-04-14 02:45:36 +02:00