summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/struct')
-rw-r--r--src/struct/battle.erl2
-rw-r--r--src/struct/battle_action.erl2
-rw-r--r--src/struct/player.erl2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/struct/battle.erl b/src/struct/battle.erl
index bf2b010..5ac12e4 100644
--- a/src/struct/battle.erl
+++ b/src/struct/battle.erl
@@ -60,7 +60,7 @@ get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
Player = array:get(CurrentIndex, Players),
Timeline = player:get_timeline(Player),
NextIndex = ((CurrentIndex + 1) rem ArraySize),
- NextResult = (Result ++ Timeline),
+ NextResult = (Timeline ++ Result),
case CurrentIndex of
EndPoint ->
NextResult;
diff --git a/src/struct/battle_action.erl b/src/struct/battle_action.erl
index 0fe780f..8aaaef9 100644
--- a/src/struct/battle_action.erl
+++ b/src/struct/battle_action.erl
@@ -113,7 +113,7 @@ handle_attack_sequence
nothing -> {AttackValidEffects, AttackerHealth, DefenderHealth};
_ ->
{
- [AttackResult|AttackValidEffects],
+ (AttackValidEffects ++ [AttackResult]),
NewAttackerHealth,
NewDefenderHealth
}
diff --git a/src/struct/player.erl b/src/struct/player.erl
index 857906e..c4aefd1 100644
--- a/src/struct/player.erl
+++ b/src/struct/player.erl
@@ -56,7 +56,7 @@ add_to_timeline (NewEvents, Player) ->
Player#player
{
- timeline = (OldTimeline ++ NewEvents)
+ timeline = (NewEvents ++ OldTimeline)
}.
-spec reset_timeline (struct()) -> struct().