Removed money-related perks and millionaire profession (#33966)

CleverRaven · Sep 25, 2019 · 5e3c369 · 5e3c369
1 parent 659feea
commit 5e3c369
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 84 deletions.
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -656,39 +656,6 @@
     "cancels": [ "TRUTHTELLER" ],
     "social_modifiers": { "lie": 40 }
   },
-  {
-    "type": "mutation",
-    "id": "SAVINGS",
-    "name": "Savings",
-    "points": 1,
-    "description": "You had some money stashed at the bank for a rainy day.  Now that the storm is raging, it's a last call to use it maybe?",
-    "starting_trait": true,
-    "purifiable": false,
-    "valid": false,
-    "cancels": [ "DEBT", "MILLIONAIRE" ]
-  },
-  {
-    "type": "mutation",
-    "id": "DEBT",
-    "name": "Debt",
-    "points": -1,
-    "description": "You needed money and had a big loan in a bank.  Good thing nobody will come to collect it now, right?  Right?",
-    "starting_trait": true,
-    "purifiable": false,
-    "valid": false,
-    "cancels": [ "SAVINGS", "MILLIONAIRE" ]
-  },
-  {
-    "type": "mutation",
-    "id": "MILLIONAIRE",
-    "name": "Millionaire",
-    "points": 3,
-    "description": "At the time of Cataclysm you were an owner of a fortune stashed in a bank.  Does that have any meaning now?",
-    "valid": false,
-    "purifiable": false,
-    "starting_trait": true,
-    "cancels": [ "DEBT", "SAVINGS" ]
-  },
   {
     "type": "mutation",
     "id": "XS",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -2427,39 +2427,6 @@
       "female": [ "bra", "panties" ]
     }
   },
-  {
-    "type": "profession",
-    "ident": "millionaire",
-    "name": "Millionaire",
-    "description": "You had a fortune, whether inherited, built by hard work, or gained by pure luck.  You invested in trade and nothing was beyond your reach.  Now it's not worth a dime and no money in the world can guarantee your safety and well being.  Hard times are ahead, so it's time to undust your skills and try to sell some ice to the Innuit.  What currency do they accept?",
-    "points": 3,
-    "traits": [ "MILLIONAIRE" ],
-    "skills": [ { "level": 3, "name": "barter" }, { "level": 2, "name": "speech" } ],
-    "items": {
-      "both": {
-        "items": [
-          "suit",
-          "tie_skinny",
-          "tieclip",
-          "socks",
-          "dress_shoes",
-          "smart_phone",
-          "money_bundle",
-          "gold_watch",
-          "gold_ear",
-          "gold_bracelet",
-          "gasdiscount_platinum",
-          "diamond_ring",
-          "gold_small",
-          "silver_small",
-          "platinum_small"
-        ],
-        "entries": [ { "item": "cash_card", "charges": 1000000 }, { "item": "diamond", "count": 5 } ]
-      },
-      "male": [ "briefs" ],
-      "female": [ "bra", "panties" ]
-    }
-  },
   {
     "type": "profession",
     "ident": "priest",

diff --git a/src/monattack.cpp b/src/monattack.cpp
@@ -3143,13 +3143,8 @@ bool mattack::photograph( monster *z )
     } else if( g->u.is_armed() ) {
         sounds::sound( z->pos(), 15, sounds::sound_t::alert, _( "\"Drop your weapon!  Now!\"" ) );
     }
-    if( cname == g->u.name && g->u.cash < 0 && g->u.has_trait( trait_id( "DEBT" ) ) ) {
-        sounds::sound( z->pos(), 15, sounds::sound_t::alert,
-                       _( "\"Wanted debtor in sight! Commencing debt enforcement proceedings!\"" ) );
-    } else {
-        const SpeechBubble &speech = get_speech( z->type->id.str() );
-        sounds::sound( z->pos(), speech.volume, sounds::sound_t::alert, speech.text.translated() );
-    }
+    const SpeechBubble &speech = get_speech( z->type->id.str() );
+    sounds::sound( z->pos(), speech.volume, sounds::sound_t::alert, speech.text.translated() );
     g->timed_events.add( TIMED_EVENT_ROBOT_ATTACK, calendar::turn + rng( 15_turns, 30_turns ), 0,
                          g->u.global_sm_location() );
 

diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp
@@ -566,19 +566,8 @@ bool avatar::create( character_type type, const std::string &tempname )
     }
 
     // setup staring bank money
-
     cash = rng( -200000, 200000 );
 
-    if( has_trait( trait_id( "MILLIONAIRE" ) ) ) {
-        cash = rng( 500000000, 1000000000 );
-    }
-    if( has_trait( trait_id( "DEBT" ) ) ) {
-        cash = rng( -1500000, -3000000 );
-    }
-    if( has_trait( trait_id( "SAVINGS" ) ) ) {
-        cash = rng( 1500000, 2000000 );
-    }
-
     if( has_trait( trait_id( "XS" ) ) ) {
         set_stored_kcal( 10000 );
         toggle_trait( trait_id( "XS" ) );