HttT Fix typo: Sceptre vs scepter
Change all "scepter" to "sceptre" except for Dark Queen's scepter. The definite article Sceptre of Fire and all variables related to it use sceptre spelling. General articles, such as the Dark Queen's scepter and attack, use scepter spelling. Note some file names do not follow this rule and remain unchanged.
This commit is contained in:
Gregory A Lundberg
parent
c3d74c5726
commit
4da8f20d0c
13 changed files with 60 additions and 60 deletions
|
|
@ -647,7 +647,7 @@
|
|||
|
||||
[message]
|
||||
speaker=Konrad
|
||||
message= _ "Oh, and you want me to get this scepter?"
|
||||
message= _ "Oh, and you want me to get this Sceptre?"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@
|
|||
[message]
|
||||
speaker=narrator
|
||||
image="wesnoth-icon.png"
|
||||
message= _ "Konrad finally decided he could not wait until the gryphons grew to maturity — Delfador’s insistence that the scepter must be recovered was too compelling. And so after many days of rest, the party set out once again for the dwarven kingdom..."
|
||||
message= _ "Konrad finally decided he could not wait until the gryphons grew to maturity — Delfador’s insistence that the Sceptre must be recovered was too compelling. And so after many days of rest, the party set out once again for the dwarven kingdom..."
|
||||
[/message]
|
||||
[/then]
|
||||
[else]
|
||||
|
|
@ -412,7 +412,7 @@
|
|||
[message]
|
||||
speaker=narrator
|
||||
image="wesnoth-icon.png"
|
||||
message= _ "Eventually Delfador’s insistence that the scepter must be recovered proved too compelling, even when it meant dismantling the camp without the spring having yet fully arrived. And so after many days of rest, the party set out once again for the dwarven kingdom..."
|
||||
message= _ "Eventually Delfador’s insistence that the Sceptre must be recovered proved too compelling, even when it meant dismantling the camp without the spring having yet fully arrived. And so after many days of rest, the party set out once again for the dwarven kingdom..."
|
||||
[/message]
|
||||
[/else]
|
||||
[/if]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{DEEP_UNDERGROUND}
|
||||
|
||||
next_scenario=17_Scepter_of_Fire
|
||||
next_scenario=17_Sceptre_of_Fire
|
||||
|
||||
{SCENARIO_MUSIC "underground.ogg"} # More in start event
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#textdomain wesnoth-httt
|
||||
[scenario]
|
||||
id=17_Scepter_of_Fire
|
||||
id=17_Sceptre_of_Fire
|
||||
name= _ "The Sceptre of Fire"
|
||||
next_scenario=18_A_Choice_Must_Be_Made
|
||||
scenario_generation=cave
|
||||
|
|
@ -231,19 +231,19 @@
|
|||
[store_locations]
|
||||
terrain=Xu,Qxu,Ql
|
||||
[and]
|
||||
x=$scepter_x
|
||||
y=$scepter_y
|
||||
x=$sceptre_x
|
||||
y=$sceptre_y
|
||||
radius=3
|
||||
[/and]
|
||||
[or]
|
||||
x=$scepter_x
|
||||
y=$scepter_y
|
||||
x=$sceptre_x
|
||||
y=$sceptre_y
|
||||
radius=1
|
||||
[/or]
|
||||
variable=scepter_vicinity
|
||||
variable=sceptre_vicinity
|
||||
[/store_locations]
|
||||
[foreach]
|
||||
array=scepter_vicinity
|
||||
array=sceptre_vicinity
|
||||
[do]
|
||||
[terrain]
|
||||
x=$this_item.x
|
||||
|
|
@ -252,10 +252,10 @@
|
|||
[/terrain]
|
||||
[/do]
|
||||
[/foreach]
|
||||
{CLEAR_VARIABLE scepter_vicinity}
|
||||
{CLEAR_VARIABLE sceptre_vicinity}
|
||||
[terrain]
|
||||
x=$scepter_x
|
||||
y=$scepter_y
|
||||
x=$sceptre_x
|
||||
y=$sceptre_y
|
||||
terrain=Uu^Ii
|
||||
[/terrain]
|
||||
|
||||
|
|
@ -306,7 +306,7 @@
|
|||
name=moveto
|
||||
[filter]
|
||||
[filter_location]
|
||||
x,y=$scepter_x,$scepter_y
|
||||
x,y=$sceptre_x,$sceptre_y
|
||||
radius=6
|
||||
[/filter_location]
|
||||
side=1
|
||||
|
|
@ -354,7 +354,7 @@
|
|||
[event]
|
||||
name=victory
|
||||
|
||||
{CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,scepter_x,scepter_y}
|
||||
{CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,sceptre_x,sceptre_y}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
|
|
@ -373,18 +373,18 @@
|
|||
local H = wesnoth.require "lua/helper.lua"
|
||||
local W = H.set_wml_action_metatable {}
|
||||
local delf = wesnoth.get_units { id = 'Delfador' }[1]
|
||||
local sceptre_x, sceptre_y = wesnoth.get_variable('scepter_x'), wesnoth.get_variable('scepter_y')
|
||||
local sceptre_x, sceptre_y = wesnoth.get_variable('sceptre_x'), wesnoth.get_variable('sceptre_y')
|
||||
local path = wesnoth.find_path(delf, sceptre_x, sceptre_y, {ignore_units = true, viewing_side = 0}) -- # wmllint: noconvert
|
||||
_ = wesnoth.textdomain 'wesnoth-httt'
|
||||
|
||||
local dirs = { _"I sense the path to the sceptre is to the east of me.",
|
||||
_"I sense the path to the sceptre is to the south-east of me.",
|
||||
_"I sense the path to the sceptre is to the south of me.",
|
||||
_"I sense the path to the sceptre is to the south-west of me.",
|
||||
_"I sense the path to the sceptre is to the west of me.",
|
||||
_"I sense the path to the sceptre is to the north-west of me.",
|
||||
_"I sense the path to the sceptre is to the north of me.",
|
||||
_"I sense the path to the sceptre is to the north-east of me." }
|
||||
local dirs = { _"I sense the path to the Sceptre is to the east of me.",
|
||||
_"I sense the path to the Sceptre is to the south-east of me.",
|
||||
_"I sense the path to the Sceptre is to the south of me.",
|
||||
_"I sense the path to the Sceptre is to the south-west of me.",
|
||||
_"I sense the path to the Sceptre is to the west of me.",
|
||||
_"I sense the path to the Sceptre is to the north-west of me.",
|
||||
_"I sense the path to the Sceptre is to the north of me.",
|
||||
_"I sense the path to the Sceptre is to the north-east of me." }
|
||||
|
||||
local goal = { x = path[6][1], y = path[6][2] }
|
||||
|
||||
|
|
@ -570,11 +570,11 @@
|
|||
{PASSAGE_NORMAL mini_2 2 5 2}
|
||||
[items]
|
||||
#
|
||||
# These macros handle the placement and attainment of the scepter,
|
||||
# These macros handle the placement and attainment of the sceptre,
|
||||
# including ending the level in victory.
|
||||
# I moved them to the utils file to make the chamber WML more readable
|
||||
#
|
||||
# The scepter will always be in mini chamber 3, but the location of this
|
||||
# The sceptre will always be in mini chamber 3, but the location of this
|
||||
# particular chamber is highly variable
|
||||
#
|
||||
{PLACE_SCEPTRE}
|
||||
|
|
|
|||
|
|
@ -167,11 +167,11 @@
|
|||
|
||||
[if]
|
||||
[variable]
|
||||
name=scepter
|
||||
name=sceptre
|
||||
equals="Konrad"
|
||||
[/variable]
|
||||
|
||||
#if Konrad got the Sceptre
|
||||
#if Konrad got the sceptre
|
||||
[then]
|
||||
[message]
|
||||
speaker="Li'sar"
|
||||
|
|
@ -203,7 +203,7 @@
|
|||
[/message]
|
||||
[/then]
|
||||
|
||||
#if Li'sar got the Sceptre
|
||||
#if Li'sar got the sceptre
|
||||
[else]
|
||||
[message]
|
||||
speaker="Li'sar"
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
[/message]
|
||||
[if]
|
||||
[variable]
|
||||
name=scepter
|
||||
name=sceptre
|
||||
equals="Konrad"
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -305,7 +305,7 @@
|
|||
speaker=Parandra
|
||||
message= _ "Yes, rest. Your soldiers will be tended to and refreshed. We have made sure you will leave our protection with the resources to finish your journey."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE scepter}
|
||||
{CLEAR_VARIABLE sceptre}
|
||||
[endlevel]
|
||||
result=victory
|
||||
bonus=no
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Delfador
|
||||
message= _ "How long must the people endure your rule? Give the throne to your daughter. She is the rightful heir. We even hold the scepter to prove it!"
|
||||
message= _ "How long must the people endure your rule? Give the throne to your daughter. She is the rightful heir. We even hold the Sceptre to prove it!"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Asheviere
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
[/attack_anim]
|
||||
{WEAPON_SPECIAL_INITIATIVE_EVENTS}
|
||||
[variation]
|
||||
variation_id=scepter
|
||||
variation_id=sceptre
|
||||
hide_help=yes
|
||||
id=Battle Princess
|
||||
name= _ "female^Battle Princess"
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
number=4
|
||||
[/attack]
|
||||
[attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
#the sceptre of fire always has the 're' writing, this is intentional!
|
||||
description= _"sceptre of fire"
|
||||
type=fire
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
[/attack]
|
||||
[attack_anim]
|
||||
[filter_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_attack]
|
||||
{MISSILE_FRAME_FIREBALL_XY 22 -22}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,13 +94,13 @@
|
|||
|
||||
[variation]
|
||||
{HTTT_COMMANDER -scepter}
|
||||
variation_id=scepter
|
||||
variation_id=sceptre
|
||||
hide_help=yes
|
||||
cost=60
|
||||
{LEADING_ANIM "units/konrad-commander-scepter-leading.png" "units/konrad-commander-scepter.png" 17,-22}
|
||||
description= _ "The rank of Commander is held by those who lead battle groups into combat. Possessing leadership skills, they give lower-level units in adjacent hexes improved performance in combat. Commanders are best skilled with the sword, although they also carry a bow to use when necessary. If the Commander is lost, so is the battle."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}
|
||||
[attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
#the sceptre of fire always has the 're' writing, this is intentional!
|
||||
description= _"sceptre of fire"
|
||||
type=fire
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
[/attack]
|
||||
{DEFENSE_ANIM_FILTERED "units/konrad-commander-scepter-defend.png" "units/konrad-commander-scepter.png" {SOUND_LIST:HUMAN_HIT} (
|
||||
[filter_second_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_second_attack]
|
||||
)}
|
||||
{DEFENSE_ANIM_FILTERED "units/konrad-commander-bow-defend.png" "units/konrad-commander-bow.png" {SOUND_LIST:HUMAN_HIT} (
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
)}
|
||||
[attack_anim]
|
||||
[filter_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_attack]
|
||||
{MISSILE_FRAME_FIREBALL_XY 16 -24}
|
||||
start_time=-300
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@
|
|||
description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However they have the potential to become great warriors one day."
|
||||
[variation]
|
||||
{HTTT_FIGHTER}
|
||||
variation_id=scepter
|
||||
variation_id=sceptre
|
||||
hide_help=yes
|
||||
cost=38
|
||||
description= _ "Young and brash, Fighters attack with a sword, and are vulnerable to more seasoned enemies. However they have the potential to become great warriors one day."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}
|
||||
[attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
#the sceptre of fire always has the 're' writing, this is intentional!
|
||||
description= _"sceptre of fire"
|
||||
type=fire
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
[/attack]
|
||||
[attack_anim]
|
||||
[filter_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_attack]
|
||||
{MISSILE_FRAME_FIREBALL_XY 0 0}
|
||||
sound_start_time=-300
|
||||
|
|
|
|||
|
|
@ -107,14 +107,14 @@
|
|||
{DEFENSE_ANIM_RANGE "units/konrad-lord-bow-defend.png" "units/konrad-lord-bow.png" {SOUND_LIST:HUMAN_HIT} ranged}
|
||||
[variation]
|
||||
{HTTT_LORD -scepter}
|
||||
variation_id=scepter
|
||||
variation_id=sceptre
|
||||
hide_help=yes
|
||||
cost=85
|
||||
{LEADING_ANIM "units/konrad-lord-scepter-leading.png" "units/konrad-lord-scepter.png" -16,-21}
|
||||
description= _ "The noble leaders of many troops, Lords are especially strong in melee combat, and also possess skill with the bow. Like Commanders, Lords possess leadership skills, and improve the fighting ability of all adjacent lower-level units."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_MAGICAL}
|
||||
{DEFENSE_ANIM_FILTERED "units/konrad-lord-scepter-defend.png" "units/konrad-lord-scepter.png" {SOUND_LIST:HUMAN_HIT} (
|
||||
[filter_second_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_second_attack]
|
||||
)}
|
||||
{DEFENSE_ANIM_FILTERED "units/konrad-lord-bow-defend.png" "units/konrad-lord-bow.png" {SOUND_LIST:HUMAN_HIT} (
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
[/filter_second_attack]
|
||||
)}
|
||||
[attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
#the sceptre of fire always has the 're' writing, this is intentional!
|
||||
description= _"sceptre of fire"
|
||||
type=fire
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
[/attack]
|
||||
[attack_anim]
|
||||
[filter_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_attack]
|
||||
{MISSILE_FRAME_FIREBALL_XY -16 -21}
|
||||
start_time=-300
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
[/attack_anim]
|
||||
{WEAPON_SPECIAL_INITIATIVE_EVENTS}
|
||||
[variation]
|
||||
variation_id=scepter
|
||||
variation_id=sceptre
|
||||
hide_help=yes
|
||||
id=Princess
|
||||
name= _ "female^Princess"
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
number=4
|
||||
[/attack]
|
||||
[attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
#the sceptre of fire always has the 're' writing, this is intentional!
|
||||
description= _"sceptre of fire"
|
||||
type=fire
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
[/attack]
|
||||
[attack_anim]
|
||||
[filter_attack]
|
||||
name=scepter of fire
|
||||
name=sceptre of fire
|
||||
[/filter_attack]
|
||||
{MISSILE_FRAME_FIREBALL_XY -15 -20}
|
||||
|
||||
|
|
|
|||
|
|
@ -304,7 +304,7 @@ fire: +10%"
|
|||
|
||||
[event]
|
||||
same_location_as_previous=yes
|
||||
store_location_as=scepter
|
||||
store_location_as=sceptre
|
||||
name=moveto
|
||||
first_time_only=no
|
||||
[filter]
|
||||
|
|
@ -313,7 +313,7 @@ fire: +10%"
|
|||
y=32
|
||||
[/filter]
|
||||
[object]
|
||||
id=object_scepter
|
||||
id=object_sceptre
|
||||
name= _ "Sceptre of Fire"
|
||||
image=items/sceptre-of-fire.png
|
||||
duration=forever
|
||||
|
|
@ -324,7 +324,7 @@ fire: +10%"
|
|||
[/filter]
|
||||
[effect]
|
||||
apply_to=variation
|
||||
name=scepter
|
||||
name=sceptre
|
||||
[/effect]
|
||||
[/object]
|
||||
[/event]
|
||||
|
|
@ -338,7 +338,7 @@ fire: +10%"
|
|||
id=Konrad
|
||||
[/filter]
|
||||
[set_variable]
|
||||
name=scepter
|
||||
name=sceptre
|
||||
value="Konrad"
|
||||
[/set_variable]
|
||||
|
||||
|
|
@ -372,7 +372,7 @@ fire: +10%"
|
|||
id="Li'sar"
|
||||
[/filter]
|
||||
[set_variable]
|
||||
name=scepter
|
||||
name=sceptre
|
||||
value="Li'sar"
|
||||
[/set_variable]
|
||||
|
||||
|
|
@ -483,9 +483,9 @@ fire: +10%"
|
|||
[/filter_adjacent_location]
|
||||
[/filter_adjacent_location]
|
||||
[not]
|
||||
# don't start near the cave floor around the scepter
|
||||
x=$scepter_x
|
||||
y=$scepter_y
|
||||
# don't start near the cave floor around the sceptre
|
||||
x=$sceptre_x
|
||||
y=$sceptre_y
|
||||
radius=5
|
||||
[/not]
|
||||
[not]
|
||||
|
|
@ -561,8 +561,8 @@ fire: +10%"
|
|||
radius=1
|
||||
[/not]
|
||||
[not]
|
||||
# don't go anywhere near the cave floor around the scepter
|
||||
x,y=$scepter_x,$scepter_y
|
||||
# don't go anywhere near the cave floor around the sceptre
|
||||
x,y=$sceptre_x,$sceptre_y
|
||||
radius=4
|
||||
[filter_radius]
|
||||
terrain=U*,Re
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue