diff options
| -rw-r--r-- | crawl-ref/docs/crawl_options.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/init.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 4 |
6 files changed, 19 insertions, 17 deletions
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index b265b6e1a2..ae075b199b 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -967,8 +967,8 @@ item_stack_summary_minimum = 5 4-k Missiles. ----------------- -fire_items_start = a - Sets the first inventory item to consider. Default is a, many use c. +fire_items_start = c + Sets the first inventory item to consider. Default is c. fire_order = launcher, dart / stone / dagger, spear, handaxe, club The list should be on one line of items, with commas between items. diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index dd6e7bca55..3921212d7b 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -198,7 +198,7 @@ message_colour = lightcyan:LOW MAGIC WARNING ##### 4-k Firing Commands ####################### # -# fire_items_start = a +# fire_items_start = c # fire_order = launcher, dart / stone / javelin, dagger, spear, handaxe, club ##### 4-l Channels ############################## diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index dcf7c8d838..b235dda5eb 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -688,8 +688,7 @@ void game_options::reset_options() lowercase_invocations = true; - // Note: These fire options currently match the old behaviour. -- bwr - fire_items_start = 0; // start at slot 'a' + fire_items_start = 2; // start at slot 'c' // Clear fire_order and set up the defaults. set_fire_order("launcher, javelin / dart / stone / spear"); diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index f0784c46b4..588ea89aed 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -347,11 +347,12 @@ bool potion_effect( potion_type pot_eff, int pow ) case POT_RESISTANCE: mpr("You feel protected."); - you.duration[DUR_RESIST_FIRE] += random2(pow) + 10; - you.duration[DUR_RESIST_COLD] += random2(pow) + 10; - you.duration[DUR_INSULATION] += random2(pow) + 10; + you.duration[DUR_RESIST_FIRE] += random2(pow) + 10; + you.duration[DUR_RESIST_COLD] += random2(pow) + 10; + you.duration[DUR_RESIST_POISON] += random2(pow) + 10; + you.duration[DUR_INSULATION] += random2(pow) + 10; // one contamination point for each resist - contaminate_player(3); + contaminate_player(4); break; case NUM_POTIONS: diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index bc6f3fcc82..d8cdb15522 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -3831,12 +3831,14 @@ bool give_items_skills() you.inv[2].special = 0; } - you.inv[3].quantity = 4; - you.inv[3].base_type = OBJ_MISSILES; - you.inv[3].sub_type = MI_THROWING_NET; - you.inv[3].plus = 0; - you.inv[3].special = 0; - + if (you.species != SP_KOBOLD) + { + you.inv[3].quantity = 4; + you.inv[3].base_type = OBJ_MISSILES; + you.inv[3].sub_type = MI_THROWING_NET; + you.inv[3].plus = 0; + you.inv[3].special = 0; + } you.equip[EQ_WEAPON] = 0; you.equip[EQ_BODY_ARMOUR] = 1; you.equip[EQ_SHIELD] = 2; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 1ceee2784f..bf7a6ea221 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1980,14 +1980,14 @@ std::string status_mut_abilities() case MUT_FRAIL: if (have_any) text += ", "; - snprintf(info, INFO_SIZE, "-%d hp", level*10); + snprintf(info, INFO_SIZE, "-%d%% hp", level*10); text += info; have_any = true; break; case MUT_ROBUST: if (have_any) text += ", "; - snprintf(info, INFO_SIZE, "+%d hp", level*10); + snprintf(info, INFO_SIZE, "+%d hp%%", level*10); text += info; have_any = true; break; |