diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c index 7f5b23807..7b0abfa24 100644 --- a/src/common/gamecode/xmlreport.c +++ b/src/common/gamecode/xmlreport.c @@ -237,4 +237,3 @@ xmlreport_cleanup(void) iconv_close(utf8); #endif } - diff --git a/src/res/eressea.xml b/src/res/eressea.xml index bab5363cb..709dcfce9 100644 --- a/src/res/eressea.xml +++ b/src/res/eressea.xml @@ -70,8 +70,7 @@ - - + diff --git a/src/res/eressea/en/strings.xml b/src/res/eressea/en/strings.xml deleted file mode 100644 index e87c445f3..000000000 --- a/src/res/eressea/en/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea. - - - With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER. - - - WORK - - diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml index c13f681cc..75816f684 100644 --- a/src/res/eressea/items.xml +++ b/src/res/eressea/items.xml @@ -149,37 +149,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -195,4 +164,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/res/eressea/de/strings.xml b/src/res/eressea/strings.xml similarity index 93% rename from src/res/eressea/de/strings.xml rename to src/res/eressea/strings.xml index 90ffb243f..4d090c155 100644 --- a/src/res/eressea/de/strings.xml +++ b/src/res/eressea/strings.xml @@ -197,6 +197,7 @@ Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden. + If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea. Mit der ersten Auswertung bekommst du einen @@ -204,9 +205,11 @@ http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION COMPUTER. + With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER. ARBEITE + WORK Tempel @@ -355,16 +358,22 @@ + + Adamant + adamantium + + + Adamant + adamantium + + + + Adamantrüstung + adamantium plate + + + Adamantrüstungen + adamantium plates + + - - - - - - - - - - - - diff --git a/src/res/resources.xml b/src/res/resources.xml index 45ccd3e07..9347c5451 100644 --- a/src/res/resources.xml +++ b/src/res/resources.xml @@ -329,6 +329,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml index 9a805ff51..cc3e33ef5 100644 --- a/src/res/tutorial.xml +++ b/src/res/tutorial.xml @@ -63,11 +63,8 @@ - - + - - tutorial@eressea.de diff --git a/src/res/tutorial/en/strings.xml b/src/res/tutorial/en/strings.xml deleted file mode 100644 index 1b9a5df32..000000000 --- a/src/res/tutorial/en/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - report newbie info - - If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea. - - - With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER. - - diff --git a/src/res/tutorial/de/strings.xml b/src/res/tutorial/strings.xml similarity index 58% rename from src/res/tutorial/de/strings.xml rename to src/res/tutorial/strings.xml index 98688cca4..c40a6b7a1 100644 --- a/src/res/tutorial/de/strings.xml +++ b/src/res/tutorial/strings.xml @@ -2,9 +2,11 @@ Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden. + If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea. Mit der ersten Auswertung bekommst du einen Computerreport, den du mit vielen der Tools auf http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION COMPUTER. + With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER. ARBEITE diff --git a/src/scripts/run-tests.lua b/src/scripts/run-tests.lua index 882b725a1..35660c497 100644 --- a/src/scripts/run-tests.lua +++ b/src/scripts/run-tests.lua @@ -51,8 +51,11 @@ function test_free() end function test_hse() - read_game("50", "text") - write_game("50.dat", "binary") + read_game("50.dat", "binary") + f = get_faction(atoi36("8h7f")) + f.options = f.options + 8192 + init_reports() + write_report(f) end function test_realloc() @@ -79,7 +82,11 @@ function test_md5() read_game("571.dat", "binary") -- read_orders("orders.571") run_turn() --- write_game("572.txt", "text") + local i = test.rng_int() + print(i) + write_game("572.txt." .. i, "text") + -- 648583167 + io.stdin:read("*line") end function test_287() @@ -93,9 +100,9 @@ run_scripts() -- test_free() -- test_bmark() -- test_realloc() --- test_hse() +test_hse() -- test_md5() -test_287() +-- test_287() -- io.stdin:read("*line") -- text: 50.574 -- bin0: 19.547