Compare commits
No commits in common. "dc2574643ccf40a6a3bff5b997985cb6adcc922e" and "5b7c88a1a93465802e5563a7751753eaee63e054" have entirely different histories.
dc2574643c
...
5b7c88a1a9
1
.gitignore
vendored
@ -1,2 +1 @@
|
||||
openquell*
|
||||
tmp
|
||||
|
||||
2
TODO.md
@ -29,6 +29,8 @@
|
||||
- Player can collect collectible hidden under obstacle (should be
|
||||
fixed when above is fixed)
|
||||
|
||||
- Star Obstacle doesn't do any damage!
|
||||
|
||||
- Remove Sprite from Tile{}, not used anymore
|
||||
|
||||
## Collider Rework [abandoned: see branch collider-system, fails]
|
||||
|
||||
@ -199,20 +199,14 @@ func InitTiles() TileRegistry {
|
||||
"particle-ring-5",
|
||||
"particle-ring-6",
|
||||
}),
|
||||
"Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}),
|
||||
"HiddenDoor": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor2": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor3": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor4": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor5": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor6": 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"),
|
||||
"Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}),
|
||||
"HiddenDoor": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor2": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor3": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor4": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor5": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor6": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
"HiddenDoor7": NewTileHiddenDoor("block-greycolored", "damage"),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 148 KiB |
@ -60,7 +60,7 @@ func (velocity *Velocity) InvertDirection() int {
|
||||
case North:
|
||||
return South
|
||||
case All:
|
||||
return All
|
||||
return Stop
|
||||
case Stop:
|
||||
return Stop
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 360 B |
|
Before Width: | Height: | Size: 882 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 571 B |
|
Before Width: | Height: | Size: 573 B |
|
Before Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 847 B |
|
Before Width: | Height: | Size: 909 B |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 884 B |
@ -155,7 +155,7 @@ func (system *ObstacleSystem) Draw(screen *ebiten.Image) {
|
||||
func CheckObstacleSide(playervelocity *Velocity, obsvelocity *Velocity) bool {
|
||||
movingdirection := playervelocity.InvertDirection()
|
||||
|
||||
if obsvelocity.PointingAt == All || movingdirection == obsvelocity.PointingAt {
|
||||
if movingdirection == Stop || movingdirection == obsvelocity.PointingAt {
|
||||
slog.Debug("Damaging obstacle collision",
|
||||
"playerdirection", util.DirectionStr(playervelocity.Direction),
|
||||
"obsdirection", util.DirectionStr(obsvelocity.PointingAt),
|
||||
|
||||