nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-30 09:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pathfinder improved

Browse Source
This commit is contained in:
Beny 2019-05-04 11:43:41 +01:00
parent 7a60b97ecd
commit bf26661bdc
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java
View File

@ -1,6 +1,9 @@
package com.eu.habbo.habbohotel.rooms; package com.eu.habbo.habbohotel.rooms;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.bots.Bot;
import com.eu.habbo.habbohotel.pets.Pet;
import com.eu.habbo.habbohotel.users.Habbo;
import gnu.trove.set.hash.THashSet; import gnu.trove.set.hash.THashSet;
import java.awt.*; import java.awt.*;
@ -271,10 +274,24 @@ public class RoomLayout
openList.add(oldTile.copy()); openList.add(oldTile.copy());
List<RoomTile> unitsAt = new ArrayList<>();
for(Bot b : this.room.getCurrentBots().valueCollection()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
for(Habbo b : this.room.getCurrentHabbos().values()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
for(Pet b : this.room.getCurrentPets().valueCollection()) {
unitsAt.add(b.getRoomUnit().getCurrentLocation());
}
long startMillis = System.currentTimeMillis(); long startMillis = System.currentTimeMillis();
while (true) while (true)
{ {
if (System.currentTimeMillis() - startMillis > 25) if (System.currentTimeMillis() - startMillis > 50)
{ {
return new LinkedList<>(); return new LinkedList<>();
} }
@ -294,9 +311,7 @@ public class RoomLayout
if (closedList.contains(currentAdj)) continue; if (closedList.contains(currentAdj)) continue;
//If the tile is sitable or layable and its not our goal tile, we cannot walk over it. //If the tile is sitable or layable and its not our goal tile, we cannot walk over it.
if ( if (!currentAdj.equals(goalLocation) && (currentAdj.state == RoomTileState.BLOCKED || currentAdj.state == RoomTileState.SIT || currentAdj.state == RoomTileState.LAY))
(currentAdj.state == RoomTileState.BLOCKED) ||
((currentAdj.state == RoomTileState.SIT || currentAdj.state == RoomTileState.LAY) && !currentAdj.equals(goalLocation)))
{ {
closedList.add(currentAdj); closedList.add(currentAdj);
openList.remove(currentAdj); openList.remove(currentAdj);
@ -311,10 +326,10 @@ public class RoomLayout
if (!ALLOW_FALLING && height < - MAXIMUM_STEP_HEIGHT) continue; if (!ALLOW_FALLING && height < - MAXIMUM_STEP_HEIGHT) continue;
//If the step difference is bigger than the maximum step height, continue. //If the step difference is bigger than the maximum step height, continue.
if (height > MAXIMUM_STEP_HEIGHT && currentAdj.state == RoomTileState.OPEN) continue; if (currentAdj.state == RoomTileState.OPEN && height > MAXIMUM_STEP_HEIGHT) continue;
//Check if the tile has habbos. //Check if the tile has habbos.
if ((!this.room.isAllowWalkthrough() || currentAdj.equals(goalLocation)) && (this.room.hasHabbosAt(currentAdj.x, currentAdj.y) || this.room.hasPetsAt(currentAdj.x, currentAdj.y) || this.room.hasBotsAt(currentAdj.x, currentAdj.y))) if (unitsAt.contains(currentAdj) && (!this.room.isAllowWalkthrough() || currentAdj.equals(goalLocation)))
{ {
closedList.add(currentAdj); closedList.add(currentAdj);
openList.remove(currentAdj); openList.remove(currentAdj);
@ -392,11 +407,14 @@ public class RoomLayout
return null; return null;
RoomTile cheapest = openList.get(0); RoomTile cheapest = openList.get(0);
int cheapestFcost = Integer.MAX_VALUE;
for (RoomTile anOpenList : openList) for (RoomTile anOpenList : openList)
{ {
if (anOpenList.getfCosts() < cheapest.getfCosts()) int f = cheapest.getfCosts();
if (anOpenList.getfCosts() < cheapestFcost)
{ {
cheapest = anOpenList; cheapest = anOpenList;
cheapestFcost = f;
} }
} }
return cheapest; return cheapest;