From 4b4ed18cdb064272cdd66e08cda992053e5ccefe Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Mon, 23 Mar 2020 14:38:54 +0200 Subject: [PATCH] Award posting bugfix --- erepublik/__init__.py | 2 +- erepublik/citizen.py | 2 +- erepublik/utils.py | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 0300dc3..0c3dd11 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -5,7 +5,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' __version__ = '0.20.0' -__commit_id__ = "260344b" +__commit_id__ = "d928ffc" from erepublik import classes, utils from erepublik.citizen import Citizen diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 576af83..c08f644 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -538,7 +538,7 @@ class BaseCitizen(CitizenAPI): title = info.group(2).strip() award_id = re.search(r'"wall_enable_alerts_(\d+)', medal) if award_id: - self._post_main_wall_post_automatic(**{'message': title, 'awardId': award_id.group(1)}) + self._post_main_wall_post_automatic(message=title, achievement_id=award_id.group(1)) reward, currency = info.group(3).strip().split(" ") while not isinstance(reward, float): try: diff --git a/erepublik/utils.py b/erepublik/utils.py index 0e95e5f..790d0d9 100644 --- a/erepublik/utils.py +++ b/erepublik/utils.py @@ -79,6 +79,20 @@ GROUND_RANKS = {1: "Recruit", 2: "Private", 3: "Private*", 4: "Private**", 5: "P 80: "Legends XI", 81: "Legends XII", 82: "Legends XIII", 83: "Legends XIV", 84: "Legends XV", 85: "Legends XVI", 86: "Legends XVII", 87: "Legends XVIII", 88: "Legends XIX", 89: "Legends XX", } +GROUND_RANK_POINTS = {1: 0, 2: 15, 3: 45, 4: 80, 5: 120, 6: 170, 7: 250, 8: 350, 9: 450, 10: 600, 11: 800, 12: 1000, + 13: 1400, 14: 1850, 15: 2350, 16: 3000, 17: 3750, 18: 5000, 19: 6500, 20: 9000, 21: 12000, + 22: 15500, 23: 20000, 24: 25000, 25: 31000, 26: 40000, 27: 52000, 28: 67000, 29: 85000, + 30: 110000, 31: 140000, 32: 180000, 33: 225000, 34: 285000, 35: 355000, 36: 435000, 37: 540000, + 38: 660000, 39: 800000, 40: 950000, 41: 1140000, 42: 1350000, 43: 1600000, 44: 1875000, + 45: 2185000, 46: 2550000, 47: 3000000, 48: 3500000, 49: 4150000, 50: 4900000, 51: 5800000, + 52: 7000000, 53: 9000000, 54: 11500000, 55: 14500000, 56: 18000000, 57: 22000000, 58: 26500000, + 59: 31500000, 60: 37000000, 61: 43000000, 62: 50000000, 63: 100000000, 64: 200000000, + 65: 500000000, 66: 1000000000, 67: 2000000000, 68: 4000000000, 69: 10000000000, 70: 20000000000, + 71: 30000000000, 72: 40000000000, 73: 50000000000, 74: 60000000000, 75: 70000000000, + 76: 80000000000, 77: 90000000000, 78: 100000000000, 79: 110000000000, 80: 120000000000, + 81: 130000000000, 82: 140000000000, 83: 150000000000, 84: 160000000000, 85: 170000000000, + 86: 180000000000, 87: 190000000000, 88: 200000000000, 89: 210000000000} + COUNTRIES = {1: 'Romania', 9: 'Brazil', 10: 'Italy', 11: 'France', 12: 'Germany', 13: 'Hungary', 14: 'China', 15: 'Spain', 23: 'Canada', 24: 'USA', 26: 'Mexico', 27: 'Argentina', 28: 'Venezuela', 29: 'United Kingdom', 30: 'Switzerland', 31: 'Netherlands', 32: 'Belgium', 33: 'Austria', 34: 'Czech Republic', 35: 'Poland',