[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs! |
Date: |
Mon, 25 Jul 2016 18:14:53 +0000 (UTC) |
tag: Release_0-3-1
commit 0fbac81468a6d75fdc488c4a23df20a36cbb7909
Author: adondev <adondev>
Commit: adondev <adondev>
Fixed last (?) severe bugs!
Reenabled main_menu at startup and audio.
---
scripts/init.py | 280 +++++++++++++++++----------------
scripts/modules/main_menu.py | 23 +--
scripts/schedules/keyboard_control.py | 4 +-
3 files changed, 160 insertions(+), 147 deletions(-)
diff --git a/scripts/init.py b/scripts/init.py
index 3e2a02d..0a1c166 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -1,143 +1,151 @@
-##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.image = win_image (0, 0, background, None)
-
-## self.window = win_container (0, 0, 320, 240, None)
-## self.window.set_border_visible (0)
-## self.window.add (self.image)
-## self.window.set_visible_all (1)
-
-## win_manager_add (self.window)
-
-## self.menu = main_menu (0, 0)
-## self.menu.py_signal_connect (self.on_menu_close, WIN_SIG_CLOSE)
-
-## win_manager_set_focus (self.menu)
-
-## # on to the main menu
-## def on_menu_close (self, retval):
-## self.quit = retval
-
-
-## def loop (self):
-## while self.quit == 0:
-## input_update ()
-
-## for k in range (gametime_frames_to_do()+1):
-## win_manager_update ()
-
-## if input_has_been_pushed (SDLK_ESCAPE):
-## self.quit = 5
-## break
+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)
+
+ 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
+
+
+ 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 ()
+
+ if input_has_been_pushed (SDLK_ESCAPE):
+ self.quit = 5
+ break
-## win_manager_draw ()
-## screen_show ()
-## gametime_update()
-
-## self.window.remove (self.image)
-## 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
+ win_manager_draw ()
+ screen_show ()
+ gametime_update()
+
+ 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()
+
+
+# -- Main --
+title = title_screen (bag_o)
+title.loop ()
+retval = title.quit
+del bag_o
##audio_pause_music ()
-##if retval < 5:
-## if retval == 1: gamedata_load(0)
-## audio_play_background (1)
-## map_engine.run()
-
-gamedata_load (0)
-
-map_engine.run ()
+if retval < 5:
+ if retval == 1: gamedata_load(0)
+ audio_play_background (1)
+ map_engine.run()
diff --git a/scripts/modules/main_menu.py b/scripts/modules/main_menu.py
index f04d2ea..362d32c 100755
--- a/scripts/modules/main_menu.py
+++ b/scripts/modules/main_menu.py
@@ -10,6 +10,8 @@ class main_menu (win_container):
def __init__ (self, startup, enable_s, enable_b = 0):
win_container.__init__(self)
+ self.startup = startup
+
# Init Position
self.move (0,0)
self.resize(320,240)
@@ -129,8 +131,10 @@ class main_menu (win_container):
while done != 0:
for k in range (gametime_frames_to_do()+1):
win_manager_update ()
+ self.update ()
done = self.create_menu (moves, goals)
- win_manager_draw ()
+ win_manager_draw ()
+ self.draw ()
screen_show ()
gametime_update()
@@ -178,7 +182,7 @@ class main_menu (win_container):
def __del__(self):
del self.font
del self.theme
-
+
# -- Callback to close the window
def on_destroy (self):
return self.quit
@@ -186,8 +190,8 @@ class main_menu (win_container):
# -- pressing ESC will close the menu if it's open
def on_update (self):
- if input_has_been_pushed (SDLK_ESCAPE):
- if self.lg == None:
+ if self.lg == None:
+ if input_has_been_pushed (SDLK_ESCAPE):
self.quit = 0
@@ -208,16 +212,19 @@ class main_menu (win_container):
# Load Game
elif sel == 2:
self.lg = data_screen (LOAD_SCREEN)
- self.lg.py_signal_connect (self.on_load, win_event_CLOSE)
self.lg.thisown = 0
self.lg.set_activate (1)
+ if self.startup != 0:
+ self.quit = 0
+ else:
+ self.lg.py_signal_connect (self.on_data_close, win_event_CLOSE)
win_manager_add (self.lg)
win_manager_set_focus (self.lg)
# Save Game
elif sel == 3:
+ self.quit = 0
self.lg = data_screen (SAVE_SCREEN)
- self.lg.py_signal_connect (self.on_load, win_event_CLOSE)
self.lg.thisown = 0
self.lg.set_activate(1)
win_manager_add (self.lg)
@@ -227,13 +234,11 @@ class main_menu (win_container):
elif sel == 5:
self.quit = 0
- # -- a game has been loaded
- def on_load (self, retval):
+ def on_data_close (self, retval):
self.lg = None
if retval == 1:
self.quit = 0
-
# -- Scrolls the different menu options into view
def create_menu (self, moves, goals):
done = len (self.labels)
diff --git a/scripts/schedules/keyboard_control.py
b/scripts/schedules/keyboard_control.py
index 1304294..372998a 100755
--- a/scripts/schedules/keyboard_control.py
+++ b/scripts/schedules/keyboard_control.py
@@ -30,7 +30,7 @@ elif input_has_been_pushed (SDLK_ESCAPE):
# -- open main menu without animation, with saving and background enabled
#print "rt"
menu = main_menu (1, 1, 1)
- menu.thisown = 0
+ menu.thisown = C
# -- this tells us when the main menu is closed
menu.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
@@ -53,7 +53,7 @@ elif input_has_been_pushed (SDLK_l):
s = data_screen (LOAD_SCREEN)
s.thisown = 0
s.set_activate (1)
-# s.py_signal_connect (on_menu_close, win_event_CLOSE, (myself))
+# s.py_signal_connect (on_data_screen_close, win_event_CLOSE, (None))
win_manager_add (s)
win_manager_set_focus (s)
- [adonthell-wastesedge-commits] Release_0-3-1 509a69d 018/237: Fixed audio behavior., (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 509a69d 018/237: Fixed audio behavior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3621f37 020/237: Fixed a few things with main_menu, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dc98f7b 022/237: Oups! Forgot the cellar walls., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure now checks installation directory from adonthell binary., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dd672f0 023/237: Forgot this one! ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9f82186 026/237: main_menu return value no more overridden! (sorry) (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 944b13c 025/237: Oops! Put the bad character.data and quest.data!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f6f7dec 016/237: Added the guards house (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 908f59b 029/237: Added orloth's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2486015 027/237: Some stairs added, better map initialisation scheme., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs!,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some rooms to the map (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9112207 034/237: Fixed Lucia's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0e77bb6 032/237: ADDED dialogues of Oliver and Bjarn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 46ff573 008/237: Oooops forgot these ones..., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9997e40 031/237: Implemented schedules of Silverhair, Frostbloom and Trailfollower, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eedeab6 040/237: FIXED jerky movement during the first second after the game starts up, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 66f584b 036/237: Implemented 'Open Bjarn's Door' puzzle, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 1dac4d8 019/237: Those are the most recent versions of those dialogues - the ones on the ftp are a lot older, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8b0c1e0 042/237: Slight fix to Alek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d2a86c9 030/237: Added some more characters and dialogues, Kai Sterker, 2016/07/25