Skip to content

Commit

Permalink
Merge branch 'Team-2--Engineers' of https://github.com/UQcsse3200/202…
Browse files Browse the repository at this point in the history
…3-studio-3 into Team-2--Engineers-Praneet
  • Loading branch information
praneetdhoolia committed Sep 8, 2023
2 parents 7a2577d + 7772795 commit 38eabcb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
23 changes: 15 additions & 8 deletions source/core/assets/images/engineers/engineer.atlas
Original file line number Diff line number Diff line change
Expand Up @@ -77,31 +77,38 @@ firing_auto
firing_single
rotate: false
xy: 102, 42
size: 45, 33
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 2
firing_single
rotate: false
xy: 179, 78
size: 45, 33
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 4
firing_single
rotate: false
xy: 249, 78
size: 45, 33
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 1
firing_single
rotate: false
xy: 319, 78
size: 45, 33
size: 52, 33
orig: 45, 33
offset: 0, 0
index: 3
firing_single
rotate: false
xy: 343, 40
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 5
hit
rotate: false
xy: 560, 79
Expand Down Expand Up @@ -189,28 +196,28 @@ idle_right
prep
rotate: false
xy: 343, 40
size: 29, 33
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 4
prep
rotate: false
xy: 853, 41
size: 29, 33
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 1
prep
rotate: false
xy: 907, 41
size: 29, 33
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 3
prep
rotate: false
xy: 961, 41
size: 29, 33
size: 52, 33
orig: 29, 33
offset: 0, 0
index: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ private void spawnEngineer() {

for (int i = 0; i < terrain.getMapBounds(0).x; i += 3) {
Entity engineer = EngineerFactory.createEngineer();
spawnEntityAt(engineer, new GridPoint2(2, i), true, true);
spawnEntityAt(engineer, new GridPoint2(1, i), true, true);
}
// GridPoint2 minPos = new GridPoint2(0, 0);
// GridPoint2 maxPos = new GridPoint2(5, terrain.getMapBounds(0).sub(2, 2).y);
Expand Down

0 comments on commit 38eabcb

Please sign in to comment.