Changeset 515:6c21ba7de1e6


Ignore:
Timestamp:
04/09/11 21:28:12 (12 years ago)
Author:
Jeremy Thurgood <firxen@…>
Branch:
default
Phase:
public
Message:

Better signal fire interaction.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • skaapsteker/sprites/items.py

    r490 r515  
    125125
    126126
    127 # TODO: Finish this thing's behaviour
    128127class SignalFire(Item):
    129128    image_file = 'props/signal_fire/signal_fire_unlit.png'
     
    147146            if player.has_item('kindling'):
    148147                notify("You put the kindling in the signal fire.")
     148                self._me.litness = 'kindled'
    149149            elif player.has_item('oil'):
    150150                notify("You pour the oil on the signal fire.")
     151                self._me.litness = 'oiled'
    151152            else:
     153                notify("This signal fire needs some oil and kindling before it can be lit.")
    152154                return
    153155            player.discard_item()
    154             self._me.litness = 'kindled'
    155         elif self._me.litness == 'kindled':
     156
     157        elif self._me.litness in ['oiled', 'kindled']:
    156158            if player.has_item('kindling'):
    157159                notify("You put the kindling on the signal fire and light it.")
     
    159161                notify("You pour the oil on the signal fire and light it.")
    160162            else:
     163                if self._me.litness == 'oiled':
     164                    notify("This fire still needs some kindling before it can be lit.")
     165                else:
     166                    notify("This fire still needs some oil before it can be lit.")
    161167                return
    162168            player.discard_item()
Note: See TracChangeset for help on using the changeset viewer.