From c1045464ac85c7141ae336fec9bd3d2ed75bf3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sat, 19 Sep 2015 22:50:48 +0200 Subject: [PATCH] updated sketch --- .../samdev/cannonshooter/entities/Cannon.java | 4 ++-- data/cannon_sketch.pdn | Bin 46012 -> 46012 bytes data/cannon_sketch.png | Bin 0 -> 11915 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 data/cannon_sketch.png diff --git a/core/src/de/samdev/cannonshooter/entities/Cannon.java b/core/src/de/samdev/cannonshooter/entities/Cannon.java index ff2866a..ed2dd5e 100644 --- a/core/src/de/samdev/cannonshooter/entities/Cannon.java +++ b/core/src/de/samdev/cannonshooter/entities/Cannon.java @@ -102,9 +102,9 @@ public class Cannon extends Entity { public void onBulletHit(Team hit_team) { if (hit_team.isNeutral) return; - if (hit_team == team) { + if (hit_team == team && health < 1) { health = Math.min(1, health + HEALTH_REGEN_PER_HIT); - } else { + } else if (hit_team != team) { health = Math.max(0, health - HEALTH_REGEN_PER_HIT); } } diff --git a/data/cannon_sketch.pdn b/data/cannon_sketch.pdn index f98fcb575c6e0a5271989f30590b5d20e45236f2..9288ca211dff75c1c83b992f2fc1778d28d20519 100644 GIT binary patch delta 251 zcmdn9Zy*uiuFbglqL((~ zWcEt&$(eq6n`gv?F-`s(+_1U55-7DIbU)MP2T_|CH!}uYWZIk_QNgr%QcMhzig#H+ zWg#hcESnD}P5??~7&0QXgC#|qfhxWib~0~1oNLSi*1j1m@h%Q%FUYEIb&@QbH&(d- zC4t&Ei#8)W0jxBqa}np}ce7)eHmfe*1afS{=8_q|m^NQu@sw+`$2?Hsj_1_b{f->b^kMGS4uk z$*RX6d?8xkZKH{S``&9qr6s)A|rw9w6rnP!+d^op@8Da!T_vUwT zs~I<+sdHx8ys=6Os67U#J-ZbsA=(TiP;JTST*SHg$m%rK&2y*!0y(>3GvDM`rp@(B XUD-BkZJflkIb-Tp#?8}bJ>>!bX;NrM diff --git a/data/cannon_sketch.png b/data/cannon_sketch.png new file mode 100644 index 0000000000000000000000000000000000000000..eaa2672497c61fe371128922cc80a2872080ea8a GIT binary patch literal 11915 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