Menu
▾
▴
[crawl-ref-commits] jump_attack branch updated: 0.14-a0-81-gc4170a9
|
From: <gi...@cr...> - 2013-09-30 19:05:18
|
discards b3c2fbaeaa34fc84201300581eafb81c1a83fbd9 (commit)
discards fac964c93594dd49131d141778b5790f7c97afb3 (commit)
discards 08d2bf78a294ed497e582682f6d84ee41dd90525 (commit)
discards c5ec9a5276cef936fbacc0832559a90bad63e5c7 (commit)
discards d34add35c4e2eadc4070419d0bfd939a1ccd9fbd (commit)
discards 6980c2847b15ef7026c2566f0796cc596dd44b1a (commit)
discards ced014d0aedf6557eb093306a1f1ff7d1b5c7341 (commit)
discards 01631b83c9b0e5a5b2f56e0843ccd68f60b017a4 (commit)
discards f960547f6a86a3cfb837a621ab8c463a2f981081 (commit)
discards 2b30c7f69514a1d62d694e70b1c932a2ce79a206 (commit)
discards c892558c798fea435a2fe5c347f06ad40cd8a127 (commit)
discards 26617dcfecc41fe232007e0a652df9b18ea7a042 (commit)
discards a480ebeb2c898187c4f2027e4cb55c1ef68e2131 (commit)
discards e483ccf8e10929633fb8f815811124531c5482d1 (commit)
discards 8d34e368f9598c3e9769fa26c91a7bbbef9d4648 (commit)
via c4170a9922f5739b4dd3bd3742bb2dfdbe0214ff (commit)
via 7a91859e6abb7781f3d5946454e4e039ed7e88d0 (commit)
via a79bcc588677592fcd802eebb7781a26bbb2a2c4 (commit)
via adb8177cd31fec907787b7b5c74c83551d94571d (commit)
via 5fdbf5381836b35e7f4893f3e84c00499b3385a6 (commit)
via ff92caf220bddd6f9a8ec004f31de357979dda50 (commit)
via 16670a3e6da599cd51bd2f27a57fdae5b1be6597 (commit)
via 1e2d4d3e59092983fa0442b2ecf07fef757dfb96 (commit)
via 77d9090c115ba51ecb8f0dc861c0e87177334a38 (commit)
via f260d1effbf03e9eb0b9cf833734d9feb2e97a8b (commit)
via 8ee9460696a4c9369b8fa7287b4aa7a59d706b9e (commit)
via 66a55eb8dc9b7e8788f09a5184d32ccf7b8e0b06 (commit)
via 51ad48a7a1338b4d37b0ec687a527cc16d707eb4 (commit)
via d4749ff80b86da29861fc2bc51b02e965c9fe6ba (commit)
via 2f9d24788defaeda049a2684415e9ff0cda32255 (commit)
via 560282b6d41e0319427228cb1b2c16fe234102e0 (commit)
via 011cccd8b062ad9854dd629e73d88d488ca87466 (commit)
via 11c248451e2392f93de405dfe692c31ff6ff4338 (commit)
via b88737e909f4e54c920e240f93eca2ce475f8a4d (commit)
via 96a4fb3f24cbe59ac6ac971ccdd3387b5efd3146 (commit)
via 8b588dfb2c132f38624c8d2644c8f5badf5e14f5 (commit)
via 99e328b810d3611051b701dabf07c7886b4901a9 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (b3c2fbaeaa34fc84201300581eafb81c1a83fbd9)
\
N -- N -- N (c4170a9922f5739b4dd3bd3742bb2dfdbe0214ff)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
-----------------------------------------------------------------------
commit c4170a9922f5739b4dd3bd3742bb2dfdbe0214ff
Author: gammafunk <gam...@gm...>
Date: Sun Sep 29 21:34:14 2013 -0500
Fix conduct prompting for jump attacks with elec/devastator.
Warnings were not being generated for non-adjacent jump attacks and some
double-prompting occured for adjacent ones.
commit 7a91859e6abb7781f3d5946454e4e039ed7e88d0
Author: gammafunk <gam...@gm...>
Date: Sun Sep 29 20:00:11 2013 -0500
Simplify conduct checks and fix prompting with elec/devastator for jump-attack
Instead of trying to differentiate sanctuary vs. other conduct issues, just
count them equally as a conduct violation, which seems the intention of
bad_attack() anyways. Elec attacks for targets in water and devastator also
give conduct prompts now with no double-prompting.
commit a79bcc588677592fcd802eebb7781a26bbb2a2c4
Author: gammafunk <gam...@gm...>
Date: Thu Sep 26 19:41:53 2013 -0500
Allow jump attack to target an empty square
The player can target an in-range empty square for jump attack. If it turns out
that the square is empty, the jump-attack fails and the player rebounds to their
original position, losing the turn.
commit adb8177cd31fec907787b7b5c74c83551d94571d
Author: gammafunk <gam...@gm...>
Date: Fri Aug 30 12:29:08 2013 -0500
Include a header to use a canned message in the player class
commit 5fdbf5381836b35e7f4893f3e84c00499b3385a6
Author: gammafunk <gam...@gm...>
Date: Fri Aug 30 11:59:44 2013 -0500
Disable jump in tree and wisp forms
commit ff92caf220bddd6f9a8ec004f31de357979dda50
Author: gammafunk <gam...@gm...>
Date: Thu Aug 29 00:34:30 2013 -0500
Fully set the jump mutation in the Felid save compatibility code
commit 16670a3e6da599cd51bd2f27a57fdae5b1be6597
Author: gammafunk <gam...@gm...>
Date: Mon Jun 24 14:15:30 2013 -0500
Don't do an erroneus check_moveto() on the monster target, cleanups and documentation for targetter_jump
commit 1e2d4d3e59092983fa0442b2ecf07fef757dfb96
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 01:56:53 2013 -0500
Fix movement range not being properly checked
commit 77d9090c115ba51ecb8f0dc861c0e87177334a38
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 01:01:11 2013 -0500
Give felids the jump 1 mutation at start.
Increasing the mutation level at XL 6 and XL12.
commit f260d1effbf03e9eb0b9cf833734d9feb2e97a8b
Author: gammafunk <gam...@gm...>
Date: Wed Aug 28 23:36:41 2013 -0500
Jump-related save compatibility
The jump enums (two abilities, arte prop, mutation) were previously not added to
the proper location, which would break save compat with trunk. Also add a bit
of save compat code to give Fe innate jump if loading from a save where they
don't have it.
commit 8ee9460696a4c9369b8fa7287b4aa7a59d706b9e
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 00:41:21 2013 -0500
Add a player mutation granting the jump ability
* Starting attack range is 3, like the evokations ability, increasing by one for
each level of the the mutation to a max of 5.
* Cost of ability is only hunger and exhaustion (same hunger cost as evokations
ability).
* The mutation ability otherwise functions exactly the same as the evokations
ability.
commit 66a55eb8dc9b7e8788f09a5184d32ccf7b8e0b06
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 00:09:43 2013 -0500
Add a jump artefact property giving the evoke jump ability
* Can be added to anything that's not a ranged weapon with same frequency code
as used for fly/blink/rage (occurs after rage)
* Shops appraise this for same value as +Rage.
commit 51ad48a7a1338b4d37b0ec687a527cc16d707eb4
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 00:07:57 2013 -0500
Generate boots of jumping with same frequency as boots of running.
commit d4749ff80b86da29861fc2bc51b02e965c9fe6ba
Author: gammafunk <gam...@gm...>
Date: Sun Jun 16 00:04:56 2013 -0500
Add SPARM_JUMPING ego. Wearing this grants the evoke jump attack ability.
commit 2f9d24788defaeda049a2684415e9ff0cda32255
Author: gammafunk <gam...@gm...>
Date: Sat Jun 15 23:23:16 2013 -0500
Evokable Jump attack ability
* Player chooses a monster target within range where there's at least one valid
landing site adjacent to the target.
* There must be a monster to target to use the ability, but the monster can be
friendly or neutral.
* A random valid landing site is chosen, the player is moved to that square, and
weapon melee occurs against the target at the landing site.
* Jump attacks are melee with the wielded weapon and get a 20% damage bonus
* Valid landing sites are always habitable squares with no monster and no
thing that's dangerous to the player.
* Flying monsters or giant monsters not standing in deep water or lava can
'block' the path of a landing site by being in the ray path from the player to
the landing site.
* If a visible monster blocks the path to a landing site, it won't be considered
as a valid landing site.
* If something invisible blocks a landing site, the site will be shown as valid
and can be randomly chosen, in which case the player 'rebounds off something
unseen' and never leaves the starting square, but wastes a turn (delay 10aut).
* If the player is adjacent to the monster, sites adjacent to the player are not
valid; you have to 'jump over' the monster in this case.
* Player can't jump if exhausted or standing in water/lava/liquefied ground
* Exhaustion duration is set after jump (regardless of success) to prevent a
second jump, with a duration formula that's the same as the breath duration.
* The usual melee checks wielded weapon/friendly etc. checks are performed for
the jump melee.
* If any of the valid landing sites would cause problems with self-electrocution
or sanctuary violation, the player is warned first.
* Range is determined by evocations training; starting attack range is 3
(movement 2), and it increases by one at evocations 5 and 10.
* The cost of the jump is 2MP and a hunger cost using the same calculation as
for flame breath.
* The delay of a successful jump is the same as melee delay.
* Fail rate for the ability calculation based on evoke taken from breath fail
rate code
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/altar/overflow.des | 4 ++-
crawl-ref/source/dat/des/branches/abyss.des | 3 +-
crawl-ref/source/dat/des/branches/geh.des | 2 +-
crawl-ref/source/dat/des/branches/hell.des | 5 +--
crawl-ref/source/dat/des/branches/orc.des | 4 +-
crawl-ref/source/dat/des/branches/pan.des | 10 +++---
crawl-ref/source/dat/des/branches/swamp.des | 17 ++++-----
crawl-ref/source/dat/des/branches/tomb.des | 1 -
crawl-ref/source/dat/des/serial/column_ruins.des | 8 ++---
crawl-ref/source/dat/des/variable/float.des | 39 +++++++++-----------
.../source/dat/des/variable/large_abstract.des | 18 +++++-----
.../source/dat/des/variable/lemuel_castle.des | 16 ++++----
.../source/dat/des/variable/mini_features.des | 5 ++-
.../source/dat/des/variable/mini_monsters.des | 8 ++--
crawl-ref/source/dat/des/variable/tomb_raider.des | 3 +-
crawl-ref/source/dat/descript/pl/branches.txt | 1 -
crawl-ref/source/dat/descript/pl/features.txt | 1 -
crawl-ref/source/dat/descript/pl/monsters.txt | 1 -
crawl-ref/source/dungeon.cc | 10 ++---
crawl-ref/source/fight.cc | 5 ++-
crawl-ref/source/itemprop-enum.h | 2 +-
crawl-ref/source/makeitem.cc | 4 ++-
crawl-ref/source/mon-act.cc | 9 +++--
crawl-ref/source/mon-project.cc | 2 +-
24 files changed, 85 insertions(+), 93 deletions(-)
delete mode 100644 crawl-ref/source/dat/descript/pl/branches.txt
delete mode 100644 crawl-ref/source/dat/descript/pl/features.txt
delete mode 100644 crawl-ref/source/dat/descript/pl/monsters.txt
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 42c8936..b5bfc3b 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -1484,7 +1484,8 @@ MONS: orc; club ego:chaos / orc; dagger ego:chaos / orc; spear ego:chaos
MONS: gnoll; club ego:chaos / gnoll; dagger ego:chaos / gnoll; spear ego:chaos
MONS: place:D:1-8
NSUBST: ' = 1:_ / *:.
-SUBST: . = .:200 ~:70 W:60 w:50 x:80 n:80 v b l Z T U M:20
+SUBST: . = .:200 ~:10 W:60 w:50 x:80 n:80 v b l Z T U M:20
+KFEAT: ~ = shaft trap / teleport trap / alarm trap w:3
NSUBST: Z = 1:* / *:%
SUBST: M : 123333M, 1 = 1.., 2 = 2.., M = 123.
COLOUR: . = random
@@ -1599,6 +1600,7 @@ SUBST: . = lWwtm_~......
KFEAT: _ = altar_xom
NSUBST: T = 3:T / .
KFEAT: T = known teleport trap
+KFEAT: ~ = shaft trap / alarm trap / teleport trap
: interest_check(_G)
MAP
@
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 04b6a49..caa09d3 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -257,7 +257,6 @@ NAME: hangedman_abyss_feature_spike
TAGS: abyss extra no_item_gen no_pool_fixup allow_dup
MONS: fungus, plant, bush
ITEM: stone q:1, large rock q:1
-KFEAT: ^ : known dart trap / known needle trap / known blade trap
KFEAT: A : stone_arch w:99 / abandoned_shop w:1
KFEAT: - = altar_lugonu
KMASK: wWl = no_monster_gen
@@ -270,7 +269,7 @@ SUBST: f = A, g = C, h = T, i = U, j = V
SUBST: o = t, p = G, q = w, r = W, s = l
SUBST: J = x, K = c, L = v, MN = m, O = 1, P = 2, Q = 3, RS = b
SUBST: - = -----A
-SHUFFLE: AACCTTUUVYYdeefghi^, tGGwWlI, xxccvvbbmm+123
+SHUFFLE: AACCTTUUVYYdeefghi, tGGwWlI, xxccvvbbmm+123
: dgn.delayed_decay(_G, 'f', 'human skeleton')
: dgn.delayed_decay(_G, 'g', 'elf skeleton')
: dgn.delayed_decay(_G, 'h', 'dwarf skeleton')
diff --git a/crawl-ref/source/dat/des/branches/geh.des b/crawl-ref/source/dat/des/branches/geh.des
index e0e5ddd..ca48c29 100644
--- a/crawl-ref/source/dat/des/branches/geh.des
+++ b/crawl-ref/source/dat/des/branches/geh.des
@@ -149,7 +149,7 @@ KMONS: L = patrolling efreet w:12 / patrolling fire elemental w:8
KFEAT: L = l
KPROP: l = no_cloud_gen
SHUFFLE: 13, 24, 12 / 12 / 12 / 11 / 11 / 22, ()~- / ()~- / -~(), () / {( / }) / '' / ''
-SUBST: 4 = 3, ' = .:99 >:1, ( = ( <:2, ) = ) >:2
+SUBST: 4 = 3, ' = .:99 >:1, ( = ( <:2, ) = ) >:2, ~- = .
: if you.branch() == "Geh" then
SUBST: d$ = .
: end
diff --git a/crawl-ref/source/dat/des/branches/hell.des b/crawl-ref/source/dat/des/branches/hell.des
index 6a9b031..e2cf2f3 100644
--- a/crawl-ref/source/dat/des/branches/hell.des
+++ b/crawl-ref/source/dat/des/branches/hell.des
@@ -310,11 +310,10 @@ ENDMAP
NAME: vestibule_tar_mu
TAGS: vestibule_tar
MARKER: T=feat:enter_tartarus
-FTILE: =~T3Dz+'; = floor_infernal_blank
+FTILE: =T3Dz+'; = floor_infernal_blank
TILE: c = dngn_stone_dark
SUBST: T=A
-SUBST: . = ~.........
-SUBST: ; = ~...
+SUBST: ; = .
KMONS: 3 = shadow wraith
KMONS: z = skeletal warrior / zombie / nothing
KMONS: D = shadow dragon
diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des
index 61d7201..ce1e684 100644
--- a/crawl-ref/source/dat/des/branches/orc.des
+++ b/crawl-ref/source/dat/des/branches/orc.des
@@ -39,10 +39,10 @@ MAP
xx.....xxx.I.I.xxx..I..x
xx......x.......x......xx
x..x.x..x..x+x..x..x+x..x
-x.xx.xx.x.xx.xx.x.xx~xx.x
+x.xx.xx.x.xx.xx.x.xx.xx.x
x.x%1.x.x.x2e2x.x.x3d3x.x
x.x.%1x.x.x2e2x.x.xd3dx.x
-x.xx.xx.x.xx.xx.x.xx~xx.x
+x.xx.xx.x.xx.xx.x.xx.xx.x
x..x.x..x..x+x..x..x+x..x
x.......+.......+.......x
xx.....xxx.I.I.xxx..I..xx
diff --git a/crawl-ref/source/dat/des/branches/pan.des b/crawl-ref/source/dat/des/branches/pan.des
index 0864f42..a75019b 100644
--- a/crawl-ref/source/dat/des/branches/pan.des
+++ b/crawl-ref/source/dat/des/branches/pan.des
@@ -310,7 +310,7 @@ DEPTH: D:21-
MONS: common demon
KMONS: O = any demon
KFEAT: O = enter_pandemonium
-NSUBST: ^ = 4:^ / 4:1 / *:.
+NSUBST: ^ = 4:1 / *:.
MAP
............
.xxxxxxxxxx.
@@ -1387,10 +1387,10 @@ MAP
.xxxxxxxxxx.
.x2+3+3+3xx.
.x+xxxxxx2x.
-.x3x^^^^x+x.
-.x+x^P^^x2x.
-.x3x^^1^x+x.
-.x+x^^^^x3x.
+.x3x....x+x.
+.x+x.P..x2x.
+.x3x..1.x+x.
+.x+x....x3x.
.x2xxxx+x+x.
.xx2+2+3x3x.
.xxxxxxxx=x.
diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des
index bcdd9f7..22fd6f8 100644
--- a/crawl-ref/source/dat/des/branches/swamp.des
+++ b/crawl-ref/source/dat/des/branches/swamp.des
@@ -281,17 +281,16 @@ KMONS: 3 = vapour
KFEAT: t = mangrove
KFEAT: 123 = deep_water
SHUFFLE: })
-SUBST: T = w:3 t, M = ~:4 t, W = W:3 w, . = .:3 W, } = }:20 >, ) = ):25 <>
-KPROP: ~ = no_rtele_into
+SUBST: T = w:3 t, W = W:3 w, . = .:3 W, } = }:20 >, ) = ):25 <>
MAP
- Mtttttt @tt{@
- Mttttttttt..ttM
-Mttt3twwwtWT.wtt
-Mtt211w}wwt.wwwtt
+ ttttttt @tt{@
+ tttttttttt..ttt
+tttt3twwwtWT.wtt
+ttt211w}wwt.wwwtt
ttt11w.w.w.w11ttt
-ttwww.tWw)w112ttM
-Mttw.TWt.wwt3tttM
- Mtt..tttttttttM
+ttwww.tWw)w112ttt
+tttw.TWt.wwt3tttt
+ ttt..tttttttttt
tt@ ttttttt
ENDMAP
diff --git a/crawl-ref/source/dat/des/branches/tomb.des b/crawl-ref/source/dat/des/branches/tomb.des
index 13c859a..6504c56 100644
--- a/crawl-ref/source/dat/des/branches/tomb.des
+++ b/crawl-ref/source/dat/des/branches/tomb.des
@@ -274,7 +274,6 @@ SUBST: - = T
SUBST: _ = F 6 ~:30 .:30
SUBST: T = ~ .
SUBST: t = ~ .:50
-SUBST: ' = ~ ':200
SUBST: ' = 5 .:100
SUBST: 2 = 2 1:2 .
SUBST: 1 = 1 2:3 .
diff --git a/crawl-ref/source/dat/des/serial/column_ruins.des b/crawl-ref/source/dat/des/serial/column_ruins.des
index 0a4db88..6c099bc 100644
--- a/crawl-ref/source/dat/des/serial/column_ruins.des
+++ b/crawl-ref/source/dat/des/serial/column_ruins.des
@@ -36,9 +36,8 @@ function init_column_ruins(e)
e.subst('q = GGG__')
e.subst('r = GG__.')
e.subst('s = G_...')
- e.subst('_ = _:24 ~:1')
- e.ftile('_~$%*90GTUVB = floor_rough_brown')
- e.colour('_~$%*90TUVB = brown')
+ e.ftile('_$%*90GTUVB = floor_rough_brown')
+ e.colour('_$%*90TUVB = brown')
e.tile('G = dngn_crumbled_column')
e.colour('G = lightgrey')
e.subst('_ = .')
@@ -670,7 +669,6 @@ TAGS: allow_dup mini_float transparent
WEIGHT: 10
SUBST: 0 = 0:40 9:10 $:15 %:5 *:1 T:9 _:20
SUBST: T = TTUVVV
-SUBST: ~ = ~__
: init_column_ruins_hut(_G)
: init_column_ruins(_G)
MAP
@@ -681,7 +679,7 @@ MKJx___xJKM
LJ_x_0_x_JL
MJ_x___x_JM
MKJxx+xxJKM
-rLp_G~G_pLr
+rLp_G_G_pLr
MLKJ___JKLM
sMrKqJqKrMs
NMMMLLLMMMN
diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
index c1dab97..8e67996 100644
--- a/crawl-ref/source/dat/des/variable/float.des
+++ b/crawl-ref/source/dat/des/variable/float.des
@@ -631,7 +631,6 @@ TAGS: extra luniq_staircase decor
DEPTH: D:2-26
WEIGHT: 3
NSUBST: } = 1:} / *:.
-NSUBST: ~ = 1:~ / *:.
SHUFFLE: })]{([
MAP
xxxxxxx
@@ -641,7 +640,7 @@ x.x.x.x
x.x.x.x
x.x.x.x
x+x+x+x
-x~~~~~x
+x.....x
x.....x
x.....x
xx...xx
@@ -1201,8 +1200,6 @@ DEPTH: D:12-
ORIENT: float
SUBST: 9 = 9 0 8:2
SUBST: 0 = 0 .
-KFEAT: $ = ^
-KITEM: $ = gold
MAP
........................
wwwwwwwwwwwwwwwwwwwwwwww
@@ -1486,8 +1483,8 @@ SHUFFLE: AB@
SUBST: x = .:30 W x:4
SUBST: A : x, B : x
SUBST: D = .:30 W
-KFEAT: E = w:20 . / x / w:50 W / w:30 w / ~
-KFEAT: F = w:150 w / w:70 W / ~ / . / x
+KFEAT: E = w:20 . / x / w:50 W / w:30 w
+KFEAT: F = w:150 w / w:70 W / . / x
KFEAT: G = x / . / w / W
KFEAT: H = . / W
KMONS: D = Plant / w:200 nothing
@@ -2307,7 +2304,6 @@ DEPTH: D:14-
ORIENT: float
NSUBST: . = 7:0 / 2:9 / 1:8 / *:.
NSUBST: ' = 7:0 / 2:9 / 1:8 / *:.
-SUBST: . = .:90 ~
NSUBST: % = 6:* / 3:| / *=%$
SUBST: - = .
MAP
@@ -2466,7 +2462,6 @@ ORIENT: float
TAGS: no_pool_fixup
SUBST: w: wlll
NSUBST: . = 10:0 / 4:9 / *:.
-SUBST: . = .:90 ~
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
wwwwwwwwwwxxxxxxwwwxxxxxxxxxxxx
@@ -2886,7 +2881,7 @@ WEIGHT: 4
SUBST: X : cccvvb
MAP
X@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-X....XXXXXXXX0X.X.............~...........X....X
+X....XXXXXXXX0X.X.........................X....X
XXXX.XX.......X.X.XXX.XXXXXXXX.XXXXXXXX.X.X.XX.X
X....XX.XXXXXXX.X...X.XG.....X.XXXXXXXX.X...XX.X
X.XXXXX.X.......XXX.X.XXXXXX.X.X.....XX.XXXXXX.X
@@ -2897,7 +2892,7 @@ X.....X.XXXXXXX.XXXXX.X....X.X.X.XXX......XXXX.X
X.XX.XX..X....X.....X.X.XX.X.X.X.XXXXXXXXXXXXX.X
X.XXXXXX.X.XX.XXXXXXX.XGXX.....X.X|X...XX....X.X
X......X.X.XXXXXXXXXXXXXXXXXXXXX.n|X.X.XX.XX.X.X
-XXXXXX.X.X..........~............X|+.X....XX.X.X
+XXXXXX.X.X.......................X|+.X....XX.X.X
X.XXXX.X.X.XXXXXXXX.X.XXXXXXXXXX.XXXXXXXXXXX.X.X
X.XXXX.X.X.X.XX...X.X.XXXXX....X.XX..........X.X
X......X...X....XXX.X.X...X.XX.X.XX.XXX.XXXXXX.X
@@ -2907,7 +2902,7 @@ X.XX.X.XXXXXXX.X.X.XX.XX..X.XX...X......XXX....X
X.XX...XXX.XXX.X.X.XX.XX.XX.XXXX.X.XXXX.....XX.X
X.XXXXXXXX.X...X...XX.XX.....9*X.X....XXX.XXXX.X
X.XXXXXXXX.XXXXXXXXXX.XXXXXXXXXX.X.XXXX0X.X.GX.X
-X.XXXXXXXX............~..........X.XXX..X.X.XX.X
+X.XXXXXXXX.......................X.XXX..X.X.XX.X
X.X...XXXX.XXXXXXXXXX.XXXXXXXXXX.X.....XX.X.XX.X
X.X.X.XXXX.X........X.XX.......X.XXXXXXXX.X.XX.X
X...X........XXXXXX0X....XXXXX............X....X
@@ -2925,19 +2920,19 @@ xx@xxxxxxxxxxxxxxxxxxxxxxxxxx
xx..0....0....0....+........x
xxG%xxxG%xxxG%xxxG%x........x
xxxxxxxxxxxxxxxxxxxx+xxxxxxxx
-xx0........0.......~.......xx
+xx0........0...............xx
xwwwwwwwwwwwwwwwwwwwwwwwwwwwx
xwwwwwwwwwwwwwwwwwwwwwwwwwwwx
xx.........................xx
xxxx.xxxxxxxxxxxxxxxxxxxxxxxx
-xxx.xxx~.xxxxxxxxx..xxxxxG.xx
+xxx.xxx..xxxxxxxxx..xxxxxG.xx
xx.xx0.xx.xxxxxxx.xx.xxxxxx.x
-x.xxxxxxxx.xxx...xxxx..xxxx~x
+x.xxxxxxxx.xxx...xxxx..xxxx.x
x.x...xxx.x.x.xxx.xxxxx.xx.xx
xx.xxx...xxx.xxxxx.xx%0x..xxx
xxxxxxxxxxxxxxxxxxx.xxxxxxxxx
.x.0..x.x..0.x....x.x....x...
-..x..x...x..x.....~.......x..
+..x..x...x..x.............x..
..................x.x........
...................@.........
ENDMAP
@@ -2984,11 +2979,11 @@ X..%X.............X%..X
X0G.X.GXGXG.GXGXG.X.G0X
X.0.X.X.........X.X.0.X
X+XXX.X.XXXXXXX.X.XXX+X
-X.......~.............X
+X.....................X
XXXXX+XXXXXXXXXXX+XXXXX
XXXX...X.X.X.X.X...XXXX
XXX.....'..X..'.9...XXX
-@.....%'''.+~'''......@
+@.....%'''.+.'''......@
XXX..0..'..X..'.....XXX
XXXX...X.X.X.X9X...XXXX
XXXXX+XXXXnXnXXXX+XXXXX
@@ -2998,7 +2993,7 @@ XXXXXXX.XXX9XXX.XXXXXXX
XXXXXXXX.XX+XX.XXXXXXXX
XXXXXXXXX.X.X.XXXXXXXXX
XXXXXXXGXX.X.XXGXXXXXXX
-X0......XXX.XXX.~...0%X
+X0......XXX.XXX.....0%X
XXXXXXX.+..X..+.XXXXXXX
XXXXXXXXXXXXXXXXXXXXXXX
ENDMAP
@@ -3015,15 +3010,15 @@ MAP
xxxxxxxxxxxxxxxxx@xxxxxxxxxx
xxxxxx...xxxxxxx..xxxxxxxxxx
xxxxxx..%xxxxxxx...xxxxxxxxx
-x%..xx.x~xxxxxxx....xxxxxxxx
+x%..xx.x.xxxxxxx....xxxxxxxx
x...+.x.xxxxxxx..'..xxxxxxxx
x...xxxx.xxx....'.'..xxxxxxx
-xxxxxxxxx......'.'.'~..xxxxx
+xxxxxxxxx......'.'.'...xxxxx
xxxx1.WWW..xxx..'.'.xx+xxxxx
-xx...WW....+0x~..'..x....xxx
+xx...WW....+0x...'..x....xxx
x1.........xxx......x...0xxx
xxx.xxxx...'........xxxxxxxx
-xxxxx0.+..'.'...~.xxxxxxxxxx
+xxxxx0.+..'.'.....xxxxxxxxxx
xxxxxxxx.'.'.'.xx+x%..x9..xx
xxxxxxxxx.'.'xxxx.x...+...xx
xxxxxxxxxx.'xxxxx....0x...xx
diff --git a/crawl-ref/source/dat/des/variable/large_abstract.des b/crawl-ref/source/dat/des/variable/large_abstract.des
index d47c528..6cd1485 100644
--- a/crawl-ref/source/dat/des/variable/large_abstract.des
+++ b/crawl-ref/source/dat/des/variable/large_abstract.des
@@ -417,7 +417,7 @@ ENDMAP
NAME: thingy_vault_2
DEPTH: D:14-26
ORIENT: southeast
-SUBST: ' = ^ .:50
+KFEAT: ' = alarm trap / floor w:190
MONS: orange crystal statue
MAP
xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx
@@ -498,19 +498,19 @@ xx.@.xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxx...xxxxxxxxxxxxxxxxxxxxxxxxxx
xxxx..........................xx
xxxxxxxxxxxxxxxxxxxxxxxxxxxx..xx
-x.^^..........................xx
-xx.^^xx+xxxxxxxxxxxxxxxxxxxxxxxx
-xxx.^...11....xxxxxxxx..xxxxxxxx
+x.............................xx
+xx...xx+xxxxxxxxxxxxxxxxxxxxxxxx
+xxx.....11....xxxxxxxx..xxxxxxxx
xxxx..x.1..6..xxx........xx..xxx
xxxxx.xxxxxxxxx...vvvvv...x...xx
x6..1...x.........+1..v.......xx
x..1....x.........vvvvv........x
x..5...xx......................x
-xxxxxx^++...........vvvvvvv....x
-xxxxxx^xx...xx=xx...vv$%$vvvvv.x
-xxxxxx^x...xxv1vxx...vvv*2...v.x
-xxxxxx^x..vvvv7.vvvv...vv.vv+v^x
-x..xxx^..vvvb....bvvv...vvv^...x
+xxxxxx.++...........vvvvvvv....x
+xxxxxx.xx...xx=xx...vv$%$vvvvv.x
+xxxxxx.x...xxv1vxx...vvv*2...v.x
+xxxxxx.x..vvvv7.vvvv...vv.vv+v.x
+x..xxx...vvvb....bvvv...vvv....x
x%%.xx..vvvvb....bvvvv.......xxx
xx.....vvbbb......bbbvv.....xxxx
xxx....vvb....66....bvvxxxxxxxxx
diff --git a/crawl-ref/source/dat/des/variable/lemuel_castle.des b/crawl-ref/source/dat/des/variable/lemuel_castle.des
index c25de52..13e97ce 100644
--- a/crawl-ref/source/dat/des/variable/lemuel_castle.des
+++ b/crawl-ref/source/dat/des/variable/lemuel_castle.des
@@ -19,8 +19,8 @@ function castle_lemuel_subvault_setup(e)
e.colour("? = brown")
e.ftile("? = floor_mud")
e.kfeat("? = floor")
+ e.kfeat("~ = alarm trap w:1 / floor")
e.subst("X = c +:1")
- e.subst("~ = ~:2 .")
e.subst("8 = 89")
e.tile("c = wall_stone_brick")
e.ftile(".~*X|+$ = floor_cobble_blood")
@@ -94,7 +94,7 @@ NAME: lemuel_castle_interior_original
TAGS: lemuel_castle_interior
: castle_lemuel_subvault_setup(_G)
MAP
-+c....+~~~.~~~+..+~~.~~~~+.***c+
++c....+~......+..+......~+.***c+
.c||..ccccccccc++ccccccccc.***c.
1c||2.c1...1..1321..1...1c.***c1
.cccccc..1...211112...1..cccccc.
@@ -117,7 +117,7 @@ MAP
.c.11.ccc+cccccccccccc+ccc..2.c.
.c|.2.X*m.1..........1.m|c....c.
.ccm+mc|m.....1111.....m|cm+mcc.
-....~.c|m..1...22......m*c.~1...
+......c|m..1...22......m*c..1...
......c.+....1132.2....+.X..1...
.cccccccccccccccccccccccccccccc.
.c........1..m....m..1........c.
@@ -134,14 +134,14 @@ TAGS: lemuel_castle_interior
SUBST: $=$:5 .
ITEM: w:5 meat ration / sausage / beef jerky / potion of confusion
MAP
-+c....+~~.....1............~$*c+
++c....+.......1.............$*c+
...1..cccccccccccccccccccccccXc.
cc....c......cG..Gc.1.......c|c1
*cc++cc..cG..+....+...12....m|c.
-|....~12.cG..+....+...23....+~c.
+|....~12.cG..+....+...23....+.c.
$....~.2.....c....c...12....m*c.
*cc++ccccccccc....ccccccc++ccXc+
-cc.~~.c.m444dc....c2..$c.~~.....
+cc~~~~c.m444dc....c2..$c.~~.....
...12.c.cm4mmc....c$cc.c12......
+c....+...2..c....c...........c+
cccccccccccc++++cccccccccccc
@@ -154,14 +154,14 @@ TAGS: lemuel_castle_interior
: castle_lemuel_subvault_setup(_G)
SUBST: $=$:5 .
MAP
-+c....+~~.*c$*|cc|*$cccccc$...c+
++c....+...*c$*|cc|*$cccccc$...c+
.c.1..ccccccmc1321cmcccccc....c.
.c..2........c.12.c...........c.
.cc++c.........ww.....2..1c++cc.
.....c.2.......ww.........c.....
.2...c...1...c..$.c...1...c..1..
.ccccc+cccccccccXcccccccc+ccccc.
-.c.1.c.~..1..+....+2.....~c2..c.
+.c.1.c.~..1..+....+2....~.c2..c.
.~.c$c.~2....c....c.....~.c$c1~.
+c..2c.~..1..c....c..1..~.c...c+
cccccccccccc++++cccccccccccc
diff --git a/crawl-ref/source/dat/des/variable/mini_features.des b/crawl-ref/source/dat/des/variable/mini_features.des
index 9e97911..9399a97 100644
--- a/crawl-ref/source/dat/des/variable/mini_features.des
+++ b/crawl-ref/source/dat/des/variable/mini_features.des
@@ -3385,7 +3385,7 @@ TAGS: transparent mini_float allow_dup extra
DEPTH: D:8-26
MAP
............
-.~xxxxxxxx~.
+..xxxxxxxx..
.x........x.
.x.ccnccc.x.
.x.c|..<c.x.
@@ -3394,7 +3394,7 @@ MAP
.x.c>..|c.x.
.x.cccncc.x.
.x........x.
-.~xxxxxxxx~.
+..xxxxxxxx..
............
ENDMAP
@@ -3402,6 +3402,7 @@ NAME: minivault_22
TAGS: transparent mini_float allow_dup extra abyss ruin_abyss
DEPTH: D:6-26
SUBST: $ : $ *:5
+SUBST: ~ : . +:2
MAP
............
.....xx.....
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index efd1fd2..a758b9f 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -2956,7 +2956,7 @@ NAME: onia_ninara_cookie
SHUFFLE: ABCDEF
SUBST: A : !, B : !, C : !, D : !, E : !, F : +, G : ~ l:50 w:50 I
SUBST: ! : xvcb
-SUBST: H = 0 . ~ , J = 1 0:100 $:20
+SUBST: H = 0 ., J = 1 0:100 $:20
ITEM: any jewellery
MONS: giant eyeball
MAP
@@ -3679,14 +3679,14 @@ NAME: wad_rectangle_vault
DEPTH: D:3-26
WEIGHT: 4
FTILE: ; = floor_pebble
-FTILE: "0~U = floor_pebble_brown
+FTILE: "0U = floor_pebble_brown
COLOUR: "0 = brown
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
x..xxx;;;;;.;;;;;.;;;;;xxx..x
x..xxxx;";...;";...;";xxxx..x
xx.x.x;""";.;"0";.;""";x.x.xx
-@.x.x;""~0";""U0";""~"0;x.x.@
+@.x.x;"""0";""U0";""""0;x.x.@
xx.x.x;""";.;""";.;0"";x.x.xx
x..xxxx;";...;";...;0;xxxx..x
x..xxx;;;;;.;;;;;.;;;;;xxx..x
@@ -3704,7 +3704,7 @@ MAP
.""".vvvvv1....
.."..vvvvv.."0.
.....vvvvv.""".
-.~G..vvvvv.~...
+.~G..vvvvv.....
vvvvv.....vvvvv
vvvvv."...xx*xv
vvvvv."".G.x%8v
diff --git a/crawl-ref/source/dat/des/variable/tomb_raider.des b/crawl-ref/source/dat/des/variable/tomb_raider.des
index 181ac1d..eaf9cff 100644
--- a/crawl-ref/source/dat/des/variable/tomb_raider.des
+++ b/crawl-ref/source/dat/des/variable/tomb_raider.des
@@ -41,7 +41,6 @@ TAGS: no_item_gen no_monster_gen
KITEM: $ = ring of regeneration unrand:ring_of_vitality / acquire any
KITEM: 1234 = gold / any / nothing
KITEM: M4 = superb_item / any
-SUBST: . = .:10 ~:1
COLOUR: G = yellow
TILE: G = dngn_sarcophagus_sealed
COLOUR: c = yellow
@@ -50,7 +49,7 @@ COLOUR: C = white
TILE: C = wall_lab_stone
COLOUR: X = brown
TILE: X = dngn_stone_wall_brown
-FTILE: .!~>cCXG1234M$ = floor_sandstone
+FTILE: .!>cCXG1234M$ = floor_sandstone
: if you.absdepth() <= 17 then
KMONS: 1 = mummy / guardian mummy / nothing
KMONS: 2 = mummy / guardian mummy / nothing
diff --git a/crawl-ref/source/dat/descript/pl/branches.txt b/crawl-ref/source/dat/descript/pl/branches.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/branches.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dat/descript/pl/features.txt b/crawl-ref/source/dat/descript/pl/features.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/features.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dat/descript/pl/monsters.txt b/crawl-ref/source/dat/descript/pl/monsters.txt
deleted file mode 100644
index 0206eda..0000000
--- a/crawl-ref/source/dat/descript/pl/monsters.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%%%
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index c34a30a..3f1b062 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4982,9 +4982,7 @@ static bool _dgn_place_one_monster(const vault_placement &place,
return false;
}
-/* "Oddball grids" are handled in _vault_grid. 'B' is arguably oddball, too, as
- * it depends on the place where the vault is. Maybe handling it here is not
- * such a good idea. */
+/* "Oddball grids" are handled in _vault_grid. */
static dungeon_feature_type _glyph_to_feat(int glyph,
vault_placement *place = NULL)
{
@@ -5011,8 +5009,6 @@ static dungeon_feature_type _glyph_to_feat(int glyph,
(glyph == ']') ? DNGN_STONE_STAIRS_DOWN_III :
(glyph == '[') ? DNGN_STONE_STAIRS_UP_III :
(glyph == 'A') ? DNGN_STONE_ARCH :
- (glyph == 'B') ? (place ? _pick_temple_altar(*place)
- : DNGN_ALTAR_ZIN) :
(glyph == 'C') ? _pick_an_altar() : // f(x) elsewhere {dlb}
(glyph == 'I') ? DNGN_ORCISH_IDOL :
(glyph == 'G') ? DNGN_GRANITE_STATUE :
@@ -5114,7 +5110,6 @@ static void _vault_grid_glyph(vault_placement &place, const coord_def& where,
case '+':
if (_map_feat_is_on_edge(place, where))
place.exits.push_back(where);
-
break;
case '^':
place_specific_trap(where, TRAP_RANDOM);
@@ -5122,6 +5117,9 @@ static void _vault_grid_glyph(vault_placement &place, const coord_def& where,
case '~':
place_specific_trap(where, random_trap_for_place());
break;
+ case 'B':
+ grd(where) = _pick_temple_altar(place);
+ break;
}
// Then, handle grids that place "stuff" {dlb}:
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 8c1bcb6..b529a32 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -55,8 +55,9 @@ bool fight_melee(actor *attacker, actor *defender, bool *did_hit, bool simu)
{
ASSERT(!crawl_state.game_is_arena());
// Friendly and good neutral monsters won't attack unless confused.
- if (attacker->as_monster()->wont_attack() &&
- !mons_is_confused(attacker->as_monster()))
+ if (attacker->as_monster()->wont_attack()
+ && !mons_is_confused(attacker->as_monster())
+ && !attacker->as_monster()->has_ench(ENCH_INSANE))
{
return false;
}
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 716d10f..b10481c 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -349,7 +349,6 @@ enum special_armour_type
SPARM_INTELLIGENCE,
SPARM_PONDEROUSNESS,
SPARM_FLYING,
- SPARM_JUMPING,
SPARM_MAGIC_RESISTANCE,
SPARM_PROTECTION,
SPARM_STEALTH,
@@ -360,6 +359,7 @@ enum special_armour_type
SPARM_REFLECTION,
SPARM_SPIRIT_SHIELD,
SPARM_ARCHERY,
+ SPARM_JUMPING,
NUM_REAL_SPECIAL_ARMOURS,
NUM_SPECIAL_ARMOURS,
};
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 2bd3601..f07c1c0 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -158,9 +158,11 @@ static int _missile_colour(const item_def &item)
{
case MI_STONE:
case MI_SLING_BULLET:
- case MI_LARGE_ROCK:
item_colour = BROWN;
break;
+ case MI_LARGE_ROCK:
+ item_colour = YELLOW;
+ break;
case MI_ARROW:
item_colour = BLUE;
break;
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 4895d48..07d8a57 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -2276,9 +2276,12 @@ void handle_monster_move(monster* mons)
&& !mons->has_ench(ENCH_CHARM)
&& !mons->withdrawn())
{
- // If it steps into you, cancel other targets.
- mons->foe = MHITYOU;
- mons->target = you.pos();
+ if (!mons->wont_attack())
+ {
+ // If it steps into you, cancel other targets.
+ mons->foe = MHITYOU;
+ mons->target = you.pos();
+ }
fight_melee(mons, &you);
diff --git a/crawl-ref/source/mon-project.cc b/crawl-ref/source/mon-project.cc
index a609cfa..53c9e37 100644
--- a/crawl-ref/source/mon-project.cc
+++ b/crawl-ref/source/mon-project.cc
@@ -222,7 +222,7 @@ static bool _boulder_hit(monster& mon, const coord_def &pos)
}
noisy(5, pos);
- return victim && victim->alive();
+ return victim && victim->alive() || !mon.alive();
}
static bool _iood_hit(monster& mon, const coord_def &pos, bool big_boom = false)
--
Dungeon Crawl Stone Soup
|
