mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-22 20:48:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented map generation step along with entity creation

Browse Source
This commit is contained in:
Collin Smith 2019-12-22 03:32:35 -08:00
parent cbec965eb1
commit 786cd255ee
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/d2gs/src/com/riiablo/server/d2gs/D2GS.java
View File

@ -41,11 +41,13 @@ import com.riiablo.engine.server.ServerEntityFactory;
import com.riiablo.engine.server.ServerNetworkIdManager; import com.riiablo.engine.server.ServerNetworkIdManager;
import com.riiablo.engine.server.WarpInteractor; import com.riiablo.engine.server.WarpInteractor;
import com.riiablo.engine.server.component.Networked; import com.riiablo.engine.server.component.Networked;
import com.riiablo.map.Act1MapBuilder;
import com.riiablo.map.DS1; import com.riiablo.map.DS1;
import com.riiablo.map.DS1Loader; import com.riiablo.map.DS1Loader;
import com.riiablo.map.DT1; import com.riiablo.map.DT1;
import com.riiablo.map.DT1Loader; import com.riiablo.map.DT1Loader;
import com.riiablo.map.Map; import com.riiablo.map.Map;
import com.riiablo.map.MapManager;
import com.riiablo.mpq.MPQFileHandleResolver; import com.riiablo.mpq.MPQFileHandleResolver;
import com.riiablo.net.packet.d2gs.Connection; import com.riiablo.net.packet.d2gs.Connection;
import com.riiablo.net.packet.d2gs.D2GSData; import com.riiablo.net.packet.d2gs.D2GSData;
@ -158,6 +160,7 @@ public class D2GS extends ApplicationAdapter {
Map map; Map map;
EntityFactory factory; EntityFactory factory;
MapManager mapManager;
NetworkSynchronizer sync; NetworkSynchronizer sync;
protected ComponentMapper<Networked> mNetworked; protected ComponentMapper<Networked> mNetworked;
@ -209,6 +212,7 @@ public class D2GS extends ApplicationAdapter {
Gdx.app.log(TAG, "Generating map..."); Gdx.app.log(TAG, "Generating map...");
map = new Map(seed, diff); map = new Map(seed, diff);
mapManager = new MapManager();
Gdx.app.log(TAG, " generating act 1..."); Gdx.app.log(TAG, " generating act 1...");
long start = TimeUtils.millis(); long start = TimeUtils.millis();
map.generate(0); map.generate(0);
@ -219,10 +223,12 @@ public class D2GS extends ApplicationAdapter {
map.finishLoading(); map.finishLoading();
factory = new ServerEntityFactory(); factory = new ServerEntityFactory();
mapManager = new MapManager();
sync = new NetworkSynchronizer(); sync = new NetworkSynchronizer();
WorldConfigurationBuilder builder = new WorldConfigurationBuilder() WorldConfigurationBuilder builder = new WorldConfigurationBuilder()
.with(new EventSystem()) .with(new EventSystem())
.with(new ServerNetworkIdManager()) .with(new ServerNetworkIdManager())
.with(mapManager)
.with(new CofManager()) .with(new CofManager())
.with(new ObjectInitializer()) .with(new ObjectInitializer())
.with(new ObjectInteractor(), new WarpInteractor(), new ItemInteractor()) .with(new ObjectInteractor(), new WarpInteractor(), new ItemInteractor())
@ -240,6 +246,13 @@ public class D2GS extends ApplicationAdapter {
.register("outPackets", outPackets) .register("outPackets", outPackets)
; ;
Riiablo.engine = world = new World(config); Riiablo.engine = world = new World(config);
world.inject(map);
world.inject(Act1MapBuilder.INSTANCE);
map.generate();
mapManager.createEntities();
mNetworked = world.getMapper(Networked.class); mNetworked = world.getMapper(Networked.class);
world.delta = Animation.FRAME_DURATION; world.delta = Animation.FRAME_DURATION;