Removing runtime old classes
This commit is contained in:
parent
0bcc1e3591
commit
acab58d0a3
@ -1,4 +1,4 @@
|
||||
package com.bernard.greposimu.model.runtime;
|
||||
package com.bernard.greposimu.model.game;
|
||||
|
||||
public class Timestamp {
|
||||
|
||||
@ -2,7 +2,7 @@ package com.bernard.greposimu.model.game.queues;
|
||||
|
||||
import com.bernard.greposimu.model.game.Building;
|
||||
import com.bernard.greposimu.model.game.Resources;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
|
||||
public class BuildingQueueItem extends QueueItem {
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package com.bernard.greposimu.model.game.queues;
|
||||
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
import com.bernard.greposimu.model.game.UnitResources;
|
||||
import com.bernard.greposimu.model.game.units.Unit;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
|
||||
public class RecruitmentQueueItem extends QueueItem {
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package com.bernard.greposimu.model.game.queues;
|
||||
|
||||
import com.bernard.greposimu.model.game.Resources;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
import com.bernard.greposimu.model.game.researches.Research;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
|
||||
public class ResearchQueueItem extends QueueItem {
|
||||
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
package com.bernard.greposimu.model.runtime;
|
||||
|
||||
public class Alliance {
|
||||
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
package com.bernard.greposimu.model.runtime;
|
||||
|
||||
public class Joueureuse {
|
||||
|
||||
String nom;
|
||||
Alliance alliance;
|
||||
int points;
|
||||
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
package com.bernard.greposimu.model.runtime;
|
||||
|
||||
public class PositionVille {
|
||||
|
||||
int ileId;
|
||||
int x,y,nr,ex,ey,fx,fy;
|
||||
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
package com.bernard.greposimu.model.runtime;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import com.bernard.greposimu.model.game.Resources;
|
||||
|
||||
public class Ville {
|
||||
|
||||
int id;
|
||||
|
||||
// null -> Ville fantôme
|
||||
Joueureuse proprietaire;
|
||||
|
||||
PositionVille ville;
|
||||
|
||||
Resources resources;
|
||||
|
||||
Map<String,Integer> batiments;
|
||||
|
||||
}
|
||||
@ -5,7 +5,7 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.bernard.greposimu.model.game.God;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
|
||||
public class Joueureuse {
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.bernard.greposimu.model.simulator;
|
||||
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
|
||||
public class Movements {
|
||||
|
||||
|
||||
@ -7,12 +7,12 @@ import java.util.Set;
|
||||
import com.bernard.greposimu.model.game.Building;
|
||||
import com.bernard.greposimu.model.game.God;
|
||||
import com.bernard.greposimu.model.game.Resources;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
import com.bernard.greposimu.model.game.powers.Power;
|
||||
import com.bernard.greposimu.model.game.queues.BuildingQueueItem;
|
||||
import com.bernard.greposimu.model.game.queues.RecruitmentQueueItem;
|
||||
import com.bernard.greposimu.model.game.queues.ResearchQueueItem;
|
||||
import com.bernard.greposimu.model.game.researches.Research;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
|
||||
public class Ville {
|
||||
|
||||
|
||||
@ -14,6 +14,7 @@ import com.bernard.greposimu.model.game.Building;
|
||||
import com.bernard.greposimu.model.game.GameConfig;
|
||||
import com.bernard.greposimu.model.game.God;
|
||||
import com.bernard.greposimu.model.game.Resources;
|
||||
import com.bernard.greposimu.model.game.Timestamp;
|
||||
import com.bernard.greposimu.model.game.UnitResources;
|
||||
import com.bernard.greposimu.model.game.powers.Power;
|
||||
import com.bernard.greposimu.model.game.queues.BuildingQueueItem;
|
||||
@ -22,7 +23,6 @@ import com.bernard.greposimu.model.game.queues.RecruitmentQueueItem.RecruitmentK
|
||||
import com.bernard.greposimu.model.game.queues.ResearchQueueItem;
|
||||
import com.bernard.greposimu.model.game.researches.Research;
|
||||
import com.bernard.greposimu.model.game.units.Unit;
|
||||
import com.bernard.greposimu.model.runtime.Timestamp;
|
||||
import com.bernard.greposimu.model.simulator.Joueureuse;
|
||||
import com.bernard.greposimu.model.simulator.SimulatorData;
|
||||
import com.bernard.greposimu.model.simulator.Troupes;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user