Menu
▾
▴
[crawl-ref-commits] (branch: master) updated. 0.8.0-a0-2708-g76eef0e
|
From: KiloByte <cas...@us...> - 2010-11-30 14:00:21
|
via 76eef0e4008d29b82f5137e9b0e580fd5358e31c (commit)
via 5188528250af30c0705bd27ac533477538d8c33d (commit)
via 211a0488211a26b30285b970d97e8b0f2e9ae7f4 (commit)
from 45cb568f01c298bb9511e59a119194122a3844b4 (commit)
-----------------------------------------------------------------------
commit 76eef0e4008d29b82f5137e9b0e580fd5358e31c
Author: Adam Borowski <kil...@an...>
Date: Tue Nov 30 14:58:49 2010 +0100
Remove special placing of porridge in the Dwarven Hall.
This can be done easier with vaults if we want that.
commit 5188528250af30c0705bd27ac533477538d8c33d
Author: Adam Borowski <kil...@an...>
Date: Tue Nov 30 14:55:57 2010 +0100
Give Paracelsus an axe.
That's what you get for inventing gnomes, undines, sylphs and salamanders.
commit 211a0488211a26b30285b970d97e8b0f2e9ae7f4
Author: Adam Borowski <kil...@an...>
Date: Sun Nov 14 15:26:35 2010 +0100
A command-line argument --print-charset to query the i/o encoding Crawl wants.
This is to let DGL support both Crawls that obey system locale settings and
ones which do not.
I guess we'll use another approach and this will be reverted, but if not,
having this commit in would reduce the amount of incompatible builds on CDO
(as it's currently impossible to update past trunk versions).
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/branches/dwarf.des | 2 +-
crawl-ref/source/dat/descript/monsters.txt | 4 ---
crawl-ref/source/dungeon.cc | 22 +----------------
crawl-ref/source/enum.h | 3 +-
crawl-ref/source/initfile.cc | 25 +++++++++++++++++++-
crawl-ref/source/mon-data.h | 15 ++---------
crawl-ref/source/mon-gear.cc | 33 ---------------------------
crawl-ref/source/mon-spll.h | 11 ---------
crawl-ref/source/monster.cc | 2 +-
9 files changed, 32 insertions(+), 85 deletions(-)
diff --git a/crawl-ref/source/dat/des/branches/dwarf.des b/crawl-ref/source/dat/des/branches/dwarf.des
index 7f10275..f6ef716 100644
--- a/crawl-ref/source/dat/des/branches/dwarf.des
+++ b/crawl-ref/source/dat/des/branches/dwarf.des
@@ -452,7 +452,7 @@ SUBVAULT: W : fruiting_plant
KITEM: p = potion of healing / potion of heal wounds / \
potion of restore abilities w:1 / potion of poison w:3 / \
potion of strong poison w:1 / potion of confusion w:1 / nothing
-KMONS: 1 = patrolling Paracelsus name:the_alchemist name_suffix
+KMONS: 1 = deep dwarf artificer
MAP
ZZZZZ..YYYYY
ZZZZZ..YYYYY
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index ab2c296..21cfcbb 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -219,10 +219,6 @@ There was once a human priest named Mennas. He travelled far and wide preaching
Whether or not this angel is that same Mennas is something of a mystery, as he seems to have difficulty speaking.
%%%%
-Paracelsus
-
-A powerful alchemist of particular renown for his discovery of zinc and the beginnings of medicine. His wanderings as an itinerant physician and sometime journeyman miner took him throughout the world, but never could he find a safer replacement for his laudanum. People say he wanders the world in search of one to this day.
-%%%%
Menkaure
A fair and noble ruler of an ancient and mighty kingdom, mummified after an early death. His faithful priests subsequently infused him with great and powerful magic, seeking to grant him eternal life. Now he is forgotten and reduced to mouldering bandages and dry, brittle bones.
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 592a0a6..61f099d 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3985,26 +3985,8 @@ static void _builder_items(int level_number, level_area_type level_type, int ite
{
for (i = 0; i < items_wanted; i++)
{
- // porridge in the dwarven hall
- if (player_in_branch(BRANCH_DWARVEN_HALL))
- {
- const int it = random2(100);
- if (it == 1)
- {
- items(1, OBJ_POTIONS, POT_PORRIDGE, false, 0, 250,
- MMT_NO_ITEM);
- }
- else if (it < 10)
- {
- items(1, specif_type, OBJ_RANDOM, false, items_levels, 250,
- MMT_NO_ITEM);
- }
- }
- else
- {
- items(1, specif_type, OBJ_RANDOM, false, items_levels, 250,
- MMT_NO_ITEM);
- }
+ items(1, specif_type, OBJ_RANDOM, false, items_levels, 250,
+ MMT_NO_ITEM);
}
// Make sure there's a very good chance of a knife being placed
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 229c55e..af4d1cb 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1974,7 +1974,7 @@ enum monster_type // (int) menv[].type
MONS_UNUSED_256,
MONS_UNUSED_257,
MONS_UNUSED_258,
- MONS_PARACELSUS,
+ MONS_UNUSED_PARACELSUS,
// BCR - End first batch of uniques.
MONS_NAGA_MAGE, // 260
MONS_NAGA_WARRIOR,
@@ -2449,7 +2449,6 @@ enum mon_spellbook_type
MST_DEEP_DWARF_UNBORN,
MST_BK_TROG,
MST_BK_YREDELEMNUL,
- MST_PARACELSUS,
MST_GUARDIAN_SERPENT = 10,
MST_LICH_I = 20,
MST_LICH_II,
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 22182e8..c72e1e8 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -3554,6 +3554,7 @@ enum commandline_option_type
CLO_EXTRA_OPT_LAST,
CLO_SPRINT_MAP,
CLO_EDIT_SAVE,
+ CLO_PRINT_CHARSET,
CLO_NOPS
};
@@ -3563,7 +3564,7 @@ static const char *cmd_ops[] = {
"rcdir", "tscores", "vscores", "scorefile", "morgue", "macro",
"mapstat", "arena", "test", "script", "builddb", "help", "version",
"seed", "save-version", "sprint", "extra-opt-first", "extra-opt-last",
- "sprint-map", "edit-save",
+ "sprint-map", "edit-save", "print-charset",
};
static const int num_cmd_ops = CLO_NOPS;
@@ -4147,6 +4148,28 @@ bool parse_args(int argc, char **argv, bool rc_only)
Options.game.map = next_arg;
break;
+ case CLO_PRINT_CHARSET:
+ if (rc_only)
+ break;
+ switch(Options.char_set)
+ {
+ case CSET_ASCII:
+ printf("ASCII\n");
+ end(0);
+ case CSET_IBM:
+ printf("IBM\n");
+ end(0);
+ case CSET_DEC:
+ printf("DEC\n");
+ end(0);
+ case CSET_UNICODE:
+ printf("UNICODE\n");
+ end(0);
+ case NUM_CSET:
+ ASSERT(!"unset charset");
+ }
+ break;
+
case CLO_EXTRA_OPT_FIRST:
if (!next_is_param)
return (false);
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index d9db78e..3172046 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -5709,18 +5709,9 @@ static monsterentry mondata[] = {
MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
},
-{
- // the alchemist
- MONS_PARACELSUS, 'q', LIGHTBLUE, "Paracelsus",
- M_WARM_BLOOD | M_NO_REGEN | M_SPELLCASTER | M_SPEAKS | M_UNIQUE,
- MR_NO_FLAGS,
- 600, 14, MONS_DWARF, MONS_DEEP_DWARF, MH_NATURAL, -8,
- { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
- { 12, 3, 5, 100 },
- 2, 12, MST_PARACELSUS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
- I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
- MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
+#if TAG_MAJOR_VERSION == 31
+AXED_MON(MONS_UNUSED_PARACELSUS)
+#endif
// human uniques
{
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index fca18f8..5305c1d 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -178,39 +178,6 @@ static void _give_potion(monster* mon, int level)
mitm[thing_created].flags = 0;
_give_monster_item(mon, thing_created);
}
- else if (mon->type == MONS_PARACELSUS)
- {
- int type = random2(4);
- switch (type)
- {
- case 0:
- type = OBJ_RANDOM;
- break;
- case 1:
- type = POT_HEALING;
- break;
- case 2:
- type = POT_HEAL_WOUNDS;
- break;
- case 3:
- type = POT_POISON;
- break;
- case 4:
- type = POT_STRONG_POISON;
- break;
- default:
- type = POT_WATER;
- break;
- }
- int pot = items(0, OBJ_POTIONS, type, true, level, 0);
-
- if (pot == NON_ITEM)
- return;
-
- mitm[pot].flags = 0;
- _give_monster_item(mon, pot, true,
- &monster::pickup_potion);
- }
else if (mons_is_unique(mon->type) && one_chance_in(3))
{
const int thing_created =
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index c31c938..0b77281 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -97,17 +97,6 @@
}
},
- { MST_PARACELSUS,
- {
- SPELL_EVAPORATE,
- SPELL_EVAPORATE,
- SPELL_STONESKIN,
- SPELL_POLYMORPH_OTHER,
- SPELL_STICKS_TO_SNAKES,
- SPELL_STICKS_TO_SNAKES
- }
- },
-
{ MST_GUARDIAN_SERPENT,
{
SPELL_TELEPORT_OTHER,
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index c8e2466..88bc432 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -1840,7 +1840,7 @@ bool monster::pickup_potion(item_def &item, int near)
// them.
const potion_type ptype = static_cast<potion_type>(item.sub_type);
- if (type != MONS_PARACELSUS && !can_drink_potion(ptype))
+ if (!can_drink_potion(ptype))
return (false);
return (pickup(item, MSLOT_POTION, near));
--
Dungeon Crawl Stone Soup
|