[adonthell-wastesedge-commits] Release_0-3-1 0df9cb7 084/237: Continued map forest

[Kai Sterker]

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

    Continued map forest
---
 gfx/mapobjects/terrains/Makefile.am            |    2 +-
 gfx/mapobjects/terrains/forest_mid.mobj        |  Bin 0 -> 37484 bytes
 gfx/mapobjects/terrains/forest_mid_leaves.mobj |  Bin 0 -> 15667 bytes
 maps/test.map                                  |  Bin 2709 -> 2757 bytes
 scripts/init.py                                |  256 ++++++++++++------------
 5 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/gfx/mapobjects/terrains/Makefile.am 
b/gfx/mapobjects/terrains/Makefile.am
index 2d50ae8..60beb44 100755
--- a/gfx/mapobjects/terrains/Makefile.am
+++ b/gfx/mapobjects/terrains/Makefile.am
@@ -6,6 +6,6 @@ pkgdata_DATA = grass1.mobj grass2.mobj ground-stone-1.mobj 
ground-stone2.mobj \
        road_sandy_to_grass_left.mobj road_sandy_to_grass_right.mobj \
        road_to_stone_bot-left.mobj road_to_stone_left.mobj 
grass_medium-height_front.mobj \
        grass_medium-height.mobj forest_bot.mobj forest_bot_leaves.mobj 
forest_left.mobj \
-       forest_left_leaves.mobj
+       forest_left_leaves.mobj forest_mid.mobj forest_mid_leaves.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/terrains/forest_mid.mobj 
b/gfx/mapobjects/terrains/forest_mid.mobj
new file mode 100644
index 0000000..0eda9de
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_mid.mobj differ
diff --git a/gfx/mapobjects/terrains/forest_mid_leaves.mobj 
b/gfx/mapobjects/terrains/forest_mid_leaves.mobj
new file mode 100644
index 0000000..f2a83f6
Binary files /dev/null and b/gfx/mapobjects/terrains/forest_mid_leaves.mobj 
differ
diff --git a/maps/test.map b/maps/test.map
index 232a687..0f86c4d 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/init.py b/scripts/init.py
index 3bd67c2..f974bab 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -11,150 +11,150 @@ win_manager_add_font ("white")
 win_manager_add_font ("original")
 win_manager_add_font ("silverleaf")
 
-from main_menu import *
-import time
-
-bag_o = image ()
-bag_c = image ()
-bag_t = image ()
-bag_o.load_pnm ("gfx/cutscene/jewelbag_open.pnm")
-bag_c.load_pnm ("gfx/cutscene/jewelbag_closed.pnm")
-bag_t.load_pnm ("gfx/cutscene/adonthell_03.pnm")
-
-bag_o.set_alpha (0)
-bag_c.set_alpha (0)
-bag_t.set_alpha (255)
-
-
-# Fade in/out multiple pictures
-# Returns current alpha of last picture
-# Usage fade (pic1, ..., picN, step1, ..., stepN)
-def fade (*args):
-    pics = args[:len (args)/2]
-    vals = args[len (args)/2:]
-    alpha = 0
-    for i in range (len (pics)):
-        alpha = pics[i].alpha () + vals[i]
-        if alpha < 0: alpha = 0
-        if alpha > 255: alpha = 255
-        pics[i].set_alpha (alpha)
-        pics[i].draw (0,0)
-    return alpha
+##from main_menu import *
+##import time
+
+##bag_o = image ()
+##bag_c = image ()
+##bag_t = image ()
+##bag_o.load_pnm ("gfx/cutscene/jewelbag_open.pnm")
+##bag_c.load_pnm ("gfx/cutscene/jewelbag_closed.pnm")
+##bag_t.load_pnm ("gfx/cutscene/adonthell_03.pnm")
+
+##bag_o.set_alpha (0)
+##bag_c.set_alpha (0)
+##bag_t.set_alpha (255)
+
+
+### Fade in/out multiple pictures
+### Returns current alpha of last picture
+### Usage fade (pic1, ..., picN, step1, ..., stepN)
+##def fade (*args):
+##    pics = args[:len (args)/2]
+##    vals = args[len (args)/2:]
+##    alpha = 0
+##    for i in range (len (pics)):
+##        alpha = pics[i].alpha () + vals[i]
+##        if alpha < 0: alpha = 0
+##        if alpha > 255: alpha = 255
+##        pics[i].set_alpha (alpha)
+##        pics[i].draw (0,0)
+##    return alpha
  
-alpha = 0
-
-audio_load_background (0, "audio/at-menu-full.ogg")
-audio_load_background (1, "audio/at-dummy-1.ogg")
-audio_load_wave (0, "audio/select.wav")
-audio_load_wave (1, "audio/switch.wav")
-audio_load_wave (2, "audio/unselect.wav")
-
-audio_play_background (0)
-gametime_start_action ()
-
-k=0
-
-# Fade in closed bag
-while alpha < 255:
-    for k in range (gametime_frames_to_do()): pass
-    screen_clear ()
-    alpha = fade (bag_c, k+1)
-    bag_c.draw(0,0)
-    screen_show ()
-    gametime_update()
+##alpha = 0
+
+##audio_load_background (0, "audio/at-menu-full.ogg")
+##audio_load_background (1, "audio/at-dummy-1.ogg")
+##audio_load_wave (0, "audio/select.wav")
+##audio_load_wave (1, "audio/switch.wav")
+##audio_load_wave (2, "audio/unselect.wav")
+
+##audio_play_background (0)
+##gametime_start_action ()
+
+##k=0
+
+### Fade in closed bag
+##while alpha < 255:
+##    for k in range (gametime_frames_to_do()): pass
+##    screen_clear ()
+##    alpha = fade (bag_c, k+1)
+##    bag_c.draw(0,0)
+##    screen_show ()
+##    gametime_update()
     
-bag_t.draw (33, 86)
-screen_show ()
-gametime_update ()
-
-# wait ~2.5 seconds
-for i in range (25):
-    time.sleep (0.1)
-    screen_show ()
-    gametime_update()
-
-alpha = 0
-
-# fade in open bag
-while alpha < 255:
-    for k in range (gametime_frames_to_do()): pass
-    screen_clear ()
-    bag_c.draw (0, 0)
-    bag_t.draw (33, 86)
-    alpha = fade (bag_o, k+1)
-    screen_show ()
-    gametime_update ()
+##bag_t.draw (33, 86)
+##screen_show ()
+##gametime_update ()
+
+### wait ~2.5 seconds
+##for i in range (25):
+##    time.sleep (0.1)
+##    screen_show ()
+##    gametime_update()
+
+##alpha = 0
+
+### fade in open bag
+##while alpha < 255:
+##    for k in range (gametime_frames_to_do()): pass
+##    screen_clear ()
+##    bag_c.draw (0, 0)
+##    bag_t.draw (33, 86)
+##    alpha = fade (bag_o, k+1)
+##    screen_show ()
+##    gametime_update ()
     
-del bag_c
-del bag_t
-
-class title_screen:
-    def __init__ (self, background):
-        self.quit = 0
-        self.bgimage = win_image ()
-        self.bgimage.move (0, 0)
-        image.copy (self.bgimage, background)
-        self.bgimage.pack ()
+##del bag_c
+##del bag_t
+
+##class title_screen:
+##    def __init__ (self, background):
+##        self.quit = 0
+##        self.bgimage = win_image ()
+##        self.bgimage.move (0, 0)
+##        image.copy (self.bgimage, background)
+##        self.bgimage.pack ()
         
-        self.window = win_container ()
-        self.window.move (0, 0)
-        self.window.resize (320, 240)
-        self.window.set_visible_border (0)
-        self.window.add (self.bgimage)
-        self.window.set_visible_all (1)
-
-        win_manager_add (self.window)
-
-        self.menu = main_menu (0, 0)
-        self.menu.thisown = C
-        self.menu.py_signal_connect (self.on_menu_close, win_event_CLOSE)
+##        self.window = win_container ()
+##        self.window.move (0, 0)
+##        self.window.resize (320, 240)
+##        self.window.set_visible_border (0)
+##        self.window.add (self.bgimage)
+##        self.window.set_visible_all (1)
+
+##        win_manager_add (self.window)
+
+##        self.menu = main_menu (0, 0)
+##        self.menu.thisown = C
+##        self.menu.py_signal_connect (self.on_menu_close, win_event_CLOSE)
         
-        win_manager_add (self.menu)
-        win_manager_set_focus (self.menu)
-        self.menu = None
+##        win_manager_add (self.menu)
+##        win_manager_set_focus (self.menu)
+##        self.menu = None
 
-    # on to the main menu
-    def on_menu_close (self, retval):
-        self.quit = retval
+##    # on to the main menu
+##    def on_menu_close (self, retval):
+##        self.quit = retval
 
 
-    def loop (self):
-        self.cont = 0
-        while self.cont == 0:
-            input_update ()
+##    def loop (self):
+##        self.cont = 0
+##        while self.cont == 0:
+##            input_update ()
 
-            for k in range (gametime_frames_to_do()+1):
-                win_manager_input_update ()
-                win_manager_update ()
+##            for k in range (gametime_frames_to_do()+1):
+##                win_manager_input_update ()
+##                win_manager_update ()
 
-            win_manager_draw ()
-            screen_show ()
-            gametime_update()
+##            win_manager_draw ()
+##            screen_show ()
+##            gametime_update()
 
-            self.cont = self.quit
+##            self.cont = self.quit
 
-        self.window.remove (self.bgimage)
-        win_manager_remove (self.window)
-        alpha = 255
-       bag_o.set_alpha(255)
-        gametime_start_action()
-        while alpha > 0:
-          for k in range (gametime_frames_to_do()): pass
-          screen_clear ()
-          alpha = fade (bag_o, (-(k+1)*2))
-          screen_show ()
-          gametime_update()
+##        self.window.remove (self.bgimage)
+##        win_manager_remove (self.window)
+##        alpha = 255
+##     bag_o.set_alpha(255)
+##        gametime_start_action()
+##        while alpha > 0:
+##          for k in range (gametime_frames_to_do()): pass
+##          screen_clear ()
+##          alpha = fade (bag_o, (-(k+1)*2))
+##          screen_show ()
+##          gametime_update()
 
 
-# -- Main --
-title = title_screen (bag_o)
-title.loop ()
-retval = title.quit
-del bag_o
+### -- Main --
+##title = title_screen (bag_o)
+##title.loop ()
+##retval = title.quit
+##del bag_o
 
-audio_pause_music ()
+##audio_pause_music ()
 
-##retval = 1
+retval = 1
 
 if retval < 5: 
     if retval == 1: