Author: esr
Date: Mon Oct 20 05:01:57 2008
New Revision: 30276
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30276&view=rev
Log:
Contnuity fix: the SoF Caverns of Flame now coincide with the HttT ones.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
trunk/data/campaigns/Sceptre_of_Fire/utils/journey.cfg
trunk/data/tools/trackplacer
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
Mon Oct 20 05:01:57 2008
@@ -410,7 +410,7 @@
[message]
speaker=Delfador
- message= _ "If we are to have any hope of penetrating into Knalga,
we must continue north to seek help from the Dwarves of the Deep Mountains in
the north."
+ message= _ "If we are to have any hope of penetrating into Knalga,
we must continue north to seek help from the Dwarves of the Heart Mountains in
the north."
[/message]
[if]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
Mon Oct 20 05:01:57 2008
@@ -214,7 +214,7 @@
[/message]
[message]
speaker=Baglur
- message= _ "Wait, wait. The gold and coal... I think we can find
those in the abandoned eastern mines. Trolls have overrun them, but earlier
they were the source of the finest smithing materials."
+ message= _ "Wait, wait. The gold and coal... I think we can find
those in the abandoned eastern mines, north of the Arkan-thoria. Trolls have
overrun them, but earlier they were the source of the finest smithing
materials."
[/message]
[message]
speaker=Rugnur
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg Mon
Oct 20 05:01:57 2008
@@ -298,7 +298,11 @@
[/message]
[message]
speaker=Thursagan
- message= _ "I don't know if we will be cornered. That cave looks
like it goes deep, and we can lose the elves in the caves, they move so slow
there."
+ message= _ "I don't know if we will be cornered. That cave looks
like it goes deep, and we can lose the elves in the caves, they move so slow
there. Once we get out, we'll make our way back to Knalga."
+ [/message]
+ [message]
+ speaker=Rugnur
+ message= _"The country between here and Knalga will be swarming
with elves. We had better head back to the abandoned mines north of the
Arkan-thoria, where we gathered our gold and coal. At least there Alanin will
have some hope of finding us."
[/message]
[message]
speaker=Alanin
@@ -324,7 +328,7 @@
[/message]
[message]
speaker=Thursagan
- message= _ "You going south has more of a chance of success for
you than staying here or going to the caves! And getting news to Haldric of
what has happened is also the best way to get help to us."
+ message= _ "You going south has more of a chance of success for
you than staying here or going to back to the mines! And getting news to
Haldric of what has happened is also the best way to get help to us."
[/message]
[message]
speaker=Alanin
@@ -366,7 +370,7 @@
[then]
[message]
speaker=Rugnur
- message= _ "Alanin, ride as fast as you can south. Tell
Haldric we are heading northeast, towards the old eastern mines where we
gathered the gold, and to send forces to meet us there as soon as he can!"
+ message= _ "Alanin, ride as fast as you can south. Tell
Haldric we are heading northeast, towards the old eastern mines, and if he
wants his precious scepter he should send forces to meet us there as soon as he
can!"
[/message]
[store_unit]
[filter]
@@ -441,7 +445,7 @@
[/message]
[message]
speaker=Thursagan
- message= _ "Tell him to send forces north to aid us and
fight the elves, but that we are probably going to die. We are running
northeast towards the old eastern mines, so you will know where to find us."
+ message= _ "Tell him to send forces north to aid us and
fight the elves, but that we are probably going to die. We will run northeast
towards the old eastern mines, and if he wants his scepter intact he'd best
send troops to meet us there."
[/message]
{MODIFY_UNIT id=Alanin canrecruit yes}
[store_unit]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
Mon Oct 20 05:01:57 2008
@@ -52,7 +52,7 @@
[story]
[part]
- story= _ "Rugnur had fled to the caves, but Alanin could not do
that. He went south - back to the Wesnoth border."
+ story= _ "Rugnur had fled across the Aekan-thoria, but Alanin
could not do that. He went south - back to the Wesnoth border."
[/part]
[part]
story= _ "The elves followed both of them. First I will tell of
their pursuit of Alanin, before we descend into the caves to learn Rugnur's
fate."
Modified: trunk/data/campaigns/Sceptre_of_Fire/utils/journey.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/utils/journey.cfg?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/utils/journey.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/utils/journey.cfg Mon Oct 20 05:01:57
2008
@@ -99,31 +99,34 @@
#enddef
#define MATERIALS_STAGE1
- {NEW_JOURNEY 503 208}
- {NEW_JOURNEY 518 208}
- {NEW_JOURNEY 534 210}
- {NEW_JOURNEY 550 210}
- {NEW_JOURNEY 564 210}
- {NEW_BATTLE 578 202}
+ {NEW_JOURNEY 501 203}
+ {NEW_JOURNEY 520 190}
+ {NEW_JOURNEY 545 171}
+ {NEW_JOURNEY 570 154}
+ {NEW_JOURNEY 587 140}
+ {NEW_JOURNEY 602 130}
+ {NEW_BATTLE 618 123}
#enddef
#define MATERIALS_STAGE2
- {OLD_JOURNEY 503 208}
- {OLD_JOURNEY 518 208}
- {OLD_JOURNEY 534 210}
- {OLD_JOURNEY 550 210}
- {OLD_JOURNEY 564 210}
- {OLD_BATTLE 578 202}
+ {OLD_JOURNEY 501 203}
+ {OLD_JOURNEY 520 190}
+ {OLD_JOURNEY 545 171}
+ {OLD_JOURNEY 570 154}
+ {OLD_JOURNEY 587 140}
+ {OLD_JOURNEY 602 130}
+ {OLD_BATTLE 618 123}
{NEW_REST 489 214}
#enddef
#define MATERIALS_COMPLETE
- {OLD_JOURNEY 503 208}
- {OLD_JOURNEY 518 208}
- {OLD_JOURNEY 534 210}
- {OLD_JOURNEY 550 210}
- {OLD_JOURNEY 564 210}
- {OLD_BATTLE 578 202}
+ {OLD_JOURNEY 501 203}
+ {OLD_JOURNEY 520 190}
+ {OLD_JOURNEY 545 171}
+ {OLD_JOURNEY 570 154}
+ {OLD_JOURNEY 587 140}
+ {OLD_JOURNEY 602 130}
+ {OLD_BATTLE 618 123}
{OLD_REST 489 214}
#enddef
@@ -135,6 +138,10 @@
#enddef
#define TOOLS_STAGE2
+ {OLD_JOURNEY 502 224}
+ {OLD_JOURNEY 514 231}
+ {OLD_JOURNEY 523 238}
+ {OLD_BATTLE 536 245}
{NEW_BATTLE 536 245}
#enddef
@@ -142,6 +149,7 @@
{OLD_JOURNEY 502 224}
{OLD_JOURNEY 514 231}
{OLD_JOURNEY 523 238}
+ {OLD_BATTLE 536 245}
{OLD_BATTLE 536 245}
#enddef
@@ -163,30 +171,42 @@
#define FORGING_STAGE1
{NEW_JOURNEY 548 243}
- {NEW_JOURNEY 559 236}
- {NEW_JOURNEY 572 230}
- {NEW_JOURNEY 584 225}
- {NEW_BATTLE 597 221}
+ {NEW_JOURNEY 560 230}
+ {NEW_JOURNEY 575 215}
+ {NEW_JOURNEY 593 199}
+ {NEW_JOURNEY 608 187}
+ {NEW_JOURNEY 624 173}
+ {NEW_JOURNEY 636 162}
+ {NEW_JOURNEY 650 148}
+ {NEW_BATTLE 660 138}
#enddef
#define FORGING_STAGE2
{OLD_JOURNEY 548 243}
- {OLD_JOURNEY 559 236}
- {OLD_JOURNEY 572 230}
- {OLD_JOURNEY 584 225}
- {OLD_BATTLE 597 221}
- {NEW_JOURNEY 597 206}
- {NEW_BATTLE 597 192}
+ {OLD_JOURNEY 560 230}
+ {OLD_JOURNEY 575 215}
+ {OLD_JOURNEY 593 199}
+ {OLD_JOURNEY 608 187}
+ {OLD_JOURNEY 624 173}
+ {OLD_JOURNEY 636 162}
+ {OLD_JOURNEY 650 148}
+ {OLD_BATTLE 660 138}
+ {NEW_JOURNEY 661 118}
+ {NEW_BATTLE 666 104}
#enddef
#define FORGING_COMPLETE
{OLD_JOURNEY 548 243}
- {OLD_JOURNEY 559 236}
- {OLD_JOURNEY 572 230}
- {OLD_JOURNEY 584 225}
- {OLD_BATTLE 597 221}
- {OLD_JOURNEY 597 206}
- {OLD_BATTLE 597 192}
+ {OLD_JOURNEY 560 230}
+ {OLD_JOURNEY 575 215}
+ {OLD_JOURNEY 593 199}
+ {OLD_JOURNEY 608 187}
+ {OLD_JOURNEY 624 173}
+ {OLD_JOURNEY 636 162}
+ {OLD_JOURNEY 650 148}
+ {OLD_BATTLE 660 138}
+ {OLD_JOURNEY 661 118}
+ {OLD_BATTLE 666 104}
#enddef
# trackplacer: tracks end
Modified: trunk/data/tools/trackplacer
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/trackplacer?rev=30276&r1=30275&r2=30276&view=diff
==============================================================================
--- trunk/data/tools/trackplacer (original)
+++ trunk/data/tools/trackplacer Mon Oct 20 05:01:57 2008
@@ -344,15 +344,20 @@
for name in self.editor.journey.track_order:
# Gather info
self.editor.journey.set_selected_track(name)
- possible = self.editor.snap_to(x, y)
- if possible is not None:
- local.append((name, possible, self.editor.journey[possible]))
+ for (possible, item) in self.editor.journey.neighbors(x, y):
+ if within(x, y, self.editor.box(item)):
+ stagecount = 0
+ for i in range(possible):
+ (action, x, y) = self.editor.journey[i]
+ if action in segmenters:
+ stagecount += 1
+ local.append((name, possible,
self.editor.journey[possible], stagecount))
self.editor.journey.set_selected_track(save_selected)
# Display it
if local:
- for (name, index, (action, x, y)) in local:
- legend = "%s at (%d, %d) is %s[%d]" \
- % (action.capitalize(), x,y, name, index)
+ for (name, index, (action, x, y), sc) in local:
+ legend = "%s at (%d, %d) is %s[%d], stage %d" \
+ % (action.capitalize(), x,y, name, index, sc+1)
label = gtk.Label(legend)
label.show()
self.vbox.add(label)
@@ -652,8 +657,7 @@
self.drawing_area.connect("button_release_event",
self.button_release_event)
- #self.drawing_area.connect("leave_notify_event",
- # lambda w, e: self.coordwin.set_text(""))
+ self.drawing_area.connect("leave_notify_event", self.leave_area_event)
self.drawing_area.set_events(gtk.gdk.EXPOSURE_MASK
| gtk.gdk.LEAVE_NOTIFY_MASK
@@ -848,6 +852,11 @@
self.draw_feature(widget, (action, x, y), True)
self.log("Tracks are %s" % self.journey)
return True
+
+ def leave_area_event(self, w, e):
+ if self.context_popup:
+ self.context_popup.destroy()
+ #self.coordwin.set_text(""))
def quit(self, w):
if self.journey.has_unsaved_changes():
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
