morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,489 Commits 2 Branches 10 Tags
aa6f65ee1fe373b51a24d8010663ffd9083f87e7
Commit Graph

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Dill
129d2ec037 remove unnecessary ternaries in multiclient 2021-02-19 13:50:41 +01:00
Fabian Dill
96dfccdbfc set correct version in multidata 2021-02-19 13:47:25 +01: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
b1cf1a80e6 Fix non-activated flute. 2021-02-15 14:46:31 -08:00
Fabian Dill
930a0135d2 remove now outdated comment 2021-02-15 22:52:06 +01:00
Fabian Dill
d8366fbac7 Add Activated Flute as a proper item 2021-02-15 22:33:44 +01:00
Fabian Dill
1bad02e029 warn about missing logic on door-rando branch 2021-02-14 19:08:31 +01:00
Fabian Dill
e4d7e08963 when sweeping for events, only filter them once 2021-02-14 17:52:01 +01:00
Fabian Dill
e4d8823662 fix missing {choice} from default bottle_vendor_choice 
was never found as it gets removed as part of "unwanted text"
 2021-02-14 05:53:11 +01:00
CaitSith2
acefb47a00 Warn if trigger option name doesn't match something in the yaml. 2021-02-13 13:57:52 -08:00
CaitSith2
44f4f7f20c Allow for rom options in linked/triggered options without needing to... 
...overwrite the entire rom tree.
 2021-02-13 10:26:02 -08:00
Fabian Dill
5e619dec60 add mystery triggers 2021-02-13 14:03:23 +01:00
Fabian Dill
d0c4df7408 Merge remote-tracking branch 'origin/main' 2021-02-13 06:53:35 +01:00
Fabian Dill
2fd0c96369 update hint writing a bit 2021-02-13 06:53:27 +01:00
Fabian Dill
259bcdd7ff Merge pull request #174 from TWest3D/main 
Update playerSettings.yaml
 2021-02-13 06:48:18 +01:00
TWest3D
a90cb86da5 Update playerSettings.yaml 
Change "price" to "prize" in description for prize shuffle description.
 2021-02-12 20:46:46 -09:00
Fabian Dill
71dd1da24d Merge pull request #173 from StructuralMike/patch-1 
Correctly parse Turtle Rock Medallion settings
 2021-02-12 22:54:23 +01:00
StructuralMike
14b20e2c0d Correctly parse Turtle Rock Medallion settings 2021-02-12 22:11:48 +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
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
6bc1ed5584 remove no longer needed code 2021-02-09 00:40:52 +01:00
Fabian Dill
35eb2067f2 add Botte Merchant hint 2021-02-09 00:34:25 +01:00
Chris Wilson
1eaab4e843 Implement a versioning system for the weighted-settings page 2021-02-07 13:58:24 -05:00
CaitSith2
4684c2349c Fix Ice rod hunt beemizer level 4 still having 'Nothing' Items. 2021-02-07 06:34:42 -08:00
Fabian Dill
28e2c62884 add Zora hint 
(probably add and condition for shop_slot_shuffle, testing things)
 2021-02-07 10:42:20 +01:00
Fabian Dill
54ca6bb26f significantly reduce price of maps and compasses 2021-02-07 10:05:25 +01:00
Fabian Dill
191834200f introduce 100 rupee piles for retro and universal keys to be swapped into pool for shop slots 2021-02-07 09:45:30 +01:00
Fabian Dill
47837f4dae Update modules 2021-02-07 04:41:51 +01:00
pepperpow
d0d5ad4fe0 Remove debug statement 2021-02-06 17:35:44 -06:00
pepperpow
1d1abb7d22 Removed remnants of team stuff, make hide_goal default 2021-02-05 20:37:27 -06:00
Chris Wilson
87be751e45 Adjust the weighted settings json config file to properly reflect the key values for the shop_shuffle_slots option 2021-02-05 19:01:38 -05:00
Chris Wilson
5d84df4fa0 Fix a bug in the weighted settings causing the sprite list to not update when a preset is changed 2021-02-05 18:55:53 -05: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
Chris Wilson
239b365264 Remove outdated warning about QUsb2Snes version 2021-02-03 23:15:09 -05:00
CaitSith2
100ac7634e Merge branch 'inverted_flut' into main 2021-02-03 06:43:41 -08:00
Fabian Dill
88980fb3b6 Make playthrough text deterministic, by sorting alphabetically 2021-02-03 14:26:00 +01:00
Fabian Dill
e4d4ff667c Some Shop fixes: 
Make sure that dark lake hylia shop in inverted retains the blue potion, while allowing shop slots on top (potion will always be the leftmost slot, ignoring "i"/"f"/"g")
Cull Shop swap Candidates before generating weights, then keep track of updated sphere sizes during swaps. This significantly reduces the chance to run out of candidates, as large clumps of false candidates do not get included in the weight
Shop fill is slower with this, as all candidates need to be swept once, instead of on-demand; but this seemed the best way to address the remaining issues.
 2021-02-03 14:24:29 +01:00
Fabian Dill
5503547663 use less memory to assemble playthrough 2021-02-03 07:14:53 +01:00
Fabian Dill
60e1b52c55 Merge remote-tracking branch 'origin/main' 2021-02-03 06:55:14 +01:00
Fabian Dill
07866bbd3c Speed up Playthrough creation 2021-02-03 06:55:08 +01:00
Chris Wilson
fe0f41c884 Merge branch 'main' of https://github.com/berserker66/MultiWorld-Utilities into main 2021-02-02 22:58:31 -05: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
CaitSith2
ee06aca908 Update timestamp of own rights 2021-02-02 19:07:02 -08:00
Fabian Dill
52de7f6a22 Update timestamp of own rights 2021-02-03 03:56:47 +01:00
Fabian Dill
cf49cd5e4b Mark Advancement items in the client 2021-02-03 03:19:25 +01:00
Hussein Farran
25bbfb2f3e Update README.md (#163) 
* Update README.md
 2021-02-03 01:37:05 +01:00
Fabian Dill
fcbaa35cc5 new inverted logic, accounting for dark world flute activation 2021-02-02 11:24:17 +01:00
CaitSith2
842be54ab9 Merge remote-tracking branch 'origin/main' into main 2021-02-02 00:10:01 -08:00
pepperpow
e497a88137 Inverted flute mechanics (#169) 
* inverted_flute

* Added hash/inverted sign message

* Fixed flute working in both worlds instead of just dark

* Moved inverted goal sign to castle lawn
 2021-02-02 08:04:57 +01:00