[adonthell-wastesedge-commits] Release_0-3-1 da8d94a 168/237: Completed intro sequence

[Kai Sterker]

tag: Release_0-3-1
commit da8d94acc926afbf3b166eacceee41cbcd944849
Author: adondev <adondev>
Commit: adondev <adondev>

    Completed intro sequence
    FIXED some makefiles
---
 README                               |   12 ++--
 gfx/cutscene/Makefile.am             |    3 +-
 gfx/cutscene/intro_inn.img           |  Bin 212982 -> 94578 bytes
 gfx/cutscene/intro_talan.img         |  Bin 0 -> 3460 bytes
 gfx/cutscene/player.img              |  Bin 0 -> 6019 bytes
 gfx/mapobjects/floorings/Makefile.am |    3 +-
 scripts/init.py                      |    4 +-
 scripts/modules/intro.py             |  105 ++++++++++++++++++++++++++--------
 8 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/README b/README
index e5625ce..1d750e0 100755
--- a/README
+++ b/README
@@ -64,7 +64,7 @@ You can reach us in various ways:
 
 Email:         address@hidden
 Message Board: http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158
-Mailing list:  address@hidden
+Mailing list:  address@hidden
 Web site:      http://adonthell.linuxgames.com
 
 
@@ -72,12 +72,10 @@ Reporting Bugs:
 ===============
 
 We hope you'll never have to, but if you discover a problem, we
-would like to hear about it.  The prefered way is to use the
-Sourceforge Bugtracker at 
-  http://sourceforge.net/tracker/?atid=101051&group_id=1051&func=browse
-
-Please make sure that your problem isn't already listed. As an
-alternative  you may also write an email or post to the mailing list.
+would like to hear about it. Please use the Development mailing list
+(address@hidden) for that. You can 
+subscribe to the mailing lists at 
+http://savannah.gnu.org/mail/?group_id=702
 
 
 Thank you for trying this software.
diff --git a/gfx/cutscene/Makefile.am b/gfx/cutscene/Makefile.am
index 9442c20..683d9d5 100755
--- a/gfx/cutscene/Makefile.am
+++ b/gfx/cutscene/Makefile.am
@@ -2,6 +2,7 @@ pkgdatadir = $(gamedatadir)/gfx/cutscene
 
 pkgdata_DATA = adonthell_03.img adonthell_green.img jewelbag_closed.img \
        jewelbag_open.img forest1.img forest2.img forest3.img intro_bg.img \
-       intro_guard.img intro_player.img intro_inn.img
+       intro_guard.img intro_player.img intro_inn.img intro_talan.img \
+       player.img
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/cutscene/intro_inn.img b/gfx/cutscene/intro_inn.img
index 880a7c1..1660e17 100644
Binary files a/gfx/cutscene/intro_inn.img and b/gfx/cutscene/intro_inn.img 
differ
diff --git a/gfx/cutscene/intro_talan.img b/gfx/cutscene/intro_talan.img
new file mode 100644
index 0000000..17abb4c
Binary files /dev/null and b/gfx/cutscene/intro_talan.img differ
diff --git a/gfx/cutscene/player.img b/gfx/cutscene/player.img
new file mode 100644
index 0000000..23c1682
Binary files /dev/null and b/gfx/cutscene/player.img differ
diff --git a/gfx/mapobjects/floorings/Makefile.am 
b/gfx/mapobjects/floorings/Makefile.am
index 76e5853..414c297 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -5,7 +5,6 @@ pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj 
bath-floor2a.mobj \
        terracotta-tiles-2.mobj terracotta-tiles-3.mobj woodenplanks_2_1.mobj \
        woodenplanks_2_2.mobj terracotta-trans.mobj \
        woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj 
woodenplanks_trans.mobj \
-       behind-window.mobj barn_ground_inside.mobj barn_loft_main.mobj 
barn_loft_front.mobj \
-
+       behind-window.mobj barn_ground_inside.mobj barn_loft_main.mobj 
barn_loft_front.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/init.py b/scripts/init.py
index 8e8ea85..61fa9f3 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -116,12 +116,12 @@ class title_screen:
         if self.alpha == 255:
             # -- display "Adonthell v0.3"
             self.bag_t.set_visible (1)
-            self.wait_time = 30
+            self.wait_time = 35
             self.draw_func = self.wait
 
         else:
             # -- fade in
-            self.alpha = self.alpha + gametime_frames_to_skip()
+            self.alpha = self.alpha + gametime_frames_to_skip() + 1
             if self.alpha > 255: self.alpha = 255
             self.bag_c.set_alpha (self.alpha)
 
diff --git a/scripts/modules/intro.py b/scripts/modules/intro.py
index 8dc411d..6fe5967 100644
--- a/scripts/modules/intro.py
+++ b/scripts/modules/intro.py
@@ -1,3 +1,19 @@
+#
+#  (C) Copyright 2001 Alexandre Courbot <address@hidden>
+#  Part of the Adonthell Project http://adonthell.linuxgames.com
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY.
+#
+#  See the COPYING file for more details
+#
+
+# -- Introduction sequence for Waste's Edge. 
+#
+#    Dirty, ugly, quickly made, random programmed.
+
 from adonthell import *
 
 def update_im (im, x):
@@ -20,6 +36,8 @@ im2 = image ()
 im3 = image ()
 bg = image ()
 inn_close = image ()
+talan = image ()
+player = image ()
 
 im1.load_raw ("gfx/cutscene/forest3.img")
 im2.load_raw ("gfx/cutscene/forest2.img")
@@ -28,6 +46,12 @@ im3.load_raw ("gfx/cutscene/forest1.img")
 im3.set_mask (1)
 bg.load_raw ("gfx/cutscene/intro_bg.img")
 bg.set_alpha (0)
+inn_close.load_raw ("gfx/cutscene/intro_inn.img")
+inn_close.set_mask (1)
+talan.load_raw ("gfx/cutscene/intro_talan.img")
+talan.set_mask (1)
+player.load_raw ("gfx/cutscene/player.img")
+player.set_mask (1)
 
 imblack = image ()
 imblack.resize (screen_length (), screen_height ())
@@ -37,7 +61,6 @@ imblack.fillrect (0, 0, imblack.length (), imblack.height (), 
0)
 x1 = 0
 x2 = 0
 x3 = 0
-bgy = 0
 
 # ...and their delay time.
 o1 = 0
@@ -75,10 +98,11 @@ business in her name,\ntrusting me to follow in good 
speed.",
 was now only a day\nahead.  The thought nearly caused me\nto forget \
 the harshness of the road.",
            "Still, Waste's Edge was a welcome sight.",
-           "As you approach the trading post, there\nseems to be little sign 
of life. Eventually\nyou find the \
-Redwyne Inn, which seems\nto be the main building here.",
+           "As you approach the trading post, there\nseems to be little sign 
of life.                 \
+           \nEventually you find the Redwyne Inn,\nwhich seems to be the main 
building\nhere.",
            "The heavy wooden doors are closed,\nand no one is there \
-to let you in. As you\napproach the gate, you suddenly hear a voice from 
within.")
+to let you in. As you\napproach the gate, you suddenly hear a voice from 
within.",
+           "                      \nSuddently, it looked like the day 
would\nbe harder than you thought...")
 
 cont.set_visible_background (0);
 cont.set_visible_border (0);
@@ -86,8 +110,7 @@ cont.set_visible_all (1);
 cont.set_activate (1)
 
 # Images for the speech
-bubbg = (image (), image(), image())
-bubbg[0].load_raw ("gfx/cutscene/intro_inn.img")
+bubbg = (0, image(), image())
 bubbg[1].load_raw ("gfx/cutscene/intro_guard.img")
 bubbg[2].load_raw ("gfx/cutscene/intro_player.img")
 
@@ -102,12 +125,12 @@ post of Waste's Edge?", "yellow", 130, 5, 500, 2),
            ("If you turn now and make haste, you should be able to make safe 
camping \
 before dark.", "red", 25, 5, 400, 1),
            ("Turn back?  Whatever for?  And why is the gate of a free Inn 
locked \
-against a footsore traveller?", "yellow", 130, 5, 500, 0),
+against a footsore traveller?", "yellow", 140, 20, 500, 0),
            ("I am sorry, traveller, but the Inn is barred and you must be 
off.", "red", 25, 5, 300, 0),
            ("There has been trouble inside and I have instructions to turn 
away all who \
 need not be here.", "red", 25, 5, 400, 0),
            ("Trouble?  Why then, I must get inside.  My employer will need me 
close at \
-hand!", "yellow", 130, 15, 500, 0))
+hand!", "yellow", 140, 30, 500, 0))
 
 # The audio
 audio_load_background (0, "audio/at-demo-2.ogg");
@@ -119,6 +142,15 @@ wincpt = 0
 windelay = 0
 bgcpt = 0
 
+bgy = 0
+bgvelocity = 0.18
+
+inny = 510
+innvelocity = 0.4
+
+ply = 843
+plvelocity = 0.5
+
 status = -1
 
 letsexit = 0
@@ -155,7 +187,7 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
             else: o3 = o3 + 1
 
             # Update the label text
-            if wintextocc < len (wintext):
+            if wintextocc < len (wintext) - 1:
                 if wincpt < len (wintext[wintextocc]):
                     windelay = windelay + 1
                     if windelay >= 10:
@@ -189,24 +221,23 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
                 else: status = 0
 
             # Fade to the Inn view.
-            if status == 1 or status == 2:
+            if status == 1:
                 if (bg.alpha ()) < 255:
                     bg.set_alpha (bg.alpha () + 1)
-                    if bg.alpha () == 150:
+                    if bg.alpha () == 255:
                         # Start scrolling
                         status = 2
                         audio_play_background (1)
 
             if status == 2:
-                if bgy < bg.height () - screen_height ():
-                    bgcpt = bgcpt + 1
-                    if bgcpt == 2:
-                        bgy = bgy + 1
-                        bgcpt = 0
+                if inny > - (inn_close.height () - screen_height ()):
+                    bgy = bgy + bgvelocity
+                    inny = inny - innvelocity
+                    ply = ply - plvelocity
                 else: status = 3
 
         # 2nd part: speech between Talan and the player.
-        if status >=4:
+        if status == 4:
             if windelay >= 0 and wintextocc < len (bubtext):
                 windelay = -bubtext[wintextocc][4]
                 bub = text_bubble (bubtext[wintextocc][0], 
bubtext[wintextocc][1], "original")
@@ -217,27 +248,53 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
                 windelay = windelay + 1
                 if windelay >= 0:
                     wintextocc = wintextocc + 1
-                    if wintextocc == len (bubtext): letsexit = 1
+                    if wintextocc == len (bubtext):
+                        status = 5
+                        wintextocc = len (wintext) - 1
+                        wincpt = 0
+                        windelay = 0
+                        lab.set_text ("")
+
+        if status == 5:
+            if wincpt < len (wintext[wintextocc]):
+                windelay = windelay + 2
+                if windelay >= 10:
+                    lab.add_text (wintext[wintextocc][wincpt])
+                    wincpt = wincpt + 1
+                    windelay = 0
+            else:
+                windelay = windelay + 1
+                # Shall we fade to the Inn view?
+                if windelay == 500: letsexit = 1
+            
     
     # Draw the entire scene
-    if status < 3:
+    if status < 2:
         draw_im (im1, x1)
         draw_im (im2, x2)
         draw_im (im3, x3)
 
     if status > 0 and status < 4:
         bg.draw (0, -bgy, da)
+        inn_close.draw (0, inny, da)
+        player.draw (167, ply, da)
 
     if status == -1:
         imblack.draw (0, 0)
 
-    if status < 4:
-        cont.draw ()
-
     if status >= 4:
-        bubbg[currentbg].draw (0, 0)
-        bub.draw ()
+        if currentbg == 0:
+            bg.draw (0, -bgy, da)
+            inn_close.draw (0, inny, da)
+            player.draw (167, ply, da)
+            talan.draw (51, 39)
+        else: bubbg[currentbg].draw (0, 0)
+            
+        if status == 4: bub.draw ()
     
+    if status != 4:
+        cont.draw ()
+
     screen_show ()
     gametime_update ()