diff --git a/EnderLilies.Game/EnderLilies.Game.rc b/EnderLilies.Game/EnderLilies.Game.rc index d521c24..2a0367c 100644 --- a/EnderLilies.Game/EnderLilies.Game.rc +++ b/EnderLilies.Game/EnderLilies.Game.rc @@ -52,7 +52,7 @@ END VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 - PRODUCTVERSION 2,2,0,0 + PRODUCTVERSION 2,2,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -74,7 +74,7 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "EnderLilies.Game" VALUE "ProductName", "EnderLilies.Randomizer.Game" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.2.0.1" END END BLOCK "VarFileInfo" diff --git a/EnderLilies.Randomizer/EnderLilies.Randomizer.json b/EnderLilies.Randomizer/EnderLilies.Randomizer.json index 61b895a..5a672f2 100644 --- a/EnderLilies.Randomizer/EnderLilies.Randomizer.json +++ b/EnderLilies.Randomizer/EnderLilies.Randomizer.json @@ -1442,7 +1442,7 @@ "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Oubliette_02_GAMEPLAY.BP_Interactable_Item_Tip3", "requires": "swim + (dodge + (LEDGE | dash) | 2LEDGE | hook | sinner | djump + dash)", "twoways": true diff --git a/EnderLilies.Randomizer/Properties/AssemblyInfo.cs b/EnderLilies.Randomizer/Properties/AssemblyInfo.cs index ff40706..19e9ba2 100644 --- a/EnderLilies.Randomizer/Properties/AssemblyInfo.cs +++ b/EnderLilies.Randomizer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.2.0.0")] +[assembly: AssemblyVersion("2.2.0.1")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Update/Components/EnderLilies.Game.dll b/Update/Components/EnderLilies.Game.dll index 4aaa075..ab09574 100644 Binary files a/Update/Components/EnderLilies.Game.dll and b/Update/Components/EnderLilies.Game.dll differ diff --git a/Update/Components/EnderLilies.Randomizer.dll b/Update/Components/EnderLilies.Randomizer.dll index 948dd6f..1506998 100644 Binary files a/Update/Components/EnderLilies.Randomizer.dll and b/Update/Components/EnderLilies.Randomizer.dll differ diff --git a/Update/Components/EnderLilies.Randomizer.json b/Update/Components/EnderLilies.Randomizer.json index df596d0..5a672f2 100644 --- a/Update/Components/EnderLilies.Randomizer.json +++ b/Update/Components/EnderLilies.Randomizer.json @@ -8,6 +8,8 @@ "BastionGates": "Fort_03_GAMEPLAY.BP_Interactable_Item_Tip3", "AnkletRoom": "Forest_17_Map.BP_Interactable_Item_Tip5", "Aqueduct": "Oubliette_02_GAMEPLAY.BP_Interactable_Item_Tip3", + "DryadLake": "Forest_05_GAMEPLAY.BP_Interactable_Item_Tip4", + "Crossroads": "Church_08_GAMEPLAY.BP_Interactable_Item_Tip3", "Gerrod": "Village_10_GAMEPLAY.BP_e5050_Giant", "Silva": "Cave_23_GAMEPLAY.BP_e5021_OlderSister", @@ -380,7 +382,7 @@ { "from": "Dog", "to": "Castle_14_GAMEPLAY.BP_SCR_LV2LL_0000_2", - "requires": "claw + (3LEDGE | FULLSILVA | sinner + 2LEDGE | silva + 2HORIZONTAL)", + "requires": "claw + (3LEDGE | FULLSILVA | sinner + 2LEDGE | silva + 2HORIZONTAL | Dodge + Dash + 2LEDGE)", "twoways": true }, { @@ -398,7 +400,7 @@ { "from": "Julius", "to": "Castle_16_GAMEPLAY.BP_e2032_BigKnight", - "requires": "claw + (hook | FULLSILVA + (sinner | champion))", + "requires": "claw + (hook | FULLSILVA + sinner | 3LEDGE)", "twoways": true }, { @@ -548,7 +550,7 @@ { "from": "Silva", "to": "Cave_02_GAMEPLAY.BP_SCR_LV1M_2160_1", - "requires": "hook | claw + (HORIZONTAL | djump | champ)", + "requires": "hook | claw + (HORIZONTAL | djump | champ + dash | silva + dash)", "twoways": true }, { @@ -842,19 +844,19 @@ { "from": "Youth", "to": "Church_07_GAMEPLAY.BP_Interactable_Item_PassiveSlot_2", - "requires": "slam + (LEDGE | claw)", + "requires": "slam", "twoways": true }, { "from": "Youth", "to": "Church_08_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_2", - "requires": "swim + (LEDGE | claw)", + "requires": "swim", "twoways": true }, { - "from": "Siegrid", + "from": "Youth", "to": "Church_08_GAMEPLAY.BP_Interactable_Item_Tip3", - "requires": "LEDGE | claw", + "requires": "", "twoways": true }, { @@ -894,16 +896,16 @@ "twoways": true }, { - "from": "Start", + "from": "Siegrid", "to": "Church_11_GAMEPLAY.BP_Interactable_Item_Tip3", "requires": "", "twoways": true }, { - "from": "Start", + "from": "Chief", "to": "Church_12_GAMEPLAY.BP_Interactable_Item_Tip1", "requires": "", - "twoways": true + "twoways": false }, { "from": "Start", @@ -926,25 +928,25 @@ { "from": "Youth", "to": "Forest_02_GAMEPLAY.BP_SCR_LV1S_2130_2", - "requires": "LEDGE | claw ", + "requires": "", "twoways": true }, { "from": "Youth", "to": "Forest_03_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_2", - "requires": "swim + (LEDGE | claw)", + "requires": "swim", "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_03_GAMEPLAY.BP_Interactable_Item_PassiveSlot_2", - "requires": "swim + (LEDGE | claw)", + "requires": "swim", "twoways": true }, { "from": "Youth", "to": "Forest_04_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_Drop", - "requires": "LEDGE | claw", + "requires": "LEDGE | claw | HORIZONTAL + swim", "twoways": true }, { @@ -962,7 +964,7 @@ { "from": "Youth", "to": "Forest_05_GAMEPLAY.BP_Interactable_Item_Tip4", - "requires": "LEDGE | claw", + "requires": "LEDGE | claw | swim + HORIZONTAL", "twoways": true }, { @@ -984,21 +986,21 @@ "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_07_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_Drop", - "requires": "LEDGE | claw", + "requires": "LEDGE | hook | HORIZONTAL", "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_07_GAMEPLAY.BP_SCR_LV1S_2121_1", "requires": "hook | claw + (2LEDGE | LEDGE + HORIZONTAL)", "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_07_GAMEPLAY.BP_SCR_LV1S_2130_2", - "requires": "LEDGE | claw", + "requires": "", "twoways": true }, { @@ -1008,13 +1010,13 @@ "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_08_GAMEPLAY.BP_Interactable_Passive_Treasure2", "requires": "2LEDGE | LEDGE + HORIZONTAL | hook", "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_08_GAMEPLAY.BP_SCR_LV2M_2120_1", "requires": "LEDGE | HORIZONTAL", "twoways": true @@ -1062,7 +1064,7 @@ "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Forest_11_GAMEPLAY.BP_Interactable_Passives_Treasure_2", "requires": "swim + (LEDGE | HORIZONTAL)", "twoways": true @@ -1112,19 +1114,19 @@ { "from": "Youth", "to": "Forest_16_GAMEPLAY.BP_Interactable_Item_Tip3", - "requires": "LEDGE + HORIZONTAL + claw + unlock", + "requires": "claw + unlock + (LEDGE + HORIZONTAL | 2LEDGE)", "twoways": true }, { "from": "Youth", "to": "Forest_16_GAMEPLAY.BP_Interactable_Passives_Treasure_2", - "requires": "LEDGE + HORIZONTAL + claw + unlock", + "requires": "claw + unlock + (LEDGE + HORIZONTAL | 2LEDGE)", "twoways": true }, { "from": "Youth", "to": "Forest_16_GAMEPLAY.BP_SCR_LV1LL_0000_2", - "requires": "LEDGE + HORIZONTAL + claw + unlock", + "requires": "claw + unlock + (LEDGE + HORIZONTAL | 2LEDGE)", "twoways": true }, { @@ -1148,7 +1150,7 @@ { "from": "Youth", "to": "Forest_17_Map.BP_Interactable_Item_Tip5", - "requires": "hook | claw + (djump | champion) | silva + djump | sinner + (djump | champion) | 2HORIZONTAL + LEDGE | 2LEDGE + HORIZONTAL", + "requires": "hook + (LEDGE | claw) | claw + (djump | champion) | silva + djump | sinner + (djump | champion) | 2HORIZONTAL + LEDGE | 2LEDGE + HORIZONTAL", "twoways": true }, { @@ -1160,7 +1162,7 @@ { "from": "Gerrod", "to": "Fort_01_GAMEPLAY.BP_e2192_Gargoyle", - "requires": "swim + (claw + 2LEDGE + HORIZONTAL | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", + "requires": "swim + (claw + (sinner + (djump | champion) | dodge + silva | 2LEDGE + HORIZONTAL) | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", "twoways": true }, { @@ -1196,7 +1198,7 @@ { "from": "BastionGates", "to": "Fort_04_GAMEPLAY.BP_SCR_LV1L_2230_8", - "requires": "CHARGE + LEDGE", + "requires": "CHARGE + (LEDGE | claw)", "twoways": true }, { @@ -1208,7 +1210,7 @@ { "from": "BastionGates", "to": "Fort_05_GAMEPLAY.BP_Interactable_Item_PassiveSlot_Drop", - "requires": "LEDGE + hook", + "requires": "LEDGE + (hook | claw)", "twoways": true }, { @@ -1352,7 +1354,7 @@ { "from": "BastionGates", "to": "Fort_15_GAMEPLAY.BP_Interactable_Passives_Treasure_2", - "requires": "LEDGE + (HORIZONTAL | claw) + hook", + "requires": "LEDGE + (HORIZONTAL | claw) + hook | 2LEDGE", "twoways": true }, { @@ -1380,9 +1382,9 @@ "twoways": true }, { - "from": "BastionGates", + "from": "Ulv", "to": "Fort_18_GAMEPLAY.BP_Interactable_Item_MaxHPUp_02_Treasure_2", - "requires": "LEDGE + claw + HORIZONTAL", + "requires": "claw + (sinner | dodge + LEDGE | 2LEDGE | djump + dash)", "twoways": true }, { @@ -1440,7 +1442,7 @@ "twoways": true }, { - "from": "Youth", + "from": "DryadLake", "to": "Oubliette_02_GAMEPLAY.BP_Interactable_Item_Tip3", "requires": "swim + (dodge + (LEDGE | dash) | 2LEDGE | hook | sinner | djump + dash)", "twoways": true @@ -1526,7 +1528,7 @@ { "from": "Aqueduct", "to": "Oubliette_06_3_GAMEPLAY.BP_Interactable_Item_PassiveSlot_2", - "requires": "hook + (LEDGE | HORIZONTAL) | FULLSILVA", + "requires": "hook + (LEDGE | HORIZONTAL) | FULLSILVA | 3LEDGE", "twoways": true }, { @@ -1964,7 +1966,7 @@ { "from": "Youth", "to": "Village_02_GAMEPLAY.BP_SCR_LV1S_2100_2", - "requires": "2LEDGE | silva + dodge | hook", + "requires": "2LEDGE | silva + dodge | hook + (LEDGE | claw)", "twoways": true }, { @@ -1976,13 +1978,13 @@ { "from": "Youth", "to": "Village_03_GAMEPLAY.BP_Interactable_Passives_Treasure_2", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { "from": "Youth", "to": "Village_03_GAMEPLAY.BP_SCR_LV1S_2021_2", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { @@ -1994,37 +1996,37 @@ { "from": "Youth", "to": "Village_04_1_GAMEPLAY.BP_e2102_Crow", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { "from": "Youth", "to": "Village_04_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_2", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { "from": "Youth", "to": "Village_04_GAMEPLAY.BP_Interactable_Passives_Treasure_2", - "requires": "hook | LEDGE + HORIZONTAL | 2LEDGE | LEDGE + claw", + "requires": "hook + (LEDGE | claw) | LEDGE + HORIZONTAL | 2LEDGE | LEDGE + claw", "twoways": true }, { "from": "Youth", "to": "Village_04_GAMEPLAY.BP_SCR_LV1S_2010_1", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { "from": "Youth", "to": "Village_05_GAMEPLAY.BP_Interactable_Item_Tip4", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { "from": "Youth", "to": "Village_06_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_2", - "requires": "", + "requires": "LEDGE | claw", "twoways": true }, { @@ -2036,79 +2038,79 @@ { "from": "Youth", "to": "Village_06_GAMEPLAY.BP_SCR_LV1S_2020_2", - "requires": "slam + (2LEDGE | LEDGE + claw | hook)", + "requires": "slam + (2LEDGE | LEDGE + claw | hook + (LEDGE | claw))", "twoways": true }, { "from": "Youth", "to": "Village_06_GAMEPLAY.BP_SCR_LV1S_2021_2", - "requires": "slam + (2LEDGE | LEDGE + claw | hook)", + "requires": "slam + (2LEDGE | LEDGE + claw | hook + (LEDGE | claw))", "twoways": true }, { "from": "Youth", "to": "Village_06_GAMEPLAY.BP_SCR_LV2S_2010_3", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_06_GAMEPLAY.BP_SCR_LV2S_2021_2", - "requires": "(LEDGE | hook) + slam", + "requires": "(LEDGE | hook + claw) + slam", "twoways": true }, { "from": "Youth", "to": "Village_07_GAMEPLAY.BP_Interactable_Item_PassiveSlot_2", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_07_GAMEPLAY.BP_SCR_LV1S_2100_3", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_07_GAMEPLAY.BP_SCR_LV2S_2080_3", - "requires": "hook | 2LEDGE", + "requires": "hook + (LEDGE | claw) | 2LEDGE", "twoways": true }, { "from": "Youth", "to": "Village_08_GAMEPLAY.BP_e2002_Knight", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_08_GAMEPLAY.BP_Interactable_Item_MaxHPUp_01_2", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_08_GAMEPLAY.BP_SCR_LV1S_2021_2", - "requires": "(LEDGE | hook) + swim", + "requires": "(LEDGE | hook + claw) + swim", "twoways": true }, { "from": "Youth", "to": "Village_09_GAMEPLAY.BP_Interactable_Item_Tip3", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_09_GAMEPLAY.BP_Interactable_Item_Tip4", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { "from": "Youth", "to": "Village_10_GAMEPLAY.BP_e5050_Giant", - "requires": "LEDGE | hook", + "requires": "LEDGE | hook + claw", "twoways": true }, { @@ -2150,17 +2152,17 @@ { "from": "Youth", "to": "Village_13_GAMEPLAY.BP_Interactable_Item_PassiveSlot_Drop", - "requires": "slam", + "requires": "slam + (LEDGE | claw)", "twoways": true }, { "from": "Youth", "to": "Village_13_GAMEPLAY.BP_Interactable_Passives_Treasure_2", - "requires": "swim", + "requires": "swim + (LEDGE | claw)", "twoways": true }, { - "from": "Siegrid", + "from": "Youth", "to": "Village_13_GAMEPLAY.BP_SCR_LV1S_2021_2", "requires": "LEDGE | claw", "twoways": true @@ -2186,13 +2188,19 @@ { "from": "Gerrod", "to": "Village_15_GAMEPLAY.BP_SCR_LV1LL_0000_2", - "requires": "swim + (claw + 2LEDGE + HORIZONTAL | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", + "requires": "swim + (claw + (sinner + (djump | champion) | dodge + silva | 2LEDGE + HORIZONTAL) | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", + "twoways": true + }, + { + "from": "Sentinel", + "to": "Village_15_GAMEPLAY.BP_SCR_LV1LL_0000_2", + "requires": "swim + claw + djump + silva", "twoways": true }, { "from": "Gerrod", "to": "Village_15_GAMEPLAY.BP_SCR_LV1M_2050_3", - "requires": "swim + (claw + 2LEDGE + HORIZONTAL | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", + "requires": "swim + (claw + (sinner + (djump | champion) | dodge + silva | 2LEDGE + HORIZONTAL) | hook + 2LEDGE | hook + claw + (LEDGE | HORIZONTAL))", "twoways": true }, {