external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Simisays
2023-02-14 09:26:31 +01:00
parent ecd72c6444
commit 68079ac908
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-gui-mobile/src/forge/adventure/character/CharacterSprite.java
View File

@@ -8,7 +8,6 @@ import com.badlogic.gdx.utils.Array;
import forge.adventure.stage.SpriteGroup;
import forge.adventure.util.Config;
import java.util.HashMap;
/**
* CharacterSprite base class for animated sprites on the map
*/
@@ -34,8 +33,12 @@ public class CharacterSprite extends MapActor {
}
@Override
void updateBoundingRect() { //We want a slimmer box for the player entity so it can navigate terrain without getting stuck.
boundingRect.set(getX() + 4, getY(), getWidth() - 6, getHeight() * collisionHeight);
void updateBoundingRect() {
float scale = 1f;
if (this instanceof EnemySprite) {
scale = ((EnemySprite) this).getData().scale;
}//We want a slimmer box for the player entity so it can navigate terrain without getting stuck.
boundingRect.set(getX() + 4, getY(), getWidth()*scale - 6, getHeight() * collisionHeight * scale);
}
protected void load(String path) {
@@ -226,9 +229,11 @@ public class CharacterSprite extends MapActor {
setWidth(currentFrame.getRegionWidth());
Color oldColor=batch.getColor().cpy();
batch.setColor(getColor());
batch.draw(currentFrame, getX(), getY());
float scale = this instanceof EnemySprite ? 2f : 1f ;
batch.draw(currentFrame, getX(), getY(), getWidth()*scale, getHeight()*scale);
float scale = 1f;
if (this instanceof EnemySprite) {
scale = ((EnemySprite) this).getData().scale;
}
batch.draw(currentFrame, getX(), getY(), getWidth()*scale, getHeight()*scale);
batch.setColor(oldColor);
super.draw(batch,parentAlpha);
//batch.draw(getDebugTexture(),getX(),getY());

7
forge-gui-mobile/src/forge/adventure/data/EnemyData.java
View File

@@ -35,7 +35,7 @@ public class EnemyData {
deck = enemyData.deck;
ai = enemyData.ai;
boss = enemyData.boss;
flying = enemyData.flying;
flying = enemyData.flying;
spawnRate = enemyData.spawnRate;
copyPlayerDeck = enemyData.copyPlayerDeck;
difficulty = enemyData.difficulty;
@@ -46,13 +46,16 @@ public class EnemyData {
colors = enemyData.colors;
teamNumber = enemyData.teamNumber;
nextEnemy =enemyData.nextEnemy==null?null: new EnemyData(enemyData.nextEnemy);
if(enemyData.scale == 0.0f) {
scale=1.0f;
}
if(enemyData.rewards == null) {
rewards=null;
} else {
rewards = new RewardData[enemyData.rewards.length];
for(int i=0; i<rewards.length; i++)
rewards[i]=new RewardData(enemyData.rewards[i]);
}
}
}
public Deck generateDeck(boolean isFantasyMode, boolean useGeneticAI) {