pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
KimLS
2022-07-14 18:56:08 -07:00
parent 1db2dffa57 59f8d54491
commit ce74ac9913
7 changed files with 609 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_zone_repository.h
+10
View File
@@ -112,6 +112,7 @@ public:
int underworld_teleport_index;
int lava_damage;
int min_lava_damage;
int expansion;
};
static std::string PrimaryKey()
@@ -215,6 +216,7 @@ public:
"underworld_teleport_index",
"lava_damage",
"min_lava_damage",
"expansion",
};
}
@@ -314,6 +316,7 @@ public:
"underworld_teleport_index",
"lava_damage",
"min_lava_damage",
"expansion",
};
}
@@ -447,6 +450,7 @@ public:
entry.underworld_teleport_index = 0;
entry.lava_damage = 50;
entry.min_lava_damage = 10;
entry.expansion = 0;
return entry;
}
@@ -575,6 +579,7 @@ public:
entry.underworld_teleport_index = atoi(row[90]);
entry.lava_damage = atoi(row[91]);
entry.min_lava_damage = atoi(row[92]);
entry.expansion = atoi(row[93]);
return entry;
}
@@ -700,6 +705,7 @@ public:
update_values.push_back(columns[90] + " = " + std::to_string(zone_entry.underworld_teleport_index));
update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.lava_damage));
update_values.push_back(columns[92] + " = " + std::to_string(zone_entry.min_lava_damage));
update_values.push_back(columns[93] + " = " + std::to_string(zone_entry.expansion));
auto results = db.QueryDatabase(
fmt::format(
@@ -814,6 +820,7 @@ public:
insert_values.push_back(std::to_string(zone_entry.underworld_teleport_index));
insert_values.push_back(std::to_string(zone_entry.lava_damage));
insert_values.push_back(std::to_string(zone_entry.min_lava_damage));
insert_values.push_back(std::to_string(zone_entry.expansion));
auto results = db.QueryDatabase(
fmt::format(
@@ -936,6 +943,7 @@ public:
insert_values.push_back(std::to_string(zone_entry.underworld_teleport_index));
insert_values.push_back(std::to_string(zone_entry.lava_damage));
insert_values.push_back(std::to_string(zone_entry.min_lava_damage));
insert_values.push_back(std::to_string(zone_entry.expansion));
insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
}
@@ -1062,6 +1070,7 @@ public:
entry.underworld_teleport_index = atoi(row[90]);
entry.lava_damage = atoi(row[91]);
entry.min_lava_damage = atoi(row[92]);
entry.expansion = atoi(row[93]);
all_entries.push_back(entry);
}
@@ -1179,6 +1188,7 @@ public:
entry.underworld_teleport_index = atoi(row[90]);
entry.lava_damage = atoi(row[91]);
entry.min_lava_damage = atoi(row[92]);
entry.expansion = atoi(row[93]);
all_entries.push_back(entry);
}
common/version.h
+1 -1
View File
@@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/
#define CURRENT_BINARY_DATABASE_VERSION 9186
#define CURRENT_BINARY_DATABASE_VERSION 9188
#ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029