[Wesnoth-cvs-commits] wesnoth/data terrain.cfg help.cfg

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/08/01 08:40:07

Modified files:
        data           : terrain.cfg help.cfg 

Log message:
        small fixes to help, and improve terrain grouping

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/terrain.cfg.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/help.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: wesnoth/data/help.cfg
diff -u wesnoth/data/help.cfg:1.35 wesnoth/data/help.cfg:1.36
--- wesnoth/data/help.cfg:1.35  Sat Jul 30 15:11:43 2005
+++ wesnoth/data/help.cfg       Mon Aug  1 08:40:06 2005
@@ -1,7 +1,6 @@
 [help]
 [toplevel]
 
sections=introduction,gameplay,units,abilities_section,traits_section,weapon_specials,terrains
-#sections=introduction,gameplay,traits
 topics=about,license
 [/toplevel]
 
@@ -65,7 +64,7 @@
 [topic]
 id=fundamentals
 title= _ "Fundamentals of Gameplay"
-text= _ "These pages outline all you need to know to play Battle for Wesnoth. 
It covers how to play and the basic mechanics behind the game. For more 
detailed information on special situations and exceptions, please follow the 
links included." + _"
+text= _ "These pages outline all you need to know to play Battle for Wesnoth. 
They cover how to play and the basic mechanics behind the game. For more 
detailed information on special situations and exceptions, please follow the 
links included." + _"
 
 To begin with, it's best to click the <italic>text=Tutorial</italic> button at 
the main menu. This will take you to the interactive tutorial, which will teach 
you the basics of Wesnoth. After this, it is recommended that you play the Heir 
to the Throne campaign first - click <italic>text=Campaign</italic> then 
<italic>text='Heir to the Throne'</italic>. As Battle for Wesnoth can be quite 
challenging, you may wish to start on <italic>text=Easy</italic>." + "
 
@@ -337,7 +336,7 @@
 [/topic]
 
 [topic]
-id=terrain_swamp
+id=terrain_swamp_water
 title= _ "Swamp"
 text= "<img>src=terrain/swampwater.png align=left box=no</img>
 
Index: wesnoth/data/terrain.cfg
diff -u wesnoth/data/terrain.cfg:1.63 wesnoth/data/terrain.cfg:1.64
--- wesnoth/data/terrain.cfg:1.63       Sat Jul 23 12:48:49 2005
+++ wesnoth/data/terrain.cfg    Mon Aug  1 08:40:06 2005
@@ -1,6 +1,10 @@
 # Terrain configuration file. Defines how the terrain _work_ in the game. How
 # the terrains _look_ is defined in terrain_graphics.cfg .
 
+# NOTE: terrain id's are used implicitly by the in-game help:
+# each "[terrain] id=some_id" corresponds to "[section] id=terrain_some_id"
+# or "[topic] id=terrain_some_id" identifying its description in [help]
+
 [terrain]
 symbol_image=void
 id=shroud
@@ -64,16 +68,6 @@
 gives_income=true
 [/terrain]
 
-[terrain]
-symbol_image=ice
-id=ice
-name= _ "Ice"
-char=i
-unit_height_adjust=-2
-aliasof=S
-light=true
-[/terrain]
-
 
 [terrain]
 symbol_image=bridge-n-s-tile
@@ -266,6 +260,16 @@
 [/terrain]
 
 [terrain]
+symbol_image=ice
+id=ice
+name= _ "Ice"
+char=i
+unit_height_adjust=-2
+aliasof=S
+light=true
+[/terrain]
+
+[terrain]
 symbol_image=village-snow-tile
 id=snow_village
 name= _ "Snow Village"
@@ -284,6 +288,14 @@
 [/terrain]
 
 [terrain]
+symbol_image=desert-hills
+id=desert_hills
+name= _ "Desert Hills"
+char=J
+aliasof=h
+[/terrain]
+
+[terrain]
 symbol_image=snow-hills
 id=snow_hills
 name= _ "Snow Hills"
@@ -293,14 +305,6 @@
 [/terrain]
 
 [terrain]
-symbol_image=desert-hills
-id=desert_hills
-name= _ "Desert Hills"
-char=J
-aliasof=h
-[/terrain]
-
-[terrain]
 symbol_image=mountains
 id=mountains
 name= _ "Mountains"
@@ -323,20 +327,20 @@
 [/terrain]
 
 [terrain]
+symbol_image=tropical-forest
+id=tropical_forest
+name= _ "Tropical Forest"
+aliasof=f
+char=T
+[/terrain]
+
+[terrain]
 symbol_image=snow-forest-tile
 id=snow_forest
 light=true
 name= _ "Snow Forest"
 aliasof=f
 char=F
-[/terrain]
-
-[terrain]
-symbol_image=tropical-forest
-id=tropical_forest
-name= _ "Tropical Forest"
-aliasof=f
-char=T
 [/terrain]
 
 [terrain]