Merge bread and meat rations.

Taking the average of the two for normal, herbivorous, and carnivorous
nutrition.

Move the old meat ration tile to UNUSED. The remaining tile should be
updated to represent a balanced meal rather than simply bread.

Remove some out-of-date nutrition totals from food.des.

The new description needs translation, unless we're giving up on that.

crawl-ref/source/acquire.cc

@@ -415,12 +415,7 @@ static int _acquirement_food_subtype(bool /*divine*/, int& quantity)
         type_wanted = FOOD_FRUIT;
     }
     else
-    {
-        type_wanted = coinflip()
-            ? FOOD_ROYAL_JELLY
-            : you.get_mutation_level(MUT_HERBIVOROUS) ? FOOD_BREAD_RATION
-                                                      : FOOD_MEAT_RATION;
-    }
+        type_wanted = coinflip() ? FOOD_ROYAL_JELLY : FOOD_RATION;
 
     quantity = 3 + random2(5);
 

crawl-ref/source/dat/des/branches/lair.des

@@ -1402,7 +1402,7 @@ NAME:   beast_lair_carwin_2
 TAGS:   transparent luniq_beast_lair
 : beast_lair_populate_mons_small(_G)
 : beast_lair_randomise(_G)
-ITEM:  meat ration
+ITEM:  ration
 SUBST: ? : .
 MAP
   ...
@@ -2090,7 +2090,7 @@ TAGS:   no_monster_gen
 DEPTH:  Lair
 MONS:   river rat band, hell rat, river rat / rat
 KMONS:  P = plant / fungus w:2
-KITEM:  d = fruit / bread ration
+KITEM:  d = fruit / ration
 NSUBST: ' = 1:1 / 2:P / 2:2 / 2:3 / 2:d
 MAP
  xxxx
@@ -2109,7 +2109,7 @@ NAME:   kennysheep_abandoned_house
 TAGS:   ruin
 DEPTH:  Lair
 MONS:   rat, river rat, hell rat
-KITEM:  d = fruit / bread ration
+KITEM:  d = fruit / ration
 NSUBST: d = 1:d / 1:* / 1:9 / 1:3 / * = dd11223.......
 MAP
       .......
@@ -2203,7 +2203,7 @@ DEPTH:  Lair, !Lair:$
 MONS:   black bear / polar bear
 KFEAT:  " = W
 KMONS:  " = electric eel w:40 / nothing
-KITEM:  % = meat ration
+KITEM:  % = ration
 SUBST:  % = %., * = *:40 |, B = 1., E = tE
 CLEAR:  E
 MAP
@@ -2564,7 +2564,7 @@ MONS:    black bear, polar bear
 KMONS:   P = plant
 # The one big reward and the several smaller stacks of items
 # are randomly split between the mostly-dog and mostly-bear sections.
-KITEM:   $ = any, any w:1 / nothing w:5, meat ration q:1
+KITEM:   $ = any, any w:1 / nothing w:5, ration q:1
 KITEM:   % = any, any w:1 / nothing w:5, royal jelly q:2
 KITEM:   *| = gold, gold, gold, acquire any
 NSUBST:  2 = 2:22334 / *:3

crawl-ref/source/dat/des/branches/orc.des

@@ -189,12 +189,12 @@ ORIENT:  float
 MONS:    orc, orc priest / orc wizard
 MONS:    w:50 orc warrior / ogre, swamp drake
 # The drake's name is Bobby. Since you did ask.
-KITEM:   1 = meat ration w:5 / nothing / animal skin / \
+KITEM:   1 = ration w:5 / nothing / animal skin / \
              potion of degeneration w:20 / potion of haste w:2 / \
              potion of might w:2
 KFEAT:   1 = 1
 ITEM:    club, potion of degeneration ident:type, royal jelly
-ITEM:    meat ration w:2 / nothing, potion of degeneration ident:type
+ITEM:    ration w:2 / nothing, potion of degeneration ident:type
 SHUFFLE: defO
 KFEAT:   O = enter_orcish_mines
 MAP

crawl-ref/source/dat/des/branches/shoals.des

@@ -604,8 +604,8 @@ KPROP: YycfZ. = no_tide
 KPROP: ZYcf. = no_tele_into
 KMONS: c = patrolling hungry ghost
 NSUBST: f = 1:g / 2:f / *:.
-KITEM: g = meat ration / bread ration
-KITEM: f = meat ration / bread ration / nothing w:20
+KITEM: g = ration
+KITEM: f = ration / nothing w:10
 : dgn.delayed_decay(_G, 'c', 'human skeleton')
 SUBST: Z = yY
 KFEAT: y = w

crawl-ref/source/dat/des/branches/swamp.des

@@ -570,7 +570,7 @@ dgn.delayed_decay_extra(_G, 'p', 'orc corpse', 'hand axe / broad axe, ' ..
    'leather armour / pair of gloves')
 }}
 KITEM: w = mundane quarterstaff
-KITEM: s = meat ration / bread ration
+KITEM: s = ration
 KFEAT: 'o = W
 CLEAR:  _
 MAP
@@ -1614,7 +1614,7 @@ SUBST: ghi = .
 KMONS: D = patrolling spriggan rider
 KMONS: SGHI = spriggan / nothing
 KMONS: F = spriggan druid
-KITEM: f = royal jelly q:3 / bread ration / fruit
+KITEM: f = royal jelly q:3 / ration / fruit
 MAP
        ttttt
   ttttttgggt

crawl-ref/source/dat/des/branches/zot.des

@@ -2253,7 +2253,7 @@ TAGS: no_monster_gen transparent
 MONS: lightning spire, patrolling electric golem
 NSUBST: % = 2:!
 KMONS: ! = patrolling death cob
-KITEM: %! = fruit q:1 / bread ration w:2 / nothing w:8
+KITEM: %! = fruit q:1 / ration w:2 / nothing w:8
 MAP
 @xxxxx@
 .......

crawl-ref/source/dat/des/builder/alphashops.des

@@ -65,7 +65,7 @@
 
       elseif s == "B" then i = { "bardiche", "battleaxe", "bolt",
        "book of battle", "book of beasts", "book of burglary", "box of beasts",
-       "bread ration", "broad axe", "pair of boots", "potion of berserk rage",
+       "broad axe", "pair of boots", "potion of berserk rage",
        "blowgun", "potion of blood", "potion of brilliance",
        "scroll of blinking", "scroll of brand weapon",
        "manual of bows", "buckler" }
@@ -120,7 +120,7 @@
        "potion of lignification", "ring of loudness", "lajatang", "longbow",
        "lightning rod" }
 
-      elseif s == "M" then i = { "manual of maces & flails", "meat ration",
+      elseif s == "M" then i = { "manual of maces & flails",
        "book of minor magic", "book of misfortune", "book of maledictions",
        "morningstar", "mace", "potion of magic",
        "ring of magical power", "amulet of magic regeneration", "potion of might",
@@ -146,7 +146,7 @@
        "amulet of regeneration", "rapier", "ring of resist corrosion",
        "royal jelly", "potion of resistance", "robe", "ring mail",
        "scroll of random uselessness", "scroll of remove curse",
-       "wand of random effects" }
+       "wand of random effects", "ration" }
 
       elseif s == "S" then i = { "scarf", "scimitar", "short sword",
        "sling bullet", "scale mail", "book of summonings", "book of the sky",

crawl-ref/source/dat/des/builder/food.des

@@ -20,11 +20,11 @@ end
 # Guarantee at least some really minimal food supply.
 ##########################################################################
 
-NAME:   first_bread
+NAME:   first_ration
 DEPTH:  D:2-5
 CHANCE: 2500, 3333 (D:3), 5000 (D:4), 10000 (D:5)
 TAGS:   uniq_first_food extra transparent
-ITEM:   bread ration
+ITEM:   ration
 MAP
 d
 ENDMAP
@@ -65,7 +65,7 @@ MAP
 .....
 ENDMAP
 
-# 17.6k/26.6k/0
+# 18.8k/11.8k/13k
 NAME:   the_bakery
 DEPTH:  D:7-14
 # Previously this was a 25% CHANCE; I'm assuming this was meant to weight this
@@ -75,7 +75,7 @@ DEPTH:  D:7-14
 : food_weight(_G, 7)
 WEIGHT: 25
 TAGS:   uniq_second_food extra chance_second_food
-ITEM:   bread ration q:2
+ITEM:   ration q:2
 : if crawl.one_chance_in(8) then
 :   dgn.delayed_decay(_G, 'e', 'spriggan name:baked n_adj n_spe n_des corpse')
 : else
@@ -141,7 +141,6 @@ cccc....cccc
 cccccccccccc
 ENDMAP
 
-# 23.2k/19.9k/13k
 # Not really a fish farm now that fish are gone...
 NAME:   hangedman_fish_farm
 DEPTH:  D:9-14
@@ -151,7 +150,7 @@ TAGS:   uniq_second_food extra chance_second_food no_monster_gen no_pool_fixup \
         patrolling
 KMONS:  A = merfolk ; spear
 KFEAT:  g = shallow_water
-ITEM:   meat ration q:2, bread ration q:3, throwing net
+ITEM:   ration q:2, throwing net
 :       dgn.delayed_decay(_G, 'g', 'electric eel corpse')
 MAP
 xxxxxx
@@ -161,15 +160,14 @@ xWWWWx
 xxxxxx
 ENDMAP
 
-# 18k/18.8k/16.6k (min 18k/12k/12k), plus perishable 6k/6k/0
 NAME:   hangedman_pestilent_swarm
 DEPTH:  D:8-14
 : food_weight(_G, 8)
 WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food no_monster_gen patrolling
 MONS:   hornet / worm w:5 / worker ant
 MONS:   hornet w:7 / soldier ant w:13
-ITEM:   meat ration q:1 / fruit q:3
+ITEM:   ration q:1 / fruit q:3
 ITEM:   royal jelly q:3, royal jelly q:6
 MAP
 .xxxxxxx
@@ -205,7 +203,6 @@ MAP
  .Wxxxxxx
 ENDMAP
 
-# 22.3k/18.8k/19k (min 9.6k)
 NAME:     hangedman_ranch
 DEPTH:    D:8-14
 : food_weight(_G, 8)
@@ -221,7 +218,7 @@ KMONS:    F = plant
 KITEM:    C = royal jelly q:2
 KITEM:    E = falchion ego:flaming ident:type / \
               hand axe ego:flaming ident:type
-KITEM:    H = meat ration q:2
+KITEM:    H = ration q:2
 KITEM:    I = halberd
 KFEAT:    EF = shallow_water
 MAP
@@ -237,7 +234,6 @@ xFFW.W.W.x
 xxxxx@xxxx
 ENDMAP
 
-# 20.6k/23k/12.5k (min 18k/6k/0)
 NAME:    hangedman_stone_soup
 DEPTH:   D:10-14
 : food_weight(_G, 8)
@@ -255,7 +251,7 @@ KMONS:   G = necrophage
 KMONS:   H = crimson imp
 KITEM:   1 = stone q:1 w:50 no_pickup / large rock q:1 w:24 / \
              mundane hand axe w:1 no_pickup
-KITEM:   Ya = bread ration / meat ration
+KITEM:   Ya = ration
 KITEM:   b = royal jelly / fruit q:1
 KFEAT:   1Yab = shallow_water
 KMASK:   1Yac = no_monster_gen
@@ -277,7 +273,6 @@ MAP
  .......
 ENDMAP
 
-# 22.0k/29.5k/0
 # A tengu has staked out a little piece of the dungeon.
 NAME:   grunt_tengu_nest
 DEPTH:  D:10-14
@@ -286,7 +281,7 @@ WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food no_monster_gen patrolling
 MONS:   tengu warrior / tengu conjurer, plant
 NSUBST: 2 : 3:2 / *:.
-ITEM:   bread ration / fruit q:7
+ITEM:   ration / fruit q:7
 MAP
  xx+xx
 xx2.2xx
@@ -318,7 +313,7 @@ TAGS:   uniq_second_food extra chance_second_food no_monster_gen no_trap_gen \
   dgn.delayed_decay(_G, 'g', 'orc skeleton / human skeleton / elf skeleton'
                              .. ' / dwarf skeleton')
 }}
-ITEM:   bread ration q:3, meat ration q:1, throwing net
+ITEM:   ration q:3, ration q:1, throwing net
 MARKER: O = lua:fog_machine { cloud_type = "flame", pow_min = 10, \
                               pow_max = 10, delay = 10, size = 1, \
                               walk_dist = 0, excl_rad = 0 }
@@ -352,8 +347,8 @@ MONS:   human ; animal skin . hand axe
     mons("hog w:" .. hog_weight .. " / yak w:1")
   end
 }}
-ITEM:   royal jelly q:4, bread ration q:2
-ITEM:   meat ration q:1
+ITEM:   royal jelly q:4, ration q:2
+ITEM:   ration q:1
 KFEAT:  K = iron_grate
 KFEAT:  - = open_door
 MAP

crawl-ref/source/dat/des/portals/lab.des

@@ -237,7 +237,7 @@ dgn.delayed_decay_extra(_G, 'B', 'elf skeleton', 'robe, randbook, '
 
  -- Spriggan stabber. 4 items.
 dgn.delayed_decay_extra(_G, 'C', 'spriggan skeleton', 'dagger good_item / '
-   .. 'quick blade w:1, bread ration, cloak, randbook disc:hexes / any book' )
+   .. 'quick blade w:1, ration, cloak, randbook disc:hexes / any book' )
 
  -- Centaur hunter of Fedhas. 3-4 (stacks of) items.
 dgn.delayed_decay_extra(_G, 'D', 'centaur skeleton', 'shortbow good_item / longbow w:2, '
@@ -283,7 +283,7 @@ dgn.delayed_decay_extra(_G, 'L', 'halfling skeleton', 'tomahawk ego:dispersal /
 
  -- Ogre, maybe an ogre mage of some kind. 4-5 items.
 dgn.delayed_decay_extra(_G, 'M', 'ogre skeleton', 'giant club good_item / '
-   .. 'giant spiked club good_item, robe, large rock, meat ration, '
+   .. 'giant spiked club good_item, robe, large rock, ration, '
    .. 'any book / nothing' )
 }}
 MAP

crawl-ref/source/dat/des/portals/sewer.des

@@ -724,7 +724,7 @@ KMONS:  4 = Purgy, crocodile
 ITEM:   potion of flight / potion of agility / potion of heal wounds / \
         potion of invisibility / potion of mutation / potion of degeneration /\
         scroll of blinking / scroll of teleportation / scroll of fear / \
-        scroll of random uselessness / meat ration / potion of blood / \
+        scroll of random uselessness / ration / potion of blood / \
         nothing w:140
 : sewer_setup(_G)
 MAP
@@ -852,7 +852,7 @@ KMONS:  2 = purgy, crocodile
 ITEM:   potion of flight / potion of agility / potion of heal wounds / \
         potion of invisibility / potion of mutation / potion of degeneration / \
         scroll of blinking / scroll of teleportation / scroll of fear / \
-        scroll of random uselessness / meat ration / potion of blood / \
+        scroll of random uselessness / ration / potion of blood / \
         nothing w:140
 NSUBST: e = 3:* / 9:d / *:.
 NSUBST: 0 = 5:1 / 1:2 / *:.

crawl-ref/source/dat/des/sprint/linesprint.des

@@ -343,7 +343,7 @@ ENDMAP
 
 NAME:     items_3
 TAGS:     items_3
-KITEM:    a = meat ration q:12, bread ration q:12, fruit q:40
+KITEM:    a = ration q:12 w:20, fruit q:40
 KITEM:    b = pair of gloves mundane ident:all not_cursed /\
            pair of boots mundane ident:all not_cursed /\
            helmet mundane ident:all not_cursed /\

crawl-ref/source/dat/des/sprint/pitsprint.des

@@ -627,9 +627,7 @@ SUBVAULT: Y : storerooms_room_b
 SUBVAULT: T : the_temple
 SUBVAULT: U : equipment_1
 # Initial consumables
-KITEM: a = bread ration q:7, \
-       meat ration q:7, \
-       fruit q:40
+KITEM: a = ration q:7 w:20, fruit q:40
 KITEM: b = scroll of summoning ident:all q:1, \
        scroll of amnesia q:5 ident:all, \
        scroll of remove curse q:3 ident:all, \
@@ -1892,8 +1890,7 @@ TILE:   v = wall_cobalt_stone
 : base_monster_setup(_G)
 KITEM:  34CBDEJK = superb_item ident:all w:66 /\
                    royal jelly q:6 /\
-                   bread ration ident:all q:2 /\
-                   meat ration ident:all q:2
+                   ration q:2 w:20
 : lua_marker('_', props_marker {
 :           door_description_suffix=" to a Minivault (Hard)",
 :           })

crawl-ref/source/dat/des/sprint/sprint_mu.des

@@ -168,7 +168,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of mutation ident:all q:2 / potion of mutation q:1 / any potion, \
- meat ration / bread ration / royal jelly w:20 / fruit, \
+ ration w:20 / royal jelly w:20 / fruit, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2/ scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \
@@ -201,7 +201,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of mutation ident:all q:2 / potion of mutation q:1 / any potion, \
- meat ration / bread ration / royal jelly w:20 / fruit, \
+ ration w:20 / royal jelly w:20 / fruit, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2 / scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \

crawl-ref/source/dat/des/sprint/zigsprint.des

@@ -780,7 +780,7 @@ KITEM:    L = scroll of blinking q:3 ident:all, \
               scroll of holy word q:1 ident:all, \
               scroll of fog q:7 ident:all, \
               scroll of amnesia q:4 ident:all
-KITEM:    M = meat ration q:4, bread ration q:4, fruit q:42
+KITEM:    M = ration q:4 w:20, fruit q:42
 KITEM:    N = wand of acid ident:all charges:7, \
               wand of iceblast ident:all charges:7, \
               wand of disintegration ident:all charges:7

crawl-ref/source/dat/des/tutorial/lesson4.des

@@ -37,7 +37,7 @@ FTILE:   ABCDEFdefg = tutorial_pad
 ITEM:    randbook numspells:2 spells:magic_dart&mephitic_cloud title:Introduction_to_Spellcasting owner:player
 ITEM:    ring of magical power not_cursed
 ITEM:    staff of wizardry not_cursed
-ITEM:    bread ration
+ITEM:    ration
 MONS:    training dummy ; stone q:20
 MONS:    bat skeleton, goblin skeleton
 MONS:    rat, goblin

crawl-ref/source/dat/des/variable/arcadia.des

@@ -38,7 +38,7 @@ KMONS:   Q = bush
 KMONS:   R = plant
 ITEM:    dagger / short sword / rapier / flail / whip / blowgun / shortbow
 ITEM:    robe / cloak / hat / buckler / steam dragon scales w:1
-ITEM:    bread ration q:3
+ITEM:    ration q:3
 KFEAT:   _ = altar_trog
 NSUBST:  . = 10:0 / 8 = 00... / 2:O / 1:3 / 1:5 / *:.
 NSUBST:  6 = 1:9 / 2 = 669 / *:6

crawl-ref/source/dat/des/variable/float.des

@@ -1548,7 +1548,7 @@ MARKER: F = lua:fog_machine { \
 MONS:   death yak w:5 / dream sheep w:3 / yak w:7
 MONS:   generate_awake human ; dagger | hand axe
 SUBST:  F=d, 2=2.
-ITEM:   meat ration w:5 / nothing
+ITEM:   ration w:5 / nothing
 MAP
  cccccc       ccccccc
  cddddcxxxxxxxxcddddc