| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2017-11-28 18:58:09 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2017-11-28 18:58:09 +0100 |
| commit | 8493faa67f71b3bc538c0405ce9682ab76fd2cb9 (patch) | |
| tree | d388ea60c9deddd76aa6fbabfe19ecb39231a045 /src | |
| parent | e8699e6fd18e576423fa8c2261a3c426efe61d77 (diff) | |
Improves readability.
Diffstat (limited to 'src')
| -rw-r--r-- | src/type/battlemap.erl | 27 | ||||
| -rw-r--r-- | src/type/battlemap/cross_5.erl (renamed from src/type/battlemap/cross.erl) | 11 |
2 files changed, 31 insertions, 7 deletions
diff --git a/src/type/battlemap.erl b/src/type/battlemap.erl index cce1a76..d9d7b8c 100644 --- a/src/type/battlemap.erl +++ b/src/type/battlemap.erl @@ -1,4 +1,8 @@ -module(battlemap). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -record ( battlemap, @@ -10,6 +14,11 @@ instances } ). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%% Accessors -export ( [ @@ -20,19 +29,31 @@ get_instances/1 ] ). +%%%% Utils -export ( - [dist/2] + [ + cross/5, + dist/2 + ] ). --export([cross/5]). +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%% Accessors get_id (Battlemap) -> Battlemap#battlemap.id. get_width (Battlemap) -> Battlemap#battlemap.width. get_height (Battlemap) -> Battlemap#battlemap.height. list_tiles (Battlemap) -> array:sparse_to_list(Battlemap#battlemap.content). get_instances (Battlemap) -> Battlemap#battlemap.instances. --include("battlemap/cross.erl"). +%%%% Utils +-include("battlemap/cross_5.erl"). dist ({OX, OY}, {DX, DY}) -> (abs(OX - DX) + abs(OY + DY)). diff --git a/src/type/battlemap/cross.erl b/src/type/battlemap/cross_5.erl index aa1645e..dccc4b9 100644 --- a/src/type/battlemap/cross.erl +++ b/src/type/battlemap/cross_5.erl @@ -1,5 +1,9 @@ +%% +%% battlemap:cross/5 +%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% LOCAL %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% next_loc (X, Y, <<"L">>) -> {(X - 1), Y}; next_loc (X, Y, <<"R">>) -> {(X + 1), Y}; @@ -21,7 +25,7 @@ calc_new_loc (X, Y, [], Points, _Map, _CharInstsLocs) -> calc_new_loc (X, Y, [Step|Path], Points, Map, CharInstsLocs) -> io:format("~nStep - Points remaining: ~p ~n", [Points]), {NX, NY} = next_loc(X, Y, Step), - TileCost = + TileCost = tile:get_cost ( array:get @@ -41,9 +45,8 @@ calc_new_loc (X, Y, [Step|Path], Points, Map, CharInstsLocs) -> calc_new_loc(NX, NY, Path, NPoints, Map, CharInstsLocs). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% EXPORTED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - cross (Battlemap, {X, Y}, Points, Path, CharInsts) -> calc_new_loc ( |