scip/openquell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: scip:dc2574643ccf40a6a3bff5b997985cb6adcc922e
Branches Tags
scip:master
scip:newtileset
scip:animationinterface
scip:rework-animations
scip:separate-collision-checker
scip:collidersystem
scip:refactor
..
compare: scip:5b7c88a1a93465802e5563a7751753eaee63e054
Branches Tags
scip:newtileset
scip:master
scip:animationinterface
scip:rework-animations
scip:separate-collision-checker
scip:collidersystem
scip:refactor

No commits in common. "dc2574643ccf40a6a3bff5b997985cb6adcc922e" and "5b7c88a1a93465802e5563a7751753eaee63e054" have entirely different histories.
dc2574643c ... 5b7c88a1a9

24 changed files with 189 additions and 426 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1 @@
openquell* openquell*
tmp

2
TODO.md
View File

@ -29,6 +29,8 @@
- Player can collect collectible hidden under obstacle (should be - Player can collect collectible hidden under obstacle (should be
fixed when above is fixed) fixed when above is fixed)
- Star Obstacle doesn't do any damage!
- Remove Sprite from Tile{}, not used anymore - Remove Sprite from Tile{}, not used anymore
## Collider Rework [abandoned: see branch collider-system, fails] ## Collider Rework [abandoned: see branch collider-system, fails]

586
assets/levels/openquell.ldtk
View File

File diff suppressed because it is too large Load Diff

22
assets/loader-levels.go
View File

@ -199,20 +199,14 @@ func InitTiles() TileRegistry {
"particle-ring-5", "particle-ring-5",
"particle-ring-6", "particle-ring-6",
}), }),
"Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}), "Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}),
"HiddenDoor": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor2": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor2": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor3": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor3": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor4": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor4": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor5": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor5": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor6": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor6": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor7": NewTileHiddenDoor("block-greycolored", "damage"), "HiddenDoor7": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor8": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor9": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor10": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor11": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor12": NewTileHiddenDoor("block-greycolored", "damage"),
"HiddenDoor13": NewTileHiddenDoor("block-greycolored", "damage"),
} }
} }

BIN
assets/sprites/entitymap.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
assets/sprites/primarymap.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 148 KiB

2
components/velocity.go
View File

@ -60,7 +60,7 @@ func (velocity *Velocity) InvertDirection() int {
case North: case North:
return South return South
case All: case All:
return All return Stop
case Stop: case Stop:
return Stop return Stop
} }

BIN
src/entities/church_3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
src/entities/cobalt_stone_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 514 B

BIN
src/entities/crystal_wall_0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/entities/emerald_5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/entities/lab-stone_0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 360 B

BIN
src/entities/marble_wall_5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 882 B

BIN
src/entities/relief_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/entities/relief_brown_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 571 B

BIN
src/entities/stone2_brown_3_new.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 573 B

BIN
src/entities/stone_2_brown0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 555 B

BIN
src/entities/stone_2_dark0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 847 B

BIN
src/entities/stone_2_gray0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 909 B

BIN
src/entities/stone_dark_3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
src/entities/stone_gray_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 884 B

BIN
src/entitymap.xcf
View File

Binary file not shown.

BIN
src/primarymap.xcf
View File

Binary file not shown.

2
systems/obstacle_system.go
View File

@ -155,7 +155,7 @@ func (system *ObstacleSystem) Draw(screen *ebiten.Image) {
func CheckObstacleSide(playervelocity *Velocity, obsvelocity *Velocity) bool { func CheckObstacleSide(playervelocity *Velocity, obsvelocity *Velocity) bool {
movingdirection := playervelocity.InvertDirection() movingdirection := playervelocity.InvertDirection()
if obsvelocity.PointingAt == All || movingdirection == obsvelocity.PointingAt { if movingdirection == Stop || movingdirection == obsvelocity.PointingAt {
slog.Debug("Damaging obstacle collision", slog.Debug("Damaging obstacle collision",
"playerdirection", util.DirectionStr(playervelocity.Direction), "playerdirection", util.DirectionStr(playervelocity.Direction),
"obsdirection", util.DirectionStr(obsvelocity.PointingAt), "obsdirection", util.DirectionStr(obsvelocity.PointingAt),