diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-12-20 16:32:03 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-12-20 16:32:03 -0300 |
| commit | 826af4e92f2880f2aa599f5d3e05ac079b8c97c4 (patch) | |
| tree | 514316ae896a90a9e9b186fb966683b581c6fb3b | |
| parent | 176275df4108ee4def8ccd17f804d53556b843f8 (diff) | |
| download | client-826af4e92f2880f2aa599f5d3e05ac079b8c97c4.tar.gz client-826af4e92f2880f2aa599f5d3e05ac079b8c97c4.tar.bz2 client-826af4e92f2880f2aa599f5d3e05ac079b8c97c4.tar.xz client-826af4e92f2880f2aa599f5d3e05ac079b8c97c4.zip | |
Almost forgot to send the world data as well
| -rw-r--r-- | game/02_init.rpy | 2 | ||||
| -rw-r--r-- | game/03_init.rpy | 6 | ||||
| -rw-r--r-- | game/quest.rpy | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/game/02_init.rpy b/game/02_init.rpy index f4c98f1..c2c5629 100644 --- a/game/02_init.rpy +++ b/game/02_init.rpy @@ -16,7 +16,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ######################################################################################## -# Definitions: decode, encode, memory +# Definitions: decode, encode, JSON parser and memory ############################################################################ init -1 python: stdout("======================= %s %s %s" % (config.name, config.version, persistent.release_name)) diff --git a/game/03_init.rpy b/game/03_init.rpy index 2db95cd..df63339 100644 --- a/game/03_init.rpy +++ b/game/03_init.rpy @@ -18,7 +18,6 @@ ######################################################################################## # Definitions - Music, Graphics, and JSON data ############################################################################ -# This is the JSON data formatter init python: def logindata(): global password @@ -36,11 +35,12 @@ init python: }""" % (t, a) - def questdata(q, p): + def questdata(w, q, p): return """{ + "world": "%s", "quest_id": %d, "party_id": %d - }""" % (q, p) + }""" % (w, q, p) def battledata(u, s): diff --git a/game/quest.rpy b/game/quest.rpy index b738b83..de01117 100644 --- a/game/quest.rpy +++ b/game/quest.rpy @@ -20,8 +20,7 @@ init python: ######################## Server Communications def loadquest(quest_id, party_id=1): - import json - raw=send_packet("begin_quest", questdata(quest_id, party_id)) + raw=send_packet("begin_quest", questdata("Main", quest_id, party_id)) bt=json_decode(raw) if (bt == ERR_JSONDECODER): |