X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=newdungeon.py;h=52c34e5ff5913e70135fb1a94f07831696c0acea;hp=3399cafa1a01205208e945ae8fe68c19e76878cf;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=d40085ce6fd2141a7d38ea9be04ea04b3ef90cbe

diff --git a/newdungeon.py b/newdungeon.py
index 3399caf..52c34e5 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -3,8 +3,48 @@
 # This is the new open-adventure dungeon generator. It'll eventually
 # replace the existing dungeon.c It currently outputs a .h and .c pair
 # for C code.
-
-import yaml
+#
+# The nontrivial part of this is the compilation of the YAML for
+# movement rules to the travel array that's actually used by
+# playermove().  This program first compiles the YAML to a form
+# identical to the data in section 3 of the old adventure.text file,
+# then a second stage packs that data into the travel array.
+#
+# Here are the rules of the intermediate form:
+#
+# Each row of data contains a location number (X), a second
+# location number (Y), and a list of motion numbers (see section 4).
+# each motion represents a verb which will go to Y if currently at X.
+# Y, in turn, is interpreted as follows.  Let M=Y/1000, N=Y mod 1000.
+#		If N<=300	it is the location to go to.
+#		If 300<N<=500	N-300 is used in a computed goto to
+#					a section of special code.
+#		If N>500	message N-500 from section 6 is printed,
+#					and he stays wherever he is.
+# Meanwhile, M specifies the conditions on the motion.
+#		If M=0		it's unconditional.
+#		If 0<M<100	it is done with M% probability.
+#		If M=100	unconditional, but forbidden to dwarves.
+#		If 100<M<=200	he must be carrying object M-100.
+#		If 200<M<=300	must be carrying or in same room as M-200.
+#		If 300<M<=400	game.prop(M % 100) must *not* be 0.
+#		If 400<M<=500	game.prop(M % 100) must *not* be 1.
+#		If 500<M<=600	game.prop(M % 100) must *not* be 2, etc.
+# If the condition (if any) is not met, then the next *different*
+# "destination" value is used (unless it fails to meet *its* conditions,
+# in which case the next is found, etc.).  Typically, the next dest will
+# be for one of the same verbs, so that its only use is as the alternate
+# destination for those verbs.  For instance:
+#		15	110022	29	31	34	35	23	43
+#		15	14	29
+# This says that, from loc 15, any of the verbs 29, 31, etc., will take
+# him to 22 if he's carrying object 10, and otherwise will go to 14.
+#		11	303008	49
+#		11	9	50
+# This says that, from 11, 49 takes him to 8 unless game.prop(3)=0, in which
+# case he goes to 9.  Verb 50 takes him to 9 regardless of game.prop(3).
+
+import sys, yaml
 
 yaml_name = "adventure.yaml"
 h_name = "newdb.h"
@@ -51,7 +91,7 @@ typedef struct {{
   const char** longs;
   const char** sounds;
   const char** texts;
-}} object_description_t;
+}} object_t;
 
 typedef struct {{
   const char* small;
@@ -89,21 +129,26 @@ typedef struct {{
 }} hint_t;
 
 typedef struct {{
-  const char* word;
-  const int type;
-  const int value;
-}} vocabulary_t;
+  const char** words;
+}} motion_t;
+
+typedef struct {{
+  const char** words;
+  const long message;
+}} action_t;
 
 extern const location_t locations[];
-extern const object_description_t object_descriptions[];
+extern const object_t objects[];
 extern const char* arbitrary_messages[];
 extern const class_t classes[];
 extern const turn_threshold_t turn_thresholds[];
 extern const obituary_t obituaries[];
 extern const hint_t hints[];
 extern long conditions[];
-extern const vocabulary_t vocabulary[];
-extern const long actspk[];
+extern const motion_t motions[];
+extern const action_t actions[];
+extern const long travel[];
+extern const long tkey[];
 
 #define NLOCATIONS	{}
 #define NOBJECTS	{}
@@ -111,8 +156,9 @@ extern const long actspk[];
 #define NCLASSES	{}
 #define NDEATHS		{}
 #define NTHRESHOLDS	{}
-#define NVERBS  	{}
-#define NVOCAB          {}
+#define NACTIONS  	{}
+#define NTRAVEL		{}
+#define NKEYS		{}
 
 enum arbitrary_messages_refs {{
 {}
@@ -122,7 +168,15 @@ enum locations_refs {{
 {}
 }};
 
-enum object_descriptions_refs {{
+enum object_refs {{
+{}
+}};
+
+enum motion_refs {{
+{}
+}};
+
+enum action_refs {{
 {}
 }};
 
@@ -153,7 +207,7 @@ const location_t locations[] = {{
 {}
 }};
 
-const object_description_t object_descriptions[] = {{
+const object_t objects[] = {{
 {}
 }};
 
@@ -169,15 +223,18 @@ long conditions[] = {{
 {}
 }};
 
-const vocabulary_t vocabulary[] = {{
+const motion_t motions[] = {{
 {}
 }};
 
-const long actspk[] = {{
-    NO_MESSAGE,
+const action_t actions[] = {{
 {}
 }};
 
+{}
+
+{}
+
 /* end */
 """
 
@@ -259,7 +316,7 @@ def get_locations(loc):
     loc_str = loc_str[:-1] # trim trailing newline
     return loc_str
 
-def get_object_descriptions(obj):
+def get_objects(obj):
     template = """    {{ // {}
         .inventory = {},
         .plac = {},
@@ -393,36 +450,172 @@ def recompose(type_word, value):
         sys.stderr.write("dungeon: %s is not a known word\n" % word)
         sys.exit(1)
     except IndexError:
-        sys.stderr.write("%s is not a known word classifier" % attrs["type"])
+        sys.stderr.write("%s is not a known word classifier\n" % attrs["type"])
         sys.exit(1)
 
-def get_vocabulary(vocabulary):
+def get_motions(motions):
+    template = """    {{
+        .words = {},
+    }},
+"""
+    mot_str = ""
+    for motion in motions:
+        contents = motion[1]
+        if contents["words"] == None:
+            mot_str += template.format("NULL")
+            continue
+        c_words = [make_c_string(s) for s in contents["words"]]
+        words_str = "(const char* []) {" + ", ".join(c_words) + "}"
+        mot_str += template.format(words_str)
+    return mot_str
+
+def get_actions(actions):
     template = """    {{
-        .word = {},
-        .type = {},
-        .value = {},
+        .words = {},
+        .message = {},
     }},
 """
-    voc_str = ""
-    for vocab in vocabulary:
-        word = make_c_string(vocab["word"])
-        type_code = recompose(vocab["type"], vocab["value"])
-        value = vocab["value"]
-        voc_str += template.format(word, type_code, value)
-    voc_str = voc_str[:-1] # trim trailing newline
-    return voc_str
-
-def get_actspk(actspk):
-    res = ""
-    for (i, word) in actspk.items():
-        res += "    %s,\n" % word
-    return res
+    act_str = ""
+    for action in actions:
+        contents = action[1]
+        
+        if contents["words"] == None:
+            words_str = "NULL"
+        else:
+            c_words = [make_c_string(s) for s in contents["words"]]
+            words_str = "(const char* []) {" + ", ".join(c_words) + "}"
+
+        if contents["message"] == None:
+            message = "NO_MESSAGE"
+        else:
+            message = contents["message"]
+            
+        act_str += template.format(words_str, message)
+    act_str = act_str[:-1] # trim trailing newline
+    return act_str
+
+def bigdump(arr):
+    out = ""
+    for (i, entry) in enumerate(arr):
+        if i % 10 == 0:
+            if out and out[-1] == ' ':
+                out = out[:-1]
+            out += "\n    "
+        out += str(arr[i]) + ", "
+    out = out[:-2] + "\n"
+    return out
+
+def buildtravel(locs, objs, voc):
+    ltravel = []
+    verbmap = {}
+    for entry in db["vocabulary"]:
+        if entry["type"] == "motion" and entry["value"] not in verbmap:
+            verbmap[entry["word"]] = entry["value"]
+    def dencode(action, name):
+        "Decode a destination number"
+        if action[0] == "goto":
+            try:
+                return locnames.index(action[1])
+            except ValueError:
+                sys.stderr.write("dungeon: unknown location %s in goto clause of %s\n" % (cond[1], name))
+        elif action[0] == "special":
+            return 300 + action[1]
+        elif action[0] == "speak":
+            try:
+                return 500 + msgnames.index(action[1])
+            except ValueError:
+                sys.stderr.write("dungeon: unknown location %s in carry clause of %s\n" % (cond[1], name))
+        else:
+            print(cond)
+            raise ValueError
+    def cencode(cond, name):
+        if cond is None:
+            return 0;
+        elif cond[0] == "pct":
+            return cond[1]
+        elif cond[0] == "carry":
+            try:
+                return 100 + objnames.index(cond[1])
+            except ValueError:
+                sys.stderr.write("dungeon: unknown object name %s in carry clause of %s\n" % (cond[1], name))
+                sys.exit(1)
+        elif cond[0] == "with":
+            try:
+                return 200 + objnames.index(cond[1])
+            except IndexError:
+                sys.stderr.write("dungeon: unknown object name %s in with clause of \n" % (cond[1], name))
+                sys.exit(1)
+        elif cond[0] == "not":
+            # FIXME: Allow named as well as numbered states
+            try:
+                return 300 + objnames.index(cond[1]) + 100 * cond[2]
+            except ValueError:
+                sys.stderr.write("dungeon: unknown object name %s in not clause of %s\n" % (cond[1], name))
+                sys.exit(1)
+        else:
+            print(cond)
+            raise ValueError
+
+    for (i, (name, loc)) in enumerate(locs):
+        if "travel" in loc:
+            for rule in loc["travel"]:
+                tt = [i]
+                dest = dencode(rule["action"], name) + 1000 * cencode(rule.get("cond"), name)
+                tt.append(dest)
+                tt += [verbmap[e] for e in rule["verbs"]]
+                if not rule["verbs"]:
+                    tt.append(1)
+                ltravel.append(tuple(tt))
+
+    # At this point the ltravel data is in the Section 3
+    # representation from the FORTRAN version.  Next we perform the
+    # same mapping into the runtime format.  This was the C translation
+    # of the FORTRAN code:
+    # long loc;
+    # while ((loc = GETNUM(database)) != -1) {
+    #     long newloc = GETNUM(NULL);
+    #     long L;
+    #     if (TKEY[loc] == 0) {
+    #         TKEY[loc] = TRVS;
+    #     } else {
+    #         TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1];
+    #     }
+    #     while ((L = GETNUM(NULL)) != 0) {
+    #         TRAVEL[TRVS] = newloc * 1000 + L;
+    #         TRVS = TRVS + 1;
+    #         if (TRVS == TRVSIZ)
+    #             BUG(TOO_MANY_TRAVEL_OPTIONS);
+    #     }
+    #     TRAVEL[TRVS - 1] = -TRAVEL[TRVS - 1];
+    # }
+    travel = [0]
+    tkey = [0]
+    oldloc = 0
+    while ltravel:
+        rule = list(ltravel.pop(0))
+        loc = rule.pop(0)
+        newloc = rule.pop(0)
+        if loc != oldloc:
+            tkey.append(len(travel))
+            oldloc = loc 
+        elif travel:
+            travel[-1] *= -1
+        while rule:
+            travel.append(rule.pop(0) + newloc * 1000)
+        travel[-1] *= -1
+    return (travel, tkey)
 
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
 
     locnames = [x[0] for x in db["locations"]]
+    msgnames = [el[0] for el in db["arbitrary_messages"]]
+    objnames = [el[0] for el in db["objects"]]
+
+    (travel, tkey) = buildtravel(db["locations"],
+                                 db["objects"],
+                                 db["vocabulary"])
 
     c = c_template.format(
         h_name,
@@ -430,26 +623,31 @@ if __name__ == "__main__":
         get_class_messages(db["classes"]),
         get_turn_thresholds(db["turn_thresholds"]),
         get_locations(db["locations"]),
-        get_object_descriptions(db["object_descriptions"]),
+        get_objects(db["objects"]),
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
-        get_vocabulary(db["vocabulary"]),
-        get_actspk(db["actspk"]),
+        get_motions(db["motions"]),
+        get_actions(db["actions"]),
+        "const long tkey[] = {%s};" % bigdump(tkey),
+        "const long travel[] = {%s};" % bigdump(travel), 
     )
 
     h = h_template.format(
         len(db["locations"])-1,
-        len(db["object_descriptions"])-1,
+        len(db["objects"])-1,
         len(db["hints"]),
-        len(db["classes"]),
+        len(db["classes"])-1,
         len(db["obituaries"]),
         len(db["turn_thresholds"]),
-        len(db["actspk"]),
-        len(db["vocabulary"]),
+        len(db["actions"]),
+        len(travel),
+        len(tkey),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),
-        get_refs(db["object_descriptions"]),
+        get_refs(db["objects"]),
+        get_refs(db["motions"]),
+        get_refs(db["actions"]),
         statedefines,
     )