Merge remote-tracking branch 'origin/master'
|
Before Width: | Height: | Size: 819 B After Width: | Height: | Size: 755 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 608 B |
|
Before Width: | Height: | Size: 868 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 845 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 502 B After Width: | Height: | Size: 623 B |
|
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 467 B After Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 661 B |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 329 B |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 307 B |
|
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 311 B |
|
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 232 B |
|
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 218 B |
@@ -52,7 +52,7 @@ public class StatusEffect extends MappableContent{
|
||||
if(damage > 0){
|
||||
unit.damageContinuousPierce(damage);
|
||||
}else if(damage < 0){ //heal unit
|
||||
unit.heal(damage * Time.delta);
|
||||
unit.heal(-1f * damage * Time.delta);
|
||||
}
|
||||
|
||||
if(effect != Fx.none && Mathf.chanceDelta(effectChance)){
|
||||
|
||||