BALANCE Make alcohol easier to craft

cataclysmbnteam · Jul 14, 2020 · e5e4a2e · e5e4a2e
1 parent 1209e1a
commit e5e4a2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json
@@ -6,11 +6,12 @@
     "category": "CC_CHEM",
     "subcategory": "CSC_CHEM_FUEL",
     "skill_used": "cooking",
-    "difficulty": 5,
+    "difficulty": 4,
     "time": "30 m",
-    "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ],
+    "autolearn": true,
+    "book_learn": [ [ "textbook_chemistry", 3 ], [ "brewing_cookbook", 3 ] ],
     "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ],
-    "tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ],
+    "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
     "components": [
       [
         [ "hard_liquor", 14, "LIST" ],
@@ -30,9 +31,9 @@
     "skill_used": "cooking",
     "difficulty": 3,
     "time": "30 m",
-    "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ],
+    "autolearn": true,
     "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ],
-    "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [
       [
         [ "hard_liquor", 14, "LIST" ],

diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json
@@ -368,6 +368,7 @@
     "difficulty": 4,
     "time": "200 m",
     "book_learn": [ [ "textbook_chemistry", 4 ], [ "brewing_cookbook", 3 ] ],
+    "autolearn": [ [ "fabrication", 4 ], [ "cooking", 5 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
     "components": [ [ [ "pot", 1 ], [ "pot_copper", 1 ] ], [ [ "hose", 2 ], [ "makeshift_hose", 2 ] ] ]
   },

diff --git a/src/addiction.cpp b/src/addiction.cpp
@@ -101,21 +101,19 @@ void addict_effect( Character &u, addiction &add )
             if( x_in_y( in, to_turns<int>( 2_hours ) ) ) {
                 u.mod_healthy_mod( -1, -in * 10 );
             }
-            if( one_in( 20 ) && rng( 0, 20 ) < in ) {
+            if( x_in_y( in, to_turns<int>( 2_minutes ) * 20 ) ) {
                 const std::string msg_1 = add.type == add_type::ALCOHOL ?
                                           _( "You could use a drink." ) :
                                           _( "You could use some diazepam." );
                 u.add_msg_if_player( m_warning, msg_1 );
                 u.add_morale( morale_type, -35, -10 * in );
-            } else if( rng( 8, 300 ) < in ) {
+            } else if( calendar::once_every( 1_minutes ) && rng( 8, 300 ) < in ) {
                 const std::string msg_2 = add.type == add_type::ALCOHOL ?
                                           _( "Your hands start shaking… you need a drink bad!" ) :
                                           _( "You're shaking… you need some diazepam!" );
                 u.add_msg_if_player( m_bad, msg_2 );
                 u.add_morale( morale_type, -35, -10 * in );
                 u.add_effect( effect_shakes, 5_minutes );
-            } else if( !u.has_effect( effect_hallu ) && rng( 10, 1600 ) < in ) {
-                u.add_effect( effect_hallu, 6_hours );
             }
             break;
         }