Skip to content

Commit

Permalink
make module configuration consistent, off by default
Browse files Browse the repository at this point in the history
  • Loading branch information
ennorehling committed Jan 29, 2023
1 parent 35b46b6 commit 08a91c4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions conf/e2/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"orders.default": "work",
"NewbieImmunity": 8,
"modules.astralspace": true,
"modules.iceberg": true,
"modules.volcano": true,
"monsters.spawn.chance": 50,
"entertain.base": 0,
"entertain.perlevel": 20,
Expand Down
1 change: 1 addition & 0 deletions conf/e3/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"database.gameid": 7,
"NewbieImmunity": 4,
"modules.market": true,
"modules.volcano": true,
"magic.regeneration": 0.75,
"magic.power": 0.5,
"resource.factor": 0.25,
Expand Down
2 changes: 1 addition & 1 deletion src/randenc.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ void randomevents(void)
region *r;
faction *monsters = get_monsters();

if (config_get_int("modules.iceberg", 1)) {
if (config_get_int("modules.iceberg", 0) != 0) {
icebergs();
}
for (r = regions; r; r = r->next) {
Expand Down
2 changes: 1 addition & 1 deletion src/volcano.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ bool volcano_module(void)
static int cache;
static bool active;
if (config_changed(&cache)) {
active = config_get_int("modules.volcano", 1) != 0;
active = config_get_int("modules.volcano", 0) != 0;
}
return active;
}

0 comments on commit 08a91c4

Please sign in to comment.