mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 03:38:01 +00:00
Merge pull request #5414 from kevlahnota/newmaster2
update crack overlay simple progression
This commit is contained in:
@@ -326,8 +326,28 @@ public class CardView extends GameEntityView {
|
|||||||
void updateDamage(Card c) {
|
void updateDamage(Card c) {
|
||||||
set(TrackableProperty.Damage, c.getDamage());
|
set(TrackableProperty.Damage, c.getDamage());
|
||||||
updateLethalDamage(c);
|
updateLethalDamage(c);
|
||||||
//update CrackOverlay (currently 16 overlays)
|
//get crackoverlay by level of damage light 0, medium 1, heavy 2, max 3
|
||||||
set(TrackableProperty.CrackOverlay, c.getDamage() > 0 ? MyRandom.getRandom().nextInt(16) : 0);
|
int randCrackLevel = 0;
|
||||||
|
if (c.getDamage() > 0) {
|
||||||
|
switch (c.getDamage()) {
|
||||||
|
case 1:
|
||||||
|
case 2:
|
||||||
|
randCrackLevel = 0;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
case 4:
|
||||||
|
randCrackLevel = 1;
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
case 6:
|
||||||
|
randCrackLevel = 2;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
randCrackLevel = 3;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set(TrackableProperty.CrackOverlay, randCrackLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getAssignedDamage() {
|
public int getAssignedDamage() {
|
||||||
|
|||||||
@@ -446,10 +446,7 @@ public class FSkin {
|
|||||||
int crackCount = 0;
|
int crackCount = 0;
|
||||||
for (int j = 0; j < 4; j++) {
|
for (int j = 0; j < 4; j++) {
|
||||||
int x = j * 200;
|
int x = j * 200;
|
||||||
for(int i = 0; i < 4; i++) {
|
Forge.getAssets().cracks().put(crackCount++, new TextureRegion(Forge.getAssets().getTexture(f17), x, 0, 200, 279));
|
||||||
int y = i * 279;
|
|
||||||
Forge.getAssets().cracks().put(crackCount++, new TextureRegion(Forge.getAssets().getTexture(f17), x, y, 200, 279));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//borders
|
//borders
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 489 KiB After Width: | Height: | Size: 115 KiB |
Reference in New Issue
Block a user