Skip to content

Commit aa4cd4b

Browse files
committed
Merge branch 'demo_report' into stm-web
2 parents 63e6b07 + da5c7d9 commit aa4cd4b

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

scripts/demo/demo.lua

+20-4
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ end
5555
function write_md(filename, title, description, long_description, crs)
5656
file = io.open("reports/" .. filename, "w")
5757
file:write("---\n")
58-
file:write("name: " .. filename .. "\n")
58+
file:write("name: " .. title .. "\n")
5959
file:write("description: " .. description .."\n")
6060
file:write("crs:\n")
6161
for _, v in ipairs(crs) do
62-
file:write("- " .. v .. "\n")
62+
file:write(" - " .. v .. "\n")
6363
end
6464
file:write("date: " .. os.date("%Y-%m-%d") .. "\n")
6565
file:write("---\n")
@@ -211,9 +211,12 @@ end
211211

212212
function write_demo_reports()
213213
init_reports()
214+
local fs = {}
214215
for k, f in pairs(demo_units['factions']) do
215216
write_report(f)
217+
table.insert(fs, f)
216218
end
219+
return fs
217220
end
218221

219222
function create_demo_unit(f, r, number, name, id, skills, items, orders)
@@ -544,11 +547,24 @@ function create_demo()
544547
demo_module_paula2(p)
545548
demo_module_mages2()
546549

547-
write_demo_reports()
550+
local f1 = write_demo_reports()
551+
548552

549553
process_orders()
550554

551-
write_demo_reports()
555+
local f2 = write_demo_reports()
556+
557+
local reports = {}
558+
for _, f in pairs(f1) do
559+
table.insert(reports, "999-" .. itoa36(f.id))
560+
end
561+
for _, f in pairs(f2) do
562+
table.insert(reports, "1000-" .. itoa36(f.id))
563+
end
564+
565+
write_md("eressea.md", "Eressea Example", "An extensive example",
566+
"An example with all sorts of stuff that could go on in an Eressea game",
567+
reports)
552568

553569
rules_tame()
554570
end

0 commit comments

Comments
 (0)