Merge pull request #1 from CleverRaven/master

merge from master
I-am-Erk · Oct 9, 2019 · 19f6a84 · 19f6a84
2 parents f589edc + cb7b4b0
commit 19f6a84
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -1874,19 +1874,6 @@
     "volume": 0,
     "price": 200
   },
-  {
-    "type": "GENERIC",
-    "id": "bluebell_flower",
-    "name": "bluebell",
-    "description": "A bluebell stalk with some petals.",
-    "weight": "40 g",
-    "to_hit": -3,
-    "color": "blue",
-    "symbol": ",",
-    "material": [ "veggy" ],
-    "volume": "250 ml",
-    "price": 0
-  },
   {
     "type": "GENERIC",
     "id": "bluebell_bud",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -652,5 +652,18 @@
       "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } }
     },
     "flags": [ "BOMB", "TRADER_AVOID" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "bluebell_flower",
+    "name": "bluebell",
+    "description": "A bluebell stalk with some petals.",
+    "weight": "40 g",
+    "to_hit": -3,
+    "color": "blue",
+    "symbol": ",",
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "price": 0
   }
 ]
diff --git a/src/player_display.cpp b/src/player_display.cpp
@@ -1151,15 +1151,18 @@ void player::disp_info()
           g->weather.weather != WEATHER_SUNNY ) ) {
         effect_name_and_text.push_back( { _( "In Sunlight" ),
                                           _( "The sunlight irritates you.\n"
-                                             "Strength - 1;    Dexterity - 1;    Intelligence - 1;    Perception - 1" ) } );
+                                             "Strength - 1;    Dexterity - 1;    Intelligence - 1;    Perception - 1" )
+                                        } );
     } else if( has_trait( trait_id( "TROGLO2" ) ) && g->is_in_sunlight( pos() ) ) {
         effect_name_and_text.push_back( { _( "In Sunlight" ),
                                           _( "The sunlight irritates you badly.\n"
-                                             "Strength - 2;    Dexterity - 2;    Intelligence - 2;    Perception - 2" ) } );
+                                             "Strength - 2;    Dexterity - 2;    Intelligence - 2;    Perception - 2" )
+                                        } );
     } else if( has_trait( trait_id( "TROGLO3" ) ) && g->is_in_sunlight( pos() ) ) {
         effect_name_and_text.push_back( { _( "In Sunlight" ),
                                           _( "The sunlight irritates you terribly.\n"
-                                             "Strength - 4;    Dexterity - 4;    Intelligence - 4;    Perception - 4" ) } );
+                                             "Strength - 4;    Dexterity - 4;    Intelligence - 4;    Perception - 4" )
+                                        } );
     }
 
     for( auto &elem : addictions ) {