memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

almoos dere

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-18 13:29:38 -05:00
parent 68d03c1eac
commit f1bb7447f9
14 changed files with 125 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQCSim-srv/connection.cpp
View File

@@ -132,7 +132,7 @@ void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*
}
}
Timestamp Connection::Run(World* world) {
Timestamp Connection::Run(World* world, std::unordered_map<uint64_t, Booster*> boosters) {
Input in, last;
Output out;
Timestamp tstamp = 0;
@@ -169,7 +169,8 @@ Timestamp Connection::Run(World* world) {
in.keys.backward,
in.keys.left,
in.keys.right,
in.keys.jump, false, el), world, el);
in.keys.jump, false, el),
world, el, boosters);
if (player->GetPosition().y < -20.) {
player->InflictDamage(9000.);

2
SQCSim-srv/connection.h
View File

@@ -36,7 +36,7 @@ public:
void getPacks(SOCKET sock);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
Timestamp Run(World* world);
Timestamp Run(World* world, std::unordered_map<uint64_t, Booster*> boosters);
void CleanInputManifest(Timestamp time);

1
SQCSim-srv/define.h
View File

@@ -21,6 +21,7 @@ const std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker
"So long, @, and thanks for all the lols!",
"@ has a bad case of being dead.",
"@ has finally seen the light!",
"$ sees dead people; in this case they see a dead @.",
"Thought @ was hot; guess what? He's not. He is dead, dead, dead.",
"@ did not want to live forever.",
"$ made @ die for their country.",

66
SQCSim-srv/server.cpp
View File

@@ -83,18 +83,18 @@ int Server::Ready() {
m_game.countdown = 0;
}
} while (m_game.countdown < 1);
m_game.seed = 9370707;
/*do {
// m_game.seed = 9370707;
do {
Log("Entrez le seed de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
std::stoi(m_buf.ptr);
m_game.seed = std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_game.seed = 0;
}
} while (m_game.seed < 1);*/
} while (m_game.seed < 1);
do {
Log("Entrez le nombre de joueurs: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
@@ -108,7 +108,17 @@ int Server::Ready() {
if (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS)
Log("Nombre de joueurs invalide.", true, false);
} while (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS);
do {
Log("Entrez le nombre de boosters: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try {
m_boostcount = std::stoi(m_buf.ptr);
}
catch (const std::exception& e) {
Log(e.what(), true, false);
m_boostcount = -1;
}
} while (m_boostcount < 0);
m_game.gameType = 1;
if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) {
@@ -202,8 +212,8 @@ void Server::Run() {
m_conns.erase(key);
continue;
}
int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 16,
y = (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Y * WORLD_SIZE_Y / 2)) / 16;
int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 4,
y = (rand() % (CHUNK_SIZE_Z * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Z * WORLD_SIZE_Y / 2)) / 4;
conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
conn->player->m_username = conn->GetName();
m_players[key] = conn->player;
@@ -225,8 +235,21 @@ void Server::Run() {
std::vector<Bullet*> bullets;
std::vector<std::vector<Bullet*>::iterator> bullit;
std::vector<BulletAdd*> netbull;
std::vector<PickupMod*> netboosters;
std::vector<char*> lsPck;
int max = 0;
for (int64_t x = 0; x < m_boostcount; ++x) {
Vector3f pos = Vector3f(rand() % (WORLD_SIZE_X * CHUNK_SIZE_X) + .5f, rand() % CHUNK_SIZE_Y + .5f, rand() % (WORLD_SIZE_Y * CHUNK_SIZE_Z) + .5f);
if (m_world->BlockAt(pos) == BTYPE_AIR) {
Booster* boost = new Booster(pos, (BOOST_TYPE)(rand() % BTYPE_BOOST_LAST), getUniqueId());
m_boosters[boost->GetId()] = boost;
}
else --x;
if (++max > 1000)
break;
}
Chat* startchat = new Chat();
startchat->src_id = 0;
char startmess[] = "How would -YOU- like to die today, motherf-words?";
@@ -283,7 +306,7 @@ void Server::Run() {
if (conn->m_nsync) {
Timestamp tstamp = conn->Run(m_world);
Timestamp tstamp = conn->Run(m_world, m_boosters);
if (conn->player->AmIDead() && !conn->player->Eulogy) {
Chat* chat = new Chat();
@@ -367,6 +390,33 @@ void Server::Run() {
}
}
for (auto& [key, booster] : m_boosters) {
if (booster->modified) {
PickupMod pmod;
pmod.available = booster->GetAvailability();
pmod.id = booster->GetId();
pmod.pos = booster->GetPosition();
Boosts boost;
switch (booster->GetType()) {
case BTYPE_DAMAGE:
boost.damage = true;
break;
case BTYPE_HEAL:
boost.hp = true;
break;
case BTYPE_INVINCIBLE:
boost.invincible = true;
break;
default: continue;
}
pmod.boost = boost;
booster->modified = false;
for (auto& [key, conn] : m_conns)
sendPackTo<PickupMod>(m_sock_udp, &pmod, &m_buf, conn->getAddr());
}
}
for (auto& bull : netbull) {
for (auto& [key, conn] : m_conns)
if (bull->id != conn->GetHash(false)) // Pour pas repitcher au joueur sa propre balle.

3
SQCSim-srv/server.h
View File

@@ -43,12 +43,15 @@ private:
std::unordered_map<uint64_t, Player*> m_players;
std::unordered_map<uint64_t, Connection*> m_conns;
std::unordered_map<Timestamp, Chat> m_chatlog;
std::unordered_map<uint64_t, Booster*> m_boosters;
std::vector<uint64_t> m_ids;
GameInfo m_game;
World* m_world = nullptr;
bool m_exit = true;
int64_t m_boostcount = -1;
std::string LogTimestamp();
void Log(std::string str, bool is_error, bool is_fatal);
void buildIdList(size_t size);