From 4f57c70aa8a974c9d618eea228f977e5b3904e62 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:12:41 -0500 Subject: [PATCH 1/6] Tutorial: remove swamp from part 2 map --- data/campaigns/tutorial/maps/02_Tutorial_part_2.map | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/campaigns/tutorial/maps/02_Tutorial_part_2.map b/data/campaigns/tutorial/maps/02_Tutorial_part_2.map index f3972bd4f077..780e2fff4f35 100644 --- a/data/campaigns/tutorial/maps/02_Tutorial_part_2.map +++ b/data/campaigns/tutorial/maps/02_Tutorial_part_2.map @@ -7,9 +7,9 @@ Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fms, Gll^Fp, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Gg^Es, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp Gs^Fds, Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Rp, Gg^Efm, Gs^Fds, Gll^Fp, Gll^Fp, Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp Gs^Fds, Gs^Fds, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Gs^Fds, Gg^Fet, Gg^Efm, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fms, Gll^Fp -Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Rp, Ss, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp -Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gg^Ve, Gs^Fds, Ww, Ww^Bw|, Ww, Gg^Ve, Gs^Fds, Gs^Fds, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp -Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Bw|, Wo, Ww, Ww, Ww, Gg, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds +Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Rp, Ww, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp +Ww, Gs^Fds, Gs^Fds, Ww, Ww, Gs^Fds, Gg^Ve, Gs^Fds, Ww, Ww^Bw|, Ww, Gg^Ve, Gs^Fds, Gs^Fds, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp +Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Bw|, Wo, Ww, Ww, Ww, Gg, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds Ds, Ds, Ds, Ds, Ww, Wo, Wo, Wo, Ww, Ww^Bw|, Ww, Wo, Wo, Ww, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds Ww, Ww, Ww, Ww, Wo, Wo, Ww, Wo, Gs^Fds, Re, Gg^Efm, Ww, Wo, Wo, Wo, Ww, Wo, Wo, Gg^Ve, Gs^Fds, Gs^Fds, Gs^Fds Wo, Wo, Wo, Wo, Wo, Wo, Wo, Gs^Fds, Ww, Re, Gs^Fds, Gg^Ve, Wo, Wo, Wo, Wo, Wo, Ww, Wwf, Gs^Fds, Ww, Ww From 8f3d10d619d85fff4a58a0ada6c536440f4c99bf Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:19:27 -0500 Subject: [PATCH 2/6] Tutorial: change water warning to activate on all water hexes --- data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg index 6671b452c276..f5a652134498 100644 --- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg +++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg @@ -634,8 +634,7 @@ A full list of abilities and weapons specials, along with traits, may be found i [event] name=moveto [filter] - x=8,8,8,8,10,11,17,19,20 - y=10,11,12,14,15,15,14,16,14 + terrain=Ww side=1 [/filter] From dea369ebad4ebc1e9e90858ba8d4e7f4226b9e54 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:30:46 -0500 Subject: [PATCH 3/6] Tutorial: change quintain to level 0 --- data/campaigns/tutorial/units/Quintain.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/campaigns/tutorial/units/Quintain.cfg b/data/campaigns/tutorial/units/Quintain.cfg index 290259432f19..f9937182a8e2 100644 --- a/data/campaigns/tutorial/units/Quintain.cfg +++ b/data/campaigns/tutorial/units/Quintain.cfg @@ -8,7 +8,7 @@ hitpoints=58 advances_to=null {AMLA_DEFAULT} - level=1 + level=0 cost=10 usage=fighter movement_type=treefolk From ecb0f1a472456921c8cb707079a81221de1413dc Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:52:17 -0500 Subject: [PATCH 4/6] Tutorial: add dialogue for Konrad or Li'sar levelup --- .../tutorial/scenarios/02_Tutorial_part_2.cfg | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg index f5a652134498..43931f859599 100644 --- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg +++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg @@ -1098,6 +1098,20 @@ A full list of abilities and weapons specials, along with traits, may be found i [/message] [/event] + # If you advance Konrad or Li'sar + [event] + name=post_advance + [filter] + id=student + [/filter] + + [message] + speaker=unit + message= _ "Advancing a level has fully healed me! I have become better at using the sword, dealing 9 damage in 4 attacks. Although I do not have any special abilities, my fighting skills will allow me to beat the orcs by dealing more damage!" + female_message= _ "female^Advancing a level has fully healed me! I have become better at using the sword, dealing 9 damage in 4 attacks. Although I do not have any special abilities, my fighting skills will allow me to beat the orcs by dealing more damage!" + [/message] + [/event] + [event] name=time over From 035e120639c5d8626abf0bd73be03b553fb8be91 Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:52:31 -0500 Subject: [PATCH 5/6] Tutorial: allow fighters to levelup --- data/campaigns/tutorial/units/Fighter.cfg | 5 +- data/campaigns/tutorial/units/Fighteress.cfg | 5 +- data/campaigns/tutorial/units/Warrior.cfg | 49 +++++++++++++++++++ data/campaigns/tutorial/units/Warrioress.cfg | 51 ++++++++++++++++++++ 4 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 data/campaigns/tutorial/units/Warrior.cfg create mode 100644 data/campaigns/tutorial/units/Warrioress.cfg diff --git a/data/campaigns/tutorial/units/Fighter.cfg b/data/campaigns/tutorial/units/Fighter.cfg index 754f3dd840cc..47e7e51fc777 100644 --- a/data/campaigns/tutorial/units/Fighter.cfg +++ b/data/campaigns/tutorial/units/Fighter.cfg @@ -9,9 +9,8 @@ hitpoints=32 movement_type=smallfoot movement=6 - experience=28 - advances_to=null - {AMLA_DEFAULT} + experience=33 + advances_to=Warrior level=1 alignment=lawful cost=18 diff --git a/data/campaigns/tutorial/units/Fighteress.cfg b/data/campaigns/tutorial/units/Fighteress.cfg index c1f4a201d586..b07711663784 100644 --- a/data/campaigns/tutorial/units/Fighteress.cfg +++ b/data/campaigns/tutorial/units/Fighteress.cfg @@ -11,9 +11,8 @@ hitpoints=32 movement_type=smallfoot movement=6 - experience=28 - advances_to=null - {AMLA_DEFAULT} + experience=33 + advances_to=Warrioress level=1 alignment=lawful cost=18 diff --git a/data/campaigns/tutorial/units/Warrior.cfg b/data/campaigns/tutorial/units/Warrior.cfg new file mode 100644 index 000000000000..c0c6278d2aaf --- /dev/null +++ b/data/campaigns/tutorial/units/Warrior.cfg @@ -0,0 +1,49 @@ +#textdomain wesnoth-tutorial +[unit_type] + id=Warrior + name= _ "Warrior" + race=human + num_traits=0 + image="units/konrad-fighter.png" + profile=portraits/konrad.png + hitpoints=50 + movement_type=smallfoot + movement=6 + experience=100 + advances_to=null + {AMLA_DEFAULT} + level=2 + alignment=lawful + cost=32 + usage=mixed fighter + description= _ "With more experience, Fighters have honed their skills with the sword and become powerful Warriors." + die_sound={SOUND_LIST:HUMAN_DIE} + {DEFENSE_ANIM "units/konrad-fighter-defend.png" "units/konrad-fighter.png" {SOUND_LIST:HUMAN_HIT} } + [attack] + name=sword + #textdomain wesnoth-units + description= _"sword" + #textdomain wesnoth-tutorial + icon=attacks/sword-human.png + type=blade + range=melee + damage=9 + number=4 + [/attack] + [attack_anim] + [filter_attack] + name=sword + [/filter_attack] + start_time=-125 + [frame] + image="units/konrad-fighter.png:50" + [/frame] + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75} + [frame] + image="units/konrad-fighter-attack-[1~2].png:[150,100]" + [/frame] + [frame] + image="units/konrad-fighter.png:50" + [/frame] + [/attack_anim] +[/unit_type] diff --git a/data/campaigns/tutorial/units/Warrioress.cfg b/data/campaigns/tutorial/units/Warrioress.cfg new file mode 100644 index 000000000000..91e2073fb5ce --- /dev/null +++ b/data/campaigns/tutorial/units/Warrioress.cfg @@ -0,0 +1,51 @@ +#textdomain wesnoth-tutorial +[unit_type] + id=Warrioress + name= _ "female^Warrior" + 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} } + profile=portraits/lisar.png + hitpoints=50 + movement_type=smallfoot + movement=6 + experience=100 + advances_to=null + {AMLA_DEFAULT} + level=2 + alignment=lawful + cost=32 + usage=mixed fighter + description= _ "With more experience, Fighters have honed their skills with the sword and become powerful Warriors." + die_sound={SOUND_LIST:HUMAN_FEMALE_DIE} + [attack] + name=sword + #textdomain wesnoth-units + description= _"sword" + #textdomain wesnoth-tutorial + icon=attacks/saber-human.png + type=blade + range=melee + damage=9 + number=4 + [/attack] + [attack_anim] + [filter_attack] + range=melee + [/filter_attack] + + start_time=-360 + offset=0.0:120,0.0~0.6:170,0.6:70,0.6~0.0:300 + + [frame] + image="units/human-princess-attack-[1~6].png:[95,95,95,75,75,125]" + [/frame] + [frame] + image="units/human-princess.png:100" + [/frame] + + {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75} + [/attack_anim] +[/unit_type] From 5b36cd9fea3e901275f01393039fcfead8e8245b Mon Sep 17 00:00:00 2001 From: nemaara Date: Sat, 2 Mar 2019 16:53:41 -0500 Subject: [PATCH 6/6] Update changelog with tutorial fixes --- changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.md b/changelog.md index 09a22fd3335d..4b7f955d56b9 100644 --- a/changelog.md +++ b/changelog.md @@ -125,6 +125,11 @@ * S17c: Modified Burin's description of trolls * The South Guard: * Fixed various typos + * Tutorial: + * Remove swamp from map for part 2 + * Warn player about water when stepping on any shallow water hex + * Change quintain to level 0 + * Allow Konrad and Li'sar to level up and add corresponding dialogue for part 2 ### Multiplayer server * Forum user handler ban durations are now reported back to banned players.