API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 6th, 2019
144
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 15.68 KB | None | 0 0
raw download clone embed print report
  1. Binary files Cataclysm-DDA/.git/index and nonvan/.git/index differ
  2. diff -bur Cataclysm-DDA/.git/logs/HEAD nonvan/.git/logs/HEAD
  3. --- Cataclysm-DDA/.git/logs/HEAD    2019-05-06 20:22:44.296067800 -0400
  4. +++ nonvan/.git/logs/HEAD   2019-05-06 18:38:23.009690700 -0400
  5. @@ -1 +1 @@
  6. -0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557188564 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  7. +0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557182303 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  8. diff -bur Cataclysm-DDA/.git/logs/refs/heads/master nonvan/.git/logs/refs/heads/master
  9. --- Cataclysm-DDA/.git/logs/refs/heads/master   2019-05-06 20:22:44.296067800 -0400
  10. +++ nonvan/.git/logs/refs/heads/master  2019-05-06 18:38:23.010708400 -0400
  11. @@ -1 +1 @@
  12. -0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557188564 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  13. +0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557182303 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  14. diff -bur Cataclysm-DDA/.git/logs/refs/remotes/origin/HEAD nonvan/.git/logs/refs/remotes/origin/HEAD
  15. --- Cataclysm-DDA/.git/logs/refs/remotes/origin/HEAD    2019-05-06 20:22:44.292067400 -0400
  16. +++ nonvan/.git/logs/refs/remotes/origin/HEAD   2019-05-06 18:38:23.006712300 -0400
  17. @@ -1 +1 @@
  18. -0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557188564 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  19. +0000000000000000000000000000000000000000 545f6a3925ea508a0e2575be58867579f71cf34d U-MUTIE\Hazzle <thearcy@gmail.com> 1557182303 -0400  clone: from https://github.com/CleverRaven/Cataclysm-DDA
  20. Only in nonvan: Cataclysm.exe
  21. Only in nonvan: Cataclysm.pdb
  22. Only in nonvan: config
  23. Only in nonvan/data/mods: Arcana
  24. Only in nonvan/data/mods: M_Nechronica-master
  25. Only in nonvan/data/mods: PK, No Zombie Rads
  26. Only in nonvan/data/mods: PK, No_Fungi
  27. Only in nonvan/data/mods: PKs_Rebalancing-master
  28. Only in nonvan/data/mods: nocts_cata_mod-master
  29. Only in nonvan/data/mods: secronom
  30. Only in nonvan/msvc-full-features: .vs
  31. diff -bur Cataclysm-DDA/msvc-full-features/Cataclysm-vcpkg-static.vcxproj nonvan/msvc-full-features/Cataclysm-vcpkg-static.vcxproj
  32. --- Cataclysm-DDA/msvc-full-features/Cataclysm-vcpkg-static.vcxproj 2019-05-06 20:22:46.703072500 -0400
  33. +++ nonvan/msvc-full-features/Cataclysm-vcpkg-static.vcxproj    2019-05-06 18:51:42.810374400 -0400
  34. @@ -23,7 +23,7 @@
  35.      <ProjectGuid>{19F0BE17-3DAF-40E8-A9D2-904A56382E54}</ProjectGuid>
  36.      <Keyword>Win32Proj</Keyword>
  37.      <RootNamespace>Cataclysm</RootNamespace>
  38. -    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  39. +    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  40.      <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
  41.      <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
  42.    </PropertyGroup>
  43. Only in nonvan/msvc-full-features: Cataclysm-vcpkg-static.vcxproj.user
  44. Only in nonvan/msvc-full-features: distribution
  45. Only in nonvan/msvc-full-features: vcpkg-static
  46. Only in nonvan: save
  47. Only in nonvan: sound
  48. diff -bur Cataclysm-DDA/src/action.cpp nonvan/src/action.cpp
  49. --- Cataclysm-DDA/src/action.cpp    2019-05-06 20:22:46.712079300 -0400
  50. +++ nonvan/src/action.cpp   2019-05-06 19:57:42.004619600 -0400
  51. @@ -277,6 +277,8 @@
  52.              return "quicksave";
  53.          case ACTION_QUICKLOAD:
  54.              return "quickload";
  55. +       case ACTION_CHECKSTATS:
  56. +           return "checkstats";
  57.          case ACTION_QUIT:
  58.              return "quit";
  59.          case ACTION_PL_INFO:
  60. @@ -929,6 +931,8 @@
  61.      REGISTER_ACTION( ACTION_WORLD_MODS );
  62.      REGISTER_ACTION( ACTION_ACTIONMENU );
  63.      REGISTER_ACTION( ACTION_QUICKSAVE );
  64. +   REGISTER_ACTION( ACTION_QUICKLOAD );
  65. +   REGISTER_ACTION( ACTION_CHECKSTATS );
  66.      REGISTER_ACTION( ACTION_SAVE );
  67.  
  68.      int width = 0;
  69. diff -bur Cataclysm-DDA/src/action.h nonvan/src/action.h
  70. --- Cataclysm-DDA/src/action.h  2019-05-06 20:22:46.712079300 -0400
  71. +++ nonvan/src/action.h 2019-05-06 18:42:25.581558400 -0400
  72. @@ -218,7 +218,8 @@
  73.      /** Quit the game */
  74.      ACTION_QUIT,
  75.      /**@}*/
  76. -
  77. +   /*Check to see if the player can increase their stats from kills.*/
  78. +   ACTION_CHECKSTATS,
  79.      // Info Screens
  80.      /**@{*/
  81.      /** Display player status screen */
  82. diff -bur Cataclysm-DDA/src/consumption.cpp nonvan/src/consumption.cpp
  83. --- Cataclysm-DDA/src/consumption.cpp   2019-05-06 20:22:46.753071900 -0400
  84. +++ nonvan/src/consumption.cpp  2019-05-06 20:16:37.047237700 -0400
  85. @@ -1202,7 +1202,7 @@
  86.  
  87.  bool player::can_feed_furnace_with( const item &it ) const
  88.  {
  89. -    if( !it.flammable() || it.has_flag( "RADIOACTIVE" ) || can_eat( it ).success() ) {
  90. +    if( it.has_flag( "RADIOACTIVE" ) || can_eat( it ).success() ) {
  91.          return false;
  92.      }
  93.  
  94. @@ -1322,10 +1322,10 @@
  95.  
  96.              // TODO: JSONize.
  97.              if( it.made_of( material_id( "leather" ) ) ) {
  98. -                amount /= 4;
  99. +                amount = 4;
  100.              }
  101.              if( it.made_of( material_id( "wood" ) ) ) {
  102. -                amount /= 2;
  103. +                amount = 2;
  104.              }
  105.  
  106.              return amount;
  107. diff -bur Cataclysm-DDA/src/crafting.cpp nonvan/src/crafting.cpp
  108. --- Cataclysm-DDA/src/crafting.cpp  2019-05-06 20:22:46.758069000 -0400
  109. +++ nonvan/src/crafting.cpp 2019-05-06 19:13:51.470824600 -0400
  110. @@ -340,14 +340,14 @@
  111.  int player::base_time_to_craft( const recipe &rec, int batch_size ) const
  112.  {
  113.      const size_t assistants = available_assistant_count( rec );
  114. -    return rec.batch_time( batch_size, 1.0f, assistants );
  115. +    return (rec.batch_time( batch_size, 1.0f, assistants ) * (get_option<int>("COOL_SCALING") / 100));
  116.  }
  117.  
  118.  int player::expected_time_to_craft( const recipe &rec, int batch_size, bool in_progress ) const
  119.  {
  120.      const size_t assistants = available_assistant_count( rec );
  121.      float modifier = crafting_speed_multiplier( rec, in_progress );
  122. -    return rec.batch_time( batch_size, modifier, assistants );
  123. +    return (rec.batch_time( batch_size, modifier, assistants ) * (get_option<int>("COOL_SCALING") / 100));
  124.  }
  125.  
  126.  bool player::check_eligible_containers_for_crafting( const recipe &rec, int batch_size ) const
  127. diff -bur Cataclysm-DDA/src/game.cpp nonvan/src/game.cpp
  128. --- Cataclysm-DDA/src/game.cpp  2019-05-06 20:22:46.796068300 -0400
  129. +++ nonvan/src/game.cpp 2019-05-06 19:57:54.130581000 -0400
  130. @@ -2303,9 +2303,8 @@
  131.      ctxt.register_action( "whitelist_enemy" );
  132.      ctxt.register_action( "save" );
  133.      ctxt.register_action( "quicksave" );
  134. -#if !defined(RELEASE)
  135.      ctxt.register_action( "quickload" );
  136. -#endif
  137. +   ctxt.register_action( "checkstats" );
  138.      ctxt.register_action( "quit" );
  139.      ctxt.register_action( "player_data" );
  140.      ctxt.register_action( "map" );
  141. @@ -12091,6 +12090,72 @@
  142.      last_save_timestamp = time( nullptr );
  143.  }
  144.  
  145. +void game::checkstats()
  146. +{
  147. +    int totalkills = 0;
  148. +    for (const auto &type : MonsterGenerator::generator().get_all_mtypes()) {
  149. +        if (kill_count(type.id) > 0) {
  150. +            totalkills += kill_count(type.id);
  151. +        }
  152. +    }
  153. +    if (totalkills >= (get_option<int>("STATS_PER_KILLS_BASE") * (u.current_stat_bonus + 1)) + (get_option<int>("STATS_PER_KILLS_ADDL") * (u.current_stat_bonus + 1)))
  154. +    {
  155. +        u.current_stat_bonus++;
  156. +        if (get_option<std::string>("STATS_PER_KILLS_METHOD") == "random")
  157. +        {
  158. +            int whichStat = dice(1, 4);
  159. +            switch (whichStat) {
  160. +            case 1: u.dex_max++;
  161. +                break;
  162. +            case 2: u.str_max++;
  163. +                break;
  164. +            case 3: u.per_max++;
  165. +                break;
  166. +            case 4: u.int_max++;
  167. +                break;
  168. +            }
  169. +        }
  170. +        else if (get_option<std::string>("STATS_PER_KILLS_METHOD") == "chosen")
  171. +        {
  172. +            uilist statMenu;
  173. +            statMenu.text = "Choose your stat!";
  174. +            statMenu.addentry("Strength");
  175. +            statMenu.addentry("Perception");
  176. +            statMenu.addentry("Intelligence");
  177. +            statMenu.addentry("Dexterity");
  178. +            statMenu.query();
  179. +            std::string message = "";
  180. +            game_message_type gmtSCTcolor = m_neutral;
  181. +
  182. +            if (statMenu.ret == 0)
  183. +            {
  184. +                u.mod_str_bonus(1);
  185. +                message = "Strength increased! Rip and tear!";
  186. +            }
  187. +            else if (statMenu.ret == 1)
  188. +            {
  189. +                u.mod_per_bonus(1);
  190. +                message = "Perception increased! See.. things.";
  191. +            }
  192. +            else if (statMenu.ret == 2)
  193. +            {
  194. +                u.mod_int_bonus(1);
  195. +                message = "You only lack the ability to describe how smart you're getting.";
  196. +            }
  197. +            else if (statMenu.ret == 3)
  198. +            {
  199. +                u.mod_dex_bonus(1);
  200. +                message = "You suddenly feel a lowered fear of the knife game.";
  201. +            }
  202. +            u.add_msg_if_player(message);
  203. +        }
  204. +    }
  205. +    u.add_msg_if_player("Current kill count: " + std::to_string(totalkills));
  206. +    u.add_msg_if_player("Amount required for next stat: " + std::to_string((get_option<int>("STATS_PER_KILLS_BASE") * u.current_stat_bonus) + (get_option<int>("STATS_PER_KILLS_ADDL"))));
  207. +    u.add_msg_if_player("Current number of bonus stats: " + std::to_string(u.current_stat_bonus));
  208. +}
  209. +
  210. +
  211.  void game::quicksave()
  212.  {
  213.      //Don't autosave if the player hasn't done anything since the last autosave/quicksave,
  214. diff -bur Cataclysm-DDA/src/game.h nonvan/src/game.h
  215. --- Cataclysm-DDA/src/game.h    2019-05-06 20:22:46.797070500 -0400
  216. +++ nonvan/src/game.h   2019-05-06 18:47:04.235735100 -0400
  217. @@ -1029,6 +1029,7 @@
  218.          void autosave();         // automatic quicksaves - Performs some checks before calling quicksave()
  219.      public:
  220.          void quicksave();        // Saves the game without quitting
  221. +       void checkstats();
  222.          void disp_NPCs();        // Currently for debug use.  Lists global NPCs.
  223.      private:
  224.          void quickload();        // Loads the previously saved game if it exists
  225. diff -bur Cataclysm-DDA/src/handle_action.cpp nonvan/src/handle_action.cpp
  226. --- Cataclysm-DDA/src/handle_action.cpp 2019-05-06 20:22:46.805072700 -0400
  227. +++ nonvan/src/handle_action.cpp    2019-05-06 18:45:08.878347100 -0400
  228. @@ -1888,6 +1888,9 @@
  229.              case ACTION_QUICKLOAD:
  230.                  quickload();
  231.                  return false;
  232. +           case ACTION_CHECKSTATS:
  233. +               checkstats();
  234. +               break;
  235.  
  236.              case ACTION_PL_INFO:
  237.                  u.disp_info();
  238. diff -bur Cataclysm-DDA/src/options.cpp nonvan/src/options.cpp
  239. --- Cataclysm-DDA/src/options.cpp   2019-05-06 20:22:46.915074900 -0400
  240. +++ nonvan/src/options.cpp  2019-05-06 19:00:33.009998400 -0400
  241. @@ -1726,6 +1726,31 @@
  242.           3, 20, 15
  243.         );
  244.  
  245. +    add("COOL_SCALING", "world_default", translate_marker("Make Things Less Boring scaling"),
  246. +        translate_marker("Sets the time of reading, construction, vehicle repair, etc in percents.  '50' is two times faster than default, '200' is two times longer. '0' probably breaks. I'm leaving it in and you can't stop me.."),
  247. +        0, 10000, 100
  248. +    );
  249. +    mOptionsSort["debug"]++;
  250. +    add("SPEEDYDEX_SPEED_PER_DEX", "debug", translate_marker("Speedydex speed per dex"), translate_marker("Speedydex speed per excess dex"), 1, 999, 1);
  251. +    add("SPEEDYDEX_BASE_DEX", "debug", translate_marker("Speedydex base dex"), translate_marker("Speedydex dexterity needed to begin getting speed increases."), 1, 999, 1);
  252. +
  253. +    mOptionsSort["debug"]++;
  254. +
  255. +    add("STATS_PER_KILLS_BASE", "debug", translate_marker("Stats per Kills Base Number"),
  256. +        translate_marker("Your first stat point will come at this number."), 1, 999, 1);
  257. +
  258. +    add( "STATS_PER_KILLS_ADDL", "debug", translate_marker("Stats per Kills Added Number" ),
  259. +       translate_marker("Your next stat points are (base + additional) * kills. Probably."), 1, 999, 1);
  260. +    
  261. +   add( "STATS_PER_KILLS_BASE", "debug", translate_marker("Stats per Kills Base Number" ),
  262. +       translate_marker("Your first stat point will come at this number."), 1, 999, 1);
  263. +
  264. +    add("STATS_PER_KILLS_METHOD", "debug", translate_marker("Stats per Kills Assignment Method"),
  265. +        translate_marker("Assignment method for stats through kills."),
  266. +       { { "random", translate_marker("Random") },
  267. +       { "chosen", translate_marker("Chosen") } },
  268. +       "chosen" );
  269. +
  270.      mOptionsSort["debug"]++;
  271.  
  272.      add( "INITIAL_STAT_POINTS", "debug", translate_marker( "Initial stat points" ),
  273. diff -bur Cataclysm-DDA/src/player.cpp nonvan/src/player.cpp
  274. --- Cataclysm-DDA/src/player.cpp    2019-05-06 20:22:46.935072700 -0400
  275. +++ nonvan/src/player.cpp   2019-05-06 19:37:48.878764700 -0400
  276. @@ -1829,6 +1829,12 @@
  277.      if( has_bionic( bio_speed ) ) { // multiply by 1.1
  278.          set_speed_bonus( static_cast<int>( get_speed() * 1.1 ) - get_speed_base() );
  279.      }
  280. +    int isBonusDex = dex_cur - get_option<int>("SPEEDYDEX_BASE_DEX");
  281. +
  282. +    if (isBonusDex > 0)
  283. +    {
  284. +        mod_speed_bonus(dex_cur * get_option<int>("SPEEDYDEX_SPEED_PER_DEX"));
  285. +    }
  286.  
  287.      // Speed cannot be less than 25% of base speed, so minimal speed bonus is -75% base speed.
  288.      const int min_speed_bonus = static_cast<int>( -0.75 * get_speed_base() );
  289. @@ -3238,8 +3244,10 @@
  290.          ret *= 1.3;
  291.      }
  292.  
  293. -    if( ret < 100 ) {
  294. -        ret = 100;
  295. +   ret *= get_option<int>("COOL_SCALING") / 100;
  296. +
  297. +    if( ret < 10 ) {
  298. +        ret = 10;
  299.      }
  300.      // return_stat_effect actually matters here
  301.      return ( return_stat_effect ? ret : ret / 10 );
  302. diff -bur Cataclysm-DDA/src/player.h nonvan/src/player.h
  303. --- Cataclysm-DDA/src/player.h  2019-05-06 20:22:46.936073100 -0400
  304. +++ nonvan/src/player.h 2019-05-06 18:49:12.795869600 -0400
  305. @@ -223,6 +223,7 @@
  306.          void hardcoded_effects( effect &it );
  307.          /** Returns the modifier value used for vomiting effects. */
  308.          double vomit_mod();
  309. +        int current_stat_bonus;
  310.  
  311.          bool in_sleep_state() const override {
  312.              return Creature::in_sleep_state() || activity.id() == "ACT_TRY_SLEEP";
  313. diff -bur Cataclysm-DDA/src/savegame.cpp nonvan/src/savegame.cpp
  314. --- Cataclysm-DDA/src/savegame.cpp  2019-05-06 20:22:46.956068400 -0400
  315. +++ nonvan/src/savegame.cpp 2019-05-06 18:50:42.344410800 -0400
  316. @@ -108,6 +108,7 @@
  317.      json.end_array();
  318.  
  319.      json.member( "player", u );
  320. +   json.member("stats", g->u.current_stat_bonus);
  321.      Messages::serialize( json );
  322.  
  323.      json.end_object();
  324. @@ -237,6 +238,7 @@
  325.          }
  326.  
  327.          data.read( "player", u );
  328. +       data.read("stats", u.current_stat_bonus);
  329.          Messages::deserialize( data );
  330.  
  331.      } catch( const JsonError &jsonerr ) {
  332. diff -bur Cataclysm-DDA/src/veh_interact.cpp nonvan/src/veh_interact.cpp
  333. --- Cataclysm-DDA/src/veh_interact.cpp  2019-05-06 20:22:46.992072900 -0400
  334. +++ nonvan/src/veh_interact.cpp 2019-05-06 19:57:58.214577800 -0400
  335. @@ -13,7 +13,7 @@
  336.  #include <set>
  337.  #include <type_traits>
  338.  #include <utility>
  339. -
  340. +#include "options.h"
  341.  #include "activity_handlers.h"
  342.  #include "cata_utility.h"
  343.  #include "catacharset.h"
  344. @@ -114,6 +114,8 @@
  345.              time = vp->removal_time( g->u ) + vp->install_time( g->u );
  346.              break;
  347.      }
  348. +    //i have taken klonopin so good luck I hope I didn't do this exactly backwards
  349. +    time *= (get_option<int>("COOL_SCALING") / 100);
  350.      if( g->u.has_trait( trait_id( "DEBUG_HS" ) ) ) {
  351.          time = 1;
  352.      }
  353. Only in nonvan/src: version.h
  354. Only in nonvan: templates
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!