diff options
| author | jani270 <jani270@gmx.de> | 2022-11-09 22:29:54 +0100 |
|---|---|---|
| committer | jani270 <jani270@gmx.de> | 2022-11-09 22:29:54 +0100 |
| commit | c7f6c27bafd374d29a511e125f9f08cac32e4771 (patch) | |
| tree | 197a3a249fd49e69a9c4b9a01568b79b05ba64c9 /constants | |
| parent | a6066974be169ca6ae32212aaa4868ee8d63f3b8 (diff) | |
| parent | 2f58108e625e56545a075f86fb502dfb74b6467e (diff) | |
| download | NotEnoughUpdates-REPO-c7f6c27bafd374d29a511e125f9f08cac32e4771.tar.gz NotEnoughUpdates-REPO-c7f6c27bafd374d29a511e125f9f08cac32e4771.tar.bz2 NotEnoughUpdates-REPO-c7f6c27bafd374d29a511e125f9f08cac32e4771.zip | |
Merge branch 'master' into prerelease
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/abiphone.json | 2 | ||||
| -rw-r--r-- | constants/misc.json | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/constants/abiphone.json b/constants/abiphone.json index a85b5df8..2b380ab2 100644 --- a/constants/abiphone.json +++ b/constants/abiphone.json @@ -324,7 +324,7 @@ "ยง6- Wear a full set of Fairy Armor." ], "island": "hub", - "x": -129, + "x": 129, "y": 68, "z": 137 }, diff --git a/constants/misc.json b/constants/misc.json index 9d73c977..d5197600 100644 --- a/constants/misc.json +++ b/constants/misc.json @@ -1317,6 +1317,13 @@ "ABICASE_SUMSUNG_1", "ABICASE_SUMSUNG_2", "ABICASE_BLUE_RED" + ], + "VACCINE_TALISMAN": [ + "VACCINE_RING", + "VACCINE_ARTIFACT" + ], + "VACCINE_RING": [ + "VACCINE_ARTIFACT" ] }, "special_bois": [ @@ -1330,7 +1337,7 @@ "689ff4bbf61e4e0594e01066892b0bbe", "a5761ff3c7104cabb4f43e7f017a8dbf", "f94771a6e4c4457495e7aa821c370e3d", - "4f0e53f2bc1e464fa86af515e22390c7", + "fe558f53ad324290aeeac91f3d37a681", "baa6c0a7c3494f7d9257c92dd886b890", "783f560bff974363b5cfd61c496ba278", "d82f5572054f4b7cb3d73e614098bbcb", |