mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright
2
0
Fork 0
Code Issues Wiki
Shipwright/soh/assets/custom/objects/gameplay_keep
History
Varuuna dd81af17bb
[Rando] Grassanity (#4889) 
* * fixes softlock when talking to Mido without Kokiri Emerald after killing Gohma

* * moved scene check to hook
* moved vanilla conditioon into GameInteractor_Should

* * corrected hook condition
* removed 'this'

* * reverted GameInteractor and hook_handlers
* changed actor to use existing hook

* * updated kokiri emerald conditions

* * missed parentheses

* * Overworld pretty much done.
* Known issue with Market Night + 2 bushes in KF
* Known issue with Adult bush in ZR

* * fixed locations post-merge

* * renamed option and types to 'GRASSANITY'
* changed grassnity to be a combobox option
* added first 5 deku tree locations

* * color is a sickly green when containing a check
* added ZR 14 (adult only bush on the platform, not the same?)

* * forgot to rename the files to grassanity
* updated draw method to fix regrowing grass

* Removed old WIP locacc files

* * removed comments in bush actor
* added rest of Deku Tree plus MQ

* Added DC + MQ

* Fixed DC incorrect pos value on 1 loc

* JJB done minus after big octo

* Added BotW + MQ locs

* WIP grottos

* Grottos done

* Workaround to allow market grass during night

* Seperated the 2 KF bushes into 4 checks

* Hints and additional formatting

* Slightly less ghastly color

* Corrected the 2 JJB locs

* * Renaming and removal of some locs.
* Restructure in z_en_kusa.c to leave vanilla code alone.
* Formatting.

* * see previous (forgot to stage woops)

* * Clear grassIdentity on item drop
* Added check for RC on RandoDraw function
Results in no extra dupe drops, and instantly correct the color of the grass when cut instead of on collecting the item.

* * fixed dupe location spoiler names which caused occasional crash when writing spoiler log

* * reverse should

* * fixed faulty locations

* * corrected KAK location names and some formatting

* * Fixed market bushes by tree not working at night

* * merged ZR near PoH grass into a single loc

* * Changed to ShipInit (might be missing something?)
* Corrected Should in z_en_kusa.c to use original draw func when setting is Off

* * Renaming to Shuffle Grass

* * minor fix

* * keyboard fail lol

* * suggestions

* * removed unused function

* * move grass locations into ShuffleGrass
* move grass GameInteractor into GIVanillaBehavior
* minor fixes

* * pre-removed locs from dungeon.cpp

* * pre-remove from context.cpp

* * re-added Grass to context

* * added Dana's amazing custom bush models
* using CSMC to display flowers based on "contents"

* * added Dana's grass models
* refactor to lessen the clutter in the switch

* * removed fairy case

* Added back missing Deku Tree locations

* formatting

* Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>

* re-added suggestion from previous

* removed wrong line >.>

---------

Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
 		2025-03-26 19:33:10 +01:00
..
LeafTex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
StemTex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_bosskey_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_bronze_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_fairy_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_gold_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_heart_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_mask_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_random_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_silver_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
flower_token_tex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gGrassBunchTex.rgba16 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassBossKeyDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassFairyDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassHeartDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassJunkDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassJunkDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassJunkDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassJunkDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMajorDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMaskDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassMinorDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassRandomDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassSmallKeyDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_tri_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_tri_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_tri_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_tri_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_vtx_0 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_vtx_1 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_vtx_2 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_vtx_3 [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
gRandoCuttableGrassTokenDL_vtx_cull [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassBossKeyDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassFairyDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassFairyDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassFairyDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassHeartDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassHeartDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassHeartDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassJunkDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMajorDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMajorDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMajorDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMaskDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMaskDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMaskDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMinorDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMinorDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassMinorDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassRandomDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassRandomDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassRandomDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassTokenDL_f3dlite_Grass [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassTokenDL_f3dlite_leaf [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
mat_gRandoCuttableGrassTokenDL_f3dlite_material [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00
model.xml [Rando] Grassanity (#4889) 2025-03-26 19:33:10 +01:00