Updated silver and item collection
This commit is contained in:
@@ -0,0 +1,110 @@
|
||||
import json
|
||||
import os
|
||||
import threading
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Dict, List
|
||||
|
||||
from ..environment import discovery_log_path
|
||||
from . import items as itemdb
|
||||
|
||||
|
||||
_lock = threading.Lock()
|
||||
_initialized = False
|
||||
|
||||
|
||||
def enabled() -> bool:
|
||||
return bool(discovery_log_path())
|
||||
|
||||
|
||||
def log(record_type: str, **fields):
|
||||
path = discovery_log_path()
|
||||
if not path:
|
||||
return
|
||||
|
||||
global _initialized
|
||||
with _lock:
|
||||
log_dir = os.path.dirname(path)
|
||||
if log_dir:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
mode = 'a' if _initialized else 'w'
|
||||
with open(path, mode, encoding='utf-8') as out:
|
||||
if not _initialized:
|
||||
out.write(json.dumps({
|
||||
'type': 'session_start',
|
||||
'timestamp': _timestamp(),
|
||||
'format': 'aostats-discovery-jsonl-v1',
|
||||
}, sort_keys=True) + '\n')
|
||||
_initialized = True
|
||||
out.write(json.dumps({
|
||||
'type': record_type,
|
||||
'timestamp': _timestamp(),
|
||||
**_clean(fields),
|
||||
}, sort_keys=True) + '\n')
|
||||
|
||||
|
||||
def message_record(message) -> Dict[str, Any]:
|
||||
params = getattr(message, 'params', {}) or {}
|
||||
return {
|
||||
'kind': getattr(message, 'kind', None),
|
||||
'code': getattr(message, 'code', None),
|
||||
'return_code': getattr(message, 'return_code', None),
|
||||
'debug_message': _clean(getattr(message, 'debug_message', None)),
|
||||
'params': _clean(params),
|
||||
'item_id_candidates': item_candidates(params),
|
||||
}
|
||||
|
||||
|
||||
def game_message_record(game_message) -> Dict[str, Any]:
|
||||
params = getattr(game_message, 'params', {}) or {}
|
||||
return {
|
||||
'name': getattr(game_message, 'name', None),
|
||||
'code': getattr(game_message, 'code', None),
|
||||
'params': _clean(params),
|
||||
'item_id_candidates': item_candidates(params),
|
||||
}
|
||||
|
||||
|
||||
def item_candidates(params: Dict[Any, Any]) -> List[Dict[str, Any]]:
|
||||
db = itemdb.get_db()
|
||||
found: List[Dict[str, Any]] = []
|
||||
for key, value in (params or {}).items():
|
||||
for path, number in _walk_numbers(value, str(key)):
|
||||
if number in db:
|
||||
found.append({
|
||||
'path': path,
|
||||
'id': number,
|
||||
'unique_name': db[number],
|
||||
})
|
||||
return found
|
||||
|
||||
|
||||
def _timestamp() -> str:
|
||||
return datetime.now(timezone.utc).isoformat(timespec='milliseconds')
|
||||
|
||||
|
||||
def _clean(value):
|
||||
if isinstance(value, bytes):
|
||||
return {'bytes_hex': value.hex(), 'len': len(value)}
|
||||
if isinstance(value, dict):
|
||||
return {str(k): _clean(v) for k, v in value.items()}
|
||||
if isinstance(value, (list, tuple)):
|
||||
return [_clean(v) for v in value]
|
||||
return value
|
||||
|
||||
|
||||
def _walk_numbers(value, path: str):
|
||||
if isinstance(value, bool):
|
||||
return
|
||||
if isinstance(value, int):
|
||||
yield path, value
|
||||
return
|
||||
if isinstance(value, float) and value.is_integer():
|
||||
yield path, int(value)
|
||||
return
|
||||
if isinstance(value, dict):
|
||||
for key, item in value.items():
|
||||
yield from _walk_numbers(item, f'{path}.{key}')
|
||||
return
|
||||
if isinstance(value, (list, tuple)):
|
||||
for i, item in enumerate(value):
|
||||
yield from _walk_numbers(item, f'{path}[{i}]')
|
||||
+20
-4
@@ -2,12 +2,14 @@ import os
|
||||
from typing import Dict, Optional
|
||||
|
||||
_ITEM_DB: Optional[Dict[int, str]] = None
|
||||
_ITEM_NAME_DB: Optional[Dict[int, str]] = None
|
||||
_ITEM_DB_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'static', 'item_ids.txt')
|
||||
_ITEM_NAMES_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'static', 'item_names.txt')
|
||||
|
||||
|
||||
def _load() -> Dict[int, str]:
|
||||
def _load_file(path: str) -> Dict[int, str]:
|
||||
db = {}
|
||||
with open(_ITEM_DB_PATH, encoding='utf-8') as f:
|
||||
with open(path, encoding='utf-8') as f:
|
||||
for line in f:
|
||||
parts = line.strip().split(',', 1)
|
||||
if len(parts) != 2:
|
||||
@@ -25,10 +27,24 @@ def _load() -> Dict[int, str]:
|
||||
def get_db() -> Dict[int, str]:
|
||||
global _ITEM_DB
|
||||
if _ITEM_DB is None:
|
||||
_ITEM_DB = _load()
|
||||
_ITEM_DB = _load_file(_ITEM_DB_PATH)
|
||||
return _ITEM_DB
|
||||
|
||||
|
||||
def get_name_db() -> Dict[int, str]:
|
||||
global _ITEM_NAME_DB
|
||||
if _ITEM_NAME_DB is None:
|
||||
if os.path.exists(_ITEM_NAMES_PATH):
|
||||
_ITEM_NAME_DB = _load_file(_ITEM_NAMES_PATH)
|
||||
else:
|
||||
_ITEM_NAME_DB = {}
|
||||
return _ITEM_NAME_DB
|
||||
|
||||
|
||||
def display_name(item_id: int) -> str:
|
||||
return get_name_db().get(item_id) or get_db().get(item_id) or str(item_id)
|
||||
|
||||
|
||||
ITEMS_SLOTS = ('weapon', 'offhand', 'helmet', 'armor', 'boots', 'bag', 'cape', 'mount', 'potion', 'food')
|
||||
|
||||
|
||||
@@ -47,4 +63,4 @@ def decode_items(item_array) -> Dict[str, Optional[str]]:
|
||||
code = item_array[slot]
|
||||
if code and code in db:
|
||||
items[_id] = db[code]
|
||||
return items
|
||||
return items
|
||||
|
||||
@@ -5,6 +5,7 @@ from typing import Callable, List
|
||||
from .photon import PhotonDecoder, PhotonMessage
|
||||
from .translate import into_game_message
|
||||
from .world import World
|
||||
from . import discovery
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -21,11 +22,18 @@ class Pipeline:
|
||||
|
||||
def on_udp(self, payload: bytes):
|
||||
logger.debug("received UDP payload: %d bytes", len(payload))
|
||||
discovery.log(
|
||||
'udp_payload',
|
||||
length=len(payload),
|
||||
payload_hex=payload.hex())
|
||||
messages = self.decoder.decode_packet(payload)
|
||||
if not messages:
|
||||
return
|
||||
with self._lock:
|
||||
for message in messages:
|
||||
discovery.log(
|
||||
'photon_message',
|
||||
message=discovery.message_record(message))
|
||||
for event in self._events_from_message(message):
|
||||
self.emit(event)
|
||||
|
||||
@@ -33,8 +41,12 @@ class Pipeline:
|
||||
game_message = into_game_message(message)
|
||||
if game_message is None:
|
||||
return []
|
||||
discovery.log(
|
||||
'game_message',
|
||||
message=discovery.game_message_record(game_message))
|
||||
logger.debug("translated game message: %s", game_message)
|
||||
events = self.world.transform(game_message)
|
||||
for event in events:
|
||||
discovery.log('app_event', event=event)
|
||||
logger.debug("emitting app event: %s", event)
|
||||
return events
|
||||
|
||||
+25
-1
@@ -10,9 +10,11 @@ PHOTON_GAME_CODE = 1
|
||||
EVENT_LEAVE = 1
|
||||
EVENT_HEALTH_UPDATE = 6
|
||||
EVENT_NEW_CHARACTER = 29
|
||||
EVENT_ITEM_GAINED = 32
|
||||
EVENT_UPDATE_FAME = 82
|
||||
EVENT_CHARACTER_EQUIPMENT_CHANGED = 90
|
||||
EVENT_REGENERATION_HEALTH_CHANGED = 91
|
||||
EVENT_SILVER_GAINED = 153
|
||||
EVENT_KNOCKED_DOWN = 166
|
||||
EVENT_PARTY_INVITATION = 229
|
||||
EVENT_PARTY_JOIN_REQUEST = 230
|
||||
@@ -98,9 +100,11 @@ EVENT_NAMES = {
|
||||
EVENT_LEAVE: 'Leave',
|
||||
EVENT_HEALTH_UPDATE: 'HealthUpdate',
|
||||
EVENT_NEW_CHARACTER: 'NewCharacter',
|
||||
EVENT_ITEM_GAINED: 'ItemGained',
|
||||
EVENT_UPDATE_FAME: 'UpdateFame',
|
||||
EVENT_CHARACTER_EQUIPMENT_CHANGED: 'CharacterEquipmentChanged',
|
||||
EVENT_REGENERATION_HEALTH_CHANGED: 'RegenerationHealthChanged',
|
||||
EVENT_SILVER_GAINED: 'SilverGained',
|
||||
EVENT_KNOCKED_DOWN: 'KnockedDown',
|
||||
EVENT_PARTY_INVITATION: 'PartyInvitation',
|
||||
EVENT_PARTY_JOIN_REQUEST: 'PartyJoinRequest',
|
||||
@@ -173,6 +177,26 @@ def msg_fame_gained(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(2))
|
||||
|
||||
|
||||
def msg_collected_item_id(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(1))
|
||||
|
||||
|
||||
def msg_collected_item_quantity(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(2))
|
||||
|
||||
|
||||
def msg_collected_item_value(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(4))
|
||||
|
||||
|
||||
def msg_silver_source_type(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(1))
|
||||
|
||||
|
||||
def msg_silver_amount(msg: GameMessage) -> Optional[int]:
|
||||
return _int(msg.params.get(2))
|
||||
|
||||
|
||||
def msg_party_structures(msg: GameMessage) -> List[List[int]]:
|
||||
out = []
|
||||
for item in msg.params.get(4, []) or []:
|
||||
@@ -195,4 +219,4 @@ def msg_party_structure(msg: GameMessage) -> List[int]:
|
||||
|
||||
def msg_party_name(msg: GameMessage) -> str:
|
||||
v = _string(msg.params.get(2))
|
||||
return v if v is not None else ''
|
||||
return v if v is not None else ''
|
||||
|
||||
+53
-2
@@ -6,6 +6,7 @@ from .translate import GameMessage
|
||||
|
||||
FIX_POINT = 10000.0
|
||||
FAME_MIN_TOTAL = 1000000 # albion-lens sanity filter for UpdateFame events
|
||||
SILVER_SOURCE_LOOTED = 54
|
||||
|
||||
|
||||
class IdCache:
|
||||
@@ -121,7 +122,9 @@ class World:
|
||||
self.party = Party()
|
||||
self.unconsumed_messages = UnconsumedMessages()
|
||||
self.main_player_id: Optional[int] = None
|
||||
self._main_player_joined = False
|
||||
self._fame_totals: Dict[int, int] = {}
|
||||
self._seen_item_pickups = set()
|
||||
|
||||
def transform(self, message: GameMessage) -> List[dict]:
|
||||
if message.name == 'NewCharacter':
|
||||
@@ -140,6 +143,10 @@ class World:
|
||||
return self._on_knocked_down(message)
|
||||
if message.name == 'UpdateFame':
|
||||
return self._on_update_fame(message)
|
||||
if message.name == 'ItemGained':
|
||||
return self._on_item_gained(message)
|
||||
if message.name == 'SilverGained':
|
||||
return self._on_silver_gained(message)
|
||||
if message.name == 'CharacterEquipmentChanged':
|
||||
return self._on_character_equipment_changed(message)
|
||||
if message.name == 'PartyJoined':
|
||||
@@ -190,9 +197,11 @@ class World:
|
||||
return []
|
||||
self.party.set_main_player_name(name)
|
||||
result = []
|
||||
if self.main_player_id is None:
|
||||
if not self._main_player_joined:
|
||||
result.append({'name': 'ZoneChange'})
|
||||
self.main_player_id = static_id
|
||||
self._main_player_joined = True
|
||||
self._seen_item_pickups.clear()
|
||||
result.append({
|
||||
'name': 'MainPlayerAppeared',
|
||||
'value': {'id': static_id, 'name': name},
|
||||
@@ -203,6 +212,7 @@ class World:
|
||||
def _on_change_cluster(self, msg: GameMessage) -> List[dict]:
|
||||
if self.main_player_id is None:
|
||||
return []
|
||||
self._seen_item_pickups.clear()
|
||||
return [{'name': 'ZoneChange'}]
|
||||
|
||||
def _on_leave(self, msg: GameMessage) -> List[dict]:
|
||||
@@ -212,6 +222,8 @@ class World:
|
||||
return []
|
||||
if self.main_player_id == static_id:
|
||||
self.main_player_id = None
|
||||
self._main_player_joined = False
|
||||
self._seen_item_pickups.clear()
|
||||
return [{'name': 'ZoneChange'}]
|
||||
return []
|
||||
|
||||
@@ -278,6 +290,45 @@ class World:
|
||||
return []
|
||||
return [{'name': 'UpdateFame', 'value': {'value': float(gained / FIX_POINT)}}]
|
||||
|
||||
def _on_item_gained(self, msg: GameMessage) -> List[dict]:
|
||||
if not self._main_player_joined:
|
||||
return []
|
||||
source_id = _dyn(translate.msg_source(msg))
|
||||
item_id = translate.msg_collected_item_id(msg)
|
||||
quantity = translate.msg_collected_item_quantity(msg)
|
||||
if item_id is None or quantity is None or quantity <= 0:
|
||||
return []
|
||||
pickup_key = (source_id, item_id, quantity)
|
||||
if pickup_key in self._seen_item_pickups:
|
||||
return []
|
||||
self._seen_item_pickups.add(pickup_key)
|
||||
item_name = itemdb.display_name(item_id)
|
||||
value = {
|
||||
'item_id': item_id,
|
||||
'item_name': item_name,
|
||||
'quantity': quantity,
|
||||
}
|
||||
estimated_value = translate.msg_collected_item_value(msg)
|
||||
if estimated_value is not None:
|
||||
value['estimated_value'] = estimated_value
|
||||
return [{'name': 'ItemCollected', 'value': value}]
|
||||
|
||||
def _on_silver_gained(self, msg: GameMessage) -> List[dict]:
|
||||
if not self._main_player_joined:
|
||||
return []
|
||||
amount = translate.msg_silver_amount(msg)
|
||||
source_type = translate.msg_silver_source_type(msg)
|
||||
if amount is None or amount <= 0:
|
||||
return []
|
||||
if source_type == SILVER_SOURCE_LOOTED:
|
||||
silver_type = 'looted'
|
||||
else:
|
||||
return []
|
||||
return [{'name': 'SilverGained', 'value': {
|
||||
'value': float(amount),
|
||||
'silver_type': silver_type,
|
||||
}}]
|
||||
|
||||
def _on_character_equipment_changed(self, msg: GameMessage) -> List[dict]:
|
||||
dynamic_id = _dyn(translate.msg_source(msg))
|
||||
static_id = self.cache.get_static_id(dynamic_id)
|
||||
@@ -299,4 +350,4 @@ def _dyn(value) -> int:
|
||||
|
||||
|
||||
def _party_id(party_structure: List[int]) -> int:
|
||||
return sum(party_structure)
|
||||
return sum(party_structure)
|
||||
|
||||
Reference in New Issue
Block a user