Skip to content

Commit 9374028

Browse files
author
dgengin
committed
- add itemCount to Inventory
- apply light radius from items to player - update BUILD.txt - update lighting - update project - use override instead of virtual - update gamefiles
1 parent 5667905 commit 9374028

118 files changed

Lines changed: 823 additions & 684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
/Debug
2020
/Debug Clang
2121
/Debug Code Analysis
22-
/Debug VS2015
22+
/Debug NoDiabloFormatSupport
23+
/Debug NoMovie
2324
/DGEngine
2425
/DIABDAT
2526
/DIABDAT.*
@@ -40,7 +41,9 @@
4041
/obj
4142
/PhysicsFS
4243
/Release
44+
/Release NoMovie
4345
/Release Static
46+
/Release Static NoMovie
4447
/sfeMovie
4548
/SFML
4649
/Win32

‎BUILD.txt‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,23 @@
11
Windows
22

3-
To compile in Windows, you need Visual Studio 2017, since this project
4-
uses C++ features that are present only in VS2017.
3+
To compile in Windows, you can use CMake or the Visual Studio 2019 project.
54

6-
The provided project expects the following folders in the root of the
7-
project to build properly.
5+
The easiest way to get the required dependencies is to use vcpkg.
6+
7+
vcpkg install physfs:x86-windows sfml:x86-windows ffmpeg:x86-windows
8+
vcpkg install physfs:x86-windows-static sfml:x86-windows-static ffmpeg:x86-windows-static
89

910
/PhysicsFS - https://icculus.org/physfs
1011
version >= 2.1
11-
Compile using MinSizeRel.
1212

1313
/SFML - http://www.sfml-dev.org/
1414
SFML 2.5.0
1515

1616
/FFmpeg - http://ffmpeg.zeranoe.com/builds/
1717
Get both 32 bit shared and dev packages (version 2.x or 3.x)
1818

19-
DGEngine now bundles a modified version of sfeMovie (no subtitle support,
20-
FFmpeg 3.x API suport), so you only need FFmpeg >= 2.8 now.
21-
2219
If you want to skip movie playback support, use the preprocessor define
2320
USE_SFML_MOVIE_STUB which uses a stub class that does nothing instead.
24-
The provided project uses sfeMovie and will fail to compile if you don't have
25-
sfeMovie with OpenFromStream support installed. Use this to fix that.
26-
27-
To prevent missing DLL errors when running from Visual Studio,
28-
place the following in the root of the project:
29-
30-
avcodec-56.dll (FFmpeg 2)
31-
avdevice-56.dll (FFmpeg 2)
32-
avfilter-5.dll (FFmpeg 2)
33-
avformat-56.dll (FFmpeg 2)
34-
avutil-54.dll (FFmpeg 2)
35-
openal32.dll (SFML)
36-
physfs.dll (PhysicsFS)
37-
sfml-audio-2.dll (SFML)
38-
sfml-audio-d-2.dll (SFML)
39-
sfml-graphics-2.dll (SFML)
40-
sfml-graphics-d-2.dll (SFML)
41-
sfml-network-2.dll (SFML)
42-
sfml-network-d-2.dll (SFML)
43-
sfml-system-2.dll (SFML)
44-
sfml-system-d-2.dll (SFML)
45-
sfml-window-2.dll (SFML)
46-
sfml-window-d-2.dll (SFML)
47-
swresample-1.dll (FFmpeg 2)
48-
swscale-3.dll (FFmpeg 2)
4921

5022
Linux
5123

‎DGEngine.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Global
1313
Debug NoMovie|Win32 = Debug NoMovie|Win32
1414
Debug|Win32 = Debug|Win32
1515
Release NoMovie|Win32 = Release NoMovie|Win32
16+
Release Static NoMovie|Win32 = Release Static NoMovie|Win32
1617
Release Static|Win32 = Release Static|Win32
1718
Release|Win32 = Release|Win32
1819
EndGlobalSection
@@ -29,6 +30,8 @@ Global
2930
{B30255A6-E921-4847-9FB1-26842AB465A4}.Debug|Win32.Build.0 = Debug|Win32
3031
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release NoMovie|Win32.ActiveCfg = Release NoMovie|Win32
3132
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release NoMovie|Win32.Build.0 = Release NoMovie|Win32
33+
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release Static NoMovie|Win32.ActiveCfg = Release Static NoMovie|Win32
34+
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release Static NoMovie|Win32.Build.0 = Release Static NoMovie|Win32
3235
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release Static|Win32.ActiveCfg = Release Static|Win32
3336
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release Static|Win32.Build.0 = Release Static|Win32
3437
{B30255A6-E921-4847-9FB1-26842AB465A4}.Release|Win32.ActiveCfg = Release|Win32

‎DGEngine.vcxproj‎

Lines changed: 138 additions & 49 deletions
Large diffs are not rendered by default.

‎gamefilesd/level/item/descriptions.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@
7878
{ "min": 1, "max": "max", "value": "Chance to Hit : +%toHit%%" }
7979
]
8080
},
81+
{
82+
"property": "toLightRadius",
83+
"value": [
84+
{ "min": "min", "max": -1, "value": "%toLightRadius%% to Light Radius" },
85+
{ "min": 1, "max": "max", "value": "+%toLightRadius%% to Light Radius" }
86+
]
87+
},
8188
{
8289
"property": "toArmor",
8390
"value": [

‎gamefilesd/level/item/suffixes.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
]
193193
},
194194
{
195-
"property": "lightRadius",
195+
"property": "toLightRadius",
196196
"value": [
197197
{ "min": "min", "max": -40, "value": "Of The Dark" },
198198
{ "min": -39, "max": -20, "value": "Of The Night" },
@@ -308,7 +308,7 @@
308308
]
309309
},
310310
{
311-
"property": "lightRadius",
311+
"property": "toLightRadius",
312312
"value": [
313313
{ "min": "min", "max": -40, "value": "Of The Dark" },
314314
{ "min": -39, "max": -20, "value": "Of The Night" },

‎gamefilesd/level/item/suffixesPriceB.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
]
149149
},
150150
{
151-
"property": "lightRadius",
151+
"property": "toLightRadius",
152152
"value": [
153153
{ "min": "min", "max": -20, "value": 0 },
154154
{ "min": 20, "max": 39, "value": 750 },
@@ -249,7 +249,7 @@
249249
]
250250
},
251251
{
252-
"property": "lightRadius",
252+
"property": "toLightRadius",
253253
"value": [
254254
{ "min": "min", "max": -20, "value": 0 },
255255
{ "min": 20, "max": 39, "value": 750 },

‎gamefilesd/level/item/suffixesPriceM.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
]
176176
},
177177
{
178-
"property": "lightRadius",
178+
"property": "toLightRadius",
179179
"value": [
180180
{ "min": "min", "max": -40, "value": -3 },
181181
{ "min": -39, "max": -20, "value": -2 },
@@ -291,7 +291,7 @@
291291
]
292292
},
293293
{
294-
"property": "lightRadius",
294+
"property": "toLightRadius",
295295
"value": [
296296
{ "min": "min", "max": -40, "value": -3 },
297297
{ "min": -39, "max": -20, "value": -2 },

‎gamefilesd/level/loadBaseLevel.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"id": "level",
44
"anchor": "all",
55
"size": [640, 352],
6+
"lightRadius": 64,
67
"automapPlayerDirectionIndex": 1024,
78
"playerClassClearIndex": 1,
89
"playerClearIndex": 1,

‎gamefilesd/level/map/town/items.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191
},
9292
{
9393
"class": "club",
94-
"mapPosition": [59, 74]
94+
"mapPosition": [59, 74],
95+
"properties": {
96+
"toLightRadius": 20,
97+
"magical": true
98+
}
9599
},
96100
{
97101
"class": "compositeBow",

0 commit comments

Comments
 (0)