Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*

Feature #822932 ยป 0054-Add-output_granularity-ruleset-setting.patch

Marko Lindqvist, 2019-06-23 07:02 AM

View differences:

client/tilespec.c
const int ox = t->type == TS_ISOMETRIC ? t->normal_tile_width / 3 : 0;
const int oy = t->type == TS_ISOMETRIC ? -t->normal_tile_height / 3 : 0;
food = CLIP(0, food, NUM_TILES_DIGITS - 1);
shields = CLIP(0, shields, NUM_TILES_DIGITS - 1);
trade = CLIP(0, trade, NUM_TILES_DIGITS - 1);
food = CLIP(0, food / game.info.granularity, NUM_TILES_DIGITS - 1);
shields = CLIP(0, shields / game.info.granularity, NUM_TILES_DIGITS - 1);
trade = CLIP(0, trade / game.info.granularity, NUM_TILES_DIGITS - 1);
ADD_SPRITE(t->sprites.city.tile_foodnum[food], TRUE, ox, oy);
ADD_SPRITE(t->sprites.city.tile_shieldnum[shields], TRUE, ox, oy);
common/networking/packets.def
SINT16 civil_war_bonus_celebrating;
SINT16 civil_war_bonus_unhappy;
BOOL paradrop_to_transport;
UINT16 granularity;
end
PACKET_CALENDAR_INFO = 255; sc, is-info, handle-via-packet
data/alien/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "Nation"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = FALSE
data/civ1/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = FALSE
data/civ2/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = FALSE
data/civ2civ3/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "Mixed"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = TRUE
data/classic/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
; There are some latent building effects in effects.ruleset which affect
data/experimental/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "Mixed"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = TRUE
data/multiplayer/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
; There are some latent building effects in effects.ruleset which affect
data/sandbox/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "Mixed"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = TRUE
data/stub/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
illness_on = FALSE
data/webperimental/game.ruleset
; upkeep are disbanded.
gold_upkeep_style = "City"
; How many points of output one basic unit consists of. Typically you
; want this to be some 10^n.
output_granularity = 1
[illness]
; Whether plagues (illness) are possible
; There are some latent building effects in effects.ruleset which affect
fc_version
# - No new mandatory capabilities can be added to the release branch; doing
# so would break network capability of supposedly "compatible" releases.
#
NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2019.Jun.23"
NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2019.Jun.23b"
FREECIV_DISTRIBUTOR=""
server/ruleset.c
ok = FALSE;
}
game.info.granularity = secfile_lookup_int_default(file, 1,
"civstyle.output_granularity");
/* section: illness */
game.info.illness_on
= secfile_lookup_bool_default(file, RS_DEFAULT_ILLNESS_ON,
tools/ruleutil/rulesave.c
gold_upkeep_style_name(game.info.gold_upkeep_style),
"civstyle.gold_upkeep_style");
}
save_default_int(sfile, game.info.granularity,
1, "civstyle.output_granularity", NULL);
save_default_bool(sfile, game.info.illness_on,
RS_DEFAULT_ILLNESS_ON,
"illness.illness_on", NULL);
    (1-1/1)