[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/A_Cho...
|
From: |
Philippe Plantier |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/A_Cho... |
|
Date: |
Mon, 01 Nov 2004 14:48:41 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 04/11/01 19:43:06
Modified files:
data/scenarios/Heir_To_The_Throne: A_Choice_Must_Be_Made.cfg
Battle_for_Wesnoth.cfg
Bay_of_Pearls.cfg
Blackwater_Port.cfg
Crossroads.cfg
Dwarven_Doors.cfg
Elven_Council.cfg
Elves_Besieged.cfg
Epilogue.cfg Ford_of_Abez.cfg
Gryphon_Mountain.cfg
Hasty_Alliance.cfg
High_King_at_Sea.cfg
Home_Clan.cfg
Home_North_Elves.cfg
Isle_of_Anduin.cfg
Isle_of_the_Damned.cfg
Mountain_Pass.cfg
Muff_Malal_Peninsula.cfg
Northern_Winter.cfg
Plunging_Into_the_Darkness.cfg
Princess_of_Wesnoth.cfg
Return_to_Wesnoth.cfg
Sceptre.cfg Snow_Plains.cfg
Swamp_Of_Dread.cfg
The_Lost_General.cfg
The_Siege_of_Elensefar.cfg
Valley_of_Death.cfg
Valley_of_Statues.cfg
po/wesnoth : fr.po
po/wesnoth-lib : fr.po
src : playturn.cpp unit.cpp unit.hpp
Log message:
Applied patch 3470 : support for unrenamable units.
Made some units "unrenamable" in HttT, for demonstration. I'll let the
scenario designers apply the changes in their scenarios.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fr.po.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-lib/fr.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.283&tr2=1.284&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.12
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.13
--- wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.12
Fri Oct 1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg Mon Nov
1 19:43:04 2004
@@ -32,6 +32,7 @@
side=1
canrecruit=1
controller=human
+ unrenamable=1
[/side]
[side]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.7
wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.8
--- wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.7
Tue Oct 19 18:55:51 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg Mon Nov
1 19:43:04 2004
@@ -72,6 +72,7 @@
[side]
type=Fighter
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.15 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Mon Nov 1
19:43:05 2004
@@ -31,6 +31,7 @@
race=Elves
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish
Shaman
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg:1.15 Sat Sep
25 10:35:12 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg Mon Nov
1 19:43:05 2004
@@ -36,6 +36,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
hitpoints=45
experience=0
side=1
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.18
wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.19
--- wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg:1.18 Sat Oct
30 05:37:43 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg Mon Nov 1
19:43:05 2004
@@ -27,6 +27,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg:1.15 Wed Oct
6 00:01:41 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg Mon Nov 1
19:43:05 2004
@@ -66,6 +66,7 @@
type=Commander
description=Konrad
side=1
+ unrenamable=1
canrecruit=1
controller=human
[/side]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.10
wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.11
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.10 Thu Sep
16 11:09:28 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg Mon Nov 1
19:43:05 2004
@@ -43,6 +43,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.22
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.22 Fri Oct
1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg Mon Nov
1 19:43:05 2004
@@ -34,6 +34,7 @@
[side]
type=Fighter
description=Konrad
+ unrenamable=yes
side=1
canrecruit=1
controller=human
@@ -42,6 +43,7 @@
team_name=elves
[unit]
description=Delfador
+ unrenamable=yes
type=Elder Mage
experience=500
side=1
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.2
wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.3
--- wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg:1.2 Sat Sep 4
10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg Mon Nov 1
19:43:05 2004
@@ -41,6 +41,7 @@
[side]
type=Fighter
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.14
wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.15
--- wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.14 Fri Oct
1 19:23:52 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg Mon Nov 1
19:43:05 2004
@@ -29,6 +29,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.13
wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.14
--- wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.13 Fri Oct
1 19:23:52 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg Mon Nov
1 19:43:05 2004
@@ -54,6 +54,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.13
wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.14
--- wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg:1.13 Fri Oct
1 19:15:09 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg Mon Nov
1 19:43:05 2004
@@ -25,6 +25,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg:1.8
wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg:1.9
--- wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg:1.8 Fri Oct
1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg Mon Nov
1 19:43:05 2004
@@ -15,6 +15,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.14
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.15
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.14 Thu Oct
7 21:01:57 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg Mon Nov 1
19:43:05 2004
@@ -31,6 +31,7 @@
team_name=elves
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.11
wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.12
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.11 Fri Oct
1 19:23:52 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg Mon Nov
1 19:43:05 2004
@@ -33,6 +33,7 @@
description=Konrad
hitpoints=45
experience=0
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.15 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg Mon Nov
1 19:43:05 2004
@@ -39,6 +39,7 @@
description=Konrad
hitpoints=45
experience=0
+ unrenamable=1
side=1
gold=100
canrecruit=1
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg:1.17
Sun Oct 10 23:32:07 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg Mon Nov
1 19:43:05 2004
@@ -46,6 +46,7 @@
[side]
description=Konrad
type=Commander
+ unrenamable=1
side=1
canrecruit=1
recruit=Thug,Poacher,Footpad
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.11
wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.12
--- wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg:1.11 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg Mon Nov 1
19:43:05 2004
@@ -30,6 +30,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.12
wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.13
--- wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg:1.12
Sat Sep 4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg Mon Nov
1 19:43:05 2004
@@ -29,6 +29,7 @@
race=Elves
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.11
wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.12
--- wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg:1.11 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg Mon Nov
1 19:43:05 2004
@@ -32,6 +32,7 @@
description=Konrad
hitpoints=45
experience=0
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.11
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.12
---
wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg:1.11
Sat Sep 4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg
Mon Nov 1 19:43:05 2004
@@ -24,6 +24,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.18
wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.19
--- wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.18
Sun Oct 10 23:32:07 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg Mon Nov
1 19:43:05 2004
@@ -55,6 +55,7 @@
race=Elves
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
@@ -64,6 +65,7 @@
[side]
type=Princess
description=Li'sar
+ unrenamable=yes
side=2
canrecruit=1
facing=reverse
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.11
wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.12
--- wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg:1.11
Wed Sep 22 21:32:30 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg Mon Nov
1 19:43:05 2004
@@ -31,6 +31,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.15
wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.16
--- wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg:1.15 Fri Oct 1
18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Sceptre.cfg Mon Nov 1
19:43:05 2004
@@ -74,6 +74,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.10
wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.11
--- wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg:1.10 Fri Oct
1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg Mon Nov 1
19:43:05 2004
@@ -30,6 +30,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.9
wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.10
--- wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg:1.9 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg Mon Nov
1 19:43:05 2004
@@ -30,6 +30,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.10
wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.11
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg:1.10 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg Mon Nov
1 19:43:05 2004
@@ -24,6 +24,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
diff -u
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.14
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.15
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.14
Fri Oct 1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
Mon Nov 1 19:43:05 2004
@@ -34,6 +34,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
@@ -249,6 +250,7 @@
[unit]
description=Delfador
+ unrenamable=yes
type=Elder Mage
x=20
y=20
@@ -256,6 +258,7 @@
[/unit]
[unit]
description=Kalenz
+ unrenamable=1
type=Elvish Lord
x=20
y=19
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.17
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.18
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg:1.17 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg Mon Nov
1 19:43:05 2004
@@ -29,6 +29,7 @@
[side]
type=Commander
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.9
wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.10
--- wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg:1.9 Sat Sep
4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg Mon Nov
1 19:43:05 2004
@@ -128,6 +128,7 @@
[side]
type=Fighter
description=Konrad
+ unrenamable=1
side=1
canrecruit=1
controller=human
Index: wesnoth/po/wesnoth-lib/fr.po
diff -u wesnoth/po/wesnoth-lib/fr.po:1.5 wesnoth/po/wesnoth-lib/fr.po:1.6
--- wesnoth/po/wesnoth-lib/fr.po:1.5 Sun Oct 31 00:36:51 2004
+++ wesnoth/po/wesnoth-lib/fr.po Mon Nov 1 19:43:06 2004
@@ -1,4 +1,5 @@
# French translations for Battle for Wesnoth package.
+# vim:set encoding=utf-8:
# Copyright (C) 2004 Wesnoth development team
# This file is distributed under the same license as the Battle for Wesnoth
package.
# Automatically generated, 2004.
@@ -9,7 +10,7 @@
"Project-Id-Version: Battle for Wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
"POT-Creation-Date: 2004-10-31 02:17+0200\n"
-"PO-Revision-Date: 2004-10-31 00:40+0200\n"
+"PO-Revision-Date: 2004-10-31 22:50+0100\n"
"Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
"Language-Team: Language fr\n"
"MIME-Version: 1.0\n"
@@ -143,7 +144,7 @@
#: src/hotkeys.cpp:151
msgid "Best Possible Enemy Moves"
-msgstr "Meilleurs déplacements possibles de l'ennemi"
+msgstr "Meilleurs déplacements ennemis"
#: src/hotkeys.cpp:152
msgid "Quit Editor"
@@ -211,11 +212,11 @@
#: src/hotkeys.cpp:168
msgid "Delay Shroud Updates"
-msgstr "Différer les mises-à -jour du voile"
+msgstr "Différer les mises à jour du voile"
#: src/hotkeys.cpp:169
msgid "Update Shroud Now"
-msgstr "Mettre-Ã -jour le voile maintenant"
+msgstr "Mettre à jour le voile maintenant"
#: src/hotkeys.cpp:170
msgid "Continue Move"
Index: wesnoth/po/wesnoth/fr.po
diff -u wesnoth/po/wesnoth/fr.po:1.29 wesnoth/po/wesnoth/fr.po:1.30
--- wesnoth/po/wesnoth/fr.po:1.29 Sun Oct 31 19:20:07 2004
+++ wesnoth/po/wesnoth/fr.po Mon Nov 1 19:43:05 2004
@@ -11,7 +11,7 @@
"Project-Id-Version: Battle for Wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
"POT-Creation-Date: 2004-10-31 02:21+0200\n"
-"PO-Revision-Date: 2004-10-31 21:21+0100\n"
+"PO-Revision-Date: 2004-10-31 22:50+0100\n"
"Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
"Language-Team: Language fr\n"
"MIME-Version: 1.0\n"
@@ -8768,7 +8768,7 @@
#: src/titlescreen.cpp:174
msgid "TitleScreen button^Preferences"
-msgstr "Preferences"
+msgstr "Préférences"
#: src/titlescreen.cpp:176
msgid "TitleScreen button^Quit"
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.283 wesnoth/src/playturn.cpp:1.284
--- wesnoth/src/playturn.cpp:1.283 Sun Oct 31 18:48:07 2004
+++ wesnoth/src/playturn.cpp Mon Nov 1 19:43:06 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.283 2004/10/31 18:48:07 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.284 2004/11/01 19:43:06 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -952,7 +952,10 @@
return current_unit() != units_.end();
case hotkey::HOTKEY_RENAME_UNIT:
- return !commands_disabled && current_unit() != units_.end() &&
current_unit()->second.side() == gui_.viewing_team()+1;
+ return !commands_disabled &&
+ current_unit() != units_.end() &&
+ !(current_unit()->second.unrenamable()) &&
+ current_unit()->second.side() == gui_.viewing_team()+1;
case hotkey::HOTKEY_LABEL_TERRAIN:
return !commands_disabled && map_.on_board(last_hex_) &&
!gui_.shrouded(last_hex_.x,last_hex_.y) && !is_observer();
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.102 wesnoth/src/unit.cpp:1.103
--- wesnoth/src/unit.cpp:1.102 Sat Oct 30 20:05:21 2004
+++ wesnoth/src/unit.cpp Mon Nov 1 19:43:06 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.102 2004/10/30 20:05:21 gruikya Exp $ */
+/* $Id: unit.cpp,v 1.103 2004/11/01 19:43:06 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -89,7 +89,8 @@
backupMaxMovement_(type_->movement()),
recruit_(false), attacks_(type_->attacks()),
backupAttacks_(type_->attacks()),
- guardian_(false), upkeep_(UPKEEP_FULL_PRICE)
+ guardian_(false), upkeep_(UPKEEP_FULL_PRICE),
+ unrenamable_(false)
{
//dummy units used by the 'move_unit_fake' command don't need to have a
side.
if(dummy_unit == false) validate_side(side_);
@@ -125,7 +126,8 @@
attacks_(type_->attacks()),
backupAttacks_(type_->attacks()),
modifications_(u.modifications_),
traitsDescription_(u.traitsDescription_),
- guardian_(false), upkeep_(u.upkeep_)
+ guardian_(false), upkeep_(u.upkeep_),
+ unrenamable_(u.unrenamable_)
{
validate_side(side_);
@@ -211,7 +213,9 @@
void unit::rename(const std::string& new_description)
{
- description_ = new_description;
+ if (!unrenamable_) {
+ description_ = new_description;
+ }
}
int unit::side() const
@@ -229,6 +233,11 @@
side_ = new_side;
}
+bool unit::unrenamable() const
+{
+ return unrenamable_;
+}
+
double unit::alpha() const
{
return type().alpha();
@@ -708,6 +717,7 @@
experience_ = atoi(experience.c_str());
resting_ = (cfg["resting"] == "yes");
+ unrenamable_ = (cfg["unrenamable"] == "yes");
}
void unit::write(config& cfg) const
@@ -775,6 +785,7 @@
cfg["moves"] = buf;
cfg["resting"] = resting_ ? "yes" : "no";
+ cfg["unrenamable"] = unrenamable_ ? "yes" : "no";
}
void unit::assign_role(const std::string& role)
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.53 wesnoth/src/unit.hpp:1.54
--- wesnoth/src/unit.hpp:1.53 Sun Aug 29 20:33:01 2004
+++ wesnoth/src/unit.hpp Mon Nov 1 19:43:06 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.hpp,v 1.53 2004/08/29 20:33:01 Sirp Exp $ */
+/* $Id: unit.hpp,v 1.54 2004/11/01 19:43:06 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -51,6 +51,9 @@
int experience() const;
int max_experience() const;
bool get_experience(int xp);
+ //the name of this unit is fixed by scenario, it is impossible to
+ //change it.
+ bool unrenamable() const;
bool advances() const;
int side() const;
unit_race::GENDER gender() const;
@@ -214,6 +217,8 @@
UPKEEP_COST upkeep_;
+ bool unrenamable_;
+
void reset_modifications();
void apply_modifications();
void remove_temporary_modifications();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/A_Cho...,
Philippe Plantier <=