mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up checks for open warp gates

pull/2610/head
Anders Jenbo 5 years ago
parent
17f1991b45
commit
9b2cbbdb38
4 changed files with 104 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Source/msg.cpp
  2. 28
      Source/town.cpp
  3. 144
      Source/trigs.cpp
  4. 2
      Source/trigs.h

1
Source/msg.cpp
Unescape View File

@ -1798,6 +1798,7 @@ DWORD OnOpenHive(TCmd *pCmd, int pnum)
if (gbBufferMsgs != 1) {
AddMissile({ p->x, p->y }, { p->wParam1, p->wParam2 }, 0, MIS_HIVEEXP2, TARGET_MONSTERS, pnum, 0, 0);
TownOpenHive();
InitTownTriggers();
}
return sizeof(*p);
}

28
Source/town.cpp
Unescape View File

@ -167,29 +167,25 @@ void DrlgTPass3()
FillSector("Levels\\TownData\\Sector3s.DUN", 0, 46);
FillSector("Levels\\TownData\\Sector4s.DUN", 0, 0);
if (gbIsSpawn || !gbIsMultiplayer) {
auto &myPlayer = Players[MyPlayerId];
if (gbIsSpawn || ((myPlayer.pTownWarps & 1) == 0 && (!gbIsHellfire || myPlayer._pLevel < 10))) {
FillTile(48, 20, 320);
}
if (gbIsSpawn || ((myPlayer.pTownWarps & 2) == 0 && (!gbIsHellfire || myPlayer._pLevel < 15))) {
FillTile(16, 68, 332);
FillTile(16, 70, 331);
}
if (gbIsSpawn || ((myPlayer.pTownWarps & 4) == 0 && (!gbIsHellfire || myPlayer._pLevel < 20))) {
for (int x = 36; x < 46; x++) {
FillTile(x, 78, GenerateRnd(4) + 1);
}
if (!IsWarpOpen(DTYPE_CATACOMBS)) {
FillTile(48, 20, 320);
}
if (!IsWarpOpen(DTYPE_CAVES)) {
FillTile(16, 68, 332);
FillTile(16, 70, 331);
}
if (!IsWarpOpen(DTYPE_HELL)) {
for (int x = 36; x < 46; x++) {
FillTile(x, 78, GenerateRnd(4) + 1);
}
}
if (gbIsHellfire) {
if (Quests[Q_FARMER]._qactive == QUEST_DONE || Quests[Q_FARMER]._qactive == QUEST_HIVE_DONE
|| Quests[Q_JERSEY]._qactive == QUEST_DONE || Quests[Q_JERSEY]._qactive == QUEST_HIVE_DONE) {
if (IsWarpOpen(DTYPE_NEST)) {
TownOpenHive();
} else {
TownCloseHive();
}
if (Quests[Q_GRAVE]._qactive == QUEST_DONE || Players[MyPlayerId]._pLvlVisited[21])
if (IsWarpOpen(DTYPE_CRYPT))
TownOpenGrave();
else
TownCloseGrave();

144
Source/trigs.cpp
Unescape View File

@ -15,7 +15,6 @@
namespace devilution {
bool townwarps[3];
bool trigflag;
int numtrigs;
TriggerStruct trigs[MAXTRIGGERS];
@ -64,57 +63,81 @@ void InitNoTriggers()
trigflag = false;
}
bool IsWarpOpen(dungeon_type type)
{
if (gbIsSpawn)
return false;
if (gbIsMultiplayer && type != DTYPE_NEST) // Opening the nest is part of in town quest
return true;
auto &myPlayer = Players[MyPlayerId];
if (type == DTYPE_CATACOMBS && (myPlayer.pTownWarps & 1) != 0)
return true;
if (type == DTYPE_CAVES && (myPlayer.pTownWarps & 2) != 0)
return true;
if (type == DTYPE_HELL && (myPlayer.pTownWarps & 4) != 0)
return true;
if (gbIsHellfire) {
if (type == DTYPE_CATACOMBS && myPlayer._pLevel >= 10)
return true;
if (type == DTYPE_CAVES && myPlayer._pLevel >= 15)
return true;
if (type == DTYPE_HELL && myPlayer._pLevel >= 20)
return true;
if (type == DTYPE_NEST && IsAnyOf(Quests[Q_FARMER]._qactive, QUEST_DONE, QUEST_HIVE_DONE))
return true;
if (type == DTYPE_CRYPT && Quests[Q_GRAVE]._qactive == QUEST_DONE)
return true;
}
return false;
}
void InitTownTriggers()
{
numtrigs = 0;
// Cathedral
trigs[numtrigs].position = { 25, 29 };
trigs[numtrigs]._tmsg = WM_DIABNEXTLVL;
numtrigs++;
for (bool &townwarp : townwarps) {
townwarp = gbIsMultiplayer && !gbIsSpawn;
}
if (!gbIsSpawn) {
auto &myPlayer = Players[MyPlayerId];
if (gbIsMultiplayer || (myPlayer.pTownWarps & 1) != 0 || (gbIsHellfire && myPlayer._pLevel >= 10)) {
townwarps[0] = true;
trigs[numtrigs].position = { 49, 21 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 5;
if (IsWarpOpen(DTYPE_CATACOMBS)) {
trigs[numtrigs].position = { 49, 21 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 5;
#ifdef _DEBUG
if (debug_mode_key_j != 0)
trigs[numtrigs]._tlvl = debug_mode_key_j;
if (debug_mode_key_j != 0)
trigs[numtrigs]._tlvl = debug_mode_key_j;
#endif
numtrigs++;
}
if (gbIsMultiplayer || (myPlayer.pTownWarps & 2) != 0 || (gbIsHellfire && myPlayer._pLevel >= 15)) {
townwarps[1] = true;
trigs[numtrigs].position = { 17, 69 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 9;
numtrigs++;
}
if (gbIsMultiplayer || (myPlayer.pTownWarps & 4) != 0 || (gbIsHellfire && myPlayer._pLevel >= 20)) {
townwarps[2] = true;
trigs[numtrigs].position = { 41, 80 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 13;
numtrigs++;
}
numtrigs++;
}
if (gbIsHellfire) {
if (IsWarpOpen(DTYPE_CAVES)) {
trigs[numtrigs].position = { 17, 69 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 9;
numtrigs++;
}
if (IsWarpOpen(DTYPE_HELL)) {
trigs[numtrigs].position = { 41, 80 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 13;
numtrigs++;
}
if (IsWarpOpen(DTYPE_NEST)) {
trigs[numtrigs].position = { 80, 62 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 17;
numtrigs++;
if (gbIsMultiplayer || Quests[Q_GRAVE]._qactive == QUEST_DONE) {
trigs[numtrigs].position = { 36, 24 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 21;
numtrigs++;
}
}
if (IsWarpOpen(DTYPE_CRYPT)) {
trigs[numtrigs].position = { 36, 24 };
trigs[numtrigs]._tmsg = WM_DIABTOWNWARP;
trigs[numtrigs]._tlvl = 21;
numtrigs++;
}
trigflag = false;
@ -315,8 +338,10 @@ void InitVPTriggers()
bool ForceTownTrig()
{
for (int i = 0; TownDownList[i] != -1; i++) {
if (dPiece[cursmx][cursmy] == TownDownList[i]) {
for (auto tileId : TownDownList) {
if (tileId == -1)
break;
if (dPiece[cursmx][cursmy] == tileId) {
strcpy(infostr, _("Down to dungeon"));
cursmx = 25;
cursmy = 29;
@ -324,9 +349,11 @@ bool ForceTownTrig()
}
}
if (townwarps[0]) {
for (int i = 0; TownWarp1List[i] != -1; i++) {
if (dPiece[cursmx][cursmy] == TownWarp1List[i]) {
if (IsWarpOpen(DTYPE_CATACOMBS)) {
for (auto tileId : TownWarp1List) {
if (tileId == -1)
break;
if (dPiece[cursmx][cursmy] == tileId) {
strcpy(infostr, _("Down to catacombs"));
cursmx = 49;
cursmy = 21;
@ -335,7 +362,7 @@ bool ForceTownTrig()
}
}
if (townwarps[1]) {
if (IsWarpOpen(DTYPE_CAVES)) {
for (int i = 1199; i <= 1220; i++) {
if (dPiece[cursmx][cursmy] == i) {
strcpy(infostr, _("Down to caves"));
@ -346,7 +373,7 @@ bool ForceTownTrig()
}
}
if (townwarps[2]) {
if (IsWarpOpen(DTYPE_HELL)) {
for (int i = 1240; i <= 1255; i++) {
if (dPiece[cursmx][cursmy] == i) {
strcpy(infostr, _("Down to hell"));
@ -357,17 +384,11 @@ bool ForceTownTrig()
}
}
if (gbIsHellfire) {
for (int i = 0; TownCryptList[i] != -1; i++) {
if (dPiece[cursmx][cursmy] == TownCryptList[i]) {
strcpy(infostr, _("Down to Crypt"));
cursmx = 36;
cursmy = 24;
return true;
}
}
for (int i = 0; TownHiveList[i] != -1; i++) {
if (dPiece[cursmx][cursmy] == TownHiveList[i]) {
if (IsWarpOpen(DTYPE_NEST)) {
for (auto tileId : TownHiveList) {
if (tileId == -1)
break;
if (dPiece[cursmx][cursmy] == tileId) {
strcpy(infostr, _("Down to Hive"));
cursmx = 80;
cursmy = 62;
@ -376,6 +397,19 @@ bool ForceTownTrig()
}
}
if (IsWarpOpen(DTYPE_CRYPT)) {
for (auto tileId : TownCryptList) {
if (tileId == -1)
break;
if (dPiece[cursmx][cursmy] == tileId) {
strcpy(infostr, _("Down to Crypt"));
cursmx = 36;
cursmy = 24;
return true;
}
}
}
return false;
}

2
Source/trigs.h
Unescape View File

@ -6,6 +6,7 @@
#pragma once
#include "engine/point.hpp"
#include "gendung.h"
#include "interfac.h"
namespace devilution {
@ -24,6 +25,7 @@ extern TriggerStruct trigs[MAXTRIGGERS];
extern int TWarpFrom;
void InitNoTriggers();
bool IsWarpOpen(dungeon_type type);
void InitTownTriggers();
void InitL1Triggers();
void InitL2Triggers();

Write Preview
Loading…
Cancel
Save