Moved PropertyConditional match checking & status effect cancelling from the StatusEffect class to PropertyConditional.

2018-01-09 16:42:11 +02:00
parent 0671dba1b4
commit 3956785032
3 changed files with 92 additions and 74 deletions
@@ -380,8 +380,9 @@
    <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
      <StatusEffect type="OnUse" target="Character">
        <RequiredItem name="Medical Syringe" type="Container"/>
-        <Conditional hasstatustag="morbusine"/>
-        <Cancel/>
+        <Conditional hasstatustag="morbusine">
+          <CancelStatusEffect/>
+        </Conditional>
      </StatusEffect>
    </Throwable>
  </Item>