Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12

This commit is contained in:
Chris Beck 2014-12-21 02:14:52 -05:00
commit b8952d64cb

View file

@ -244,23 +244,18 @@
[allow_undo][/allow_undo]
[/event]
# This event is commented out partly because crappy pseudo-profundities make my
# teeth ache, but more because it no longer really fits Malin's character
# arc. Since I filled in the backstory of his expulsion from the Academy, it
# has become pretty clear that pride and ego, not fear, is what pulled him
# to the dark side.
#
# [event]
# name=moveto
# [filter]
# x,y=24,20
# [/filter]
# [message]
# speaker=narrator
# message=_ "Fear is the path to the dark side. Fear leads to anger. Anger leads to hate. Hate leads to suffering."
# image=wesnoth-icon.png
# [/message]
# [/event]
[event]
name=moveto
[filter]
x,y=24,20
id=Malin Keshar
[/filter]
[message]
speaker=narrator
message=_ "Fear is the path to the dark side. Fear leads to anger. Anger leads to hate. Hate leads to suffering."
image=wesnoth-icon.png
[/message]
[/event]
# Defeat Conditions
[event]