morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,737 Commits 3 Branches 10 Tags
0af31c71e0a8e3930cf24aec717fdea644054314
Commit Graph

564 Commits

Author SHA1 Message Date
Fabian Dill
a528ed5e9e Client now uses location_id consistently internally, instead of switching on a dime all the time 
And some smaller changes
 2021-03-07 22:05:07 +01:00
Fabian Dill
f7dc21ddcc Merge branch 'main' into breaking_changes 
# Conflicts:
#	Main.py
#	Utils.py
 2021-03-07 22:04:06 +01:00
Fabian Dill
1d04fcfbaa typo V: the typo strikes back 2021-03-07 20:15:22 +01:00
Fabian Dill
cd5696527d some er layout group fixes 2021-03-07 20:11:36 +01:00
Fabian Dill
11e1125044 fixes for solo tracker 2021-03-06 05:59:49 +01:00
Fabian Dill
bfa9bde348 Merge branch 'main' into breaking_changes 2021-03-03 02:00:10 +01:00
Fabian Dill
7ac893f3e0 fix adjuster crash 2021-03-03 01:59:33 +01: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
Fabian Dill
8bfddb7fc6 Remove Single-Item logic macros 2021-02-27 17:11:54 +01:00
CaitSith2
2e275d1f4e Merge remote-tracking branch 'pepperpow/triforce_changes' into main 2021-02-26 19:56:44 -08:00
Fabian Dill
abcc2690f0 Add "Fake" (Randomizer-only) Hollow Knight items 2021-02-26 21:03:16 +01:00
Fabian Dill
f19291aaed Remove Fake Hollow Knight Items and Locations 
Add GetDataPackage Network system
 2021-02-25 02:07:28 +01:00
CaitSith2
056a0c739c No point in assigning a seed for vanilla ER layout. 2021-02-24 13:23:42 -08:00
Fabian Dill
499f67c586 HK Logic 2021-02-24 06:02:51 +01:00
Fabian Dill
e60ae897b4 Allow HK items in shops and allow settings local/non-local items for HK 2021-02-24 00:36:37 +01:00
pepperpow
222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06:00
CaitSith2
4c1033a91d Actually get player specific values. 2021-02-22 12:52:39 -08:00
CaitSith2
9c50d0ba28 Allow for team shared unknown initial seeds. 2021-02-22 12:42:14 -08:00
Fabian Dill
a248fd5f94 add a HK game completion rule 2021-02-22 11:18:53 +01:00
Fabian Dill
ff9b24e88e Hollow Knight integration 
(prototype status)
 2021-02-21 20:17:24 +01:00
CaitSith2
8dc2a5748c Allow for possible reuse of er layout 
This is done by assigning a unique seed to each player who doesn't have one set.  er layout seed is output in spoiler log.
 2021-02-20 12:01:38 -08:00
Fabian Dill
c55cf28229 allow ER coop 2021-02-20 02:30:55 +01:00
pepperpow
fca64f1177 Removes Flashing instances in game (#168) 
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
 2021-02-19 17:45:54 +01:00
Fabian Dill
0af77421fc remove fairy and big magic from bonk prizes in hard/expert 
remove arrow prizes in retro when "g" is not toggled
rename "difficulty_adjustments" to "item_functionality"
 2021-02-10 07:01:03 +01:00
Fabian Dill
96d544ac84 Speed up Progression Balancing, mostly by using generators and pre-sorts where the opportunity exists 
In some cases multi-thousand element lists were created in-memory with near identical contents, per player, then discarded and reassembled.
Was testing against a case with 3 GB of additional memory use (50 players) which appeared to get stuck, but really was just very slow. This example case is fixed with these changes.
Additionally, progression balancing is now run after ShopSlotFill, so it is now "aware" of the changed progression shops can produce.
As well, special handling for keys was removed, as not all games will have the notion of keys.
 2021-02-05 08:07:12 +01:00
Fabian Dill
88980fb3b6 Make playthrough text deterministic, by sorting alphabetically 2021-02-03 14:26:00 +01:00
Fabian Dill
5503547663 use less memory to assemble playthrough 2021-02-03 07:14:53 +01:00
Fabian Dill
07866bbd3c Speed up Playthrough creation 2021-02-03 06:55:08 +01:00
Fabian Dill
2352445146 Remove all uses of "item.priority" as the remaining fill algorithms don't need it anymore. 2021-01-30 09:57:25 +01:00
CaitSith2
5cc8dd2c71 Fix mistake made while reverting changes 2021-01-29 20:57:38 -08:00
CaitSith2
90c3fe9df3 Count take-any caves into final total. 2021-01-29 15:42:28 -08:00
CaitSith2
1d93952ef1 Revert part of a previous change 2021-01-29 13:49:17 -08:00
pepperpow
82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
CaitSith2
7f74aa7cb0 Implement open_pyramid yaml settings 2021-01-29 13:27:42 -08:00
Fabian Dill
8ddb1ab614 create per-team enemizer calls 2021-01-27 02:39:12 +01:00
Fabian Dill
a6dad66b59 Merge branch 'multishop' 2021-01-24 20:30:52 +01:00
Fabian Dill
441fa3e5db Allow Plando'ing Dungeon Prizes 
There be dragons beyond this point.
 2021-01-24 08:26:39 +01:00
CaitSith2
a2eb666ae9 Shop location sram offsets now fully static. 2021-01-22 07:08:50 -08:00
CaitSith2
6095cfc586 If any shop shuffle slots are defined, define ALL of them to avoid information leakage. 2021-01-22 05:40:50 -08:00
CaitSith2
bd4e062d8d Revert "Store region/item name/id maps in multidata" 
This reverts commit 6f1fc2ad4e.
 2021-01-21 22:45:21 -08:00
CaitSith2
6f1fc2ad4e Store region/item name/id maps in multidata 2021-01-21 19:38:41 -08:00
Fabian Dill
7e18f93a3a copy shop slots to new world 2021-01-19 01:03:32 +01:00
Fabian Dill
b775bfa916 Merge branch 'main' into multishop 2021-01-19 01:02:57 +01:00
Fabian Dill
e2075686c2 fix ItemPlando defaults 2021-01-19 01:02:03 +01:00
Fabian Dill
51692e7668 Merge remote-tracking branch 'origin/multishop' into multishop 2021-01-16 02:23:33 +01:00
Fabian Dill
f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
CaitSith2
0c1b679100 Whoops, fix for backwards cherry-pick 2021-01-15 17:07:18 -08:00
CaitSith2
94b56d10f5 Add shops / old man cave to multidata 2021-01-15 17:04:50 -08:00
Fabian Dill
d214783932 If due to DR or Plando the world is not fulfilling access rules, default to can_beat_game for Shop Logic 2021-01-14 00:26:49 +01:00
Fabian Dill
e8a57a4d24 Change hint for shop items to be "for sale" 
Lock Dungeon Prizes, as they're not supposed to be moved by any swapping mechanic
 2021-01-13 14:58:40 +01:00