0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made 'speak' command available in menu

Browse source
This commit is contained in:
uid68803 2003-12-30 21:48:16 +00:00
parent 1a77a34d75
commit 769c02fb38
10 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/scenarios/A_Choice_Must_Be_Made.cfg
View file

@ -169,7 +169,7 @@ Defeat
[/message]
[message]
description=Kalenz
message="With all respect, princess, I think it would be us doing the sparing, Sceptre or no Sceptre. Us doing the sparing, again, I might add."
message="With all due respect, princess, we would be doing the sparing again, Sceptre or no Sceptre."
id=choice11
[/message]
[message]
@ -195,7 +195,7 @@ Defeat
[message]
id=choice15
description=Delfador
message="We have a choice to make. To the north passed the Orcs are the snow plains. To the south, beyond the Lichen armies is the Swamp of Dread."
message="We have a choice to make. To the north past the Orcs are the snow plains. To the south, beyond the armies of the Walking Dead is the Swamp of Dread."
[/message]
[message]
id=choice16

6
data/scenarios/Ford_of_Abez.cfg
View file

@ -252,7 +252,7 @@ Defeat:
[message]
id=msg9_6
description=Kalenz
message="Until the king's son, in the heat of battle, until he turned on the king!"
message="Until the king's son, in the heat of battle, turned upon the king!"
[/message]
[message]
id=msg9_7b
@ -302,7 +302,7 @@ Defeat:
[message]
id=msg9_17
description=Gaga-Breuk
message="Look! Some of the southerners, the men of Wesnoth are trying to cross into our lands! We will have to stop them men!"
message="Look! Some of the southerners, the men of Wesnoth are trying to cross into our lands! We will slaughter them at the water's edge!"
[/message]
[message]
id=msg9_18
@ -317,7 +317,7 @@ Defeat:
[message]
id=msg9_19b
description=Li'sar
message="There they are! So it is true, they foiled the undead. Now they are trying to leave Wesnoth. We can't let them cross the river. After them men!"
message="There they are! So it is true, they foiled the undead. Now they are trying to leave Wesnoth. We can't let them cross the river. After them, men!"
[/message]
[message]
id=msg9_20a

2
data/scenarios/Mountain_Pass.cfg
View file

@ -181,7 +181,7 @@ Defeat:
[message]
description=Stalrag
id=msg10_13
message="The shinsplitters will aid you in your quest, look, they arise from the villages to the east, the mighty shinsplitters!!! To battle!"
message="The shinsplitters will aid you in your quest, look, they arise from the villages to the west, the mighty shinsplitters! To battle!"
[/message]
[/event]

8
data/scenarios/Plunging_Into_the_Darkness.cfg
View file

@ -184,7 +184,7 @@ Defeat
[message]
id=msg12_3
description=Kalenz
message="Indeed. Us Elves are not well-skilled in these dark pits."
message="Indeed. We Elves are not well-skilled in these dark pits."
[/message]
[/event]
@ -213,7 +213,7 @@ Defeat
[message]
id=msg12_7
description=Geldar
message="Oh do you? I see you are even accompanied by Elves. Can us Dwarves not live in peace without the treacherous Elves coming to bother us?"
message="Oh do you? I see you are even accompanied by Elves. Can we Dwarves not live in peace without the treacherous Elves coming to bother us?"
[/message]
[/command]
[command]
@ -297,7 +297,7 @@ Defeat
[message]
id=msg12_19
description=Geldar
message="You, haha, this boy that stands before me is the king of Wesnoth? Haha! I haven't had such a laugh in a long time. And whom are you, old man?"
message="You? Haha! This boy that stands before me is the king of Wesnoth? Haha! I haven't had such a laugh in a long time. And who are you, old man?"
[/message]
[/command]
[command]
@ -371,7 +371,7 @@ Defeat
[message]
id=msg12_25
description=Geldar
message="And you really think you can find, the Sceptre of Fire?"
message="And you really think you can find the Sceptre of Fire?"
[/message]
[/command]
[command]

2
data/scenarios/Princess_of_Wesnoth.cfg
View file

@ -584,7 +584,7 @@ Defeat:
[message]
id=msg6_30
description=Konrad
message="Think about the story of the old king, ask somebody old about it."
message="Think about the story of the old king. Ask somebody who knew of him."
[/message]
[message]
id=msg6_31

6
data/scenarios/Swamp_Of_Dread.cfg
View file

@ -115,17 +115,17 @@ Defeat
[message]
id=msgswamp1
description=Delfador
message="This land is cursed. The Lichen have lived here for years amassing great armies and fortunes."
message="This land is cursed. The Liches have lived here for years amassing great armies and fortunes."
[/message]
[message]
id=msgswamp2
description=Konrad
message="The Lichen are all over this swamp. I hope I have made a wise choice to come down this path."
message="The Liches are all over this swamp. I hope I have made a wise choice to come down this path."
[/message]
[message]
id=msgswamp3
description=Delfador
message="Each of the Lichen leaders will have a pile of gold you can take, if they are defeated. Don't stretch you armies to thin though, we still must pass threw this swamp to the north."
message="Each of the Liches will have a pile of gold you can take, if they are defeated. Don't stretch you armies to thin though, we still must pass through this swamp."
[/message]
[/event]

2
data/scenarios/The_Lost_General.cfg
View file

@ -352,7 +352,7 @@ Defeat:
[message]
id=msg13_die3
description=Lionel
message="Though I am destroyed, my mission must be completed. Friends, the Sceptre further North of here, deep in the caverns. Better fortune to you in finding it than there was to me."
message="Though I am destroyed, my mission must be completed. Though you are foes, you are at least worthy ones. The Sceptre is further North of here, deep in the caverns. Better fortune to you in finding it than there was to me."
[/message]
[/event]

18
data/scenarios/Valley_of_Death.cfg
View file

@ -176,7 +176,7 @@ Defeat:
[message]
id=msg7_1
description=Kalenz
message=My lord! This road does not seem as safe as we had hoped, look around us at the hills, there are undead about!
message=My lord! This road does not seem as safe as we had hoped. Look around us at the hills: there are undead about!
[/message]
[message]
id=msg7_2
@ -267,9 +267,19 @@ Defeat:
name=time over
[message]
id=msg7_10
id=msg7_10a
description=Delfador
message=The sun rises in the East. Surely the undead do not have the power to continue their onslaught through another day!
[/message]
[message]
id=msg7_10b
description=Kalenz
message=Indeed not! I feel we have survived this battle.
[/message]
[message]
id=msg7_10c
description=Konrad
message=Whew! They seem to be retreating at last!
message=Whew! That was a difficult battle, but they retreat at last!
[/message]
[endlevel]
@ -293,7 +303,7 @@ Defeat:
[message]
id=msg7_11
description=Delfador
message=Yes! We have fought them off
message=Yes! We have fought them off!
[/message]
#if Moremirmu survived the battle, then this dialog

2
data/themes/default.cfg
View file

@ -27,7 +27,7 @@ height=600
[/panel]
[menu]
is_context_menu=true
items=objectives,recruit,recall,preferences,statustable,undo,redo,createunit,endturn,describeunit
items=objectives,recruit,recall,preferences,statustable,undo,redo,createunit,endturn,describeunit,speak
[/menu]
[menu]
title=action_endturn

4
src/playturn.cpp
View file

@ -624,12 +624,14 @@ bool turn_info::can_execute_command(hotkey::HOTKEY_COMMAND command) const
case hotkey::HOTKEY_TOGGLE_GRID:
case hotkey::HOTKEY_STATUS_TABLE:
case hotkey::HOTKEY_MUTE:
case hotkey::HOTKEY_SPEAK:
case hotkey::HOTKEY_PREFERENCES:
case hotkey::HOTKEY_OBJECTIVES:
case hotkey::HOTKEY_UNIT_LIST:
return true;
case hotkey::HOTKEY_SPEAK:
return network::nconnections() > 0;
case hotkey::HOTKEY_REDO:
return !browse_ && !redo_stack_.empty();
case hotkey::HOTKEY_UNDO: