Merge lp://staging/~sirver/widelands/tutorial_mission into lp://staging/widelands
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | not available | ||||||||||||
| Proposed branch: | lp://staging/~sirver/widelands/tutorial_mission | ||||||||||||
| Merge into: | lp://staging/widelands | ||||||||||||
| Diff against target: |
2904 lines (+1455/-235) 41 files modified
campaigns/cconfig (+2/-2) campaigns/emp01.wmf/scripting/texts.lua (+5/-5) campaigns/emp02.wmf/scripting/texts.lua (+4/-4) campaigns/t01.wmf/scripting/initial_messages.lua (+1/-1) campaigns/t01.wmf/scripting/khantrukhs_talking.lua (+1/-1) campaigns/t01.wmf/scripting/texts.lua (+5/-5) campaigns/t02.wmf/scripting/mission_thread.lua (+1/-1) campaigns/t02.wmf/scripting/mission_thread_texts.lua (+2/-2) campaigns/t03.wmf/scripting/texts.lua (+14/-14) campaigns/tutorial01.wmf/elemental (+1/-1) campaigns/tutorial01.wmf/player_names (+6/-0) campaigns/tutorial01.wmf/player_position (+2/-0) campaigns/tutorial01.wmf/scripting/init.lua (+527/-73) campaigns/tutorial01.wmf/scripting/texts.lua (+425/-104) src/economy/flag.cc (+11/-0) src/economy/flag.h (+1/-0) src/economy/road.cc (+18/-0) src/economy/road.h (+1/-0) src/logic/building.cc (+26/-0) src/logic/building.h (+2/-0) src/logic/immovable.cc (+9/-0) src/logic/immovable.h (+10/-0) src/logic/legacy.cc (+17/-0) src/save_handler.cc (+3/-0) src/save_handler.h (+5/-1) src/scripting/lua_game.cc (+46/-8) src/scripting/lua_map.cc (+83/-2) src/scripting/lua_map.h (+31/-2) src/scripting/lua_ui.cc (+63/-0) src/scripting/lua_ui.h (+4/-0) src/scripting/scripting.cc (+5/-0) src/scripting/test/ts.wmf/scripting/test_baseimmovables.lua (+2/-0) src/scripting/test/ts.wmf/scripting/test_constructionsite.lua (+46/-0) src/scripting/test/ts.wmf/scripting/test_flag.lua (+7/-1) src/scripting/test/ts.wmf/scripting/test_immovables.lua (+1/-0) src/scripting/test/ts.wmf/scripting/test_road.lua (+11/-4) src/scripting/test/ts.wmf/scripting/test_ui.lua (+16/-0) src/ui_basic/panel.cc (+32/-0) src/ui_basic/panel.h (+4/-0) src/wlapplication.cc (+0/-2) src/wui/interactive_base.cc (+5/-2) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~sirver/widelands/tutorial_mission | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chuck Wilder | playtesting, spellchecking | Needs Fixing | |
|
Review via email:
|
|||
Description of the change
This is not really a merge request, as an earlier version of this tutorial was already merged together with the ui scripting capabilities, so this will also be merged eventually. I want to try out if making a merge request will help in getting feedback for the mission to further improve on it.
Please, play the mission and give me some feedback (especially positive to keep me motivated :P).
@chuck and other native speakers: I am especially looking forward to english language improvement. Feel free to reformulate whatever you seem unfitting, as long as the sense stays around, I am happy with improvements to the grammar and the words.
Changes:
To tutorial:
* made tutorial more robust against bad user input
- by allowing user input to be completely suppressed
- by adding a coroutine that rips everything the user builds when he shouldn't build anything.
* typo and grammatical fixes
* added infos about census & statistics
* added a chapter about resources & mining
* added infos about the mini map
* added a chapter about soldiers, training and warfare
* added mission objectives
To code:
* minimal Lua wrappings for constructionsites
* new functions to suppress user input processing in the UI
* new property fields in base immovables that offers the reverse mapping from Field.immovable
| Chuck Wilder (chuckw20) wrote | # |
| SirVer (sirver) wrote | # |
| Kiscsirke (csirkeee) wrote | # |
spellchecking
I reviewed the campaigns folder and found a number of instances that require spelling, grammatical and/or wording changes.
These I have applied and can be found in the following branch: