diff --git a/.idea/inspectionProfiles/Default.xml b/.idea/inspectionProfiles/Default.xml index 2831a6dc..5639f88f 100644 --- a/.idea/inspectionProfiles/Default.xml +++ b/.idea/inspectionProfiles/Default.xml @@ -48,6 +48,7 @@ + diff --git a/assets/src/ba_data/python/ba/_coopsession.py b/assets/src/ba_data/python/ba/_coopsession.py index 3ef4c817..f30f2316 100644 --- a/assets/src/ba_data/python/ba/_coopsession.py +++ b/assets/src/ba_data/python/ba/_coopsession.py @@ -72,7 +72,7 @@ class CoopSession(Session): except Exception: max_players = 4 - print('FIXME: COOP SESSION WOULD CALC DEPS.') + # print('FIXME: COOP SESSION WOULD CALC DEPS.') depsets: Sequence[ba.DependencySet] = [] super().__init__(depsets, diff --git a/assets/src/ba_data/python/bastd/actor/background.py b/assets/src/ba_data/python/bastd/actor/background.py index 20558d1f..02811c7c 100644 --- a/assets/src/ba_data/python/bastd/actor/background.py +++ b/assets/src/ba_data/python/bastd/actor/background.py @@ -150,7 +150,7 @@ class Background(ba.Actor): ba.timer(self.fade_time + 0.1, self.node.delete) def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): self._die(msg.immediate) diff --git a/assets/src/ba_data/python/bastd/actor/controlsguide.py b/assets/src/ba_data/python/bastd/actor/controlsguide.py index e6916227..8809cc69 100644 --- a/assets/src/ba_data/python/bastd/actor/controlsguide.py +++ b/assets/src/ba_data/python/bastd/actor/controlsguide.py @@ -469,7 +469,7 @@ class ControlsGuide(ba.Actor): return not self._dead def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if msg.immediate: diff --git a/assets/src/ba_data/python/bastd/actor/image.py b/assets/src/ba_data/python/bastd/actor/image.py index 07bffd73..6b4d1a32 100644 --- a/assets/src/ba_data/python/bastd/actor/image.py +++ b/assets/src/ba_data/python/bastd/actor/image.py @@ -51,8 +51,9 @@ class Image(ba.Actor): # pylint: disable=too-many-branches # pylint: disable=too-many-locals super().__init__() - # if they provided a dict as texture, assume its an icon.. - # otherwise its just a texture value itself + + # If they provided a dict as texture, assume its an icon. + # otherwise its just a texture value itself. mask_texture: Optional[ba.Texture] if isinstance(texture, dict): tint_color = texture['tint_color'] @@ -156,13 +157,13 @@ class Image(ba.Actor): cmb.input1 = position[1] cmb.connectattr('output', self.node, 'position') - # if we're transitioning out, die at the end of it + # If we're transitioning out, die at the end of it. if transition_out_delay is not None: ba.timer(transition_delay + transition_out_delay + 1.0, ba.WeakCall(self.handlemessage, ba.DieMessage())) def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if self.node: diff --git a/assets/src/ba_data/python/bastd/actor/popuptext.py b/assets/src/ba_data/python/bastd/actor/popuptext.py index 370f84b2..134811fe 100644 --- a/assets/src/ba_data/python/bastd/actor/popuptext.py +++ b/assets/src/ba_data/python/bastd/actor/popuptext.py @@ -122,7 +122,7 @@ class PopupText(ba.Actor): lifespan, ba.WeakCall(self.handlemessage, ba.DieMessage())) def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if self.node: diff --git a/assets/src/ba_data/python/bastd/actor/spaz.py b/assets/src/ba_data/python/bastd/actor/spaz.py index 28d06e1e..1e38890b 100644 --- a/assets/src/ba_data/python/bastd/actor/spaz.py +++ b/assets/src/ba_data/python/bastd/actor/spaz.py @@ -128,8 +128,10 @@ class Spaz(ba.Actor): else: self._punch_power_scale = factory.punch_power_scale self.fly = ba.sharedobj('globals').happy_thoughts_mode - assert isinstance(activity, ba.GameActivity) - self._hockey = activity.map.is_hockey + if isinstance(activity, ba.GameActivity): + self._hockey = activity.map.is_hockey + else: + self._hockey = False self._punched_nodes: Set[ba.Node] = set() self._cursed = False self._connected_to_player: Optional[ba.Player] = None @@ -693,7 +695,7 @@ class Spaz(ba.Actor): # pylint: disable=too-many-return-statements # pylint: disable=too-many-statements # pylint: disable=too-many-branches - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.PickedUpMessage): @@ -1122,6 +1124,7 @@ class Spaz(ba.Actor): elif isinstance(msg, ba.OutOfBoundsMessage): # By default we just die here. self.handlemessage(ba.DieMessage(how=ba.DeathType.FALL)) + elif isinstance(msg, ba.StandMessage): self._last_stand_pos = (msg.position[0], msg.position[1], msg.position[2]) @@ -1129,8 +1132,10 @@ class Spaz(ba.Actor): self.node.handlemessage("stand", msg.position[0], msg.position[1], msg.position[2], msg.angle) + elif isinstance(msg, CurseExplodeMessage): self.curse_explode() + elif isinstance(msg, PunchHitMessage): if not self.node: return None diff --git a/assets/src/ba_data/python/bastd/actor/text.py b/assets/src/ba_data/python/bastd/actor/text.py index 8e64e4d6..3004cbd7 100644 --- a/assets/src/ba_data/python/bastd/actor/text.py +++ b/assets/src/ba_data/python/bastd/actor/text.py @@ -191,7 +191,7 @@ class Text(ba.Actor): ba.WeakCall(self.handlemessage, ba.DieMessage())) def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if self.node: diff --git a/assets/src/ba_data/python/bastd/actor/tipstext.py b/assets/src/ba_data/python/bastd/actor/tipstext.py index 4a3883ca..5b98f39e 100644 --- a/assets/src/ba_data/python/bastd/actor/tipstext.py +++ b/assets/src/ba_data/python/bastd/actor/tipstext.py @@ -103,7 +103,7 @@ class TipsText(ba.Actor): self.node.text = next_tip def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if self.node: diff --git a/assets/src/ba_data/python/bastd/actor/zoomtext.py b/assets/src/ba_data/python/bastd/actor/zoomtext.py index f2184b75..f2fedf3a 100644 --- a/assets/src/ba_data/python/bastd/actor/zoomtext.py +++ b/assets/src/ba_data/python/bastd/actor/zoomtext.py @@ -171,7 +171,7 @@ class ZoomText(ba.Actor): ba.DieMessage())) def handlemessage(self, msg: Any) -> Any: - if __debug__ is True: + if __debug__: self._handlemessage_sanity_check() if isinstance(msg, ba.DieMessage): if not self._dying and self.node: diff --git a/assets/src/ba_data/python/efro/entity/_field.py b/assets/src/ba_data/python/efro/entity/_field.py index 1dc273c5..d0791186 100644 --- a/assets/src/ba_data/python/efro/entity/_field.py +++ b/assets/src/ba_data/python/efro/entity/_field.py @@ -96,7 +96,7 @@ class CompoundField(BaseField, Generic[TC]): value: TC, store_default: bool = True) -> None: super().__init__(d_key) - if __debug__ is True: + if __debug__: from efro.entity._value import CompoundValue assert isinstance(value, CompoundValue) assert not hasattr(value, 'd_data')