diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-10 23:20:44 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-10 23:20:44 -0700 |
| commit | 3f28249f4a17dc7974c019342e36e40e6f886af9 (patch) | |
| tree | 0caee5dd5f894c943c1589087acbb99c24e6c546 /vampirism.patch | |
| parent | Remove pain recovery source changes from vampirism patch. (diff) | |
| download | cataclysm-bn-3f28249f4a17dc7974c019342e36e40e6f886af9.tar.xz | |
Updated to 202209110044
Update vampirism patch for new mutation IDs.
Diffstat (limited to 'vampirism.patch')
| -rw-r--r-- | vampirism.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vampirism.patch b/vampirism.patch index c9c44c3..298496a 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -232,9 +232,9 @@ if( u.has_amount( itype_holybook_bible1, 1 ) || u.has_amount( itype_holybook_bible2, 1 ) || - u.has_amount( itype_holybook_bible3, 1 ) ) { - if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) ) ) { -+ u.has_amount( itype_holybook_bible3, 1 ) || u.has_trait( trait_id( "THRESH_VAMP" ) ) ) { ++ u.has_amount( itype_holybook_bible3, 1 ) || u.has_trait( trait_id( "THRESH_REAL_VAMP" ) ) ) { + if( !( u.has_trait( trait_id( "CANNIBAL" ) ) || u.has_trait( trait_id( "PSYCHOPATH" ) ) || -+ u.has_trait( trait_id( "THRESH_VAMP" ) ) ) ) { ++ u.has_trait( trait_id( "THRESH_REAL_VAMP" ) ) ) ) { vRip.emplace_back( " _______ ___" ); vRip.emplace_back( " < `/ |" ); vRip.emplace_back( " > _ _ (" ); @@ -383,7 +383,7 @@ static const trap_str_id tr_snake( "tr_snake" ); static const trap_str_id tr_glass_pit( "tr_glass_pit" ); -+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" ); ++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" ); static const trait_id trait_CANNIBAL( "CANNIBAL" ); static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" ); static const trait_id trait_SAPIOVORE( "SAPIOVORE" ); @@ -391,7 +391,7 @@ character_id ch = e.get<character_id>( "killer" ); if( ch == g->u.getID() ) { std::string name = e.get<cata_variant_type::string>( "victim_name" ); -+ bool vampire = g->u.has_trait( trait_THRESH_VAMP ); ++ bool vampire = g->u.has_trait( trait_THRESH_REAL_VAMP ); bool cannibal = g->u.has_trait( trait_CANNIBAL ); bool psycho = g->u.has_trait( trait_PSYCHOPATH ); if( g->u.has_trait( trait_SAPIOVORE ) ) { @@ -469,7 +469,7 @@ static const trait_id trait_SAPIOVORE( "SAPIOVORE" ); static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" ); static const trait_id trait_TERRIFYING( "TERRIFYING" ); -+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" ); ++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" ); static const std::string flag_NPC_SAFE( "NPC_SAFE" ); @@ -477,7 +477,7 @@ } if( killer == &g->u && ( !guaranteed_hostile() || hit_by_player ) ) { -+ bool vampire = g->u.has_trait( trait_THRESH_VAMP ); ++ bool vampire = g->u.has_trait( trait_THRESH_REAL_VAMP ); bool cannibal = g->u.has_trait( trait_CANNIBAL ); bool psycho = g->u.has_trait( trait_PSYCHOPATH ); if( g->u.has_trait( trait_SAPIOVORE ) || psycho ) { @@ -496,7 +496,7 @@ static const trait_id trait_SEESLEEP( "SEESLEEP" ); static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" ); static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" ); -+static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" ); ++static const trait_id trait_THRESH_REAL_VAMP( "THRESH_REAL_VAMP" ); +static const trait_id trait_VAMP_SKIN( "VAMP_SKIN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); @@ -516,8 +516,8 @@ // Determine the strength of effects or dreams based upon category strength int strength = 0; // Category too weak for any effect or dream if( crossed_threshold() ) { -+ if( has_trait( trait_THRESH_VAMP ) ) { -+ highcat = "VAMP"; ++ if( has_trait( trait_THRESH_REAL_VAMP ) ) { ++ highcat = "REAL_VAMP"; + } strength = 4; // Post-human. } else if( highest >= 20 && highest < 35 ) { @@ -771,7 +771,7 @@ { "id": [ "ELFA_EARS", "FELINE_EARS", "LUPINE_EARS", "URSINE_EARS" ], "order": 5500 }, { "id": [ "ANTENNAE", "ANTLERS", "CURVED_HORNS", "HORNS", "POINTED_HORNS" ], "order": 6000 }, - { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE" ], "order": 6500 }, -+ { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "VAMP_EYES" ], "order": 6500 }, ++ { "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "REAL_VAMP_EYES" ], "order": 6500 }, { "id": [ "BEAK", |