Raise the empires basic countState quest progression

game_settings.py

@@ -70,7 +70,7 @@ def lookup_state_machine(state_machine_name, custom_values, custom_reference_val
         custom_reference_values = []
     state_machine = copy.deepcopy(lookup_raw_state_machine(state_machine_name))
     replacements = {e['-name']: e['-value'] for e in custom_values}
-    reference_replacements = {e['-name']: e['-value'] for e in custom_reference_values}
+    reference_replacements = {e['-name']: e['-value'] for e in simple_list(custom_reference_values)}
     print('replacements', repr(replacements))
     if reference_replacements:
         print('reference item replacements', repr(replacements))
@@ -120,5 +120,9 @@ def replenish_energy():
         print("Energy replenished:", energy_replenished)
 
 
+def simple_list(raw_list):
+    return (raw_list if isinstance(raw_list, list) else [raw_list]) if raw_list != '' else []
+
+
 def get_zid():
     return libscrc.iso(session.sid.encode()) // 1000

quest_engine.py

@@ -211,7 +211,7 @@ def progress_place(state, state_machine, game_item, step, *state_args):
 
 def progress_state(state, state_machine, game_item, step, *state_args):
     return lambda task, progress, i, *args: \
-        task["_action"] in ["state"] and '-stateName' in state and task["_state"] == state['-stateName'] and ("_item" not in task or task["_item"] == game_item['-code'])\
+        task["_action"] in ["state", "countState"] and '-stateName' in state and state['-stateName'] in task["_state"].split(',')  and ("_item" not in task or task["_item"] == game_item['-code'])\
         and ("_subtype" not in task or task["_subtype"] == game_item['-subtype']) and progress < int(task["_total"])
 
 

templates/changelog.txt

@@ -1,3 +1,11 @@
+consumable poison gas (boss fight only), fixes Nat 14/09/2019 00:21
+new quest precompletion fix Nat 13/09/2019 01:06
+battleDamage, battleKill quest progression Nat 13/09/2019 00:04
+no scrolling the page when zooming in flash Nat 12/09/2019 22:33
+facebook mock screens Nat 12/09/2019 20:16
+accuracy & strength research upgrades effects Nat 12/09/2019 01:05
+countUpgrades quest progression Nat 11/09/2019 20:16
+Missing Level 6 Pvp welcome screen Nat 11/09/2019 00:33
 Steele island, pvp immunity Nat 10/09/2019 08:14
 neighborsAdded prepopulated quest Nat 10/09/2019 00:46
 bugfix partial loading & back to original main swf Nat 09/09/2019 01:50