sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

merged with master

Browse Source 
# Conflicts:
#	core/src/netwerkprog/game/util/game/GameCharacter.java
This commit is contained in:
Sem van der Hoeven
2020-05-27 23:14:01 +02:00
parent 8b2853beeb
commit 6ebe534a29
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/netwerkprog/game/util/game/GameCharacter.java
View File

@@ -2,12 +2,13 @@ package netwerkprog.game.util.game;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.scenes.scene2d.Actor;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Objects;
public abstract class GameCharacter implements Comparable<GameCharacter> {
public abstract class GameCharacter extends Actor implements Comparable<GameCharacter> {
protected String name;
protected Faction faction;
protected HashSet<Ability> abilities;