From 09e021403675e3fdcf58bf824514274f1c15ddd9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 14 Jun 2023 23:15:07 -0700 Subject: Updated to Revert "Fix-mutant-scenarios-adding-an-obsoleted-trait" as it conflicts with revert of generic night vision. --- ...-scenarios-adding-an-obsoleted-trait-2929.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch (limited to 'revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch') diff --git a/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch b/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch new file mode 100644 index 0000000..4a65221 --- /dev/null +++ b/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch @@ -0,0 +1,34 @@ +From f25e3e13491872cef28f7bcf245c4b3f0c5dc5f5 Mon Sep 17 00:00:00 2001 +From: Chaosvolt +Date: Sun, 4 Jun 2023 12:30:28 -0500 +Subject: [PATCH] Fix mutant scenarios adding an obsoleted trait (#2929) + +--- + data/json/scenarios.json | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/json/scenarios.json b/data/json/scenarios.json +index 4b0a90da8b1..20c82aba2d4 100644 +--- a/data/json/scenarios.json ++++ b/data/json/scenarios.json +@@ -250,7 +250,7 @@ + "allowed_locs": [ "sloc_lab_random", "sloc_lab_escape_cells", "sloc_lab_finale", "sloc_ice_lab_stairs", "sloc_ice_lab_finale" ], + "traits": [ + "ELFAEYES", +- "URSINE_EYE", ++ "NIGHTVISION2", + "FANGS", + "GILLS", + "SPINES", +@@ -489,7 +489,7 @@ + ], + "traits": [ + "ELFAEYES", +- "URSINE_EYE", ++ "NIGHTVISION2", + "FANGS", + "GILLS", + "SPINES", +-- +2.40.1 + -- cgit v1.2.1