Bump version: 0.20.3.4 → 0.20.3.5

erepublik/__init__.py

@@ -4,8 +4,8 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.20.3.3'
+__version__ = '0.20.3.5'
-__commit_id__ = "cd861ea"
+__commit_id__ = "fc4295d"
 
 from erepublik import classes, utils
 from erepublik.citizen import Citizen

erepublik/citizen.py

@@ -206,11 +206,11 @@ class BaseCitizen(CitizenAPI):
         self.energy.recoverable = citizen.get("energyFromFoodRemaining", 0)
 
         self.details.current_region = citizen.get("regionLocationId", 0)
-        self.details.current_country = citizen.get("countryLocationId", 0)  # country where citizen is located
+        self.details.current_country = COUNTRIES.get(citizen.get("countryLocationId", 0))  # country where citizen is located
         self.details.residence_region = citizen.get("residence", {}).get("regionId", 0)
-        self.details.residence_country = citizen.get("residence", {}).get("countryId", 0)
+        self.details.residence_country = COUNTRIES.get(citizen.get("residence", {}).get("countryId", 0))
         self.details.citizen_id = citizen.get("citizenId", 0)
-        self.details.citizenship = int(citizen.get("country", 0))
+        self.details.citizenship = COUNTRIES.get(int(citizen.get("country", 0)))
         self.details.xp = citizen.get("currentExperiencePoints", 0)
         self.details.daily_task_done = citizen.get("dailyTasksDone", False)
         self.details.daily_task_reward = citizen.get("hasReward", False)
@@ -849,8 +849,9 @@ class CitizenCompanies(BaseCitizen):
             fin_factories = wam_holding.get_wam_companies(raw_factory=False)
 
             free_inventory = self.inventory["total"] - self.inventory["used"]
-            wam_list = [raw_factories + fin_factories][:self.energy.food_fights]
+            wam_list = raw_factories + fin_factories
-            while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(companies=wam_list):
+            wam_list = wam_list[:self.energy.food_fights]
+            while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
                 wam_list.pop(-1)
 
         if wam_list:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.3.3
+current_version = 0.20.3.5
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

setup.py

@@ -43,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.20.3.3',
+    version='0.20.3.5',
     zip_safe=False,
 )