From 2ca8d61c0b051f0a1cb17c54844c2534c653ee67 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 29 Mar 2022 12:21:09 -0600 Subject: [PATCH] Arghus splash fix Don't bother checking the ssl cert for that call --- MultiServer.py | 3 ++- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 85664 -> 85662 bytes 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index c4e8224b..4108b8dd 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -6,6 +6,7 @@ import json import logging import re import shlex +import ssl import urllib.request import websockets import zlib @@ -405,7 +406,7 @@ async def main(): logging.error('Failed to read multiworld data (%s)' % e) return - ip = urllib.request.urlopen('https://v4.ident.me').read().decode('utf8') if not ctx.host else ctx.host + ip = urllib.request.urlopen('https://v4.ident.me', context=ssl._create_unverified_context()).read().decode('utf8') if not ctx.host else ctx.host logging.info('Hosting game at %s:%d (%s)' % (ip, ctx.port, 'No password' if not ctx.password else 'Password: %s' % ctx.password)) ctx.disable_save = args.disable_save diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 1d99f310..52bc8b61 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -150,8 +150,10 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o * 1.0.1.12 * Fix for Multiworld forfeits, shops and pot items now included * Reworked GT Trash Fill. Base rate is 0-75% of locations fill with 7 crystals entrance requirements. Triforce hunt is 75%-100% of locations. The 75% number will decrease based on the crystal entrance requirement. Dungeon_only algorithm caps it based on how many items need to be placed in dungeons. Cross dungeon shuffle will now work with the trash fill. + * MultiServer fix for ssl certs and python * Inverted bug * Fix for hammerdashing pots, if sprite limit is reached, items won't spawn, error beep won't play either because of other SFX + * Arghus splash no longer used for pottery sprites (used apple instead) * Killing enemies freeze + hammer results in the droppable item instead of the freeze prize * Forbid certain doors from being dashable when you either can't dash them open (but bombs would work) or you'd fall into a pit from the recoil in OHKO * 1.0.1.11 diff --git a/Rom.py b/Rom.py index 7c0933e2..dbc7e670 100644 --- a/Rom.py +++ b/Rom.py @@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '57df02038c77f9a3b915af21d3c59b78' +RANDOMIZERBASEHASH = '1e45d174c71b2e079df1c8d5e8d1451b' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 0e97265aee6578922b9d19587bb29c55dd71d6b6..894baf13fe4a7fff2cde646bfd047b7730098b6c 100644 GIT binary patch delta 62 zcmV-E0KxyDoduqq1+YZ{1OkHneS=8>w@Cp3nhgR_PM75l0bT{=n}UJ$mq-r*BLsov UyMniI4*@4X2<8KtPM>X356N>DlmGw# delta 64 zcmV-G0Kfm9oduws1+YZ{1oD9meuGH?w@Cp3nhgT5Oqb;j0bT{mn}UJcmq-r*BL<5B WfU^LAw{H&tCqD>w^$zaQhFiq)I2ZW<