Added a feature to allow no death run

RandomizerCommon/KeyItemsPermutation.cs

@@ -82,6 +82,24 @@ public KeyItemsPermutation(RandomizerOptions options, LocationData data, Annotat
                     }
                 }
 
+                //If noDeath guaranteed, set the drawingroomkey forced requirements
+                if (options["nodeathvalid"])
+                {
+                    configExprs["drawingroomkeyreq"] = Expr.Named("volcano_drawingroom");
+                }
+                else
+                {
+                    //"volcano_drawingroom OR (academy AND altus);
+                    configExprs["drawingroomkeyreq"] =
+                        new Expr(
+                            new List<Expr>(){
+                                Expr.Named("volcano_drawingroom"),
+                                new Expr(
+                                    new List<Expr>(){
+                                        Expr.Named("academy"),
+                                        Expr.Named("altus") }) }, false);
+                }
+
                 // If leyndellRunes is 0, this condition just becomes true
                 configExprs["runes_leyndell"] = new Expr(runes.Take(leyndellRunes).Select(r => Expr.Named(r)).ToList(), true);
                 if (roldRunes == -1)

diste/Base/annotations.txt

@@ -597,7 +597,8 @@ Areas:
 - Name: volcano_town
   Text: Volcano Manor
   # Add 'altus' condition so that Dectus medallion isn't placed here
-  Req: volcano_drawingroom OR (academy AND altus)
+  # Old was : volcano_drawingroom OR (academy AND altus)
+  Req: drawingroomkeyreq
   Maps: m16_00_00_00
   MainMaps: m16_00_00_00
 - Name: volcano_temple

diste/Messages/de.json

@@ -578,6 +578,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Mini-Dungeons von allen obigen Orten ausschließen"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/es-ES.json

@@ -537,6 +537,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": ""
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/es.json

@@ -560,6 +560,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Excluye a las mazmorras de todos los lugares anteriores"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/fr.json

@@ -590,6 +590,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Retire les mini-donjons de tous les emplacements au dessus"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": "Assurer que le jeu puisse être complété sans mourir"
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/it.json

@@ -536,6 +536,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": ""
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/ja.json

@@ -566,6 +566,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "上記すべての場所からミニダンジョンを除外"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/kk-KZ.json

@@ -537,6 +537,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "[[Exclude mini-dungeons from all of the above locations]]"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/ko.json

@@ -536,6 +536,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": ""
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/pl.json

@@ -560,6 +560,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Przedmioty kluczowe nie mogą się pojawiać w tych lokacjach"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/pt-BR.json

@@ -542,6 +542,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Excluir mini-dungeons de todos os locais acima"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/ru.json

@@ -560,6 +560,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "Исключить подземелья из выше упомянутого списка локаций"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/th.json

@@ -536,6 +536,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": ""
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",

diste/Messages/zh.json

@@ -578,6 +578,12 @@
       "english_text": "Exclude mini-dungeons from all of the above locations",
       "text": "在上述位置中排除小型箱庭"
     },
+    {
+      "name": "EldenForm_nodeathvalid",
+      "explanation": "Button to force the randomizer to allow a no death run, making sur the drawing room key isn't inaccessible",
+      "english_text": "Make sure the run can be done deathless",
+      "text": ""
+    },
     {
       "name": "EldenForm_nohand",
       "explanation": "Radio button for starting class randomization: if chosen, all starting class stat requirements are completely ignored, and the player may start with a weapon or spell they do not have the stats to use",