diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-12-16 14:51:01 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-12-16 14:51:01 -0300 |
| commit | 64a9b291096910252cdb1f00b59e02e342f4edf8 (patch) | |
| tree | 865593391144bf4d4f80e4081bec9ff3f3df130e /game/defs.rpy | |
| parent | 11635c323a577bafe10b960c1127614086de9641 (diff) | |
| download | client-64a9b291096910252cdb1f00b59e02e342f4edf8.tar.gz client-64a9b291096910252cdb1f00b59e02e342f4edf8.tar.bz2 client-64a9b291096910252cdb1f00b59e02e342f4edf8.tar.xz client-64a9b291096910252cdb1f00b59e02e342f4edf8.zip | |
Improve logging.
Re-optimize download & loading sequences
Diffstat (limited to 'game/defs.rpy')
| -rw-r--r-- | game/defs.rpy | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/game/defs.rpy b/game/defs.rpy index 2fa2ef2..ae53c57 100644 --- a/game/defs.rpy +++ b/game/defs.rpy @@ -225,7 +225,6 @@ init -3 python: # File Managment Functions def get_path(path): if True or renpy.android: - #print "Android detected" path=path.replace("/", "_") #return renpy.loader.get_path(path) return renpy.config.savedir + "/" + path @@ -234,7 +233,6 @@ init -3 python: def get_path_if_exists(path): if True or renpy.android: - print "Android detected, not checking" path=path.replace("/", "_") #return renpy.loader.get_path(path) return renpy.config.savedir + "/" + path @@ -262,6 +260,7 @@ init -3 python: if (int(persistent.version) < ver): # TODO: Check if the server have SSL support + stdout("Downloading updated game data...") # Download quests.json f=open(get_path("quests.json"), "w") @@ -335,7 +334,7 @@ init -1 python: # wsock already imported - print("======================= %s %s %s" % (config.name, config.version, persistent.release_name)) + stdout("======================= %s %s %s" % (config.name, config.version, persistent.release_name)) print "[STDBY] Loading Basic functions......." # Search for array[?][key]==search in an array of dicts @@ -459,7 +458,7 @@ init -1 python: renpy.show("spinner", at_list=[truecenter]) renpy.invoke_in_thread(send_packet_now, packet, args) while not tr_load: - renpy.pause(0.1) + renpy.pause(0.1) # FIXME: This can cause errors in mobile timeout+=0.1 if timeout >= TIMEOUT_INTERVAL: @@ -488,12 +487,10 @@ init -1 python: tr_load=False # Load unit data - if renpy.android: - allunitsbase=json.loads(requests.get("http://"+HOST+'/units.json').text) - else: - f=open(get_path_if_exists("units.json"), "r") - allunitsbase=json.load(f) - f.close() + allunitsbase=json.loads(requests.get("http://"+HOST+'/units.json').text) + # f=open(get_path_if_exists("units.json"), "r") + # allunitsbase=json.load(f) + # f.close() # Reorder unit data allunits={} @@ -532,7 +529,7 @@ init -1 python: allnews=[] pass - print "[OK] Basic functions loaded" + stdout("[OK] Game data loaded to memory") tr_load=True return tr_load |