[adonthell-wastesedge-commits] Release_0-3-1 7ae2828 002/237: grabbed latest tar

[Kai Sterker]

tag: Release_0-3-1
commit 7ae282861b1c4d85882f26f4d05aa8e62c009298
Author: Josh Glover <address@hidden>
Commit: Josh Glover <address@hidden>

    grabbed latest tar
---
 gfx/mapobjects/houses/redwyne-inn/barn.mobj      |  Bin 18946 -> 18947 bytes
 gfx/mapobjects/houses/redwyne-inn/mainright.mobj |  Bin 6648 -> 6648 bytes
 gfx/mapobjects/terrains/hay.mobj                 |  Bin 4707 -> 4704 bytes
 scripts/init.py                                  |   18 +++-
 scripts/modules/adonthell.py                     |  114 ++++++++++++++++++++++
 scripts/schedules/random_move.py                 |    4 +-
 6 files changed, 133 insertions(+), 3 deletions(-)

diff --git a/gfx/mapobjects/houses/redwyne-inn/barn.mobj 
b/gfx/mapobjects/houses/redwyne-inn/barn.mobj
index c86c5a1..86d8617 100755
Binary files a/gfx/mapobjects/houses/redwyne-inn/barn.mobj and 
b/gfx/mapobjects/houses/redwyne-inn/barn.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/mainright.mobj 
b/gfx/mapobjects/houses/redwyne-inn/mainright.mobj
index 63ccaf7..2bbc7fa 100755
Binary files a/gfx/mapobjects/houses/redwyne-inn/mainright.mobj and 
b/gfx/mapobjects/houses/redwyne-inn/mainright.mobj differ
diff --git a/gfx/mapobjects/terrains/hay.mobj b/gfx/mapobjects/terrains/hay.mobj
index f5c6115..973c130 100755
Binary files a/gfx/mapobjects/terrains/hay.mobj and 
b/gfx/mapobjects/terrains/hay.mobj differ
diff --git a/scripts/init.py b/scripts/init.py
index 585a346..be17acf 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -1,3 +1,11 @@
+##import time
+
+##while 1:
+##    gamedata_load (0)
+##    time.sleep (1)
+##    print "ok"
+##    map_engine.run ()
+
 from main_menu import *
 import time
 
@@ -30,6 +38,13 @@ def fade (*args):
  
 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
@@ -118,7 +133,7 @@ class title_screen:
           gametime_update()
 
 
-### -- Main --
+# -- Main --
 title = title_screen (bag_o)
 title.loop ()
 retval = title.quit
@@ -126,4 +141,5 @@ del bag_o
 
 if retval < 5: 
     if retval == 1: gamedata_load(0)
+    audio_play_background (1)
     map_engine.run()
diff --git a/scripts/modules/adonthell.py b/scripts/modules/adonthell.py
index 7c9dc44..6d7948f 100755
--- a/scripts/modules/adonthell.py
+++ b/scripts/modules/adonthell.py
@@ -1,5 +1,101 @@
 # This file was created automatically by SWIG.
 import adonthellc
+class gz_file:
+    def __init__(self,*args):
+        self.this = apply(adonthellc.new_gz_file,args)
+        self.thisown = 1
+
+    def __del__(self,adonthellc=adonthellc):
+        if getattr(self,'thisown',0):
+            adonthellc.delete_gz_file(self)
+    def open(*args):
+        val = apply(adonthellc.gz_file_open,args)
+        return val
+    def close(*args):
+        val = apply(adonthellc.gz_file_close,args)
+        return val
+    def is_open(*args):
+        val = apply(adonthellc.gz_file_is_open,args)
+        return val
+    def eof(*args):
+        val = apply(adonthellc.gz_file_eof,args)
+        return val
+    def __repr__(self):
+        return "<C gz_file instance at %s>" % (self.this,)
+class gz_filePtr(gz_file):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+        self.__class__ = gz_file
+
+
+
+class igzstream(gz_file):
+    def __init__(self,*args):
+        self.this = apply(adonthellc.new_igzstream,args)
+        self.thisown = 1
+
+    def __del__(self,adonthellc=adonthellc):
+        if getattr(self,'thisown',0):
+            adonthellc.delete_igzstream(self)
+    def open(*args):
+        val = apply(adonthellc.igzstream_open,args)
+        return val
+    def get_block(*args):
+        val = apply(adonthellc.igzstream_get_block,args)
+        return val
+    def __repr__(self):
+        return "<C igzstream instance at %s>" % (self.this,)
+class igzstreamPtr(igzstream):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+        self.__class__ = igzstream
+
+
+
+class ogzstream(gz_file):
+    def __init__(self,*args):
+        self.this = apply(adonthellc.new_ogzstream,args)
+        self.thisown = 1
+
+    def __del__(self,adonthellc=adonthellc):
+        if getattr(self,'thisown',0):
+            adonthellc.delete_ogzstream(self)
+    def open(*args):
+        val = apply(adonthellc.ogzstream_open,args)
+        return val
+    def put_block(*args):
+        val = apply(adonthellc.ogzstream_put_block,args)
+        return val
+    def __repr__(self):
+        return "<C ogzstream instance at %s>" % (self.this,)
+class ogzstreamPtr(ogzstream):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+        self.__class__ = ogzstream
+
+
+
+class fileops:
+    def __init__(self,*args):
+        self.this = apply(adonthellc.new_fileops,args)
+        self.thisown = 1
+
+    def __del__(self,adonthellc=adonthellc):
+        if getattr(self,'thisown',0):
+            adonthellc.delete_fileops(self)
+    def __repr__(self):
+        return "<C fileops instance at %s>" % (self.this,)
+class fileopsPtr(fileops):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+        self.__class__ = fileops
+
+
+
 class storage:
     def __init__(self,*args):
         self.this = apply(adonthellc.new_storage,args)
@@ -645,6 +741,12 @@ class animation(drawable):
     def load(*args):
         val = apply(adonthellc.animation_load,args)
         return val
+    def put(*args):
+        val = apply(adonthellc.animation_put,args)
+        return val
+    def save(*args):
+        val = apply(adonthellc.animation_save,args)
+        return val
     def nbr_of_frames(*args):
         val = apply(adonthellc.animation_nbr_of_frames,args)
         return val
@@ -836,6 +938,12 @@ class mapobject(mapsquare_walkable_area):
     def load(*args):
         val = apply(adonthellc.mapobject_load,args)
         return val
+    def put(*args):
+        val = apply(adonthellc.mapobject_put,args)
+        return val
+    def save(*args):
+        val = apply(adonthellc.mapobject_save,args)
+        return val
     def nbr_of_animations(*args):
         val = apply(adonthellc.mapobject_nbr_of_animations,args)
         return val
@@ -2037,6 +2145,10 @@ class gamePtr(game):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
+fileops_put_version = adonthellc.fileops_put_version
+
+fileops_get_version = adonthellc.fileops_get_version
+
 event_list_register_event = adonthellc.event_list_register_event
 
 event_handler_register_event = adonthellc.event_handler_register_event
@@ -2185,6 +2297,8 @@ game_cleanup = adonthellc.game_cleanup
 
 Python = adonthellc.Python
 C = adonthellc.C
+READ = adonthellc.READ
+WRITE = adonthellc.WRITE
 EVENTS_DIR = adonthellc.EVENTS_DIR
 ENTER_EVENT = adonthellc.ENTER_EVENT
 LEAVE_EVENT = adonthellc.LEAVE_EVENT
diff --git a/scripts/schedules/random_move.py b/scripts/schedules/random_move.py
index e180e9e..ddbd787 100755
--- a/scripts/schedules/random_move.py
+++ b/scripts/schedules/random_move.py
@@ -1,5 +1,5 @@
-move=randint(0,30)
-if move>=30:
+move=randint(10,30)
+if move>=10:
   dir=randint(0,3)
 
   if dir==0: myself.go_north();