mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
update
This commit is contained in:
@@ -37,7 +37,6 @@ public class EnemySprite extends CharacterSprite {
|
||||
public String nameOverride = ""; //Override name of this enemy in battles.
|
||||
public RewardData[] rewards; //Additional rewards for this enemy.
|
||||
public DialogData.ConditionData spawnCondition; //Condition to spawn.
|
||||
|
||||
public EnemySprite(EnemyData enemyData) {
|
||||
this(0,enemyData);
|
||||
}
|
||||
@@ -49,7 +48,8 @@ public class EnemySprite extends CharacterSprite {
|
||||
|
||||
@Override
|
||||
void updateBoundingRect() { //We want enemies to take the full tile.
|
||||
boundingRect.set(getX(), getY(), getWidth(), getHeight());
|
||||
float scale = this instanceof EnemySprite ? 2f :1f;
|
||||
boundingRect.set(getX(), getY(), getWidth()*scale, getHeight()*scale);
|
||||
}
|
||||
|
||||
public void moveTo(Actor other, float delta) {
|
||||
|
||||
@@ -19,6 +19,7 @@ public class EnemyData {
|
||||
public float spawnRate;
|
||||
public float difficulty;
|
||||
public float speed;
|
||||
public float scale;
|
||||
public int life;
|
||||
public RewardData[] rewards;
|
||||
public String[] equipment;
|
||||
@@ -39,6 +40,7 @@ public class EnemyData {
|
||||
copyPlayerDeck = enemyData.copyPlayerDeck;
|
||||
difficulty = enemyData.difficulty;
|
||||
speed = enemyData.speed;
|
||||
scale = enemyData.scale;
|
||||
life = enemyData.life;
|
||||
equipment = enemyData.equipment;
|
||||
colors = enemyData.colors;
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
"Dominaria United",
|
||||
"Brother's War",
|
||||
"Jumpstart 22",
|
||||
"Phyrexia: All Will Be One",
|
||||
"Phyrexia ONE",
|
||||
"(All)"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -31,11 +31,13 @@
|
||||
</object>
|
||||
<object id="55" template="../obj/treasure.tx" x="30.5746" y="103.158"/>
|
||||
<object id="64" template="../obj/treasure.tx" x="225.969" y="32.1053"/>
|
||||
<object id="56" template="../obj/enemy.tx" x="241.165" y="62.5288" width="20.2535" height="21.6702">
|
||||
<object id="56" template="../obj/enemy.tx" x="241.165" y="62.5288" width="16" height="16">
|
||||
<properties>
|
||||
<property name="effect">{ "startBattleWithCard": [ "Kraken Hatchling","Tropical Island" ]
|
||||
}</property>
|
||||
<property name="enemy" value="Kiora"/>
|
||||
<property name="scaleX" type="float" value="1"/>
|
||||
<property name="scaleY" type="float" value="1"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="57" template="../obj/enemy.tx" x="212.325" y="170.425">
|
||||
@@ -52,6 +54,8 @@
|
||||
<object id="66" template="../obj/enemy.tx" x="26.7491" y="125.752">
|
||||
<properties>
|
||||
<property name="enemy" value="Crab"/>
|
||||
<property name="scaleX" type="float" value="0.5"/>
|
||||
<property name="scaleY" type="float" value="0.5"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="67" template="../obj/enemy.tx" x="93.0526" y="236.342">
|
||||
|
||||
@@ -7,5 +7,5 @@ Avatar
|
||||
xy: 1,18
|
||||
size: 27,19
|
||||
Idle
|
||||
xy: 21,8
|
||||
xy: 0,0
|
||||
size: 28, 51
|
||||
@@ -91,7 +91,7 @@
|
||||
"CaveB6",
|
||||
"CaveB8",
|
||||
"CaveBA",
|
||||
"Slimefoot's Lair"
|
||||
"Slimefoots Lair"
|
||||
],
|
||||
"structures": [
|
||||
{
|
||||
|
||||
@@ -7853,6 +7853,7 @@
|
||||
{
|
||||
"name": "Slimefoot",
|
||||
"sprite": "sprites/dungeon/slimefoot.atlas",
|
||||
"scale": 0.25,
|
||||
"deck": [
|
||||
"decks/miniboss/slimefoot.dck"
|
||||
],
|
||||
@@ -7959,6 +7960,7 @@
|
||||
{
|
||||
"name": "Crab",
|
||||
"sprite": "sprites/dungeon/crab.atlas",
|
||||
"scale": 0.5,
|
||||
"deck": [
|
||||
"decks/crab.dck"
|
||||
],
|
||||
@@ -8019,6 +8021,7 @@
|
||||
{
|
||||
"name": "Kiora",
|
||||
"sprite": "sprites/dungeon/kiora.atlas",
|
||||
"scale": 0.25,
|
||||
"deck": [
|
||||
"decks/miniboss/kiora.dck"
|
||||
],
|
||||
|
||||
@@ -1833,7 +1833,7 @@
|
||||
"map": "maps/map/kobold_mine.tmx"
|
||||
},
|
||||
{
|
||||
"name": "Slimefoot's Lair",
|
||||
"name": "Slimefoots Lair",
|
||||
"type": "dungeon",
|
||||
"count": 1,
|
||||
"radiusFactor": 0.8,
|
||||
|
||||
Reference in New Issue
Block a user