Merge pull request #3 from zeelorenc/master

Merge
This commit is contained in:
Dusan 2019-05-30 12:45:08 +02:00 committed by GitHub
commit 5849267f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ server.cfg.sample
*.dll *.dll
*.txt *.txt
*.rec *.rec
*.log
# include # include
include/* include/*

View File

@ -45,7 +45,7 @@
#define DISCORD_ROLE_TRIAL "452650284792152064" #define DISCORD_ROLE_TRIAL "452650284792152064"
#define DISCORD_ROLE_SUPPORT "452650284792152064" #define DISCORD_ROLE_SUPPORT "452650284792152064"
#define DISCORD_ROLE_VIP "191180697547833344" #define DISCORD_ROLE_VIP "191180697547833344"
#define DISCORD_ROLE_MEMBER "191180697547833344" #define DISCORD_ROLE_MEMBER "583576806133727233"
/* ** Variables ** */ /* ** Variables ** */
new stock new stock

View File

@ -36,7 +36,7 @@ static const Float: STOCK_DEFAULT_START_DONATIONS = 0.0; // the default amount t
static const Float: STOCK_DEFAULT_START_PRICE = 0.0; // the default starting price for a new report (useless) static const Float: STOCK_DEFAULT_START_PRICE = 0.0; // the default starting price for a new report (useless)
static const Float: STOCK_BANKRUPTCY_PERCENT = -80.0; // the % that makes a company go bankrupt static const Float: STOCK_BANKRUPTCY_PERCENT = -80.0; // the % that makes a company go bankrupt
static const Float: STOCK_BANKRUPTCY_LOSS_PERCENT = 20.0; // the % that is lost by the user when a stock drops static const Float: STOCK_BANKRUPTCY_LOSS_PERCENT = 5.0; // the % that is lost by the user when a stock drops
// static const Float: STOCK_BANKRUPTCY_MIN_PERCENT = -5.0; // the % that should make a company go bankrupt 'again' after it is $1 // static const Float: STOCK_BANKRUPTCY_MIN_PERCENT = -5.0; // the % that should make a company go bankrupt 'again' after it is $1
/* ** Variables ** */ /* ** Variables ** */

View File

@ -1,2 +1,4 @@
(+) Cloudy's advanced event system has been added. (+) Cloudy's advanced event system has been added.
(+) Night's discord implementation has been added.
(/) Players will lose only 5% of their stock if it drops 80% in a day.
(/) Full reversion of the turf war system to how it was pre-hardpoint. (/) Full reversion of the turf war system to how it was pre-hardpoint.