diff --git a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg index 8ab751d72be..d56b0bf9c22 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg @@ -4,6 +4,7 @@ name= _ "female^Battle Princess" gender=female race=human + num_traits=0 image="units/human-battleprincess-resting.png" {LEADING_ANIM "units/human-battleprincess-leading-1.png" "units/human-battleprincess-leading-2.png" 22,-22} hitpoints=62 @@ -27,9 +28,9 @@ description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals, and battle tactics with the greatest sages, making her both a great combatant and leader. Now battle-hardened and strong of will, she can now aid those around her in the art of combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] - name=saber + name=sword #textdomain wesnoth-units - description= _"saber" + description= _"sword" #textdomain wesnoth-httt icon=attacks/saber-human.png type=blade @@ -124,9 +125,9 @@ description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals, and battle tactics with the greatest sages, making her both a great combatant and leader. Now battle-hardened and strong of will, she can now aid those around her in the art of combat."{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE}+{SPECIAL_NOTES_MAGICAL} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] - name=saber + name=sword #textdomain wesnoth-units - description= _"saber" + description= _"sword" #textdomain wesnoth-httt icon=attacks/saber-human.png type=blade @@ -136,7 +137,7 @@ [/attack] [attack] name=sceptre of fire - #the sceptre of fire always has the 're' writing, this is intentional! + # the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire range=ranged diff --git a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg index e5c97a8514d..c99427e9449 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Commander.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Commander.cfg @@ -4,6 +4,7 @@ id=Commander name= _ "Commander" race=human + num_traits=0 image="units/konrad-commander{AFFIX}.png" hitpoints=45 [abilities] @@ -103,7 +104,7 @@ 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=sceptre of fire - #the sceptre of fire always has the 're' writing, this is intentional! + # the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire range=ranged diff --git a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg index 0d9a8aa84d4..e38e43eb2fe 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Fighter.cfg @@ -4,6 +4,7 @@ id=Fighter name= _ "Fighter" race=human + num_traits=0 image="units/konrad-fighter.png" hitpoints=32 movement_type=smallfoot @@ -59,7 +60,7 @@ 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=sceptre of fire - #the sceptre of fire always has the 're' writing, this is intentional! + # the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire range=ranged diff --git a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg index 4561d2f3042..681f009d3e8 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Lord.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Lord.cfg @@ -4,6 +4,7 @@ id=Lord name= _ "Lord" race=human + num_traits=0 image="units/konrad-lord{AFFIX}.png" hitpoints=68 [abilities] @@ -126,7 +127,7 @@ )} [attack] name=sceptre of fire - #the sceptre of fire always has the 're' writing, this is intentional! + # the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire range=ranged diff --git a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg index 3fd3bbc18b0..1db994d3393 100644 --- a/data/campaigns/Heir_To_The_Throne/units/Princess.cfg +++ b/data/campaigns/Heir_To_The_Throne/units/Princess.cfg @@ -4,6 +4,7 @@ name= _ "female^Princess" gender=female race=human + num_traits=0 image="units/human-princess.png" {DEFENSE_ANIM "units/human-princess-defend-2.png" "units/human-princess-defend-1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } {LEADING_ANIM "units/human-princess-leading-2.png" "units/human-princess-leading-1.png" 22,-22} @@ -27,9 +28,9 @@ description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and leader. The units of lower level around the Princess will fight better due to her presence."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] - name=saber + name=sword #textdomain wesnoth-units - description= _"saber" + description= _"sword" #textdomain wesnoth-httt icon=attacks/saber-human.png type=blade @@ -81,9 +82,9 @@ description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals and battle tactics with the greatest sages, making her both a great combatant and leader. The units of lower level around the Princess will fight better due to her presence."+{SPECIAL_NOTES}+{SPECIAL_NOTES_LEADERSHIP}+{SPECIAL_NOTES_INITIATIVE}+{SPECIAL_NOTES_MAGICAL} die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] - name=saber + name=sword #textdomain wesnoth-units - description= _"saber" + description= _"sword" #textdomain wesnoth-httt icon=attacks/saber-human.png type=blade @@ -93,7 +94,7 @@ [/attack] [attack] name=sceptre of fire - #the sceptre of fire always has the 're' writing, this is intentional! + # the sceptre of fire always has the 're' writing, this is intentional! description= _"sceptre of fire" type=fire range=ranged diff --git a/data/campaigns/tutorial/images/units/human-princess-defend-1.png b/data/campaigns/tutorial/images/units/human-princess-defend-1.png new file mode 100644 index 00000000000..b0c31f44c78 Binary files /dev/null and b/data/campaigns/tutorial/images/units/human-princess-defend-1.png differ diff --git a/data/campaigns/tutorial/images/units/human-princess-defend-2.png b/data/campaigns/tutorial/images/units/human-princess-defend-2.png new file mode 100644 index 00000000000..c8a00f3e33a Binary files /dev/null and b/data/campaigns/tutorial/images/units/human-princess-defend-2.png differ diff --git a/data/campaigns/tutorial/lua/character_selection.lua b/data/campaigns/tutorial/lua/character_selection.lua index 3f8d17ca603..580f59d255d 100644 --- a/data/campaigns/tutorial/lua/character_selection.lua +++ b/data/campaigns/tutorial/lua/character_selection.lua @@ -89,7 +89,7 @@ function wml_actions.select_character() local unit = wesnoth.get_variable("student_store") if character == 2 then - wesnoth.put_unit(unit.x, unit.y, { + wesnoth.put_unit({ type = "Fighteress", id = unit.id, name = _"Li’sar", @@ -97,7 +97,7 @@ function wml_actions.select_character() profile = "portraits/lisar.png", canrecruit = true, facing = unit.facing, - }) + }, unit.x, unit.y ) else wesnoth.put_unit(unit) end diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg index ed449e894ad..37ab3a6ccb3 100644 --- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg +++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg @@ -871,10 +871,9 @@ A full list of abilities and weapons specials, along with traits, may be found i [filter] side=1 race=elf - level=2 - [or] - level=3 - [/or] + [not] + level=1 + [/not] [/filter] [message] @@ -888,7 +887,7 @@ A full list of abilities and weapons specials, along with traits, may be found i name=die [filter] side=1 - type=Elvish Shaman,Elvish Druid,Elvish Shyde,Elvish Sorceress,Elvish Enchantress + type_adv_tree=Elvish Shaman [/filter] [message] diff --git a/data/campaigns/tutorial/units/Fighter.cfg b/data/campaigns/tutorial/units/Fighter.cfg index 96b6b8583fc..754f3dd840c 100644 --- a/data/campaigns/tutorial/units/Fighter.cfg +++ b/data/campaigns/tutorial/units/Fighter.cfg @@ -3,6 +3,7 @@ id=Fighter name= _ "Fighter" race=human + num_traits=0 image="units/konrad-fighter.png" profile=portraits/konrad.png hitpoints=32 diff --git a/data/campaigns/tutorial/units/Fighteress.cfg b/data/campaigns/tutorial/units/Fighteress.cfg index b7053fa66b5..fb4966ba5e8 100644 --- a/data/campaigns/tutorial/units/Fighteress.cfg +++ b/data/campaigns/tutorial/units/Fighteress.cfg @@ -4,8 +4,9 @@ name= _ "female^Fighter" gender=female race=human + num_traits=0 image="units/human-princess.png" - {DEFENSE_ANIM "units/human-princess.png" "units/human-princess.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } + {DEFENSE_ANIM "units/human-princess-defend-2.png" "units/human-princess-defend-1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} } profile=portraits/lisar.png hitpoints=32 movement_type=smallfoot @@ -20,9 +21,9 @@ description= _ "Young and brash, Fighters are skilled with swords and are vulnerable to attack from enemies. However, they have the potential to become great warriors one day." die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} [attack] - name=saber + name=sword #textdomain wesnoth-units - description= _"saber" + description= _"sword" #textdomain wesnoth-tutorial icon=attacks/saber-human.png type=blade @@ -32,7 +33,7 @@ [/attack] [attack_anim] [filter_attack] - name=saber + name=sword [/filter_attack] start_time=-300 diff --git a/data/campaigns/tutorial/units/Quintain.cfg b/data/campaigns/tutorial/units/Quintain.cfg index 7ffcaab795c..290259432f1 100644 --- a/data/campaigns/tutorial/units/Quintain.cfg +++ b/data/campaigns/tutorial/units/Quintain.cfg @@ -10,7 +10,7 @@ {AMLA_DEFAULT} level=1 cost=10 - usage=mixed fighter + usage=fighter movement_type=treefolk alignment=neutral description= _ "Quintains are used to practice swordplay and jousting on. It would be extremely unusual to be attacked by one."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MAGICAL}