diff --git a/README.md b/README.md index 22185ea..77f7a6b 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,6 @@ It is just so interesting. What it can do is under exploration. [这里 Here](https://github.com/Lost-MSth/Arcaea-server/releases) [Arcaea-CN official](https://arcaea.lowiro.com/zh) -[Arcaea-Konmai Academy](https://616.sb) ## 更新日志 Update log diff --git a/latest version/core/world.py b/latest version/core/world.py index 0ce81f3..c5414dd 100644 --- a/latest version/core/world.py +++ b/latest version/core/world.py @@ -936,8 +936,9 @@ class WorldLawMixin: def _over100_step50(self) -> None: '''PROG = OVER + STEP / 2''' - self.new_law_prog = self.character_used.overdrive_value + \ - self.character_used.prog_value / 2 + over = self.character_used.overdrive_value + self.over_skill_increase + prog = self.character_used.prog_value + self.prog_skill_increase + self.new_law_prog = over + prog / 2 def _frag50(self) -> None: '''PROG x= FRAG''' @@ -950,9 +951,10 @@ class WorldLawMixin: def _antiheroism(self) -> None: '''PROG = OVER - ||OVER-FRAG|-|OVER-STEP||''' - over = self.character_used.overdrive_value + over = self.character_used.overdrive_value + self.over_skill_increase + prog = self.character_used.prog_value + self.prog_skill_increase x = abs(over - self.character_used.frag_value) - y = abs(over - self.character_used.prog_value) + y = abs(over - prog) self.new_law_prog = over - abs(x - y) diff --git a/latest version/database/map/byd_inkarusi.json b/latest version/database/map/byd_inkarusi.json new file mode 100644 index 0000000..21574f2 --- /dev/null +++ b/latest version/database/map/byd_inkarusi.json @@ -0,0 +1,80 @@ +{ + "map_id": "byd_inkarusi", + "is_legacy": false, + "character_affinity": [], + "affinity_multiplier": [], + "chapter": 2001, + "available_from": -1, + "available_to": 9999999999999, + "is_repeatable": false, + "require_id": "inkarusi2", + "require_type": "chart_unlock", + "is_breached": true, + "stamina_cost": 3, + "new_law": "over100_step50", + "disable_over": true, + "coordinate": "500,0", + "beyond_health": 200, + "step_count": 5, + "custom_bg": "", + "is_beyond": true, + "requires": [ + { + "type": "chart_unlock", + "id": "inkarusi2" + } + ], + "steps": [ + { + "map_id": "byd_inkarusi", + "position": 0, + "capture": 50 + }, + { + "map_id": "byd_inkarusi", + "position": 1, + "capture": 50, + "items": [ + { + "type": "core", + "id": "core_generic", + "amount": 2 + } + ] + }, + { + "map_id": "byd_inkarusi", + "position": 2, + "capture": 50, + "items": [ + { + "type": "fragment", + "amount": 500 + } + ] + }, + { + "map_id": "byd_inkarusi", + "position": 3, + "capture": 50, + "items": [ + { + "type": "core", + "id": "core_generic", + "amount": 2 + } + ] + }, + { + "map_id": "byd_inkarusi", + "position": 4, + "capture": 0, + "items": [ + { + "id": "inkarusi3", + "type": "world_song" + } + ] + } + ] +} \ No newline at end of file diff --git a/latest version/linkplay_server/store.py b/latest version/linkplay_server/store.py index fdb7b71..2ca4e7d 100644 --- a/latest version/linkplay_server/store.py +++ b/latest version/linkplay_server/store.py @@ -120,7 +120,7 @@ class TCPRouter: r = getattr(self, self.endpoint)() except Exception as e: logging.error(e) - return 999 + return {'code': 999} if isinstance(r, int): return {'code': r} return { diff --git a/latest version/linkplay_server/udp_class.py b/latest version/linkplay_server/udp_class.py index 617906b..5ed8f90 100644 --- a/latest version/linkplay_server/udp_class.py +++ b/latest version/linkplay_server/udp_class.py @@ -104,7 +104,7 @@ class Room: def to_dict(self) -> dict: p = [i.to_dict() for i in self.players if i.player_id != 0] for i in p: - i['is_host'] = i['player_id'] == self.host_id + i['is_host'] = i['multiplay_player_id'] == self.host_id return { 'room_id': self.room_id, 'room_code': self.room_code,