summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testxml/xsd/tmw.xsd1
-rwxr-xr-xwiki/wikigen.py8
2 files changed, 8 insertions, 1 deletions
diff --git a/testxml/xsd/tmw.xsd b/testxml/xsd/tmw.xsd
index 73c95b4..679064a 100644
--- a/testxml/xsd/tmw.xsd
+++ b/testxml/xsd/tmw.xsd
@@ -355,6 +355,7 @@
<xs:element name="effect" type="quests_var_effect"/>
</xs:choice>
<xs:attribute name="id" type="xs:int" use="required"/>
+ <xs:attribute name="nowiki" type="xs:int" use="optional"/>
</xs:complexType>
</xs:element>
</xs:choice>
diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index 6f9ead1..4973f39 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -699,6 +699,7 @@ def DoQuest():
q=Quest(-1)
qe=QuestEntry()
ig=False
+ nw=False
for e in src:
# Handle Comments and Ignored lines
@@ -716,7 +717,10 @@ def DoQuest():
# Handle Quest Headers
if '</var' in e:
- qlog.append(q)
+ if (nw):
+ nw=False
+ else
+ qlog.append(q)
elif '<var' in e:
g=qnt(e)
try:
@@ -724,6 +728,8 @@ def DoQuest():
except:
print("Invalid quest: %s" % g)
exit(1)
+ if 'nowiki' in e:
+ nw=True
# Handle quest entries
if '</quest>' in e: