Skip to content

Commit

Permalink
Merge pull request #28 from konecnyjakub/wesnoth1.13-updates
Browse files Browse the repository at this point in the history 
Wesnoth 1.13 updates
  • Loading branch information
@konecnyjakub
konecnyjakub authored May 6, 2018
2 parents 534d7e4 + f658e1b commit ab8c6b1
Show file tree
Hide file tree
Showing 65 changed files with 150 additions and 609 deletions.
10 changes: 0 additions & 10 deletions chapter1/_main.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,12 @@
abbrev=_"FP1"
define=FOR_POWER_I

#ifver WESNOTH_VERSION >= 1.13.2
{CAMPAIGN_DIFFICULTY EASY "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Wizard's apprentice" _"Easy"}
{CAMPAIGN_DIFFICULTY NORMAL "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Wizard" _"Normal"}
{CAMPAIGN_DIFFICULTY HARD "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Battle wizard" _"Hard"}
#else
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Wizard's apprentice" _"(Easy)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Wizard" _"(Normal)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Battle wizard" _"(Hard)"}
#endif

icon="misc/blank-hex.png~BLIT(units/human-magi/mage+female-attack-magic2.png~CROP(19,14,34,42)~SCALE(28,28)~RC(magenta>red),20,10)~BLIT(halo/lightning-bolt-3-3.png~CROP(60,0)~SCALE(24,24),20,10)~BLIT(halo/lightning-bolt-1-3.png~CROP(60,0)~SCALE(24,24),40,10)~BLIT(units/orcs/grunt-die-6.png~CROP(10,15,35,50)~RC(magenta>brown)~FL(vertical)~SCALE(25,25),20,37)~BLIT(units/orcs/grunt-die-6.png~CROP(10,15,35,50)~RC(magenta>brown)~FL()~SCALE(25,25),37,25)"
#ifver WESNOTH_VERSION >= 1.13.4
image="data/core/images/portraits/humans/mage+female.png"
#else
image="data/core/images/portraits/humans/transparent/mage+female.png"
#endif
description=_ "Follow the tale of the young mage Clare, through an orcish assault on her village, to the assassination someone she liked, and beyond.. Lead her through her battles and choose her path of revenge to end the tale." + _ "
(Intermediate level, 12 scenarios)" + {FP_VERSION}
Expand Down Expand Up @@ -57,7 +48,6 @@
{~add-ons/For_Power/units/humans/Mage_Gold.cfg}
{~add-ons/For_Power/units/heroes/Fugitive.cfg}
{~add-ons/For_Power/units/humans/Renegade.cfg}
{~add-ons/For_Power/units/orcs/Nightblade.cfg}
[/units]

#endif
2 changes: 1 addition & 1 deletion chapter1/scenarios/05_A_Strange_Visitor.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
[message]
speaker=narrator
message=_"That very night, as the moon reached its peak, disaster struck."
image= # wmllint: ignore
image=none
[/message]
[unit]
side=4
Expand Down
2 changes: 1 addition & 1 deletion chapter1/scenarios/13_The_Path_of_Revenge.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
[message]
speaker=narrator
message=_"Clare did not have any other option so she did what he said."
image= # wmllint: ignore
image=none
[/message]
[kill]
id=Clare
Expand Down
4 changes: 2 additions & 2 deletions chapter1/scenarios/14a_The_Price_of_Revenge.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
[message]
speaker=narrator
message=_"So our heroes defeated the orcs and Clare avenged Glacyn's assassination and they celebrated. They gathered all the food and drinks that they could find and were recounting stories from the last few days. As the number of consumed drinks increased, the stories started to be filled with embellishments and exaggerations."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=narrator
message=_"But not everyone celebrated. Isolated from everyone, Clare was brooding with her cowl pulled low over her head."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Merissa
Expand Down
9 changes: 0 additions & 9 deletions chapter2/_main.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,12 @@
abbrev=_"FP2"
define=FOR_POWER_II

#ifver WESNOTH_VERSION >= 1.13.2
{CAMPAIGN_DIFFICULTY EASY "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Tourist" _"Easy"}
{CAMPAIGN_DIFFICULTY NORMAL "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Traveller" _"Normal"}
{CAMPAIGN_DIFFICULTY HARD "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Adventurer" _"Hard"}
#else
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Tourist" _"(Easy)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Traveller" _"(Normal)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Adventurer" _"(Hard)"}
#endif

icon="misc/blank-hex.png~BLIT(units/human-magi/silver-mage+female.png~CROP(19,14,40,42)~SCALE(28,28)~RC(magenta>black),15,15)~BLIT(units/human-loyalists/paladin/paladin.png~CROP(10,14)~RC(magenta>blue)~FL()~SCALE(48,48),17,15)~BLIT(units/undead-necromancers/dark-sorcerer-attack-staff-2.png~CROP(16,16,56,43)~SCALE(34,34)~FL()~RC(magenta>orange),20,35)"
#ifver WESNOTH_VERSION >= 1.13.4
image="data/core/images/portraits/humans/mage-silver+female.png"
#else
image="data/core/images/portraits/humans/transparent/mage-silver+female.png"
#endif
description=_ "A few years after defeating the orcish sovereign Clare wanted to go through some adventures. Accompany her and find out what she saw." + _ "
(Intermediate level, 12 scenarios)" + {FP_VERSION}
Expand Down
16 changes: 8 additions & 8 deletions chapter2/scenarios/05_The_Countess.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
[message]
speaker=narrator
message=_"It is recommended to use this attack from time to time. After redeeming a certain amount of enemies, redeem becomes more effective and the hero will become stronger (more hitpoints and better resistances). After reaching maximum level (7) the one will gain new and very powerful advancements."
image= # wmllint: ignore
image=none
[/message]
{VARIABLE book4 yes}
{BOOKS_COUNT}
Expand Down Expand Up @@ -551,7 +551,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"You have the power to fight for a good cause. I am proud of you, maiden."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -561,7 +561,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"My name is not important. I am a wizard like you, and I chose to guide you to power and glory."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -571,7 +571,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"I am far far away from you, but my mighty magic allows me to speak with you, no matter where you are, no matter in which dimension you are. Now listen: Follow your heart, go where you want to go, where you feel that you belong."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -581,7 +581,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"Neither of them. It is far to the north, inhabited by dwarves. The Northern Alliance."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -591,7 +591,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"There are more important things than your land. Terrible things are going to happen in the North, and without you, people will die. You can find a heir to take care of this land, travel where you always wanted to go, and defeat the dark legions."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -601,7 +601,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"Unimaginable monstrosities... they dwell in caves, where the sun never shone... and seek to invade all the lands. If the Northern Alliance falls, nothing will remain on this world that stands a chance against them..."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand All @@ -611,7 +611,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"I have many names... but call me simply Guru. Now, go. There is no time to lose. You are just experiencing a silence before the storm."
image= # wmllint: ignore
image=none
[/message]
{END_LEVEL_SILENT_CONTINUE}
[/event]
Expand Down
6 changes: 3 additions & 3 deletions chapter2/scenarios/06_Dwarven_Doors.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
speaker=narrator
caption=_"A voice in your head"
message=_"Go to the north-western corner of this city. Some weird things happen there."
image= # wmllint: ignore
image=none
[/message]
[message]
speaker=Clare
Expand Down Expand Up @@ -416,7 +416,7 @@
[message]
speaker=narrator
message=_"What will you do?"
image= # wmllint: ignore
image=none
[option]
message=_"I will help him!"
[command]
Expand Down Expand Up @@ -464,7 +464,7 @@
[message]
speaker=narrator
message=_"You do not have enough gold but I will not ruin such a worthy gesture of good will."
image= # wmllint: ignore
image=none
[/message]
[/then]
[else]
Expand Down
2 changes: 1 addition & 1 deletion chapter2/scenarios/08_Talks_with_Ralenyth.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
[message]
speaker=narrator
message=_"A few hours later ..."
image= # wmllint: ignore
image=none
[/message]
[/event]

Expand Down
8 changes: 4 additions & 4 deletions chapter2/scenarios/12_Escape_from_Prison.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
[message]
speaker=narrator
message=_"A few days later ..."
image= # wmllint: ignore
image=none
[/message]
[/event]

Expand Down Expand Up @@ -186,14 +186,14 @@
[message]
speaker=narrator
message=_"After three weeks of practice Clare was able to rise some human corpses. They were not particularly strong but they still could be of some use in this very situation."
image= # wmllint: ignore
image=none
[/message]
[/then]
[else]
[message]
speaker=narrator
message=_"Clare was not glad at all that she had to use this horrible art of rising bodies of the dead once again but she was very aware that she could not handle this bad situation with only help of her friends. But she soon realised that she forgot the exact procedure so she had to learn it again from the book. Finally after three weeks, two corpses was rising from the ground inside their cell."
image= # wmllint: ignore
image=none
[/message]
[/else]
[/if]
Expand Down Expand Up @@ -306,7 +306,7 @@
[message]
speaker=narrator
message=_"How do you want to get the key?"
image= # wmllint: ignore
image=none
[option]
message=_"I will ... try to seduce him."
[command]
Expand Down
123 changes: 0 additions & 123 deletions chapter2/scenarios/13a_Escape_from_Dwarven_Doors.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@
[unpetrify]
side=1
[/unpetrify]
#ifver WESNOTH_VERSION >= 1.13.6
[remove_object]
id=Clare
object_id=nightstalk1
Expand All @@ -333,128 +332,6 @@
id=Amiwen
object_id=nightstalk5
[/remove_object]
#else
[store_unit]
[filter]
id=Clare
[/filter]
variable=clare_store
kill=yes
[/store_unit]
{FOREACH clare_store.modifications.object i}
[if]
[variable]
name=clare_store.modifications.object[$i].id
equals=nightstalk1
[/variable]
[then]
{CLEAR_VARIABLE clare_store.modifications.object[$i]}
{VARIABLE_OP i sub 1}
[/then]
[/if]
{NEXT i}
[unstore_unit]
variable=clare_store
find_vacant=no
[/unstore_unit]
{TRANSFORM_UNIT id=Clare Clare_Lich}
[store_unit]
[filter]
id=Lemyr
[/filter]
variable=lemyr_store
kill=yes
[/store_unit]
{FOREACH lemyr_store.modifications.object i}
[if]
[variable]
name=lemyr_store.modifications.object[$i].id
equals=nightstalk2
[/variable]
[then]
{CLEAR_VARIABLE lemyr_store.modifications.object[$i]}
{VARIABLE_OP i sub 1}
[/then]
[/if]
{NEXT i}
[unstore_unit]
variable=lemyr_store
find_vacant=no
[/unstore_unit]
{TRANSFORM_UNIT id=Lemyr $lemyr_store.type}
[store_unit]
[filter]
id=Merissa
[/filter]
variable=merissa_store
kill=yes
[/store_unit]
{FOREACH merissa_store.modifications.object i}
[if]
[variable]
name=merissa_store.modifications.object[$i].id
equals=nightstalk3
[/variable]
[then]
{CLEAR_VARIABLE merissa_store.modifications.object[$i]}
{VARIABLE_OP i sub 1}
[/then]
[/if]
{NEXT i}
[unstore_unit]
variable=merissa_store
find_vacant=no
[/unstore_unit]
{TRANSFORM_UNIT id=Merissa $merissa_store.type}
[store_unit]
[filter]
id=Tinry
[/filter]
variable=tinry_store
kill=yes
[/store_unit]
{FOREACH tinry_store.modifications.object i}
[if]
[variable]
name=tinry_store.modifications.object[$i].id
equals=nightstalk4
[/variable]
[then]
{CLEAR_VARIABLE tinry_store.modifications.object[$i]}
{VARIABLE_OP i sub 1}
[/then]
[/if]
{NEXT i}
[unstore_unit]
variable=tinry_store
find_vacant=no
[/unstore_unit]
{TRANSFORM_UNIT id=Tinry $tinry_store.type}
[store_unit]
[filter]
id=Amiwen
[/filter]
variable=amiwen_store
kill=yes
[/store_unit]
{FOREACH amiwen_store.modifications.object i}
[if]
[variable]
name=amiwen_store.modifications.object[$i].id
equals=nightstalk5
[/variable]
[then]
{CLEAR_VARIABLE amiwen_store.modifications.object[$i]}
{VARIABLE_OP i sub 1}
[/then]
[/if]
{NEXT i}
[unstore_unit]
variable=amiwen_store
find_vacant=no
[/unstore_unit]
{TRANSFORM_UNIT id=Amiwen $amiwen_store.type}
#endif
[/event]

[event]
Expand Down
9 changes: 0 additions & 9 deletions chapter3/_main.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,11 @@
abbrev=_"FP3"
define=FOR_POWER_III

#ifver WESNOTH_VERSION >= 1.13.2
{CAMPAIGN_DIFFICULTY EASY "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Tourist" _"Easy"}
{CAMPAIGN_DIFFICULTY NORMAL "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Traveller" _"Normal"}
{CAMPAIGN_DIFFICULTY HARD "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Adventurer" _"Hard"}
#else
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/human-magi/mage+female-attack-magic1.png~RC(magenta>red)" _"Tourist" _"(Easy)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/red-mage+female-attack-magic-1.png~RC(magenta>red)" _"Traveller" _"(Normal)"} + ";" + {MENU_IMG_TXT2 "units/human-magi/arch-mage+female-attack-magic-1.png~RC(magenta>red)" _"Adventurer" _"(Hard)"}
#endif

#ifver WESNOTH_VERSION >= 1.13.2
icon="misc/blank-hex.png~BLIT(units/human-magi/arch-mage-attack-magic-1.png~CROP(14,10,46,49)~SCALE(33,33)~O(70%)~RC(magenta>brown),12,12)~BLIT(units/undead-necromancers/necromancer+female-magic-3.png~CROP(15,0,65,60)~SCALE(40,40)~FL()~RC(magenta>orange),20,12)~BLIT(units/undead-skeletal/revenant/revenant-dying-3.png~SCALE(45,32)~RC(magenta>orange),9,33)"
#else
icon="misc/blank-hex.png~BLIT(units/human-magi/arch-mage-attack-magic-1.png~CROP(14,10,46,49)~SCALE(33,33)~O(70%)~RC(magenta>brown),12,12)~BLIT(units/undead-necromancers/necromancer+female-magic-3.png~CROP(15,0,65,60)~SCALE(40,40)~FL()~RC(magenta>orange),20,12)~BLIT(units/undead-skeletal/revenant-dying-3.png~SCALE(45,32)~RC(magenta>orange),9,33)"
#endif
image=data/add-ons/For_Power/images/portraits/Clare.png
description=_ "After a few years of peace the troubles returned to the Northlands. But it only started a chain of events what affected all known parts of the Great Continent. Join Clare and her friends and watch it with you own eyes." + _ "
Expand Down
Loading

0 comments on commit ab8c6b1

Please sign in to comment.