mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-09-01 18:27:55 +00:00
Orb of the Sword can now kill yourself through mirror or topology
This commit is contained in:
@@ -1202,6 +1202,8 @@ EX void killHardcorePlayer(int id, flagtype flags) {
|
||||
}
|
||||
}
|
||||
|
||||
EX bool suicidal;
|
||||
|
||||
EX void killThePlayer(eMonster m, int id, flagtype flags) {
|
||||
if(markOrb(itOrbShield)) return;
|
||||
if(shmup::on) {
|
||||
@@ -1231,6 +1233,7 @@ EX void killThePlayer(eMonster m, int id, flagtype flags) {
|
||||
else {
|
||||
// printf("confused!\n");
|
||||
addMessage(XLAT("%The1 is confused!", m));
|
||||
changes.value_set(suicidal, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1283,7 +1286,8 @@ EX void stabbingAttack(movei mi, eMonster who, int bonuskill IS(0)) {
|
||||
|
||||
bool stabthere = false, away = true;
|
||||
if(logical_adjacent(mt, who, c)) stabthere = true, away = false;
|
||||
|
||||
if(inmirror(c)) c = mirror::reflect(c).at;
|
||||
|
||||
if(stabthere && c->wall == waExplosiveBarrel && markOrb(itOrbThorns))
|
||||
explodeBarrel(c);
|
||||
|
||||
|
Reference in New Issue
Block a user