Updated silver and item collection
This commit is contained in:
+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