summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-03-07 22:26:26 -0700
committerSteve Melenchuk <smelenchuk@gmail.com>2014-03-07 22:27:06 -0700
commit9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54 (patch)
tree8af26519a20d5c8c53b76453deedd09bbf9ab682
parentc3ea3b707afa11309dfc91b1f994ffc55041be02 (diff)
downloadcrawl-ref-9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54.tar.gz
crawl-ref-9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54.zip
Badtiles for the latest unrands.
If only so that they can have *something* to show.
-rw-r--r--crawl-ref/source/art-data.txt6
-rw-r--r--crawl-ref/source/art-func.h6
-rw-r--r--crawl-ref/source/rltiles/dc-player.txt2
-rw-r--r--crawl-ref/source/rltiles/item/weapon/artefact/urand_firestarter.pngbin0 -> 305 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/artefact/urand_order.pngbin0 -> 1188 bytes
-rw-r--r--crawl-ref/source/rltiles/player/hand1/artefact/firestarter.pngbin0 -> 201 bytes
-rw-r--r--crawl-ref/source/rltiles/player/hand1/artefact/order.pngbin0 -> 823 bytes
7 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index f65fd8e2b5..f78bdccfe2 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -1141,14 +1141,16 @@ NAME: lajatang of Order
INSCRIP: silver, rMut
OBJ: OBJ_WEAPONS/WPN_LAJATANG
COLOUR: ETC_SILVER
+TILE: urand_order
+TILE_EQ: order
PLUS: 7/7
ENUM: FIRESTARTER
NAME: great mace "Firestarter"
OBJ: OBJ_WEAPONS/WPN_GREAT_MACE
COLOUR: RED
-#TILE: urand_firestarter
-#TILE_EQ: firestarter
+TILE: urand_firestarter
+TILE_EQ: firestarter
PLUS: +7/+7
BRAND: SPWPN_FLAMING
FIRE: 2
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index 9614709812..860223919f 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -915,6 +915,7 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker,
actor* defender, bool mondied, int dam)
{
int evoc = attacker->skill(SK_EVOCATIONS, 27);
+ beam_type flavour = BEAM_NONE;
if (mondied || !(x_chance_in_y(evoc, 729) || x_chance_in_y(evoc, 729)))
return;
@@ -928,16 +929,19 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker,
d = resist_adjust_damage(defender, BEAM_FIRE,
defender->res_fire(), d);
verb = "burn";
+ flavour = BEAM_FIRE;
break;
case 1:
d = resist_adjust_damage(defender, BEAM_COLD,
defender->res_cold(), d);
verb = "freeze";
+ flavour = BEAM_COLD;
break;
case 2:
d = resist_adjust_damage(defender, BEAM_ELECTRICITY,
defender->res_elec(), d);
verb = "electrocute";
+ flavour = BEAM_ELECTRICITY;
break;
case 3:
d = defender->apply_ac(d);
@@ -953,6 +957,8 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker,
attacker->is_player() ? verb : pluralise(verb).c_str(),
defender->name(DESC_THE).c_str());
defender->hurt(attacker, d);
+ if (defender->alive() && flavour != BEAM_NONE)
+ defender->expose_to_element(flavour, 2);
}
///////////////////////////////////////////////////
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 7546d9571f..2ad13382aa 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -507,6 +507,7 @@ snakebite SNAKEBITE
shillelagh SHILLELAGH
dark_maul DARK_MAUL
spellbinder SPELLBINDER
+firestarter FIRESTARTER
## polearms
trident_octopus_king TRIDENT_OCTOPUS_KING
glaive_of_prune GLAIVE_OF_PRUNE
@@ -520,6 +521,7 @@ elemental_staff ELEMENTAL_STAFF
asmodeus ASMODEUS
dispater DISPATER
olgreb OLGREB
+order ORDER
## axes
axe_trog AXE_TROG
arga ARGA
diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_firestarter.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_firestarter.png
new file mode 100644
index 0000000000..6993cbcb7e
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_firestarter.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/artefact/urand_order.png b/crawl-ref/source/rltiles/item/weapon/artefact/urand_order.png
new file mode 100644
index 0000000000..7a0906b729
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/artefact/urand_order.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/firestarter.png b/crawl-ref/source/rltiles/player/hand1/artefact/firestarter.png
new file mode 100644
index 0000000000..efa4b194c8
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/artefact/firestarter.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/order.png b/crawl-ref/source/rltiles/player/hand1/artefact/order.png
new file mode 100644
index 0000000000..76b5cf753a
--- /dev/null
+++ b/crawl-ref/source/rltiles/player/hand1/artefact/order.png
Binary files differ