Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@taslimisina
taslimisina committed Feb 3, 2020
2 parents b462f64 + adfa9ea commit 9d1e2a3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 193 deletions.
42 changes: 12 additions & 30 deletions model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,17 @@ def __init__(self, player_id, king):
self.hand = []
self.ap = 0
self.paths_from_player = []
self.path_to_friend = None
self.cast_area_spell = None
self.cast_unit_spell = None
self.duplicate_units = None
self.hasted_units = None
self.path_to_friend = []
self.cast_area_spell = []
self.cast_unit_spell = []
self.duplicate_units = []
self.hasted_units = []
self.units = [] # alive units
self.played_units = [] # units that played last turn
self.died_units = []
self.range_upgraded_unit = None # unit that last turn the player upgraded range of it
self.damage_upgraded_unit = None # unit that last turn the player upgraded damage of it

# deleted fields
self.spells = []
self.upgrade_tokens = 0

def is_alive(self):
return self.king.is_alive

Expand All @@ -64,9 +60,8 @@ def __str__(self):


class Unit:
def __init__(self, unit_id, base_unit, cell, path, hp, is_hasted, is_clone, damage_level,
range_level, was_damage_upgraded, was_range_upgraded, range, attack, active_poisons,
was_played_this_turn, target, target_cell):
def __init__(self, unit_id, base_unit, cell, path, hp, is_hasted, damage_level,
range_level, range, attack, target, target_cell):
self.unit_id = unit_id
self.base_unit = base_unit
self.cell = cell
Expand All @@ -83,16 +78,7 @@ def __init__(self, unit_id, base_unit, cell, path, hp, is_hasted, is_clone, dama
self.is_duplicate = False
self.is_hasted = is_hasted
self.affected_spells = []

# deleted fields
self.hp = hp
self.is_clone = is_clone

self.was_damage_upgraded = was_damage_upgraded
self.was_range_upgraded = was_range_upgraded

self.active_poisons = active_poisons
self.was_played_this_turn = was_played_this_turn


class SpellTarget(Enum):
Expand Down Expand Up @@ -131,17 +117,13 @@ def get_value(string):


class Spell:
def __init__(self, type, type_id, duration, priority, range, power, target):
def __init__(self, type, type_id, duration, priority, target):
self.type = SpellType.get_value(type)
self.type_id = type_id
self.duration = duration
self.priority = priority
self.target = SpellTarget.get_value(target)

# deleted fields
self.range = range
self.power = power

def is_unit_spell(self):
return self.type == SpellType.TELE

Expand Down Expand Up @@ -203,15 +185,15 @@ def __init__(self, type_id, max_hp, base_attack, base_range, target_type, is_fly


class King:
def __init__(self, target, center=None, hp=0, attack=0, range=0):
def __init__(self, player_id, target, target_cell, center=None, hp=0, attack=0, range=0, is_alive=True):
self.center = center
self.hp = hp
self.attack = attack
self.range = range
self.target = target
self.target_cell = None
self.is_alive = True
self.player_id = 0
self.target_cell = target_cell
self.is_alive = is_alive
self.player_id = player_id


class Message:
Expand Down
166 changes: 3 additions & 163 deletions world.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ def _map_init(self, map_msg):
paths = [Path(path["id"], [input_cells[cell["row"]][cell["col"]] for cell in path["cells"]]
) for path in map_msg["paths"]]
kings = [King(center=input_cells[king["center"]["row"]][king["center"]["col"]], hp=king["hp"],
attack=king["attack"], range=king["range"], target_id=-1)
attack=king["attack"], range=king["range"], target=None, target_cell=None, player_id=0)
for king in map_msg["kings"]]
self.players = [Player(player_id=map_msg["kings"][i]["playerId"], king=kings[i]) for i in range(4)]
self.player = self.players[0]
self.player_friend = self.players[1]
self.player_first_enemy = self.players[2]
self.player_second_enemy = self.players[3]
self.map = Map(row_count=row_num, column_count=col_num, paths=paths, kings=kings, cells=input_cells)
self.map = Map(row_num=row_num, column_num=col_num, paths=paths, kings=kings, cells=input_cells)

def get_unit_by_id(self, unit_id):
for unit in self.map.units:
Expand All @@ -110,7 +110,7 @@ def _base_unit_init(self, msg):
self.base_units = [BaseUnit(type_id=b_unit["typeId"], max_hp=b_unit["maxHP"],
base_attack=b_unit["baseAttack"],
base_range=b_unit["baseRange"],
target=b_unit["target"],
target_type=b_unit["target_type"],
is_flying=b_unit["isFlying"],
is_multiple=b_unit["isMultiple"])
for b_unit in msg]
Expand All @@ -126,8 +126,6 @@ def _spells_init(self, msg):
type_id=spell["typeId"],
duration=spell["duration"],
priority=spell["priority"],
range=spell["range"],
power=spell["power"],
target=spell["target"])
for spell in msg]

Expand Down Expand Up @@ -170,16 +168,12 @@ def _handle_turn_units(self, msg, is_dead_unit=False):
hp=unit_msg["hp"],
damage_level=unit_msg["damageLevel"],
range_level=unit_msg["rangeLevel"],
was_damage_upgraded=unit_msg["wasDamageUpgraded"],
was_range_upgraded=unit_msg["wasRangeUpgraded"],
is_hasted=unit_msg["isHasted"],
is_clone=unit_msg["isDuplicate"],
# is_clone=unit_msg.keys().isdisjoint("isClone") and unit_msg["isClone"],
# active_poisons=unit_msg["activePoisons"],
# active_poisons=unit_msg.keys().isdisjoint("activePoisons") and unit_msg["activePoisons"],
range=unit_msg["range"],
attack=unit_msg["attack"],
was_played_this_turn=unit_msg["wasPlayedThisTurn"],
target=unit_msg["target"],
target_cell=tc)
if not is_dead_unit:
Expand Down Expand Up @@ -300,43 +294,6 @@ def get_first_enemy(self):
def get_second_enemy(self):
return self.player_second_enemy

# returns a cell that is the fortress of player with player_id
# def get_player_position(self, player_id):
# player = self.get_player_by_id(player_id)
# if player is not None:
# return player.king.center
#
# # return a list of paths starting from the fortress of player with player_id
# # the beginning is from player_id fortress cell
# def get_paths_from_player(self, player_id):
# paths = []
# player_king_cell = self.get_player_position(player_id)
# for p in self.map.paths:
# first_cell = p.cells[0]
# last_cell = p.cells[len(p.cells) - 1]
# if first_cell == player_king_cell:
# paths.append(p)
# continue
# if last_cell == player_king_cell:
# p.cells.reverse()
# paths.append(p)
# continue
# return paths
#
# # returns the path from player_id to its friend beginning from player_id's fortress
# def get_path_to_friend(self, player_id):
# player_king_cell = self.get_player_position(player_id)
# friend_king_cell = self.get_friend_by_id(player_id).king.center
#
# for p in self.map.paths:
# first_cell = p.cells[0]
# last_cell = p.cells[len(p.cells) - 1]
# if first_cell == player_king_cell and last_cell == friend_king_cell:
# return p
# if last_cell == player_king_cell and first_cell == friend_king_cell:
# p.cells.reverse()
# return p

def get_map(self):
return self.map

Expand Down Expand Up @@ -384,22 +341,6 @@ def get_shortest_path_to_cell(self, player_id, cell=None, row=None, col=None):

return shortest_path_to_cell[cell.row][cell.col]

# # returns the limit of ap for each player
# def get_max_ap(self):
# return self.game_constants.max_ap
#
# # get remaining ap
# def get_remaining_ap(self):
# return self.player.ap
#
# # returns a list of units in hand
# def get_hand(self):
# return self.player.hand
#
# # returns a list of units in deck
# def get_deck(self):
# return self.player.deck

# place unit with type_id in path_id
def put_unit(self, type_id=None, path_id=None, base_unit=None, path=None):
if base_unit is not None:
Expand All @@ -420,18 +361,6 @@ def put_unit(self, type_id=None, path_id=None, base_unit=None, path=None):
def get_current_turn(self):
return self.current_turn

# # return the limit of turns
# def get_max_turns(self):
# return self.game_constants.max_turns
#
# # return the time left to pick units and put in deck in the first turn
# def get_pick_timeout(self):
# return self.game_constants.pick_timeout
#
# # a constant limit for each turn
# def get_turn_timeout(self):
# return self.game_constants.turn_timeout

# returns the time left for turn (miliseconds)
def get_remaining_time(self):
return self.get_turn_timeout() - self.get_time_past()
Expand Down Expand Up @@ -513,16 +442,6 @@ def _is_unit_targeted(self, unit, spell_target):
return True
return False

# def get_cast_spells_on_unit(self, unit=None, unit_id=None):
# ls = []
# if unit_id is None:
# unit_id = unit.unit_id
# for cast_spell in self.cast_spells:
# if cast_spell is isinstance(CastUnitSpell):
# if unit_id == cast_spell.unit_id:
# ls.append(unit_id)
# return ls

# every once in a while you can upgrade, this returns the remaining time for upgrade
def get_remaining_turns_to_upgrade(self):
return self.game_constants.turns_to_upgrade
Expand All @@ -531,16 +450,6 @@ def get_remaining_turns_to_upgrade(self):
def get_remaining_turns_to_get_spell(self):
return self.game_constants.turns_to_spell

# returns area spells that are casted in last turn and returns other players spells also
# def get_cast_area_spell(self, player_id):
# return [cast_spell_i for cast_spell_i in self.cast_spells
# if cast_spell_i.caster_id and isinstance(cast_spell_i, CastAreaSpell)]
#
# # returns unit spells that are casted in last turn and returns other players spells also
# def get_cast_unit_spell(self, player_id):
# return [cast_spell_i for cast_spell_i in self.cast_spells
# if cast_spell_i.caster_id and isinstance(cast_spell_i, CastUnitSpell)]

# returns a list of spells casted on a cell
def get_range_upgrade_number(self, player_id):
return self.turn_updates.available_range_upgrade
Expand Down Expand Up @@ -599,60 +508,12 @@ def upgrade_unit_damage(self, unit=None, unit_id=None):
"unitId": unit_id
}))

# def get_player_duplicate_unit(self, player_id):
# unit_list = []
# for u in self.get_player_by_id(player_id).units:
# if u.is_clone:
# unit_list.append(u)
# return unit_list

def get_player_hasted_units(self, player_id):
return [unit for unit in self.get_player_by_id(player_id=player_id).units if unit.is_hasted > 0]

def get_player_played_units(self, player_id):
return [unit for unit in self.get_player_by_id(player_id=player_id).units if unit.was_played_this_turn]

# def get_unit_target(self, unit=None, unit_id=None):
# if unit_id is None:
# if unit is None:
# return None
# unit_id = unit.unit_id
#
# target_id = self.get_unit_by_id(unit_id).target_id
# unit = self.get_unit_by_id(target_id)
# return unit
#
# def get_unit_target_cell(self, unit=None, unit_id=None):
# if unit_id is None:
# if unit is None:
# return None
# unit_id = unit.unit_id
#
# target_id = self.get_unit_by_id(unit_id).target_id
# cell = self.get_unit_by_id(unit_id).target_cell
# unit = self.get_unit_by_id(target_id)
# if unit is None:
# return None
#
# return cell
#
# def get_king_target(self, player_id):
# king = self.get_player_by_id(player_id).king
# return self.get_unit_by_id(king.target_id)
#
# def get_king_target_cell(self, player_id):
# king = self.get_player_by_id(player_id).king
# return king.target_cell
#
# def get_king_unit_is_attacking_to(self, unit=None, unit_id=None):
# if unit is not None:
# unit_id = unit.unit_id
# unit = self.get_unit_by_id(unit_id)
# for p in self.players:
# if unit.target_id == p.player_id:
# return p.player_id
# return -1

def get_all_base_unit(self):
return copy.deepcopy(self.base_units)

Expand All @@ -672,27 +533,6 @@ def get_base_unit_by_id(self, type_id):
return bu
return None

# def get_player_died_units(self, player_id):
# return self.get_player_by_id(player_id).dead_units
#
# def has_player_used_ranged_upgrade(self, player_id):
# for u in self.get_player_by_id(player_id).dead_units:
# if u.was_range_upgraded:
# return True
# for u in self.get_player_by_id(player_id).units:
# if u.was_range_upgraded:
# return True
# return False
#
# def has_player_used_damage_upgrade(self, player_id):
# for u in self.get_player_by_id(player_id).dead_units:
# if u.was_damage_upgraded:
# return True
# for u in self.get_player_by_id(player_id).units:
# if u.was_damage_upgraded:
# return True
# return False

def get_game_constants(self):
return self.game_constants

Expand Down

0 comments on commit 9d1e2a3

Please sign in to comment.