summaryrefslogtreecommitdiff
path: root/revert-01_removed-traits.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-01_removed-traits.patch')
-rw-r--r--revert-01_removed-traits.patch39
1 files changed, 18 insertions, 21 deletions
diff --git a/revert-01_removed-traits.patch b/revert-01_removed-traits.patch
index cfe8c5d..fd5b772 100644
--- a/revert-01_removed-traits.patch
+++ b/revert-01_removed-traits.patch
@@ -48,26 +48,31 @@
{
"type": "trait_group",
---- a/src/player.cpp
-+++ b/src/player.cpp
-@@ -84,6 +84,7 @@
- static const activity_id ACT_READ( "ACT_READ" );
+--- a/src/character_turn.cpp
++++ b/src/character_turn.cpp
+@@ -42,6 +42,7 @@
+ static const trait_id trait_FAT( "FAT" );
+ static const trait_id trait_FELINE_FUR( "FELINE_FUR" );
+ static const trait_id trait_FUR( "FUR" );
++static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
+ static const trait_id trait_INSECT_ARMS_OK( "INSECT_ARMS_OK" );
+ static const trait_id trait_INSECT_ARMS( "INSECT_ARMS" );
+ static const trait_id trait_LIGHTFUR( "LIGHTFUR" );
+@@ -60,6 +61,7 @@
+ static const trait_id trait_WHISKERS_RAT( "WHISKERS_RAT" );
+ static const trait_id trait_WHISKERS( "WHISKERS" );
- static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_bite( "bite" );
- static const efftype_id effect_blind( "blind" );
static const efftype_id effect_bloodworms( "bloodworms" );
- static const efftype_id effect_boomered( "boomered" );
-@@ -93,14 +94,16 @@
- static const efftype_id effect_drunk( "drunk" );
+ static const efftype_id effect_brainworms( "brainworms" );
+ static const efftype_id effect_darkness( "darkness" );
+@@ -69,11 +71,13 @@
static const efftype_id effect_fungus( "fungus" );
static const efftype_id effect_happy( "happy" );
-+static const efftype_id effect_infected( "infected" );
static const efftype_id effect_irradiated( "irradiated" );
++static const efftype_id effect_infected( "infected" );
static const efftype_id effect_masked_scent( "masked_scent" );
- static const efftype_id effect_meth( "meth" );
static const efftype_id effect_narcosis( "narcosis" );
- static const efftype_id effect_nausea( "nausea" );
static const efftype_id effect_onfire( "onfire" );
static const efftype_id effect_paincysts( "paincysts" );
static const efftype_id effect_pkill( "pkill" );
@@ -75,15 +80,7 @@
static const efftype_id effect_sad( "sad" );
static const efftype_id effect_sleep_deprived( "sleep_deprived" );
static const efftype_id effect_sleep( "sleep" );
-@@ -125,6 +128,7 @@
- static const trait_id trait_FAT( "FAT" );
- static const trait_id trait_FELINE_FUR( "FELINE_FUR" );
- static const trait_id trait_FUR( "FUR" );
-+static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
- static const trait_id trait_INSECT_ARMS( "INSECT_ARMS" );
- static const trait_id trait_INSECT_ARMS_OK( "INSECT_ARMS_OK" );
- static const trait_id trait_INSOMNIA( "INSOMNIA" );
-@@ -1660,6 +1664,12 @@
+@@ -566,6 +570,12 @@
remove_effect( effect_tapeworm );
add_msg_if_player( m_good, _( "Your bowels gurgle as something inside them dies." ) );
}