diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/describe.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/it_use2.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 21 |
6 files changed, 20 insertions, 11 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 739118b602..9f28da6ad2 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -331,7 +331,7 @@ static const ability_def Ability_List[] = // Cheibriados { ABIL_CHEIBRIADOS_PONDEROUSIFY, "Make Ponderous", 2, 0, 0, 0, ABFLAG_NONE }, { ABIL_CHEIBRIADOS_TIME_BEND, "Bend Time", 3, 0, 50, 1, ABFLAG_NONE }, - { ABIL_CHEIBRIADOS_SLOUCH, "Ruinous Time", 5, 0, 100, 5, ABFLAG_NONE }, + { ABIL_CHEIBRIADOS_SLOUCH, "Slouch", 5, 0, 100, 5, ABFLAG_NONE }, { ABIL_CHEIBRIADOS_TIME_STEP, "Step From Time", 10, 0, 200, 10, ABFLAG_NONE }, { ABIL_HARM_PROTECTION, "Protection From Harm", 0, 0, 0, 0, ABFLAG_NONE }, diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index b05ca85380..3422f8a758 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1508,7 +1508,6 @@ void armour_wear_effects(const int item_slot) case SPARM_PONDEROUSNESS: mpr("You feel rather ponderous."); - // you.speed += 2; you.redraw_evasion = true; break; diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index e87434318a..6ea2a9edbc 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3333,8 +3333,8 @@ const char *divine_title[NUM_GODS][8] = "Nimbus", "Sporadic Warrior", "Green Death", "Force of Nature"}, // Cheibriados -- slow theme - {"Hurried", "Slacker", "Procrastinator", "Laid-Back", - "Ticktocktomancer", "Time Lord", "The End All And Be All", "Alpha Omega"} + {"Unwound %s", "Timekeeper", "Righteous Timekeeper", "Chronographer", + "Splendid Chronogrpaher", "Chronicler", "Eternal Chronicler", "Ticktocktomancer"} }; static int _piety_level() diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index bbe84c93e7..0175b0850a 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -640,7 +640,6 @@ void unwear_armour(int slot) case SPARM_PONDEROUSNESS: mpr("That put a bit of spring back into your step."); - // you.speed -= 2; break; case SPARM_LEVITATION: diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index f802a3e765..686140fb5c 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2250,7 +2250,7 @@ bool is_armour_brand_ok(int type, int brand) return (type == ARM_ROBE); case SPARM_PONDEROUSNESS: - return (slot == EQ_BODY_ARMOUR); + return (true); case SPARM_PRESERVATION: case SPARM_DARKNESS: diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 765c40ebd1..0c8e9cf601 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1796,6 +1796,17 @@ int player_prot_life(bool calc_unid, bool temp, bool items) return (pl); } +int _ponderous_count(){ + int count = 0; + + for( int slot = EQ_CLOAK ; slot <= EQ_BODY_ARMOUR; ++slot){ + if (player_equip_ego_type( slot, SPARM_PONDEROUSNESS )) + count += 1; + } + + return count; +} + // New player movement speed system... allows for a bit more than // "player runs fast" and "player walks slow" in that the speed is // actually calculated (allowing for centaurs to get a bonus from @@ -1830,9 +1841,9 @@ int player_movement_speed(void) if (player_equip_ego_type( EQ_BOOTS, SPARM_RUNNING )) mv -= 2; - if (player_equip_ego_type( EQ_BODY_ARMOUR, SPARM_PONDEROUSNESS )) - mv += 2; - + // ponderous brand + mv += 2 * _ponderous_count(); + // In the air, can fly fast (should be lightly burdened). if (you.light_flight()) mv--; @@ -2103,8 +2114,8 @@ int player_evasion(ev_ignore_type evit) ev += player_equip( EQ_RINGS_PLUS, RING_EVASION ); ev += scan_artefacts( ARTP_EVASION ); - if (player_equip_ego_type( EQ_BODY_ARMOUR, SPARM_PONDEROUSNESS )) - ev -= 2; + // ponderous ev mod + ev -= 2 * _ponderous_count(); if (player_mutation_level(MUT_REPULSION_FIELD) > 0) ev += (player_mutation_level(MUT_REPULSION_FIELD) * 2) - 1; |