made world change events world-bound
This commit is contained in:
@@ -88,6 +88,7 @@ public class EventHandler {
|
|||||||
panel.player.solidArea.y = panel.player.solidAreaDefaultY;
|
panel.player.solidArea.y = panel.player.solidAreaDefaultY;
|
||||||
eventRect[map.getIndex()][eventCol][eventRow].x = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultX;
|
eventRect[map.getIndex()][eventCol][eventRow].x = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultX;
|
||||||
eventRect[map.getIndex()][eventCol][eventRow].y = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultY;
|
eventRect[map.getIndex()][eventCol][eventRow].y = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultY;
|
||||||
|
if(panel.currentMap != map) hit = false;
|
||||||
return hit;
|
return hit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -294,9 +294,9 @@ public class Player extends Entity {
|
|||||||
worldX = panel.tileSize * 23;
|
worldX = panel.tileSize * 23;
|
||||||
worldY = panel.tileSize * 21;
|
worldY = panel.tileSize * 21;
|
||||||
|
|
||||||
worldX = panel.tileSize * 12;
|
// worldX = panel.tileSize * 12;
|
||||||
worldY = panel.tileSize * 12;
|
// worldY = panel.tileSize * 12;
|
||||||
panel.currentMap = Map.HUT;
|
// panel.currentMap = Map.HUT;
|
||||||
|
|
||||||
speed = 4;
|
speed = 4;
|
||||||
direction = Direction.DOWN;
|
direction = Direction.DOWN;
|
||||||
@@ -309,7 +309,7 @@ public class Player extends Entity {
|
|||||||
dexterity = 1;
|
dexterity = 1;
|
||||||
exp = 0;
|
exp = 0;
|
||||||
nextLevelExp = 5;
|
nextLevelExp = 5;
|
||||||
coins = 500;
|
coins = 0;
|
||||||
currentWeapon = new SwordNormalObj(panel);
|
currentWeapon = new SwordNormalObj(panel);
|
||||||
currentShield = new ShieldWoodObj(panel);
|
currentShield = new ShieldWoodObj(panel);
|
||||||
projectile = new FireballObj(panel);
|
projectile = new FireballObj(panel);
|
||||||
|
|||||||
Reference in New Issue
Block a user