Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement hp bars

Browse Source
This commit is contained in:
scatterflower 2020-09-09 06:15:32 -05:00
parent 0f692a4103
commit 0fb7ab5fa3
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoclient.h
View File

@ -22,6 +22,8 @@
#include "include/server.h"
#include "include/icchatpacket.h"
#include <algorithm>
#include <QHostAddress>
#include <QTcpSocket>
#include <QDateTime>

3
include/area_data.h
View File

@ -39,6 +39,9 @@ class AreaData {
bool showname_allowed;
bool locking_allowed;
bool iniswap_allowed;
int def_hp;
int pro_hp;
};
#endif // AREA_DATA_H

16
src/aoclient.cpp
View File

@ -117,6 +117,8 @@ void AOClient::handlePacket(AOPacket packet)
fullArup(); // Give client all the area data
arup(ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player
sendPacket("HP", {"1", QString::number(area->def_hp)});
sendPacket("HP", {"2", QString::number(area->pro_hp)});
sendPacket("FA", server->area_names);
sendPacket("OPPASS", {"DEADBEEF"});
sendPacket("DONE");
@ -201,6 +203,16 @@ void AOClient::handlePacket(AOPacket packet)
last_wtce_time = QDateTime::currentDateTime().toSecsSinceEpoch();
server->broadcast(packet, current_area);
}
else if (packet.header == "HP") {
if (packet.contents[0] == "1") {
area->def_hp = std::min(std::max(0, packet.contents[1].toInt()), 10);
}
else if (packet.contents[0] == "2") {
area->pro_hp = std::min(std::max(0, packet.contents[1].toInt()), 10);
}
server->broadcast(AOPacket("HP", {"1", QString::number(area->def_hp)}), area->index);
server->broadcast(AOPacket("HP", {"2", QString::number(area->pro_hp)}), area->index);
}
else {
qDebug() << "Unimplemented packet:" << packet.header;
qDebug() << packet.contents;
@ -227,7 +239,9 @@ void AOClient::changeArea(int new_area)
server->areas[current_area]->player_count--;
current_area = new_area;
arup(ARUPType::PLAYER_COUNT, true);
// send hp, bn, le, arup
// send hp, bn, le
sendPacket("HP", {"1", QString::number(server->areas[new_area]->def_hp)});
sendPacket("HP", {"2", QString::number(server->areas[new_area]->pro_hp)});
if (server->areas[current_area]->characters_taken[current_char]) {
server->updateCharsTaken(server->areas[current_area]);
current_char = "";

2
src/area_data.cpp
View File

@ -32,4 +32,6 @@ AreaData::AreaData(QStringList characters, QString p_name, int p_index)
current_cm = "FREE";
locked = false;
status = "FREE";
def_hp = 10;
pro_hp = 10;
}