From e22f56ee72c96afae3ace561b3d3c96455f98438 Mon Sep 17 00:00:00 2001
From: lalo <lalo@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 24 Nov 2008 07:30:55 +0000
Subject: [PATCH] follow-up to last commit "allow player dragons to pick
 metabolism focus": also change player title.  And I forgot to make the sea
 tiles blocking.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10700 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 python/start/dragon_attune.py    | 23 ++++++++++++++++-------
 start/HallsOfSelection/pl_dragon | 16 ++++++++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/python/start/dragon_attune.py b/python/start/dragon_attune.py
index 522c9cade..69aaa1309 100644
--- a/python/start/dragon_attune.py
+++ b/python/start/dragon_attune.py
@@ -36,10 +36,19 @@ faces = {
 }
 
 changer = Crossfire.WhoAmI()
-atype = long(Crossfire.ScriptParameters())
-player = changer.Above.Above
-force = player.CheckArchInventory('dragon_ability_force')
-force.Exp = atype
-player.Anim = animations[atype]
-player.Face = faces[atype]
-changer.Say("Your metabolism is now focused on me.")
+try:
+    aname = Crossfire.ScriptParameters()
+    atype = getattr(Crossfire.AttackTypeNumber, aname.upper())
+    player = changer
+    while player.Archetype.Name != 'pl_dragon':
+        player = player.Above
+    force = player.CheckArchInventory('dragon_ability_force')
+    force.Exp = atype
+    player.Anim = animations[atype]
+    player.Face = faces[atype]
+    changer.Say("current title: %s" % player.Title)
+    player.Title = '%s hatchling' % aname
+    changer.Say("Your metabolism is now focused on me.")
+except:
+    import sys
+    changer.Say('erorr: %s' % sys.exc_info()[1])
diff --git a/start/HallsOfSelection/pl_dragon b/start/HallsOfSelection/pl_dragon
index 41249e6be..824532a2f 100644
--- a/start/HallsOfSelection/pl_dragon
+++ b/start/HallsOfSelection/pl_dragon
@@ -1499,7 +1499,7 @@ y 17
 connected 1
 activate_on_push 1
 arch event_trigger
-name 2
+name fire
 title Python
 slaying /python/start/dragon_attune.py
 end
@@ -1533,7 +1533,7 @@ y 19
 connected 3
 activate_on_push 1
 arch event_trigger
-name 3
+name electricity
 title Python
 slaying /python/start/dragon_attune.py
 end
@@ -3110,7 +3110,7 @@ y 17
 connected 2
 activate_on_push 1
 arch event_trigger
-name 4
+name cold
 title Python
 slaying /python/start/dragon_attune.py
 end
@@ -3144,7 +3144,7 @@ y 19
 connected 4
 activate_on_push 1
 arch event_trigger
-name 10
+name poison
 title Python
 slaying /python/start/dragon_attune.py
 end
@@ -3855,6 +3855,7 @@ end
 arch sea1
 x 11
 y 18
+move_block all
 end
 arch pstone_2
 x 11
@@ -3867,6 +3868,7 @@ end
 arch sea1
 x 11
 y 19
+move_block all
 end
 arch pstone_2
 x 11
@@ -3879,6 +3881,7 @@ end
 arch sea1
 x 11
 y 20
+move_block all
 end
 arch pstone_2
 x 11
@@ -3891,10 +3894,12 @@ end
 arch sea1
 x 11
 y 21
+move_block all
 end
 arch pstone_2
 x 11
 y 22
+move_block all
 end
 arch dungeon_magic
 x 11
@@ -4166,14 +4171,17 @@ end
 arch sea1
 x 12
 y 19
+move_block all
 end
 arch sea1
 x 12
 y 20
+move_block all
 end
 arch sea1
 x 12
 y 21
+move_block all
 end
 arch sea1
 x 12