6a6b49c290
- Fix bank deposit/withdraw paths: /bank/deposit → /bank/deposit/item (and withdraw) - Fix cooldown error handling: 498 is "character not found" (raise immediately), 499 is "character in cooldown" (wait and retry) — was previously swapped - Fix events endpoint: use /events/active instead of /events for active game events - Fix action rate limiter: 7/2s → 20/2s to match actual API limits - Use page_size=10000 for static data pagination (items/monsters/resources/maps) to minimize API round-trips during cache refresh - Add missing character fields from API: wisdom, prospecting, initiative, threat, dmg, layer, map_id, effects, rune_slot, bag_slot, and *_max_xp for all skills - Fix skill bars to use actual max_xp from API instead of xp % 100 - Add rune_slot and bag_slot to equipment constants https://claude.ai/code/session_015BJtuNcKqcdqSJETj5xRjX
238 lines
4.8 KiB
Python
238 lines
4.8 KiB
Python
from datetime import datetime
|
|
from typing import Any
|
|
|
|
from pydantic import BaseModel, Field, model_validator
|
|
|
|
|
|
# --- Inventory ---
|
|
|
|
|
|
class InventorySlot(BaseModel):
|
|
slot: int
|
|
code: str
|
|
quantity: int
|
|
|
|
|
|
# --- Crafting ---
|
|
|
|
|
|
class CraftItem(BaseModel):
|
|
code: str
|
|
quantity: int
|
|
|
|
|
|
class CraftSchema(BaseModel):
|
|
skill: str | None = None
|
|
level: int | None = None
|
|
items: list[CraftItem] = Field(default_factory=list)
|
|
quantity: int | None = None
|
|
|
|
|
|
# --- Effects ---
|
|
|
|
|
|
class EffectSchema(BaseModel):
|
|
name: str = ""
|
|
value: int = 0
|
|
|
|
|
|
# --- Items ---
|
|
|
|
|
|
class ItemSchema(BaseModel):
|
|
name: str
|
|
code: str
|
|
level: int = 0
|
|
type: str = ""
|
|
subtype: str = ""
|
|
description: str = ""
|
|
effects: list[EffectSchema] = Field(default_factory=list)
|
|
craft: CraftSchema | None = None
|
|
|
|
|
|
# --- Drops ---
|
|
|
|
|
|
class DropSchema(BaseModel):
|
|
code: str
|
|
rate: int = 0
|
|
min_quantity: int = 0
|
|
max_quantity: int = 0
|
|
|
|
|
|
# --- Monsters ---
|
|
|
|
|
|
class MonsterSchema(BaseModel):
|
|
name: str
|
|
code: str
|
|
level: int = 0
|
|
hp: int = 0
|
|
attack_fire: int = 0
|
|
attack_earth: int = 0
|
|
attack_water: int = 0
|
|
attack_air: int = 0
|
|
res_fire: int = 0
|
|
res_earth: int = 0
|
|
res_water: int = 0
|
|
res_air: int = 0
|
|
min_gold: int = 0
|
|
max_gold: int = 0
|
|
drops: list[DropSchema] = Field(default_factory=list)
|
|
|
|
|
|
# --- Resources ---
|
|
|
|
|
|
class ResourceSchema(BaseModel):
|
|
name: str
|
|
code: str
|
|
skill: str = ""
|
|
level: int = 0
|
|
drops: list[DropSchema] = Field(default_factory=list)
|
|
|
|
|
|
# --- Maps ---
|
|
|
|
|
|
class ContentSchema(BaseModel):
|
|
type: str
|
|
code: str
|
|
|
|
|
|
class MapSchema(BaseModel):
|
|
name: str = ""
|
|
skin: str = ""
|
|
x: int
|
|
y: int
|
|
layer: str = "overworld"
|
|
content: ContentSchema | None = None
|
|
|
|
@model_validator(mode="before")
|
|
@classmethod
|
|
def _extract_interactions(cls, data: Any) -> Any:
|
|
"""The Artifacts API nests content under interactions.content."""
|
|
if isinstance(data, dict) and "interactions" in data:
|
|
interactions = data.get("interactions") or {}
|
|
if "content" not in data or data["content"] is None:
|
|
data["content"] = interactions.get("content")
|
|
return data
|
|
|
|
|
|
# --- Characters ---
|
|
|
|
|
|
class CharacterSchema(BaseModel):
|
|
name: str
|
|
account: str = ""
|
|
skin: str = ""
|
|
level: int = 0
|
|
xp: int = 0
|
|
max_xp: int = 0
|
|
gold: int = 0
|
|
speed: int = 0
|
|
hp: int = 0
|
|
max_hp: int = 0
|
|
haste: int = 0
|
|
critical_strike: int = 0
|
|
stamina: int = 0
|
|
wisdom: int = 0
|
|
prospecting: int = 0
|
|
initiative: int = 0
|
|
threat: int = 0
|
|
|
|
# Attack stats
|
|
attack_fire: int = 0
|
|
attack_earth: int = 0
|
|
attack_water: int = 0
|
|
attack_air: int = 0
|
|
|
|
# Damage stats
|
|
dmg: int = 0
|
|
dmg_fire: int = 0
|
|
dmg_earth: int = 0
|
|
dmg_water: int = 0
|
|
dmg_air: int = 0
|
|
|
|
# Resistance stats
|
|
res_fire: int = 0
|
|
res_earth: int = 0
|
|
res_water: int = 0
|
|
res_air: int = 0
|
|
|
|
# Position
|
|
x: int = 0
|
|
y: int = 0
|
|
layer: str = "overworld"
|
|
map_id: int = 0
|
|
|
|
# Cooldown
|
|
cooldown: int = 0
|
|
cooldown_expiration: datetime | None = None
|
|
|
|
# Active effects
|
|
effects: list[EffectSchema] = Field(default_factory=list)
|
|
|
|
# Equipment slots
|
|
weapon_slot: str = ""
|
|
rune_slot: str = ""
|
|
shield_slot: str = ""
|
|
helmet_slot: str = ""
|
|
body_armor_slot: str = ""
|
|
leg_armor_slot: str = ""
|
|
boots_slot: str = ""
|
|
ring1_slot: str = ""
|
|
ring2_slot: str = ""
|
|
amulet_slot: str = ""
|
|
artifact1_slot: str = ""
|
|
artifact2_slot: str = ""
|
|
artifact3_slot: str = ""
|
|
utility1_slot: str = ""
|
|
utility1_slot_quantity: int = 0
|
|
utility2_slot: str = ""
|
|
utility2_slot_quantity: int = 0
|
|
bag_slot: str = ""
|
|
|
|
# Inventory
|
|
inventory_max_items: int = 0
|
|
inventory: list[InventorySlot] = Field(default_factory=list)
|
|
|
|
# Task
|
|
task: str = ""
|
|
task_type: str = ""
|
|
task_progress: int = 0
|
|
task_total: int = 0
|
|
|
|
# Skill levels and XP (includes max_xp for progress calculation)
|
|
mining_level: int = 0
|
|
mining_xp: int = 0
|
|
mining_max_xp: int = 0
|
|
woodcutting_level: int = 0
|
|
woodcutting_xp: int = 0
|
|
woodcutting_max_xp: int = 0
|
|
fishing_level: int = 0
|
|
fishing_xp: int = 0
|
|
fishing_max_xp: int = 0
|
|
weaponcrafting_level: int = 0
|
|
weaponcrafting_xp: int = 0
|
|
weaponcrafting_max_xp: int = 0
|
|
gearcrafting_level: int = 0
|
|
gearcrafting_xp: int = 0
|
|
gearcrafting_max_xp: int = 0
|
|
jewelrycrafting_level: int = 0
|
|
jewelrycrafting_xp: int = 0
|
|
jewelrycrafting_max_xp: int = 0
|
|
cooking_level: int = 0
|
|
cooking_xp: int = 0
|
|
cooking_max_xp: int = 0
|
|
alchemy_level: int = 0
|
|
alchemy_xp: int = 0
|
|
alchemy_max_xp: int = 0
|
|
|
|
|
|
# --- Dashboard ---
|
|
|
|
|
|
class DashboardData(BaseModel):
|
|
characters: list[CharacterSchema] = Field(default_factory=list)
|
|
server_status: dict | None = None
|