Merge lp:~widelands-dev/widelands/reworked-readme into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merge reported by: SirVer
Merged at revision: not available
Proposed branch: lp:~widelands-dev/widelands/reworked-readme
Merge into: lp:widelands
Diff against target: 97 lines (+73/-14)
1 file modified
campaigns/atl01.wmf/scripting/texts.lua (+73/-14)
To merge this branch: bzr merge lp:~widelands-dev/widelands/reworked-readme
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+179600@code.launchpad.net

Description of the change

(Read: request for feedback, not request for merge)

I briefly started with reworking the readme. So far I've thrown it into the first dialog for the atlantean mission, and tweaked it a bit to see how it works. (This will of course be reverted once we have a final version and support for displaying it from the main menu.)

The text itself is untouched, as I figuered it made more sense to get the format down properly, then start rewriting as it will be presented how it will end up.

For now, I would mainly like some replies to the quetions posted in the comments, though general feedback is also welcome.

Work in progress-disclaimer applies. ;)

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

- TOOD: I haven't converted all of this section, but I'm not sure how good it
Noone forces you to have all in the paragraph translated. You can do things like p(_"text" .. "<br>" .. _"more text").

-- How to deal with parts which want specific styles (like centered/italics) and still be translatable?
See https://wl.widelands.org/docs/wl/autogen_aux_formatting/#p. You can pass the options for p as first argument: p("font-size=14 font-style=italic text-align=center", _"translated text"). This should work theoretically. :)

-- TODO: Btw, looks like neither spaces, tabs nor \t provides whitespace.
This is a bug in the old renderer. The new one does support tables and as soon as we use it we can reformat this to look nicer.

Revision history for this message
Hans Joachim Desserud (hjd) wrote :

>Noone forces you to have all in the paragraph translated.
Thanks for the tip. :)

>-- TODO: Btw, looks like neither spaces, tabs nor \t provides whitespace.
>This is a bug in the old renderer.
I thought we were using the new one for campaign dialogs now?

I've now converted the format of the general readme. Haven't had time to start the rewrite yet, but I have some ideas for it at least.

Revision history for this message
SirVer (sirver) wrote :

> >-- TODO: Btw, looks like neither spaces, tabs nor \t provides whitespace.
> >This is a bug in the old renderer.
> I thought we were using the new one for campaign dialogs now?
Unfortunately not yet :(. The new renderer is only used in a few places right now, mostly in the UI. Theres is a branch that uses the new renderer for everything, but we are not yet ready for merge.

Revision history for this message
SirVer (sirver) wrote :

I'll set this to in progress, feel free to change if you think this is not the correct state.

Revision history for this message
SirVer (sirver) wrote :

I merged this now in a way - I started from your atlantean modification, added the code to deal with Lua files when showing readmes and finished your conversion to be a 1to1. I am going ahead and rewriting parts of the README now that are outdate or look funky. Thanks for your work on this, it made this task significantly quicker for me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
2--- campaigns/atl01.wmf/scripting/texts.lua 2012-12-16 19:08:16 +0000
3+++ campaigns/atl01.wmf/scripting/texts.lua 2013-09-01 19:07:32 +0000
4@@ -155,20 +155,79 @@
5 {
6 title = _ "Proudest to the death",
7 body = rt(
8- h1(_"Favored by the god") ..
9- p(_
10-[[On the hidden and lost island of Atlantis, a proud tribe settled since the
11-world was very young. Ruled by the bloodline of King Ajanthul - the first human
12-to be empowered by the sea god Lutas to breathe above the sea level - and the
13-wise clerics, who provided the link to Lutas - they prospered and became
14-civilized.]]
15- ) .. p(_
16-[[This story happens during the regency of King Askandor, the 43rd successor of
17-King Ajanthul. He has been a good king, ruling Atlantis with wisdom and
18-foresight. But with age, he became afraid of dying and so he began looking for
19-a cure to death even though most clerics warned him. Some said, endless life
20-was only for the gods and to seek for it was forbidden.]]
21- )
22+ h1(_"README")
23+ -- TODO: add the logo image somehow. Can probably look at how portraits are added and do something similar.
24+.. p(
25+[[<rt image=pics/wl-logo-64.png image-align=center text-align=center></rt>]])
26+ -- TODO: Investigate whether I really need to use rt here. text-align didn't seem to be applied to the paragraphs
27+.. p("<rt text-align=center>") .. p("font-size=38 font-face=Widelands/Widelands font-color=#2F9131", "Widelands")
28+.. p("font-size=14 font-style=italic text-align=center", _"an open source strategy game")
29+.. p("</rt><rt>")
30+
31+.. h2(_"Introduction")
32+.. p(_
33+[[Widelands is a strategy game aiming for gameplay similar to Settlers II by BlueByte.<br>In this game, you start out on a small piece of land with just a few resources. Using these, you'll create an empire with many thousands of inhabitants. On your way towards this goal, you will have to establish an economic infrastructure, explore the lands around you and face enemies who are trying to rule the world just like you.]])
34+.. h3(_"Check out the Widelands project homepage:")
35+.. p("http://wl.widelands.org")
36+.. p(_"Widelands is licensed under the GNU General Public License (GPL). For more information, see the file 'COPYING' or select the License button from the main menu.")
37+.. h3(_"Status")
38+.. p(_
39+[[Widelands is now on the step of being playable, but to become more playable volunteers are needed. Your contributions (yes, I'm talking to you) are required, especially in the area of graphics, to make Widelands a better game.]])
40+.. h2(_"General game control")
41+.. p(_"To close an open window, right click it.")
42+.. p(_"To minimize/maximize a window, click on the titlebar of that window either with middle mousebutton or with left mousebutton while holding down CTRL.")
43+.. h2(_"Keyboard shortcuts (in-game)")
44+.. p(_"SPACE toggles build-help" .. "<br>"
45+.. _"M toggles minimap" .. "<br>"
46+.. _"N toggles messages ('news')" .. "<br>"
47+.. _"C toggles census" .. "<br>"
48+.. _"S toggles statistics" .. "<br>"
49+.. _"I toggles stock inventory" .. "<br>"
50+.. _"O toggles objectives" .. "<br>"
51+.. _"F toggles fullscreen" .. "<br>"
52+.. _"Home centers main mapview on starting location" .. "<br>"
53+.. _"(CTRL+) 0-9 Remember and go to previously remembered locations" .. "<br>"
54+.. _", goes to previous location" .. "<br>"
55+.. _". goes to next location" .. "<br>"
56+.. _"PAGEUP increases gamespeed" .. "<br>"
57+.. _"PAGEDOWN decreases gamespeed" .. "<br>"
58+.. _"PAUSE pauses the game (only for local games)" .. "<br>"
59+.. _"F6 shows the debug console (only in debug-builds)" .. "<br>"
60+.. _"Ctrl+F10 quits the game immediately" .. "<br>"
61+.. _"F11 takes a screenshot")
62+.. p(_"When finishing a road, flags will be placed along it if Ctrl is held down. Default is to place flags from end to start. If Shift is also held down, they are placed from start to end instead.")
63+.. p(_"When removing a road, if Ctrl is pressed all flags up to the first junction are removed.")
64+.. p(_"In the message window, the following additional shortcuts are available:")
65+.. p(_"G goes to location corresponding to current message" .. "<br>"
66+.. _"DELETE archives the current message")
67+.. h2(_"Online Help")
68+.. p(_"If you need documentation or help for Widelands or the Widelands Editor, be sure to visit our homepage. You can find an up to date online help at:")
69+.. p("http://wl.widelands.org/wiki/")
70+.. h2(_"Reporting Bugs")
71+
72+-- TODO: should we still mention the mailing list at the end as a backup for people who don't wish to register at Launchpad?
73+-- Sending an email somewhere might be considered a smaller "investment" than registering at a site.
74+.. p(_"If you encounter a bug, please report it to our bugtracker:")
75+.. p("https://bugs.launchpad.net/widelands")
76+.. p(_"Please provide enough background information. Tell us:")
77+.. p(_"- Detailed steps on how to trigger the bug, if possible.")
78+.. p(_"- What you expected to happen when performing the steps and what actually happened.")
79+.. p(_"- Which version of Widelands you are running (i.e. either the build number or the revision number if you are running the development release)")
80+.. p(_"- Please also include which operating system you are running Widelands on, as some bugs can be platform specific.")
81+.. p(_"- Which map you were playing when the bug occured.")
82+.. p(_"- If the bug concerns something not being displayed correctly or if it helps demonstrate the issue, please include one or more screenshots.")
83+.. p(_"- If you have a save game or replay demonstrating the issue (for instance crashes where it can be hard to tell exactly what is triggering it), please include that too. For more information, see the section on Replays below.")
84+.. p(_"- send us a compressed (zip, gzip, bzip2) session record if possible, unless the<br>bug is trivial to reproduce. In fact, it may be a good idea to always record<br>your sessions in case a bug surfaces. For more explanation, see below.")
85+.. h2(_"Replays")
86+.. p(_"Widelands records every game you play in two files. One of these files has a .wrpl.wgf extension and contains an initial savegame. The other file has just a .wrpl extension and contains all commands that were issued by all players, such as building a road or attacking an enemy. The rest of the filenames will tell you the time you started the game.")
87+.. p(_"Using the Watch Replay option in the main menu, a previously played game will be precisely reconstructed for you to watch. Note, however, that even small changes in the game data files or the Widelands executable can cause a replay to become incompatible and to 'go out of sync'. This is similar to how network games will suffer from desynchronization problems if one of the players has a different version of the game.")
88+.. p(_"Replays are a very useful tool to find bugs in the game logic code, so we ask you to attach replay files to all bug reports that you submit. The replay files are saved in the ~/.widelands/replays directory in your home on Linux and in the replays subdirectory of your Widelands installation on Windows.")
89+.. h2(_"Creating a Session Record")
90+.. p(_"Widelands can record all your keypresses and mouse movements to a file. It can then replay an entire session from starting the game to exiting it. This is really helpful for debugging problems.")
91+.. p(_"To create a session record, start the game with the --record parameter. On Linux, simply start Widelands like so: $ ./widelands --record=filename.rec")
92+.. p(_"On Windows, create a shortcut to the file widelands.exe (right-click on widelands.exe and choose Create Shortcut). Then edit the shortcut (right-click on the newly created shortcut and choose Properties). The Target field should read something like c:\games\widelands\widelands.exe. Change this to c:\games\widelands\widelands.exe --record=filename.rec.")
93+.. p(_"A binary file called filename.rec will be created. To play it back, perform the same steps as outlined above, but replace --record with --playback.")
94+.. p(_"Note that while recorded files are platform independent, they generally won't work across different versions of Widelands, because the user interface and the order in which low-level functions can be called may change between versions. Session records are not intended to serve as demo files; they are mostly a debugging tool which helps us to track down bugs.")
95 ),
96 },
97 {

Subscribers

People subscribed via source and target branches

to status/vote changes: