# HG changeset patch # User Neil Muller # Date 1282752240 -7200 # Node ID c18ef647ffe6527152788f11bbe8667e13118a66 # Parent aebd4fd5b561eb0ccdc870c7e23e28bf43c2d581 Add detail view for cryo screen. Tweak animation diff -r aebd4fd5b561 -r c18ef647ffe6 Resources/images/cryo/comp_info2.png Binary file Resources/images/cryo/comp_info2.png has changed diff -r aebd4fd5b561 -r c18ef647ffe6 Resources/images/cryo/comp_info_detail.png Binary file Resources/images/cryo/comp_info_detail.png has changed diff -r aebd4fd5b561 -r c18ef647ffe6 gamelib/scenes/cryo.py --- a/gamelib/scenes/cryo.py Wed Aug 25 17:04:06 2010 +0200 +++ b/gamelib/scenes/cryo.py Wed Aug 25 18:04:00 2010 +0200 @@ -268,7 +268,7 @@ NAME = "cryo.computer" INTERACTS = { - "info": InteractAnimated(416, 290, ["comp_info.png", "comp_warn.png"], + "info": InteractAnimated(416, 290, ["comp_info.png", "comp_info2.png"], 10), "warn": InteractImage(416, 290, "comp_warn.png"), "error": InteractImage(416, 290, "comp_error.png"), @@ -276,6 +276,15 @@ INITIAL = "info" + def interact_without(self): + return Result(detail_view='cryo_comp_detail') + + def interact_with_titanium_leg(self, item): + return Result("Hitting it with the leg accomplishes nothing.") + + def get_description(self): + return "A computer terminal, with some text on it." + class TitaniumLegThing(Thing): "Triangle in the cryo room." @@ -314,6 +323,17 @@ def get_description(self): return "'Prisoner 98cc-764e646391ee. War crimes. 45 years." +class CryoCompDetail(Scene): + + FOLDER = "cryo" + BACKGROUND = "comp_info_detail.png" + NAME = "cryo_comp_detail" + + SIZE = (640, 400) + + def __init__(self, state): + super(CryoCompDetail, self).__init__(state) + class CryoUnitWithCorpse(Scene): @@ -330,4 +350,4 @@ SCENES = [Cryo] -DETAIL_VIEWS = [CryoUnitWithCorpse] +DETAIL_VIEWS = [CryoUnitWithCorpse, CryoCompDetail]