Thr0lu5/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity

allow merchant ships on first city regardless of size from v17

Browse Source 
or we'll never get a merchant ship on languid testnets
This commit is contained in:
Crypto City 2023-08-14 16:42:47 +00:00
parent 01bd1ba04c
commit c3603d141c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/cc_special_events.cpp
View File

@ -234,7 +234,7 @@ static bool enable_merchant_ship(const cryptonote::BlockchainDB &db, uint32_t ci
cryptonote::cc_city_data_t cd;
if (!db.get_cc_city_data(city, cd))
return false;
if (cd.level < 4)
if ((version >= HF_VERSION_TOWNFORGE_MERCHANT_SHIPS_0 ? city : false) && cd.level < 4)
return false;
std::vector<merchant_ship_available_item_t> available_items;

1
src/cryptonote_config.h
View File

@ -191,6 +191,7 @@
#define HF_VERSION_VIEW_TAGS 15
#define HF_VERSION_2021_SCALING 15
#define HF_VERSION_TOWNFORGE_CORU 16
#define HF_VERSION_TOWNFORGE_MERCHANT_SHIPS_0 17
#define PER_KB_FEE_QUANTIZATION_DECIMALS 8
#define CRYPTONOTE_SCALING_2021_FEE_ROUNDING_PLACES 2