From 11559b8000516fa6c5aea516c7822444ec5d5413 Mon Sep 17 00:00:00 2001 From: BX442 Date: Sat, 9 Nov 2019 18:51:14 +0900 Subject: [PATCH 1/2] ModStandart --- msvc-full-features/Cataclysm-vcpkg-static.vcxproj | 7 +++---- src/game_constants.h | 6 +++--- src/magic.cpp | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj index 2b73f119efa58..1d3e8e38aff08 100644 --- a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj +++ b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj @@ -23,14 +23,14 @@ {19F0BE17-3DAF-40E8-A9D2-904A56382E54} Win32Proj Cataclysm - 10.0.17134.0 + 10.0 x86-windows-static x64-windows-static Application - v141 + v142 MultiByte @@ -130,5 +130,4 @@ - - + \ No newline at end of file diff --git a/src/game_constants.h b/src/game_constants.h index b42663e4f4297..2dd4c2ba40b67 100644 --- a/src/game_constants.h +++ b/src/game_constants.h @@ -55,7 +55,7 @@ // Items on the map with at most this distance to the player are considered available for crafting, // see inventory::form_from_map -#define PICKUP_RANGE 6 +#define PICKUP_RANGE 10 /** Number of z-levels below 0 (not including 0). */ #define OVERMAP_DEPTH 10 @@ -111,10 +111,10 @@ constexpr time_duration CORPSE_ROT_TIME = 24_hours; #define MAX_AIM_COST 10 /** Maximum (effective) level for a skill */ -#define MAX_SKILL 10 +#define MAX_SKILL 20 /** Maximum (effective) level for a stat */ -#define MAX_STAT 20 +#define MAX_STAT 100 /** Maximum range at which ranged attacks can be executed */ #define RANGE_HARD_CAP 60 diff --git a/src/magic.cpp b/src/magic.cpp index 336aab79f4bd6..b60f2644a205f 100644 --- a/src/magic.cpp +++ b/src/magic.cpp @@ -1720,8 +1720,8 @@ int known_magic::select_spell( const player &p ) std::vector known_spells = get_spells(); uilist spell_menu; - spell_menu.w_height = clamp( static_cast( known_spells.size() ), 24, TERMY * 9 / 10 ); - spell_menu.w_width = std::max( 80, TERMX * 3 / 8 ); + spell_menu.w_height = clamp( static_cast( known_spells.size() ), 36, TERMY * 9 / 10 ); + spell_menu.w_width = std::max( 100, TERMX * 3 / 8 ); spell_menu.w_x = ( TERMX - spell_menu.w_width ) / 2; spell_menu.w_y = ( TERMY - spell_menu.w_height ) / 2; spell_menu.pad_right = spell_menu.w_width - max_spell_name_length - 5; From 325e02db4fcf1d4c01d56f21ed4ffedb9b0baec4 Mon Sep 17 00:00:00 2001 From: BX442 Date: Sat, 9 Nov 2019 21:40:27 +0900 Subject: [PATCH 2/2] New char max stat up --- msvc-full-features/Cataclysm-vcpkg-static.vcxproj | 5 +++++ src/newcharacter.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj index 1d3e8e38aff08..b25c90ea7ef72 100644 --- a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj +++ b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj @@ -59,6 +59,10 @@ false + + C:\Users\BlackHole\vcpkg\installed\x64-windows-static\include;$(IncludePath) + C:\Users\BlackHole\vcpkg\installed\x64-windows-static\lib;$(LibraryPath) + Level1 @@ -111,6 +115,7 @@ true true + C:\Users\BlackHole\vcpkg\installed\x64-windows-static\lib;%(AdditionalLibraryDirectories) diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp index b69aed3322bb2..69d5e85b9563d 100644 --- a/src/newcharacter.cpp +++ b/src/newcharacter.cpp @@ -81,7 +81,7 @@ struct points_left; #define COL_NOTE_MINOR c_light_gray // Just regular note #define HIGH_STAT 14 // The point after which stats cost double -#define MAX_STAT 20 // The point after which stats can not be increased further +#define MAX_STAT 30 // The point after which stats can not be increased further #define NEWCHAR_TAB_MAX 6 // The ID of the rightmost tab