mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
update
This commit is contained in:
@@ -33,12 +33,8 @@ public class CharacterSprite extends MapActor {
|
||||
}
|
||||
|
||||
@Override
|
||||
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);
|
||||
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);
|
||||
}
|
||||
|
||||
protected void load(String path) {
|
||||
|
||||
@@ -19,7 +19,7 @@ public class EnemyData {
|
||||
public float spawnRate;
|
||||
public float difficulty;
|
||||
public float speed;
|
||||
public float scale;
|
||||
public float scale = 1.0f;
|
||||
public int life;
|
||||
public RewardData[] rewards;
|
||||
public String[] equipment;
|
||||
|
||||
@@ -35,34 +35,34 @@
|
||||
</properties>
|
||||
</object>
|
||||
<object id="115" template="../obj/gold.tx" x="315.713" y="81.5369"/>
|
||||
<object id="117" template="../obj/enemy.tx" x="339.381" y="258.584">
|
||||
<object id="117" template="../obj/enemy.tx" x="332.76" y="260.476">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="118" template="../obj/enemy.tx" x="412.406" y="226.704">
|
||||
<object id="118" template="../obj/enemy.tx" x="363.693" y="217.245">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
<property name="spawn.Easy" type="bool" value="true"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="119" template="../obj/enemy.tx" x="323.625" y="196.58">
|
||||
<object id="119" template="../obj/enemy.tx" x="316.531" y="196.107">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
<property name="spawn.Hard" type="bool" value="true"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="122" template="../obj/enemy.tx" x="181.555" y="194.825">
|
||||
<object id="122" template="../obj/enemy.tx" x="173.042" y="195.771">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="136" template="../obj/enemy.tx" x="223.023" y="100.373">
|
||||
<object id="136" template="../obj/enemy.tx" x="219.712" y="98.4812">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
</properties>
|
||||
</object>
|
||||
<object id="137" template="../obj/enemy.tx" x="144.938" y="98.257">
|
||||
<object id="137" template="../obj/enemy.tx" x="139.263" y="98.7299">
|
||||
<properties>
|
||||
<property name="enemy" value="Kobold"/>
|
||||
</properties>
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
<tileset firstgid="10113" source="../tileset/buildings.tsx"/>
|
||||
<layer id="6" name="Collision" width="30" height="17">
|
||||
<data encoding="base64" compression="zlib">
|
||||
eJzt1T0OgCAMBeDu4gmIF5OzeDB/DqdNNOkg7atSJ1/SsBQ+OhBKT7QkvUagh6uAfXzecKxapo5oM3o4bK5AHycn3UVNjnV/1PWYnlk1N9KsudFmzc3GOWy9jdd9Oh/izuf7ijJr7p3d0tRcabc2LfeyW5uIG5Xf/c5F/ktZMt69snZp5kVE
|
||||
eJyL5mVg2MWDH0cRoQaEo4lUBzJPFkjjA7XcDAx7CKgBAZCdu4lQBwLSPPjtJdZOUgE+e2llJz57aWknLntpbScue6VpbOdgs5ceYNTeUXtH7aWOvcTUl8gYGZCqFxkDAGuQN1o=
|
||||
</data>
|
||||
</layer>
|
||||
<layer id="1" name="Background" width="30" height="17">
|
||||
<layer id="1" name="Background" width="30" height="17" visible="0">
|
||||
<data encoding="base64" compression="zlib">
|
||||
eJxbwM7AsGAUj+JRPIpH8SgexSMCAwB2ckzC
|
||||
</data>
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
kobold.png
|
||||
size: 189,30
|
||||
format: RGBA8888
|
||||
filter: Nearest,Nearest
|
||||
repeat: none
|
||||
Avatar
|
||||
xy: 4,18
|
||||
size: 18,14
|
||||
Idle
|
||||
xy: 3,13
|
||||
size: 46,33
|
||||
Idle
|
||||
xy: 52, 14
|
||||
size: 48, 30
|
||||
Idle
|
||||
xy: 101, 0
|
||||
size: 48, 48
|
||||
Idle
|
||||
xy: 149, 6
|
||||
size: 50, 42
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
@@ -3392,8 +3392,7 @@
|
||||
},
|
||||
{
|
||||
"name": "Kobold",
|
||||
"sprite": "sprites/dungeon/kobold.atlas",
|
||||
"scale": 0.25,
|
||||
"sprite": "sprites/imp.atlas",
|
||||
"deck": [
|
||||
"decks/kobold.dck"
|
||||
],
|
||||
@@ -7854,7 +7853,7 @@
|
||||
{
|
||||
"name": "Slimefoot",
|
||||
"sprite": "sprites/dungeon/slimefoot.atlas",
|
||||
"scale": 0.25,
|
||||
"scale": 0.50,
|
||||
"deck": [
|
||||
"decks/miniboss/slimefoot.dck"
|
||||
],
|
||||
@@ -8022,7 +8021,7 @@
|
||||
{
|
||||
"name": "Kiora",
|
||||
"sprite": "sprites/dungeon/kiora.atlas",
|
||||
"scale": 0.25,
|
||||
"scale": 0.35,
|
||||
"deck": [
|
||||
"decks/miniboss/kiora.dck"
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user