annotate Items.cpp @ 759:b2468462a360

Merge
author Nomad
date Sat, 23 Mar 2013 13:40:00 +0200
parents e39702f35283
children cf2fbac6edc9
rev   line source
0
Ritor1
parents:
diff changeset
1 #include <stdlib.h>
228
46ae2602aceb Item generation doesn't crash (thou still generates weird stuff)
Nomad
parents: 224
diff changeset
2 #include <assert.h>
0
Ritor1
parents:
diff changeset
3
Ritor1
parents:
diff changeset
4 #include "Items.h"
Ritor1
parents:
diff changeset
5 #include "MapInfo.h"
Ritor1
parents:
diff changeset
6 #include "FrameTableInc.h"
Ritor1
parents:
diff changeset
7 #include "Allocator.h"
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
8 #include "GUIWindow.h"
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
9 #include "Events2D.h"
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
10 #include "Chest.h"
0
Ritor1
parents:
diff changeset
11 #include "LOD.h"
Ritor1
parents:
diff changeset
12 #include "Monsters.h"
Ritor1
parents:
diff changeset
13 #include "Party.h"
Ritor1
parents:
diff changeset
14 #include "FactionTable.h"
Ritor1
parents:
diff changeset
15 #include "StorylineTextTable.h"
189
038a4d09406f new texts file, fix text rendender error
Gloval
parents: 0
diff changeset
16 #include "texts.h"
0
Ritor1
parents:
diff changeset
17 #include "mm7_data.h"
Ritor1
parents:
diff changeset
18
Ritor1
parents:
diff changeset
19
Ritor1
parents:
diff changeset
20
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
21 struct ITEM_VARIATION
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
22 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
23 unsigned __int16 treasure_level;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
24 unsigned __int16 item_class[4];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
25 };
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
26
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
27
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
28 const char uItemsAmountPerShopType[5]={ 0, 6, 8, 12, 12};
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
29
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
30 const ITEM_VARIATION shopWeap_variation_ord[15] ={
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
31 { 0, { 0, 0, 0, 0 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
32 { 1, { 23, 27, 20, 20 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
33 { 1, { 23, 24, 28, 20 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
34 { 2, { 23, 24, 25, 20 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
35 { 2, { 27, 27, 26, 26 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
36 { 4, { 24, 30, 25, 27 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
37 { 4, { 24, 30, 25, 27 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
38 { 3, { 30, 24, 20, 20 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
39 { 2, { 20, 20, 20, 20 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
40 { 3, { 27, 27, 26, 26 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
41 { 3, { 28, 28, 25, 25 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
42 { 2, { 23, 23, 24, 24 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
43 { 3, { 23, 23, 26, 26 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
44 { 2, { 30, 26, 26, 26 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
45 { 2, { 28, 25, 28, 29 }}};
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
46
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
47 const ITEM_VARIATION shopArmr_variation_ord[28] ={
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
48 { 1, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
49 { 1, { 31, 31, 31, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
50 { 1, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
51 { 1, { 31, 31, 32, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
52 { 2, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
53 { 2, { 31, 32, 32, 33 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
54 { 2, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
55 { 2, { 31, 31, 32, 32 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
56 { 4, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
57 { 4, { 31, 32, 33, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
58 { 4, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
59 { 4, { 31, 32, 33, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
60 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
61 { 3, { 31, 31, 31, 31 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
62 { 2, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
63 { 2, { 31, 32, 34, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
64 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
65 { 3, { 31, 31, 32, 32 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
66 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
67 { 3, { 32, 32, 32, 33 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
68 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
69 { 3, { 31, 31, 31, 32 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
70 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
71 { 3, { 33, 31, 32, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
72 { 3, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
73 { 3, { 33, 31, 32, 34 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
74 { 4, { 35, 35, 38, 38 }},
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
75 { 4, { 33, 31, 32, 34 }}};
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
76
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
77
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
78
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
79 const unsigned __int16 shopMagic_treasure_lvl[14]= {0, 1, 1, 2, 2, 4, 4, 3, 2, 2, 2, 2, 2, 2};
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
80 const unsigned __int16 shopAlch_treasure_lvl[13] = {0, 1, 1, 2, 2, 3, 3, 4, 4, 2, 2, 2, 2};
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
81
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
82 const ITEM_VARIATION shopWeap_variation_spc[15]={
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
83 { 0, { 0, 0, 0, 0 }},
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
84 { 2, { 25, 30, 20, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
85 { 2, { 23, 24, 28, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
86 { 3, { 23, 24, 25, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
87 { 3, { 27, 27, 26, 26}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
88 { 5, { 23, 26, 28, 27}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
89 { 5, { 23, 26, 28, 27}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
90 { 4, { 30, 24, 20, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
91 { 3, { 20, 20, 20, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
92 { 4, { 27, 27, 26, 26}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
93 { 4, { 28, 28, 25, 25}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
94 { 4, { 23, 23, 24, 24}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
95 { 4, { 24, 24, 27, 20}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
96 { 4, { 30, 26, 26, 26}},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
97 { 4, { 28, 25, 28, 29}}};
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
98
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
99 const ITEM_VARIATION shopArmr_variation_spc[28]={
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
100 { 2, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
101 { 2, { 31, 31, 31, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
102 { 2, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
103 { 2, { 31, 31, 32, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
104 { 3, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
105 { 3, { 31, 32, 32, 33 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
106 { 3, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
107 { 3, { 31, 31, 32, 32 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
108 { 5, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
109 { 5, { 31, 32, 33, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
110 { 5, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
111 { 5, { 31, 32, 33, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
112 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
113 { 4, { 31, 31, 31, 31 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
114 { 3, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
115 { 3, { 31, 32, 34, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
116 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
117 { 4, { 31, 31, 32, 33 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
118 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
119 { 4, { 32, 32, 33, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
120 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
121 { 4, { 31, 31, 31, 32 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
122 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
123 { 4, { 32, 32, 32, 32 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
124 { 4, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
125 { 4, { 34, 34, 34, 34 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
126 { 5, { 35, 35, 38, 38 }},
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
127 { 5, { 33, 33, 33, 33 }}
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
128 };
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
129
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
130 const unsigned __int16 shopMagicSpc_treasure_lvl[14] = {0, 2, 2, 3, 3, 5, 5, 4, 3, 3, 3, 3, 3, 3};
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
131 const unsigned __int16 shopAlchSpc_treasure_lvl[13] = {0, 2, 2, 3, 3, 4, 4, 5, 5, 3, 2, 2, 2};
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
132
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
133
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
134 char byte_4E8168[7][14]={ //byte_4E8178
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
135 { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
136 { 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
137 { 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
138 { 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
139 { 2, 2, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
140 { 2, 2, 2, 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6},
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
141 { 2, 2, 2, 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}};
0
Ritor1
parents:
diff changeset
142
475
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
143 int sub_4BE571(int a1, int *a2, int a3, int a4);
0
Ritor1
parents:
diff changeset
144
Ritor1
parents:
diff changeset
145 ItemGen *ptr_50C9A4;
Ritor1
parents:
diff changeset
146
315
2a09e1d6fc8f Some 0041D895 GameUI_DrawItemInfo overhaul
Nomad
parents: 296
diff changeset
147 struct ItemsTable *pItemsTable; // 005D29E0
0
Ritor1
parents:
diff changeset
148
Ritor1
parents:
diff changeset
149
Ritor1
parents:
diff changeset
150
Ritor1
parents:
diff changeset
151
Ritor1
parents:
diff changeset
152
Ritor1
parents:
diff changeset
153 //----- (00439DF3) --------------------------------------------------------
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
154 int ItemGen::_439DF3_get_additional_damage(int *damage_type, bool *draintargetHP)
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
155 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
156 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
157 if ( !uItemID )
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
158 return 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
159 UpdateTempBonus(pParty->uTimePlayed);
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
160 if (uItemID == 501 ) //Iron Feather -sword
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
161 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
162 *damage_type = 1;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
163 return rand() % 10 + 6;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
164 }
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
165 if (uItemID == 507 ) //Ghoulsbane -axe
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
166 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
167 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
168 return rand() % 16 + 3;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
169 }
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
170 if ( uItemID == 510 ) //Ullyses -bow
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
171 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
172 *damage_type = 2;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
173 return rand() % 4 + 9;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
174 }
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
175 if ( uItemID == 517 ) //Old Nick -dagger
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
176 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
177 *damage_type = 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
178 return 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
179 }
0
Ritor1
parents:
diff changeset
180
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
181 switch (uSpecEnchantmentType)
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
182 {
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
183 case 4: //Adds 3-4 points of Cold damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
184 *damage_type = 2;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
185 return rand() % 2 + 3;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
186 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
187 case 5: //Adds 6-8 points of Cold damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
188 *damage_type = 2;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
189 return rand() % 3 + 6;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
190 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
191 case 6: //Adds 9-12 points of Cold damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
192 *damage_type = 2;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
193 return rand() % 4 + 9;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
194 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
195 case 7: //Adds 2-5 points of Electrical damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
196 *damage_type = 1;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
197 return rand() % 4 + 2;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
198 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
199 case 8: //Adds 4-10 points of Electrical damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
200 *damage_type = 1;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
201 return rand() % 7 + 4;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
202 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
203 case 9: //Adds 6-15 points of Electrical damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
204 *damage_type = 1;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
205 return rand() % 10 + 6;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
206 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
207 case 10: //Adds 1-6 points of Fire damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
208 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
209 return GetDiceResult(1, 6);
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
210 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
211 case 11: //Adds 2-12 points of Fire damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
212 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
213 return GetDiceResult(2, 6);
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
214 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
215 case 12: //Adds 3-18 points of Fire damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
216 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
217 return GetDiceResult(3, 6);
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
218 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
219 case 13: //Adds 5 points of Body damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
220 *damage_type = 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
221 return 5;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
222 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
223 case 14: //Adds 8 points of Body damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
224 *damage_type = 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
225 return 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
226 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
227 case 15: //Adds 12 points of Body damage.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
228 *damage_type = 8;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
229 return 12;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
230 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
231 case 16: //Drain Hit Points from target.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
232 case 41: //Drain Hit Points from target and Increased Weapon speed.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
233 *damage_type = 10;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
234 *draintargetHP = true;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
235 return 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
236 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
237 case 46: //Adds 10-20 points of Fire damage and +25 Might.
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
238 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
239 return rand() % 11 + 10;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
240 break;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
241 default:
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
242 *damage_type = 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
243 return 0;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
244
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
245 }
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
246
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
247 }
0
Ritor1
parents:
diff changeset
248
Ritor1
parents:
diff changeset
249
Ritor1
parents:
diff changeset
250 //----- (00402F07) --------------------------------------------------------
Ritor1
parents:
diff changeset
251 void ItemGen::Reset()
Ritor1
parents:
diff changeset
252 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
253 this->uHolderPlayer = 0;
0
Ritor1
parents:
diff changeset
254 this->uAttributes = 0;
Ritor1
parents:
diff changeset
255 this->uNumCharges = 0;
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
256 this->uSpecEnchantmentType = 0;
0
Ritor1
parents:
diff changeset
257 this->_bonus_strength = 0;
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
258 this->uEnchantmentType = 0;
0
Ritor1
parents:
diff changeset
259 this->uItemID = 0;
Ritor1
parents:
diff changeset
260 this->uBodyAnchor = 0;
Ritor1
parents:
diff changeset
261 this->uExpireTime = 0i64;
Ritor1
parents:
diff changeset
262 }
Ritor1
parents:
diff changeset
263
Ritor1
parents:
diff changeset
264 //----- (00458260) --------------------------------------------------------
Ritor1
parents:
diff changeset
265 void ItemGen::UpdateTempBonus(__int64 uTimePlayed)
Ritor1
parents:
diff changeset
266 {
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
267 if ( this->uAttributes & ITEM_TEMP_BONUS )
0
Ritor1
parents:
diff changeset
268 {
Ritor1
parents:
diff changeset
269 if ( uTimePlayed > (signed __int64)this->uExpireTime )
Ritor1
parents:
diff changeset
270 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
271 this->uEnchantmentType = 0;
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
272 this->uSpecEnchantmentType = 0;
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
273 this->uAttributes = this->uAttributes&(~ITEM_TEMP_BONUS);
0
Ritor1
parents:
diff changeset
274 }
Ritor1
parents:
diff changeset
275 }
Ritor1
parents:
diff changeset
276 }
Ritor1
parents:
diff changeset
277
Ritor1
parents:
diff changeset
278 //----- (0045814E) --------------------------------------------------------
374
Gloval
parents: 365
diff changeset
279 void ItemsTable::Release()
0
Ritor1
parents:
diff changeset
280 {
Ritor1
parents:
diff changeset
281 if ( pMonstersTXT_Raw )
Ritor1
parents:
diff changeset
282 pAllocator->FreeChunk(pMonstersTXT_Raw);
Ritor1
parents:
diff changeset
283 if ( pMonsterPlacementTXT_Raw )
Ritor1
parents:
diff changeset
284 pAllocator->FreeChunk(pMonsterPlacementTXT_Raw);
Ritor1
parents:
diff changeset
285 if ( pSkillDescTXT_Raw )
Ritor1
parents:
diff changeset
286 pAllocator->FreeChunk(pSkillDescTXT_Raw);
374
Gloval
parents: 365
diff changeset
287 if (pSpcItemsTXT_Raw )
Gloval
parents: 365
diff changeset
288 pAllocator->FreeChunk(pSpcItemsTXT_Raw);
Gloval
parents: 365
diff changeset
289 if ( pStdItemsTXT_Raw )
Gloval
parents: 365
diff changeset
290 pAllocator->FreeChunk(pStdItemsTXT_Raw);
Gloval
parents: 365
diff changeset
291 if ( pRndItemsTXT_Raw )
Gloval
parents: 365
diff changeset
292 pAllocator->FreeChunk(pRndItemsTXT_Raw);
Gloval
parents: 365
diff changeset
293 if ( pItemsTXT_Raw )
Gloval
parents: 365
diff changeset
294 pAllocator->FreeChunk(pItemsTXT_Raw);
0
Ritor1
parents:
diff changeset
295 if ( pHostileTXT_Raw )
Ritor1
parents:
diff changeset
296 pAllocator->FreeChunk(pHostileTXT_Raw);
Ritor1
parents:
diff changeset
297 if ( pHistoryTXT_Raw )
Ritor1
parents:
diff changeset
298 pAllocator->FreeChunk(pHistoryTXT_Raw);
Ritor1
parents:
diff changeset
299 if ( pPotionsTXT_Raw )
Ritor1
parents:
diff changeset
300 pAllocator->FreeChunk(pPotionsTXT_Raw);
Ritor1
parents:
diff changeset
301 if ( pPotionNotesTXT_Raw )
Ritor1
parents:
diff changeset
302 pAllocator->FreeChunk(pPotionNotesTXT_Raw);
374
Gloval
parents: 365
diff changeset
303 pSpcItemsTXT_Raw = NULL;
Gloval
parents: 365
diff changeset
304 pSkillDescTXT_Raw = NULL;
Gloval
parents: 365
diff changeset
305 pStdItemsTXT_Raw = NULL;
Gloval
parents: 365
diff changeset
306 pRndItemsTXT_Raw = NULL;
Gloval
parents: 365
diff changeset
307 pItemsTXT_Raw = NULL;
Gloval
parents: 365
diff changeset
308
0
Ritor1
parents:
diff changeset
309 }
Ritor1
parents:
diff changeset
310
Ritor1
parents:
diff changeset
311
Ritor1
parents:
diff changeset
312 //----- (00456D84) --------------------------------------------------------
Ritor1
parents:
diff changeset
313 void ItemsTable::Initialize()
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
314 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
315 int i,j;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
316 char* test_string;
229
Gloval
parents: 224
diff changeset
317 unsigned char c;
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
318 bool break_loop;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
319 unsigned int temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
320 char* tmp_pos;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
321 int decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
322 int item_counter;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
323
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
324 pMapStats = new MapStats;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
325 pMapStats->Initialize();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
326
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
327 pMonsterStats = new MonsterStats;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
328 pMonsterStats->Initialize();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
329 pMonsterStats->InitializePlacements();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
330
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
331 pSpellStats = new SpellStats;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
332 pSpellStats->Initialize();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
333
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
334 LoadPotions();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
335 LoadPotionNotes();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
336
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
337 pFactionTable = new FactionTable;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
338 pFactionTable->Initialize();
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
339
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
340 pStorylineText = new StorylineText;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
341 pStorylineText->Initialize();
0
Ritor1
parents:
diff changeset
342
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
343 pStdItemsTXT_Raw = NULL;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
344 pStdItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("stditems.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
345 strtok(pStdItemsTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
346 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
347 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
348 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
349 //Standard Bonuses by Group
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
350 for (i=0;i<24;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
351 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
352 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
353 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
354 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
355 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
356 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
357 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
358 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
359 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
360 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
361 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
362 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
363 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
364 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
365 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
366 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
367 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
368 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
369 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
370 switch (decode_step)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
371 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
372 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
373 pEnchantments[i].pBonusStat=RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
374 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
375 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
376 pEnchantments[i].pOfName= RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
377 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
378 default:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
379 pEnchantments[i].to_item[decode_step-2]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
380 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
381 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
382 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
383 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
384 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
385 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
386 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
387 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
388 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
389 } while ((decode_step<11)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
390 }
0
Ritor1
parents:
diff changeset
391
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
392 memset(&pEnchantmentsSumm, 0, 36);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
393 for(i=0;i<9;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
394 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
395 for (j=0;j<24;++j)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
396 pEnchantmentsSumm[i]+=pEnchantments[j].to_item[i];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
397 }
0
Ritor1
parents:
diff changeset
398
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
399 //Bonus range for Standard by Level
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
400 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
401 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
402 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
403 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
404 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
405 for(i=0;i<6;++i) //counted from 1
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
406 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
407 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
408 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
409 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
410 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
411 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
412 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
413 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
414 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
415 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
416 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
417 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
418 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
419 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
420 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
421 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
422 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
423 if (decode_step==2)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
424 bonus_ranges[i].minR = atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
425 else if (decode_step==3)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
426 bonus_ranges[i].maxR =atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
427 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
428 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
429 } while ((decode_step<4)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
430 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
431
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
432
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
433 pSpcItemsTXT_Raw = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
434 pSpcItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("spcitems.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
435 strtok(pSpcItemsTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
436 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
437 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
438 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
439 for (i=0;i<72;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
440 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
441 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
442 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
443 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
444 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
445 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
446 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
447 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
448 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
449 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
450 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
451 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
452 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
453 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
454 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
455 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
456 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
457 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
458 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
459 switch (decode_step)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
460 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
461 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
462 pSpecialEnchantments[i].pBonusStatement=RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
463 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
464 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
465 pSpecialEnchantments[i].pNameAdd= RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
466 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
467 case 14:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
468 int res;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
469 res=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
470 if(!res)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
471 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
472 ++test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
473 while (*test_string==' ')//fix X 2 case
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
474 ++test_string;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
475 res=atoi(test_string);
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
476 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
477 pSpecialEnchantments[i].iValue=res;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
478 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
479 case 15:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
480 pSpecialEnchantments[i].iTreasureLevel= tolower(*test_string) - 97;;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
481 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
482 default:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
483 pSpecialEnchantments[i].to_item_apply[decode_step-2]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
484 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
485 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
486 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
487 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
488 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
489 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
490 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
491 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
492 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
493 } while ((decode_step<16)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
494 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
495
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
496 pSpecialEnchantments_count = 71;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
497 memset(&pSpecialEnchantmentsSumm, 0, 96);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
498 for(i=0;i<12;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
499 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
500 for (j=0;j<=pSpecialEnchantments_count;++j)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
501 pSpecialEnchantmentsSumm[i]+=pSpecialEnchantments[j].to_item_apply[i];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
502 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
503
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
504 Initialize2DA();
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
505
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
506 pItemsTXT_Raw = NULL;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
507 pItemsTXT_Raw = (char*) pEvents_LOD->LoadRaw("items.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
508 strtok(pItemsTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
509 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
510 uAllItemsCount = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
511 item_counter = 0;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
512 while (true)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
513 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
514 test_string = strtok(NULL, "\r") + 1;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
515 break_loop = false;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
516 decode_step=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
517 do
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
518 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
519 c = *(unsigned char*)test_string;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
520 temp_str_len = 0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
521 while((c!='\t')&&(c>0))
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
522 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
523 ++temp_str_len;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
524 c=test_string[temp_str_len];
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
525 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
526 tmp_pos=test_string+temp_str_len;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
527 if (*tmp_pos == 0)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
528 break_loop = true;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
529 *tmp_pos = 0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
530 if (temp_str_len)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
531 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
532 switch (decode_step)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
533 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
534 case 0: //Item #
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
535 item_counter=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
536 uAllItemsCount=item_counter;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
537 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
538 case 1: //Pic File
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
539 pItems[item_counter].pIconName = RemoveQuotes(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
540 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
541 case 2: //Name
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
542 pItems[item_counter].pName = RemoveQuotes(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
543 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
544 case 3: //Value
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
545 pItems[item_counter].uValue=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
546 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
547 case 4: //Equip Stat
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
548 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
549 if ( !_strcmpi(test_string, "weapon") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
550 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
551 pItems[item_counter].uEquipType = EQUIP_ONE_OR_TWO_HANDS;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
552 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
553 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
554 if ( !_strcmpi(test_string, "weapon2") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
555 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
556 pItems[item_counter].uEquipType = EQUIP_TWO_HANDED;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
557 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
558 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
559 if ( !_strcmpi(test_string, "weapon1or2") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
560 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
561 pItems[item_counter].uEquipType = EQUIP_ONE_OR_TWO_HANDS;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
562 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
563 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
564 if ( !(_strcmpi(test_string, "missile")&&_strcmpi(test_string, "bow")))
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
565 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
566 pItems[item_counter].uEquipType = EQUIP_BOW;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
567 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
568 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
569 if ( !_strcmpi(test_string, "armor") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
570 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
571 pItems[item_counter].uEquipType = EQUIP_ARMOUR;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
572 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
573 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
574 if ( !_strcmpi(test_string, "shield") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
575 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
576 pItems[item_counter].uEquipType = EQUIP_SHIELD;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
577 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
578 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
579 if ( !_strcmpi(test_string, "helm") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
580 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
581 pItems[item_counter].uEquipType = EQUIP_HELMET;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
582 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
583 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
584 if ( !_strcmpi(test_string, "belt") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
585 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
586 pItems[item_counter].uEquipType = EQUIP_BELT;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
587 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
588 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
589 if ( !_strcmpi(test_string, "cloak") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
590 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
591 pItems[item_counter].uEquipType = EQUIP_CLOAK;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
592 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
593 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
594 if ( !_strcmpi(test_string, "gauntlets") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
595 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
596 pItems[item_counter].uEquipType = EQUIP_GAUNTLETS;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
597 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
598 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
599 if ( !_strcmpi(test_string, "boots") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
600 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
601 pItems[item_counter].uEquipType = EQUIP_BOOTS;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
602 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
603 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
604 if ( !_strcmpi(test_string, "ring") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
605 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
606 pItems[item_counter].uEquipType = EQUIP_RING;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
607 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
608 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
609 if ( !_strcmpi(test_string, "amulet") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
610 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
611 pItems[item_counter].uEquipType = EQUIP_AMULET;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
612 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
613 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
614 if ( !_strcmpi(test_string, "weaponw") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
615 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
616 pItems[item_counter].uEquipType = EQUIP_WAND;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
617 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
618 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
619 if ( !(_strcmpi(test_string, "herb")&&_strcmpi(test_string, "reagent")))
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
620 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
621 pItems[item_counter].uEquipType = EQUIP_REAGENT;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
622 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
623 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
624 if ( !_strcmpi(test_string, "bottle") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
625 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
626 pItems[item_counter].uEquipType = EQUIP_POTION;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
627 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
628 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
629 if ( !_strcmpi(test_string, "sscroll") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
630 {
374
Gloval
parents: 365
diff changeset
631 pItems[item_counter].uEquipType = EQUIP_SPELL_SCROLL;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
632 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
633 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
634 if ( !_strcmpi(test_string, "book") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
635 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
636 pItems[item_counter].uEquipType = EQUIP_BOOK;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
637 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
638 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
639 if ( !_strcmpi(test_string, "mscroll") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
640 {
374
Gloval
parents: 365
diff changeset
641 pItems[item_counter].uEquipType = EQUIP_MESSAGE_SCROLL;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
642 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
643 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
644 if ( !_strcmpi(test_string, "gold") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
645 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
646 pItems[item_counter].uEquipType = EQUIP_GOLD;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
647 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
648 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
649 if ( !_strcmpi(test_string, "gem") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
650 {
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
651 pItems[item_counter].uEquipType = EQUIP_GEM;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
652 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
653 }
365
0f35f908547f fixed missing dagger
Gloval
parents: 315
diff changeset
654 pItems[item_counter].uEquipType = EQUIP_NONE;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
655 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
656 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
657 case 5: //Skill Group
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
658 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
659 if ( !_strcmpi(test_string, "staff") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
660 {
374
Gloval
parents: 365
diff changeset
661 pItems[item_counter].uSkillType = PLAYER_SKILL_STAFF;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
662 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
663 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
664 if ( !_strcmpi(test_string, "sword") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
665 {
374
Gloval
parents: 365
diff changeset
666 pItems[item_counter].uSkillType = PLAYER_SKILL_SWORD;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
667 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
668 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
669 if ( !_strcmpi(test_string, "dagger") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
670 {
374
Gloval
parents: 365
diff changeset
671 pItems[item_counter].uSkillType = PLAYER_SKILL_DAGGER;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
672 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
673 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
674 if ( !_strcmpi(test_string, "axe") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
675 {
374
Gloval
parents: 365
diff changeset
676 pItems[item_counter].uSkillType = PLAYER_SKILL_AXE;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
677 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
678 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
679 if ( !_strcmpi(test_string, "spear") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
680 {
374
Gloval
parents: 365
diff changeset
681 pItems[item_counter].uSkillType = PLAYER_SKILL_SPEAR;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
682 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
683 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
684 if ( !_strcmpi(test_string, "bow") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
685 {
374
Gloval
parents: 365
diff changeset
686 pItems[item_counter].uSkillType = PLAYER_SKILL_BOW;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
687 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
688 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
689 if ( !_strcmpi(test_string, "mace") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
690 {
374
Gloval
parents: 365
diff changeset
691 pItems[item_counter].uSkillType = PLAYER_SKILL_MACE;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
692 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
693 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
694 if ( !_strcmpi(test_string, "blaster") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
695 {
374
Gloval
parents: 365
diff changeset
696 pItems[item_counter].uSkillType = PLAYER_SKILL_BLASTER;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
697 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
698 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
699 if ( !_strcmpi(test_string, "shield") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
700 {
374
Gloval
parents: 365
diff changeset
701 pItems[item_counter].uSkillType = PLAYER_SKILL_SHIELD;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
702 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
703 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
704 if ( !_strcmpi(test_string, "leather") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
705 {
374
Gloval
parents: 365
diff changeset
706 pItems[item_counter].uSkillType = PLAYER_SKILL_LEATHER;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
707 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
708 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
709 if ( !_strcmpi(test_string, "chain") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
710 {
374
Gloval
parents: 365
diff changeset
711 pItems[item_counter].uSkillType = PLAYER_SKILL_CHAIN;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
712 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
713 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
714 if ( !_strcmpi(test_string, "plate") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
715 {
374
Gloval
parents: 365
diff changeset
716 pItems[item_counter].uSkillType = PLAYER_SKILL_PLATE;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
717 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
718 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
719 if ( !_strcmpi(test_string, "club") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
720 {
374
Gloval
parents: 365
diff changeset
721 pItems[item_counter].uSkillType = PLAYER_SKILL_CLUB;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
722 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
723 }
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
724 pItems[item_counter].uSkillType = PLAYER_SKILL_MISC;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
725 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
726 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
727 case 6: //Mod1
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
728 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
729 int ii;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
730 char* test_char;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
731 int tst_len;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
732 tst_len=strlen(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
733 pItems[item_counter].uDamageDice=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
734 pItems[item_counter].uDamageRoll=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
735 test_char=test_string;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
736 for (ii=0; ii<tst_len; ++ii)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
737 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
738 if (tolower(*test_char)=='d')
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
739 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
740 *test_char=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
741 pItems[item_counter].uDamageDice=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
742 pItems[item_counter].uDamageRoll=atoi(test_char+1);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
743 *test_char='d';
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
744 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
745 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
746 ++test_char;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
747 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
748 test_char=test_string;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
749 if ((ii==tst_len)&&(tolower(*test_char)!='s'))
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
750 {
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
751 pItems[item_counter].uDamageDice=atoi(test_char);
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
752 pItems[item_counter].uDamageRoll=1;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
753 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
754 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
755 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
756 case 7: //Mod2
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
757 pItems[item_counter].uDamageMod=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
758 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
759 case 8: //material
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
760 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
761 if ( !_strcmpi(test_string, "artifact") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
762 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
763 pItems[item_counter].uMaterial = MATERIAL_ARTEFACT;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
764 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
765 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
766 if ( !_strcmpi(test_string, "relic") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
767 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
768 pItems[item_counter].uMaterial = MATERIAL_RELIC;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
769 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
770 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
771 if ( !_strcmpi(test_string, "special") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
772 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
773 pItems[item_counter].uMaterial = MATERIAL_SPECIAL;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
774 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
775 }
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
776 pItems[item_counter].uMaterial = MATERIAL_COMMON;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
777 break;}
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
778 case 9: //ID/Rep/St
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
779 pItems[item_counter].uItemID_Rep_St=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
780 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
781 case 10: //Not identified name
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
782 pItems[item_counter].pUnidentifiedName = RemoveQuotes(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
783 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
784 case 11: //Sprite Index
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
785 pItems[item_counter].uSpriteID=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
786 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
787 case 12: //VarA
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
788 {
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
789 pItems[item_counter]._additional_value=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
790 pItems[item_counter]._bonus_type=0;
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
791 if (pItems[item_counter].uMaterial==MATERIAL_SPECIAL)
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
792 {
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
793 for(int ii=0; ii<24; ++ii)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
794 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
795 if (stricmp(test_string,pEnchantments[ii].pBonusStat))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
796 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
797 pItems[item_counter]._bonus_type=ii+1;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
798 break;
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
799 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
800 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
801 if (!pItems[item_counter]._bonus_type)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
802 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
803 for(int ii=0; ii<72; ++ii)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
804 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
805 if (stricmp(test_string,pSpecialEnchantments[ii].pBonusStatement))
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
806 {
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
807 pItems[item_counter]._additional_value=ii+1;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
808 }
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
809 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
810 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
811 }
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
812
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
813 break;
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
814 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
815 case 13: //VarB
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
816 if ((pItems[item_counter].uMaterial==MATERIAL_SPECIAL)&&(pItems[item_counter]._bonus_type))
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
817 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
818 char b_s=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
819 if (b_s)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
820 pItems[item_counter]._bonus_strength=b_s;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
821 else
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
822 pItems[item_counter]._bonus_strength=1;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
823 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
824 else
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
825 pItems[item_counter]._bonus_strength=0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
826 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
827 case 14: //Equip X
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
828 pItems[item_counter].uEquipX=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
829 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
830 case 15: //Equip Y
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
831 pItems[item_counter].uEquipY=atoi(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
832 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
833 case 16: //Notes
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
834 pItems[item_counter].pDescription = RemoveQuotes(test_string);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
835 break;
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
836
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
837 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
838 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
839 else
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
840 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
841 if (decode_step)
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
842 break_loop = true;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
843 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
844 ++decode_step;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
845 test_string=tmp_pos+1;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
846 } while ((decode_step<17)&&!break_loop);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
847 ++item_counter;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
848 if (item_counter>799)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
849 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
850 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
851
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
852
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
853 pRndItemsTXT_Raw = NULL;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
854 uAllItemsCount = item_counter;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
855 pRndItemsTXT_Raw = (char *)pEvents_LOD->LoadRaw("rnditems.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
856 strtok(pRndItemsTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
857 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
858 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
859 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
860 item_counter = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
861 while (true)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
862 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
863 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
864 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
865 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
866 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
867 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
868 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
869 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
870 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
871 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
872 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
873 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
874 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
875 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
876 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
877 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
878 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
879 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
880 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
881 switch (decode_step)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
882 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
883 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
884 item_counter=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
885 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
886 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
887 pItems[item_counter].uChanceByTreasureLvl1=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
888 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
889 case 3:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
890 pItems[item_counter].uChanceByTreasureLvl2=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
891 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
892 case 4:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
893 pItems[item_counter].uChanceByTreasureLvl3=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
894 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
895 case 5:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
896 pItems[item_counter].uChanceByTreasureLvl4=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
897 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
898 case 6:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
899 pItems[item_counter].uChanceByTreasureLvl5=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
900 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
901 case 7:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
902 pItems[item_counter].uChanceByTreasureLvl6=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
903 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
904 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
905 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
906 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
907 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
908 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
909 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
910 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
911 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
912 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
913 } while ((decode_step<8)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
914 ++item_counter;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
915 if (item_counter>618)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
916 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
917 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
918
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
919 //ChanceByTreasureLvl Summ - anti cheating?
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
920 memset(&uChanceByTreasureLvlSumm, 0, 24);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
921 for(i=0;i<6;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
922 {
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
923 for (j=1;j<item_counter;++j)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
924 uChanceByTreasureLvlSumm[i]+=pItems[j].uChanceByTreasureLvl[i];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
925 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
926
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
927 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
928 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
929 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
930 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
931 strtok(NULL, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
932 for (i=0;i<3;++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
933 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
934 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
935 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
936 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
937 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
938 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
939 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
940 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
941 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
942 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
943 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
944 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
945 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
946 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
947 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
948 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
949 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
950 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
951 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
952 switch (decode_step)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
953 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
954 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
955 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
956 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
957 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
958 uBonusChanceStandart[0]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
959 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
960 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
961 uBonusChanceSpecial[0]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
962 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
963 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
964 uBonusChanceWpSpecial[0]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
965 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
966 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
967 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
968 case 3:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
969 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
970 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
971 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
972 uBonusChanceStandart[1]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
973 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
974 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
975 uBonusChanceSpecial[1]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
976 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
977 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
978 uBonusChanceWpSpecial[1]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
979 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
980 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
981 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
982 case 4:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
983 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
984 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
985 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
986 uBonusChanceStandart[2]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
987 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
988 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
989 uBonusChanceSpecial[2]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
990 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
991 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
992 uBonusChanceWpSpecial[2]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
993 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
994 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
995 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
996 case 5:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
997 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
998 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
999 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1000 uBonusChanceStandart[3]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1001 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1002 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1003 uBonusChanceSpecial[3]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1004 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1005 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1006 uBonusChanceWpSpecial[3]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1007 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1008 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1009 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1010 case 6:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1011 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1012 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1013 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1014 uBonusChanceStandart[4]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1015 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1016 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1017 uBonusChanceSpecial[4]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1018 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1019 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1020 uBonusChanceWpSpecial[4]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1021 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1022 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1023 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1024 case 7:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1025 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1026 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1027 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1028 uBonusChanceStandart[5]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1029 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1030 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1031 uBonusChanceSpecial[5]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1032 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1033 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1034 uBonusChanceWpSpecial[5]=atoi(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1035 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1036 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1037 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1038 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1039 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1040 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1041 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1042 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1043 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1044 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1045 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1046 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1047 } while ((decode_step<8)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1048 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1049
705
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1050 if ( pRndItemsTXT_Raw )
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1051 {
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1052 pAllocator->FreeChunk(pRndItemsTXT_Raw);
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1053 pRndItemsTXT_Raw = NULL;
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1054 }
e39702f35283 memory allocation partly reworked
zipi
parents: 598
diff changeset
1055
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1056 pSkillDescTXT_Raw = NULL;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1057 pSkillDescTXT_Raw = (char *)pEvents_LOD->LoadRaw("skilldes.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1058 strtok(pSkillDescTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1059 for (i=0; i<37; ++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1060 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1061 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1062 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1063 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1064 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1065 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1066 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1067 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1068 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1069 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1070 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1071 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1072 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1073 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1074 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1075 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1076 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1077 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1078 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1079 switch (decode_step)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1080 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1081 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1082 pSkillDesc[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1083 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1084 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1085 pNormalSkillDesc[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1086 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1087 case 3:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1088 pExpertSkillDesc[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1089 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1090 case 4:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1091 pMasterSkillDesc[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1092 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1093 case 5:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1094 pGrandSkillDesc[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1095 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1096 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1097 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1098 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1099 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1100 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1101 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1102 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1103 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1104 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1105 } while ((decode_step<6)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1106 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1107
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1108 pStatsTXT_Raw = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1109 pStatsTXT_Raw = (char *)pEvents_LOD->LoadRaw("stats.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1110 strtok(pStatsTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1111 for (i=0; i<26; ++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1112 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1113 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1114 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1115 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1116 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1117 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1118 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1119 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1120 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1121 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1122 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1123 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1124 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1125 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1126 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1127 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1128 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1129 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1130 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1131 switch (i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1132 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1133 case 0:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1134 case 1:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1135 case 2:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1136 case 3:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1137 case 4:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1138 case 5:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1139 case 6:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1140 pAttributeDescriptions[i] = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1141 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1142 case 7:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1143 pHealthPointsAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1144 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1145 case 8:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1146 pArmourClassAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1147 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1148 case 9:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1149 pSpellPointsAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1150 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1151 case 10:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1152 pPlayerConditionAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1153 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1154 case 11:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1155 pFastSpellAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1156 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1157 case 12:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1158 pPlayerAgeAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1159 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1160 case 13:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1161 pPlayerLevelAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1162 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1163 case 14:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1164 pPlayerExperienceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1165 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1166 case 15:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1167 pAttackBonusAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1168 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1169 case 16:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1170 pAttackDamageAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1171 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1172 case 17:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1173 pMissleBonusAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1174 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1175 case 18:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1176 pMissleDamageAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1177 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1178 case 19:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1179 pFireResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1180 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1181 case 20:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1182 pAirResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1183 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1184 case 21:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1185 pWaterResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1186 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1187 case 22:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1188 pEarthResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1189 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1190 case 23:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1191 pMindResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1192 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1193 case 24:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1194 pBodyResistanceAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1195 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1196 case 25:
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1197 pSkillPointsAttributeDescription = RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1198 break;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1199 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1200 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1201 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1202 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1203 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1204 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1205 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1206 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1207 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1208 } while ((decode_step<2)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1209 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1210
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1211
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1212 pClassTXT_Raw = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1213 pClassTXT_Raw = (char *)pEvents_LOD->LoadRaw("class.txt", 0);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1214 strtok(pClassTXT_Raw, "\r");
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1215 for (i=0; i<36; ++i)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1216 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1217 test_string = strtok(NULL, "\r") + 1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1218 break_loop = false;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1219 decode_step=0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1220 do
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1221 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1222 c = *(unsigned char*)test_string;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1223 temp_str_len = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1224 while((c!='\t')&&(c>0))
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1225 {
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1226 ++temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1227 c=test_string[temp_str_len];
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1228 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1229 tmp_pos=test_string+temp_str_len;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1230 if (*tmp_pos == 0)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1231 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1232 *tmp_pos = 0;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1233 if (temp_str_len)
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1234 {
229
Gloval
parents: 224
diff changeset
1235 //if(i)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1236 pClassDescriptions[i]=RemoveQuotes(test_string);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1237 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1238 else
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1239 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1240 if (decode_step)
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1241 break_loop = true;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1242 }
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1243 ++decode_step;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1244 test_string=tmp_pos+1;
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1245 } while ((decode_step<2)&&!break_loop);
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1246 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1247
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1248 }
0
Ritor1
parents:
diff changeset
1249
Ritor1
parents:
diff changeset
1250 //----- (00456D17) --------------------------------------------------------
Ritor1
parents:
diff changeset
1251 void ItemsTable::SetSpecialBonus(ItemGen *pItem)
Ritor1
parents:
diff changeset
1252 {
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1253 if ( pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL )
0
Ritor1
parents:
diff changeset
1254 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1255 pItem->uEnchantmentType = pItems[pItem->uItemID]._bonus_type;
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1256 pItem->uSpecEnchantmentType = pItems[pItem->uItemID]._additional_value;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1257 pItem->_bonus_strength = pItems[pItem->uItemID]._bonus_strength;
0
Ritor1
parents:
diff changeset
1258 }
Ritor1
parents:
diff changeset
1259 }
Ritor1
parents:
diff changeset
1260
Ritor1
parents:
diff changeset
1261 //----- (00456D43) --------------------------------------------------------
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1262 bool ItemsTable::IsMaterialSpecial(ItemGen *pItem)
0
Ritor1
parents:
diff changeset
1263 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1264 return this->pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL;
0
Ritor1
parents:
diff changeset
1265 }
Ritor1
parents:
diff changeset
1266
Ritor1
parents:
diff changeset
1267 //----- (00456D5E) --------------------------------------------------------
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1268 bool ItemsTable::IsMaterialNonCommon(ItemGen *pItem)
0
Ritor1
parents:
diff changeset
1269 {
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1270 return pItems[pItem->uItemID].uMaterial == MATERIAL_SPECIAL ||
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1271 pItems[pItem->uItemID].uMaterial == MATERIAL_RELIC ||
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1272 pItems[pItem->uItemID].uMaterial == MATERIAL_ARTEFACT;
0
Ritor1
parents:
diff changeset
1273 }
Ritor1
parents:
diff changeset
1274
Ritor1
parents:
diff changeset
1275
Ritor1
parents:
diff changeset
1276 //----- (00453B3C) --------------------------------------------------------
Ritor1
parents:
diff changeset
1277 void ItemsTable::LoadPotions()
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1278 {
0
Ritor1
parents:
diff changeset
1279
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1280 CHAR Text[90]; // [sp+Ch] [bp-6Ch]@26
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1281 char* test_string;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1282 unsigned int uRow;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1283 unsigned int uColumn;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1284 unsigned __int8 potion_value;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1285
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1286 if ( pPotionsTXT_Raw )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1287 pAllocator->FreeChunk(pPotionsTXT_Raw);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1288 pPotionsTXT_Raw = NULL;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1289 pPotionsTXT_Raw = (char *)pEvents_LOD->LoadRaw("potion.txt", 0);
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1290 test_string = strtok(pPotionsTXT_Raw,"\t\r\n");
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1291 while ( 1 )
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1292 {
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1293 if ( !test_string )
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1294 {
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1295 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1296 return;
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1297 }
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1298 if ( !strcmp(test_string, "222") )
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1299 break;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1300
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1301 test_string = strtok(NULL, "\t\r\n");
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1302 }
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1303 while ( 1 )
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1304 {
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1305 test_string = strtok(NULL, "\t\r\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1306
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1307 if ( !test_string )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1308 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1309 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1310 return;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1311 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1312 if ( !strcmp(test_string, "222") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1313 break;
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1314 }
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1315
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1316 for (uRow = 0;uRow < 50; ++uRow)
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1317 {
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1318 int skip_count;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1319 for (skip_count = 0;skip_count < 6; ++skip_count)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1320 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1321 if ( !strtok(NULL, "\r\t\n") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1322 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1323 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1324 if ( skip_count != 6 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1325 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1326 for (uColumn = 0; uColumn < 50; ++uColumn)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1327 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1328 test_string = strtok(NULL, "\r\t\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1329 if ( !test_string )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1330 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1331 potion_value = atoi(test_string);
233
0df4136b6aac store_line
Gloval
parents: 230
diff changeset
1332 unsigned char c=*test_string;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1333 if ( !potion_value )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1334 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1335 if ( tolower(c) == 'e' )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1336 potion_value = atoi(test_string + 1);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1337 else
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1338 potion_value = 0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1339 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1340 this->potion_data[uRow][uColumn]=potion_value;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1341 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1342 if ( uColumn != 50 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1343 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1344 strtok(NULL, "\r\t\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1345 }
193
821fd955c379 fixed potion data parsing. Somehow 3d render was affected
Gloval
parents: 189
diff changeset
1346
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1347 if ( uRow != 50 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1348 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1349 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, uColumn);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1350 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1351 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1352 if ( pPotionsTXT_Raw )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1353 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1354 pAllocator->FreeChunk(pPotionsTXT_Raw);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1355 pPotionsTXT_Raw = 0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1356 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1357 }
0
Ritor1
parents:
diff changeset
1358
Ritor1
parents:
diff changeset
1359 //----- (00453CE5) --------------------------------------------------------
Ritor1
parents:
diff changeset
1360 void ItemsTable::LoadPotionNotes()
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1361 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1362
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1363 CHAR Text[90];
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1364 char* test_string;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1365 unsigned int uRow;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1366 unsigned int uColumn;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1367 unsigned __int8 potion_note;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1368
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1369 if ( pPotionNotesTXT_Raw )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1370 pAllocator->FreeChunk(pPotionNotesTXT_Raw);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1371 pPotionNotesTXT_Raw = NULL;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1372 pPotionNotesTXT_Raw = (char *)pEvents_LOD->LoadRaw("potnotes.txt", 0);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1373 test_string = strtok(pPotionNotesTXT_Raw ,"\t\r\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1374 while ( 1 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1375 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1376 if ( !test_string )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1377 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1378 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1379 return;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1380 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1381 if ( !strcmp(test_string, "222") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1382 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1383 test_string = strtok(NULL, "\t\r\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1384 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1385 while ( 1 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1386 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1387 test_string = strtok(NULL, "\t\r\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1388
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1389 if ( !test_string )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1390 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1391 MessageBoxA(0, "Error Pre-Parsing Potion Table", "Load Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1392 return;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1393 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1394 if ( !strcmp(test_string, "222") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1395 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1396 }
0
Ritor1
parents:
diff changeset
1397
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1398 for (uRow = 0;uRow < 50; ++uRow)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1399 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1400 int skip_count;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1401 for (skip_count = 0;skip_count < 6; ++skip_count)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1402 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1403 if ( !strtok(NULL, "\r\t\n") )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1404 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1405 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1406 if ( skip_count != 6 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1407 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1408 for (uColumn = 0; uColumn < 50; ++uColumn)
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1409 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1410 test_string = strtok(NULL, "\r\t\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1411 if ( !test_string )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1412 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1413 potion_note = atoi(test_string);
233
0df4136b6aac store_line
Gloval
parents: 230
diff changeset
1414 unsigned char c=*test_string;
222
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1415 if ( !potion_note )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1416 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1417 if ( tolower(c) == 'e' )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1418 potion_note = atoi(test_string + 1);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1419 else
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1420 potion_note = 0;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1421 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1422 this->potion_note[uRow][uColumn]=potion_note;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1423 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1424 if ( uColumn != 50 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1425 break;
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1426 strtok(NULL, "\r\t\n");
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1427 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1428 if ( uRow != 50 )
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1429 {
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1430 wsprintfA(Text, "Error Parsing Potion Table at Row: %d Column: %d", uRow, uColumn);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1431 MessageBoxA(0, Text, "Parsing Error", MB_ICONHAND|MB_CANCELTRYCONTINUE);
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1432 }
8113753ed2ae more item init fixing
Gloval
parents: 193
diff changeset
1433 }
0
Ritor1
parents:
diff changeset
1434
Ritor1
parents:
diff changeset
1435
Ritor1
parents:
diff changeset
1436 //----- (00456442) --------------------------------------------------------
Ritor1
parents:
diff changeset
1437 unsigned int ItemGen::GetValue()
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1438 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1439 unsigned int uBaseValue; // edi@1
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1440 unsigned int bonus;
0
Ritor1
parents:
diff changeset
1441
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1442 uBaseValue = pItemsTable->pItems[this->uItemID].uValue;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1443 if ( this->uAttributes & ITEM_TEMP_BONUS || pItemsTable->IsMaterialNonCommon(this) )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1444 return uBaseValue;
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1445 if (uEnchantmentType )
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1446 return uBaseValue + 100 * _bonus_strength;;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1447 if (uSpecEnchantmentType )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1448 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1449 bonus = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType].iTreasureLevel;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1450 if ( bonus > 10 )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1451 return uBaseValue + bonus;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1452 else
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1453 return uBaseValue * bonus;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1454 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1455 return uBaseValue;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1456 }
0
Ritor1
parents:
diff changeset
1457
Ritor1
parents:
diff changeset
1458 //----- (00456499) --------------------------------------------------------
Ritor1
parents:
diff changeset
1459 const char *ItemGen::GetDisplayName()
Ritor1
parents:
diff changeset
1460 {
366
85edec9da96b _4B910F_shop_interaction
Nomad
parents: 365
diff changeset
1461 if (Identified())
85edec9da96b _4B910F_shop_interaction
Nomad
parents: 365
diff changeset
1462 return GetIdentifiedName();
0
Ritor1
parents:
diff changeset
1463 else
366
85edec9da96b _4B910F_shop_interaction
Nomad
parents: 365
diff changeset
1464 return pItemsTable->pItems[uItemID].pUnidentifiedName;
0
Ritor1
parents:
diff changeset
1465 }
Ritor1
parents:
diff changeset
1466
Ritor1
parents:
diff changeset
1467 //----- (004564B3) --------------------------------------------------------
Ritor1
parents:
diff changeset
1468 const char *ItemGen::GetIdentifiedName()
Ritor1
parents:
diff changeset
1469 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1470 unsigned __int8 equip_type;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1471 const char *player_name;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1472 const char *nameModificator;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1473 const char *format_str;
0
Ritor1
parents:
diff changeset
1474
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1475 equip_type = pItemsTable->pItems[uItemID].uEquipType;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1476 if ( (equip_type == EQUIP_REAGENT) || (equip_type == EQUIP_POTION) || (equip_type == EQUIP_GOLD) )
0
Ritor1
parents:
diff changeset
1477 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1478 sprintf(item__getname_buffer, "%s", pItemsTable->pItems[uItemID].pName);
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1479 return item__getname_buffer;
0
Ritor1
parents:
diff changeset
1480 }
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1481 sprintf(item__getname_buffer, "%s", pItemsTable->pItems[uItemID].pName);
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1482 if ( uItemID == ITEM_LICH_JAR ) //Lich Jar
0
Ritor1
parents:
diff changeset
1483 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1484 if ( (uHolderPlayer >0 )&& (uHolderPlayer <= 4) )
0
Ritor1
parents:
diff changeset
1485 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1486 player_name = pPlayers[uHolderPlayer]->pName;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1487 strlen(player_name);
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1488 if ( player_name[strlen(player_name) - 1] == 's' )
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1489 format_str = pGlobalTXT_LocalizationStrings[655]; //"%s' Jar"
0
Ritor1
parents:
diff changeset
1490 else
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1491 format_str = pGlobalTXT_LocalizationStrings[654]; //"%s's Jar"
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1492 sprintf(item__getname_buffer, format_str, pPlayers[uHolderPlayer]->pName);
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1493 return item__getname_buffer;
0
Ritor1
parents:
diff changeset
1494 }
Ritor1
parents:
diff changeset
1495 }
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1496 if ( !pItemsTable->IsMaterialNonCommon(this) )
0
Ritor1
parents:
diff changeset
1497 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1498 if ( uEnchantmentType )
0
Ritor1
parents:
diff changeset
1499 {
Ritor1
parents:
diff changeset
1500 strcat(item__getname_buffer, " ");
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1501 nameModificator = pItemsTable->pEnchantments[uEnchantmentType-1].pOfName;
0
Ritor1
parents:
diff changeset
1502 }
Ritor1
parents:
diff changeset
1503 else
Ritor1
parents:
diff changeset
1504 {
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1505 if ( !uSpecEnchantmentType )
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1506 return item__getname_buffer;
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1507 if ( uSpecEnchantmentType == 16 //Drain Hit Points from target.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1508 || uSpecEnchantmentType == 39 //Double damage vs Demons.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1509 || uSpecEnchantmentType == 40 //Double damage vs Dragons
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1510 || uSpecEnchantmentType == 45 //+5 Speed and Accuracy
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1511 || uSpecEnchantmentType == 56 //+5 Might and Endurance.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1512 || uSpecEnchantmentType == 57 //+5 Intellect and Personality.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1513 || uSpecEnchantmentType == 58 //Increased Value.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1514 || uSpecEnchantmentType == 60 //+3 Unarmed and Dodging skills
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1515 || uSpecEnchantmentType == 61 //+3 Stealing and Disarm skills.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1516 || uSpecEnchantmentType == 59 //Increased Weapon speed.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1517 || uSpecEnchantmentType == 63 //Double Damage vs. Elves.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1518 || uSpecEnchantmentType == 64 //Double Damage vs. Undead.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1519 || uSpecEnchantmentType == 67 //Adds 5 points of Body damage and +2 Disarm skill.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1520 || uSpecEnchantmentType == 68 ) //Adds 6-8 points of Cold damage and +5 Armor Class.
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1521 { //enchantment and name positions inverted!
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1522 sprintf( item__getname_buffer, "%s %s",
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1523 pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd,
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1524 pItemsTable->pItems[uItemID].pName);
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1525 return item__getname_buffer;
0
Ritor1
parents:
diff changeset
1526 }
Ritor1
parents:
diff changeset
1527 strcat(item__getname_buffer, " ");
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1528 nameModificator = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType-1].pNameAdd;
0
Ritor1
parents:
diff changeset
1529 }
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1530 strcat(item__getname_buffer, nameModificator);
0
Ritor1
parents:
diff changeset
1531 }
377
243418228760 GetIdentifiedName
Gloval
parents: 375
diff changeset
1532 return item__getname_buffer;
0
Ritor1
parents:
diff changeset
1533 }
Ritor1
parents:
diff changeset
1534
Ritor1
parents:
diff changeset
1535
Ritor1
parents:
diff changeset
1536 //----- (00456620) --------------------------------------------------------
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1537 void ItemsTable::GenerateItem(int treasure_level, unsigned int uTreasureType, ItemGen *out_item)
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1538 {
0
Ritor1
parents:
diff changeset
1539
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1540 ItemsTable *v5; // edi@1
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1541 int v6; // ebx@3
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1542 int *v7; // ecx@33
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1543 //int v8; // eax@34
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1544 //int v9; // eax@39
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1545 int current_chance; // ebx@43
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1546 int tmp_chance; // ecx@47
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1547 unsigned int *v12; // edx@48
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1548 unsigned int v13; // eax@49
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1549 signed int v14; // ebx@52
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1550 int v15; // eax@53
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1551 signed int v16; // eax@55
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1552 int v17; // ebx@57
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1553 int v18; // edx@62
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1554 signed int v19; // ebx@70
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1555 unsigned __int8 v20; // al@81
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1556 int v21; // eax@84
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1557 int v22; // ebx@85
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1558 int v23; // eax@86
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1559 int v24; // ebx@86
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1560 int special_chance; // edx@86
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1561 int v26; // edx@89
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1562 unsigned int v27; // eax@89
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1563 int i; // ebx@89
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1564 unsigned int v29; // ecx@90
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1565 int v30; // ebx@91
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1566 int v31; // eax@91
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1567 int v32; // ecx@91
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1568 int v33; // eax@91
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1569 int v34; // eax@97
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1570 unsigned __int8 v35; // sf@97
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1571 unsigned __int8 v36; // of@97
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1572 int v37; // ebx@98
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1573 int v38; // edx@99
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1574 signed int v39; // ebx@101
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1575 int v40; // ecx@102
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1576 char v41; // zf@107
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1577 char v42; // al@108
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1578 char v43; // al@111
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1579 int *v44; // edx@118
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1580 int v45; // eax@120
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1581 int v46; // edx@120
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1582 int j; // eax@121
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1583 unsigned int v48; // ecx@123
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1584 int v49; // eax@123
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1585 int v50; // eax@123
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1586 int val_list[800]; // [sp+Ch] [bp-C88h]@33
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1587 int total_chance; // [sp+C8Ch] [bp-8h]@33
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1588 int v53; // [sp+C90h] [bp-4h]@1
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1589 int v54; // [sp+C9Ch] [bp+8h]@3
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1590 //int v55; // [sp+CA0h] [bp+Ch]@34
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1591 signed int v56; // [sp+CA0h] [bp+Ch]@55
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1592 int v57; // [sp+CA0h] [bp+Ch]@62
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1593 int *v58; // [sp+CA0h] [bp+Ch]@102
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1594 int v59; // [sp+CA0h] [bp+Ch]@123
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1595 //signed int a2a; // [sp+CA4h] [bp+10h]@33
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1596 int a2b; // [sp+CA4h] [bp+10h]@101
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1597 int a2c; // [sp+CA4h] [bp+10h]@120
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1598
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1599 v5 = this;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1600 if (!out_item)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1601 out_item = (ItemGen *)pAllocator->AllocNamedChunk(out_item, sizeof(*out_item), "newItemGen");
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1602 memset(out_item, 0, sizeof(*out_item));
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1603
228
46ae2602aceb Item generation doesn't crash (thou still generates weird stuff)
Nomad
parents: 224
diff changeset
1604
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1605 v6 = treasure_level - 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1606 v54 = treasure_level - 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1607 if ( uTreasureType ) //generate known treasure type
0
Ritor1
parents:
diff changeset
1608 {
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1609 ITEM_EQUIP_TYPE requested_equip;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1610 PLAYER_SKILL_TYPE requested_skill = PLAYER_SKILL_INVALID;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1611 switch (uTreasureType)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1612 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1613 case 20: requested_equip = EQUIP_ONE_OR_TWO_HANDS; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1614 case 21: requested_equip = EQUIP_ARMOUR; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1615 case 22: requested_skill = PLAYER_SKILL_MISC; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1616 case 23: requested_skill = PLAYER_SKILL_SWORD; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1617 case 24: requested_skill = PLAYER_SKILL_DAGGER; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1618 case 25: requested_skill = PLAYER_SKILL_AXE; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1619 case 26: requested_skill = PLAYER_SKILL_SPEAR; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1620 case 27: requested_skill = PLAYER_SKILL_BOW; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1621 case 28: requested_skill = PLAYER_SKILL_MACE; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1622 case 29: requested_skill = PLAYER_SKILL_CLUB; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1623 case 30: requested_skill = PLAYER_SKILL_STAFF; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1624 case 31: requested_skill = PLAYER_SKILL_LEATHER; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1625 case 32: requested_skill = PLAYER_SKILL_CHAIN; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1626 case 33: requested_skill = PLAYER_SKILL_PLATE; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1627 case 34: requested_equip = EQUIP_SHIELD; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1628 case 35: requested_equip = EQUIP_HELMET; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1629 case 36: requested_equip = EQUIP_BELT; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1630 case 37: requested_equip = EQUIP_CLOAK; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1631 case 38: requested_equip = EQUIP_GAUNTLETS; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1632 case 39: requested_equip = EQUIP_BOOTS; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1633 case 40: requested_equip = EQUIP_RING; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1634 case 41: requested_equip = EQUIP_AMULET; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1635 case 42: requested_equip = EQUIP_WAND; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1636 case 43: requested_equip = EQUIP_SPELL_SCROLL; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1637 case 44: requested_equip = EQUIP_POTION; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1638 case 45: requested_equip = EQUIP_REAGENT; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1639 case 46: requested_equip = EQUIP_GEM; break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1640 default:
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1641 __debugbreak(); // check this condition
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1642 requested_equip = (ITEM_EQUIP_TYPE)(uTreasureType - 1);
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1643 break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1644 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1645 memset(val_list, 0, sizeof(val_list));
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1646 total_chance = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1647 j=0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1648 //a2a = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1649 if (requested_skill == PLAYER_SKILL_INVALID) // no skill for this item needed
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1650 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1651 for (uint i = 1; i < 500; ++i)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1652 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1653 if (pItems[i].uEquipType == requested_equip)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1654 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1655 val_list[j] = i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1656 ++j;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1657 total_chance += pItems[i].uChanceByTreasureLvl[treasure_level - 1];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1658 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1659 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1660 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1661 else //have needed skill
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1662 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1663 for (uint i = 1; i < 500; ++i)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1664 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1665 if (pItems[i].uSkillType == requested_skill)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1666 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1667 val_list[j] = i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1668 ++j;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1669 total_chance += pItems[i].uChanceByTreasureLvl[treasure_level - 1];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1670 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1671 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1672 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1673
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1674 current_chance = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1675 if ( total_chance )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1676 current_chance = rand() % total_chance;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1677
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1678 out_item->uItemID = val_list[0];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1679 if (!out_item->uItemID)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1680 out_item->uItemID = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1681
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1682 if ( pItems[out_item->uItemID].uChanceByTreasureLvl[treasure_level - 1] < current_chance )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1683 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1684 j=0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1685 tmp_chance=pItems[out_item->uItemID].uChanceByTreasureLvl[treasure_level - 1];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1686 do
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1687 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1688 ++j;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1689 out_item->uItemID = val_list[j];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1690 tmp_chance += pItems[val_list[j]].uChanceByTreasureLvl[treasure_level - 1];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1691 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1692 while ( tmp_chance < current_chance );
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1693 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1694
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1695 if (pItems[out_item->uItemID].uEquipType == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1696 {// if it potion set potion spec
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1697 out_item->uEnchantmentType = 0;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1698 for (int i=0; i<2; ++i)
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1699 out_item->uEnchantmentType += rand() % 4 + 1;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1700 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1701 }
0
Ritor1
parents:
diff changeset
1702 }
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1703 else
0
Ritor1
parents:
diff changeset
1704 {
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1705 //artifact
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1706 v56 = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1707 for(int i=0; i<29; ++i)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1708 v56 += pParty->pIsArtifactFound[i];
228
46ae2602aceb Item generation doesn't crash (thou still generates weird stuff)
Nomad
parents: 224
diff changeset
1709
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1710 v17 = rand() % 29;
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1711
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1712 if ( v6 == 5 && (rand() % 100 < 5) && !pParty->pIsArtifactFound[v17] && v56 < 13 )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1713 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1714 pParty->pIsArtifactFound[v17] = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1715 out_item->uAttributes = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1716 out_item->uItemID = v17 + 500;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1717 SetSpecialBonus(out_item);
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1718 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1719 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1720
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1721 v57 = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1722 v18 = rand() % v5->uChanceByTreasureLvlSumm[treasure_level - 1];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1723 out_item->uItemID = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1724 if ( v18 > 0 )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1725 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1726 do
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
1727 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
1728 v57 += pItems[out_item->uItemID + 1].uChanceByTreasureLvl[v6];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
1729 ++out_item->uItemID;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
1730 }
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1731 while ( v57 < v18 );
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1732 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1733
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1734 if ( !v18 )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1735 out_item->uItemID = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1736 if ( !out_item->uItemID )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1737 out_item->uItemID = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1738 if (pItems[out_item->uItemID].uEquipType == EQUIP_POTION && out_item->uItemID != ITEM_POTION_BOTTLE )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1739 {// if it potion set potion spec
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1740 out_item->uEnchantmentType = 0;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1741 for (int i=0; i<2; ++i)
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1742 out_item->uEnchantmentType += rand() % 4 + 1;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1743 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1744 }
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1745 out_item->uEnchantmentType = out_item->uEnchantmentType * treasure_level;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1746 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1747
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1748 if ( out_item->uItemID == ITEM_SPELLBOOK_LIGHT_DIVINE_INTERVENTION
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1749 && !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1750 out_item->uItemID = ITEM_SPELLBOOK_LIGHT_SUN_BURST;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1751 if ( pItemsTable->pItems[out_item->uItemID + 1].uItemID_Rep_St )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1752 out_item->uAttributes = 0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1753 else
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1754 out_item->uAttributes = 1;
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1755
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1756 if ( pItems[out_item->uItemID].uEquipType != EQUIP_POTION )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1757 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1758 out_item->uSpecEnchantmentType = 0;
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1759 out_item->uEnchantmentType = 0;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1760 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1761 //try get special enhansment
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1762 switch (pItems[out_item->uItemID].uEquipType)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1763 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1764 case EQUIP_ONE_OR_TWO_HANDS:
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1765 case EQUIP_TWO_HANDED :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1766 case EQUIP_BOW :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1767 if ( !uBonusChanceWpSpecial[v6] )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1768 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1769 if ((rand() % 100)>=uBonusChanceWpSpecial[v6])
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1770 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1771 break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1772 case EQUIP_ARMOUR :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1773 case EQUIP_SHIELD :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1774 case EQUIP_HELMET :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1775 case EQUIP_BELT :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1776 case EQUIP_CLOAK :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1777 case EQUIP_GAUNTLETS :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1778 case EQUIP_BOOTS :
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1779 case EQUIP_RING :
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1780
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1781 if ( !uBonusChanceStandart[v6] )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1782 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1783 special_chance = rand() % 100;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1784 if ( special_chance < uBonusChanceStandart[v6])
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1785 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1786 v26 = rand() %pEnchantmentsSumm[pItems[out_item->uItemID].uEquipType-3];
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1787 out_item->uEnchantmentType = 0;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1788 v27=pEnchantments[out_item->uEnchantmentType].to_item[pItems[out_item->uItemID].uEquipType-3];
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1789 if (v26>v27 )
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1790 {
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1791 do
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1792 {
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1793 ++out_item->uEnchantmentType;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1794 v27+=pEnchantments[out_item->uEnchantmentType].to_item[pItems[out_item->uItemID].uEquipType-3];
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1795 } while (v26>v27);
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1796 }
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1797 ++out_item->uEnchantmentType;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1798
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1799 v33 = rand() % (bonus_ranges[v6].maxR - bonus_ranges[v6].minR + 1);
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1800 out_item->_bonus_strength = v33 + bonus_ranges[v6].minR;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1801 v32 = out_item->uEnchantmentType - 1;
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1802 if ( v32 == 21 || v32 == 22 || v32 == 23 ) //Armsmaster skill, Dodge skill, Unarmed skill
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1803 out_item->_bonus_strength = out_item->_bonus_strength/2;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1804 if ( out_item->_bonus_strength <= 0 )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1805 out_item->_bonus_strength = 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1806 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1807
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1808 }
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1809 if ( !uBonusChanceSpecial[v6])
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1810 return;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1811 v34 = uBonusChanceStandart[v6] + uBonusChanceSpecial[v6];
570
f54481c85df8 itemgen working, i hope
Gloval
parents: 559
diff changeset
1812 if ( special_chance>v34 )
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1813 return;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1814 break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1815 case EQUIP_WAND:
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1816 out_item->uNumCharges = rand() % 6 + pItemsTable->pItems[out_item->uItemID].uDamageMod + 1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1817 out_item->uMaxCharges = out_item->uNumCharges;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1818 default:
224
9917d3b4925e items init refactored
Gloval
parents: 223
diff changeset
1819 return;
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1820 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1821
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1822 j=0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1823 int spc_sum=0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1824 int spc;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1825 memset(&val_list, 0, 3200);
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1826 for (int i=0; i<pSpecialEnchantments_count;++i)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1827 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1828 int tr_lv= pSpecialEnchantments[i].iTreasureLevel;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1829 switch ( treasure_level - 1 )
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1830 {
0
Ritor1
parents:
diff changeset
1831 case 2:
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1832 if ((tr_lv==1)||(tr_lv==0))
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1833 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1834 spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1835 spc_sum+=spc;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1836 if(spc)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1837 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1838 val_list[j++]=i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1839 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1840 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1841 break;
0
Ritor1
parents:
diff changeset
1842 case 3:
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1843 if ((tr_lv==2)||(tr_lv==1)||(tr_lv==0))
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1844 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1845 spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1846 spc_sum+=spc;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1847 if(spc)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1848 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1849 val_list[j++]=i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1850 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1851 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1852 break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1853 case 4:
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1854 if ((tr_lv==3)||(tr_lv==2)||(tr_lv==1))
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1855 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1856 spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1857 spc_sum+=spc;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1858 if(spc)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1859 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1860 val_list[j++]=i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1861 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1862 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1863 break;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1864 case 5:
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1865 if (tr_lv==3)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1866 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1867 spc=pSpecialEnchantments[i].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1868 spc_sum+=spc;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1869 if(spc)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1870 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1871 val_list[j++]=i;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1872 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1873 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1874 break;
0
Ritor1
parents:
diff changeset
1875 }
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1876 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1877
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1878 v46 = rand()%spc_sum+1;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1879 j=0;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1880 out_item->uSpecEnchantmentType =val_list[j];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1881 v45=pSpecialEnchantments[val_list[j]].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1882 if (v45<v46)
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1883 {
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1884 do
245
f070b49d40dd goto cleaning
zipi
parents: 243
diff changeset
1885 {
559
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1886 ++j;
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1887 out_item->uSpecEnchantmentType=val_list[j];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1888 v45+=pSpecialEnchantments[val_list[j]].to_item_apply[pItems[out_item->uItemID].uEquipType];
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1889 } while (v45<v46);
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1890 }
09108e73f2f4 item gen fixes (not full)
Gloval
parents: 526
diff changeset
1891 ++out_item->uSpecEnchantmentType;
0
Ritor1
parents:
diff changeset
1892 }
Ritor1
parents:
diff changeset
1893
Ritor1
parents:
diff changeset
1894 //----- (004505CC) --------------------------------------------------------
Ritor1
parents:
diff changeset
1895 bool ItemGen::GenerateArtifact()
Ritor1
parents:
diff changeset
1896 {
Ritor1
parents:
diff changeset
1897 signed int uNumArtifactsNotFound; // esi@1
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1898 int artifacts_list[32];
0
Ritor1
parents:
diff changeset
1899
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1900 memset(artifacts_list, 0,sizeof(artifacts_list));
0
Ritor1
parents:
diff changeset
1901 uNumArtifactsNotFound = 0;
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1902
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1903 for (int i=500;i<529;++i)
484
4bd56919f075 avard quest guild bits
Gloval
parents: 475
diff changeset
1904 if ( !pParty->pIsArtifactFound[i-500] )
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1905 artifacts_list[uNumArtifactsNotFound++] = i;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1906
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1907 Reset();
0
Ritor1
parents:
diff changeset
1908 if ( uNumArtifactsNotFound )
Ritor1
parents:
diff changeset
1909 {
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1910 uItemID = artifacts_list[rand() % uNumArtifactsNotFound];
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1911 pItemsTable->SetSpecialBonus(this);
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1912 return true;
0
Ritor1
parents:
diff changeset
1913 }
Ritor1
parents:
diff changeset
1914 else
385
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1915 return false;
b509ef97807a additional dmg
Gloval
parents: 377
diff changeset
1916
0
Ritor1
parents:
diff changeset
1917 }
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
1918 //----- (004B8E3D) --------------------------------------------------------
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1919 void GenerateStandartShopItems()
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1920 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1921 signed int item_count;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1922 signed int shop_index;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1923 int treasure_lvl;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1924 int item_class;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1925 int mdf;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1926
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1927 shop_index = (signed int)window_SpeakInHouse->ptr_1C;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1928 if ( uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType] )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1929 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1930 for (item_count=0; item_count<=uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType]; ++item_count )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1931 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1932 if (shop_index<=14) //weapon shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1933 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1934 treasure_lvl = shopWeap_variation_ord[shop_index].treasure_level;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1935 item_class =shopWeap_variation_ord[shop_index].item_class[rand() % 4];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1936 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1937 else if (shop_index<=28) //armor shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1938 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1939 mdf =0;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1940 if (item_count > 3)
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1941 ++mdf;// rechek offsets
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1942 treasure_lvl = shopArmr_variation_ord[2*(shop_index-15)+mdf].treasure_level;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1943 item_class =shopArmr_variation_ord[2*(shop_index-15)+mdf].item_class[rand() % 4];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1944 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1945 else if (shop_index<=41) //magic shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1946 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1947 treasure_lvl = shopMagic_treasure_lvl[shop_index-28];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1948 item_class = 22; //misc
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1949 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1950 else if (shop_index<=53) //alchemist shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1951 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1952 if (item_count<6)
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1953 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1954 pParty->StandartItemsInShops[shop_index][item_count].Reset();
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1955 pParty->StandartItemsInShops[shop_index][item_count].uItemID = 220; //potion bottle
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1956 continue;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1957 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1958 else
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1959 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1960 treasure_lvl = shopAlch_treasure_lvl[shop_index-41];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1961 item_class = 45; //reagent
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1962 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1963 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1964 pItemsTable->GenerateItem(treasure_lvl, item_class, &pParty->StandartItemsInShops[shop_index][item_count]);
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1965 pParty->StandartItemsInShops[shop_index][item_count].SetIdentified(); //identified
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1966 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1967 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1968 pParty->InTheShopFlags[shop_index] = 0;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1969 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1970
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1971 //----- (004B8F94) --------------------------------------------------------
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1972 void GenerateSpecialShopItems()
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
1973 {
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1974 signed int item_count;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1975 signed int shop_index;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1976 int treasure_lvl;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1977 int item_class;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1978 int mdf;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1979
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1980 shop_index = (signed int)window_SpeakInHouse->ptr_1C;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1981 if ( uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType] )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1982 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1983 for (item_count=0; item_count<=uItemsAmountPerShopType[p2DEvents[shop_index - 1].uType]; ++item_count )
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1984 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1985 if (shop_index<=14) //weapon shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1986 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1987 treasure_lvl = shopWeap_variation_spc[shop_index].treasure_level;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1988 item_class = shopWeap_variation_spc[shop_index].item_class[rand() % 4];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1989 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1990 else if (shop_index<=28) //armor shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1991 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1992 mdf =0;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1993 if (item_count > 3)
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1994 ++mdf;
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
1995 treasure_lvl = shopArmr_variation_spc[2*(shop_index-15)+mdf].treasure_level;
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
1996 item_class =shopArmr_variation_spc[2*(shop_index-15)+mdf].item_class[rand() % 4];
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1997 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1998 else if (shop_index<=41) //magic shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
1999 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2000 treasure_lvl = shopMagicSpc_treasure_lvl[shop_index-28];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2001 item_class = 22; //misc
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2002 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2003 else if (shop_index<=53) //alchemist shop
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2004 {
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2005 if (item_count<6)
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2006 {
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
2007 pParty->SpecialItemsInShops[shop_index][item_count].Reset();
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
2008 pParty->SpecialItemsInShops[shop_index][item_count].uItemID = rand() % 32 + 740; //mscrool
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2009 continue;
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2010 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2011 else
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2012 {
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
2013 treasure_lvl = shopAlchSpc_treasure_lvl[shop_index-41];
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2014 item_class = 44; //potion
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2015 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2016 }
470
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
2017 pItemsTable->GenerateItem(treasure_lvl, item_class, &pParty->SpecialItemsInShops[shop_index][item_count]);
fcdaa804074f Tables for shopgenerators
Gloval
parents: 463
diff changeset
2018 pParty->SpecialItemsInShops[shop_index][item_count].SetIdentified(); //identified
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2019 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2020 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2021 pParty->InTheShopFlags[shop_index] = 0;
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2022 }
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2023
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2024
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2025 //----- (00450218) --------------------------------------------------------
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2026 void GenerateItemsInChest()
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
2027 {
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2028 unsigned int v0; // eax@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2029 Chest *v1; // ebx@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2030 MapInfo *v2; // esi@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2031 ItemGen *v3; // ebx@2
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2032 int v4; // ebp@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2033 int v5; // edi@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2034 int v6; // esi@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2035 int v7; // eax@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2036 signed int v8; // esi@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2037 int v9; // edx@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2038 int v10; // esi@8
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2039 int v11; // ebp@25
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2040 int v12; // esi@25
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2041 signed int v13; // ebp@27
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2042 ItemGen *v14; // edi@28
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2043 signed int v15; // edx@32
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2044 signed __int64 v16; // qtt@32
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2045 int v17; // esi@34
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2046 signed int v18; // [sp+10h] [bp-18h]@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2047 int v19; // [sp+14h] [bp-14h]@4
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2048 MapInfo *v20; // [sp+18h] [bp-10h]@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2049 Chest *v21; // [sp+1Ch] [bp-Ch]@1
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2050 int v22; // [sp+20h] [bp-8h]@26
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2051 signed int v23; // [sp+24h] [bp-4h]@2
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2052
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2053 v18 = rand() % 100; //main random
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2054 v0 = pMapStats->GetMapInfo(pCurrentMapName);
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2055 // v1 = pChests;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2056 v2 = &pMapStats->pInfos[v0];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2057 //v21 = pChests;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2058 //v20 = &pMapStats->pInfos[v0];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2059 for(int i=1; i<20;++i)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2060 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2061 for(int j=0; j<140;++j)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2062 {
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
2063
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2064 v3 = &pChests[i].igChestItems[j];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2065 if ( v3->uItemID < 0 )
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2066 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2067 v4 = rand() % 5; //additional items in chect
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2068 v5 = (unsigned __int8)byte_4E8168[abs((int)v3->uItemID)-1][2*v2->Treasure_prob];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2069 v6 = (unsigned __int8)byte_4E8168[abs((int)v3->uItemID)-1][2*v2->Treasure_prob+1];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2070 v8 = v6 - v5 + 1;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2071 v9 = v5 + rand() % v8; //treasure level
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2072 if (v9<7)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2073 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2074 if (v18<20)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2075 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2076 v3->Reset();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2077 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2078 else if (v18<60) //generate gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2079 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2080 v10=0;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2081 v3->Reset();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2082 switch (v9)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2083 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2084 case 1: //small gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2085 v10 = rand() % 51 + 50;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2086 v3->uItemID = 197;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2087 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2088 case 2://small gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2089 v10 = rand() % 101 + 100;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2090 v3->uItemID = 197;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2091 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2092 case 3: //medium
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2093 v10 = rand() % 301 + 200;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2094 v3->uItemID = 198;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2095 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2096 case 4: //medium
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2097 v10 = rand() % 501 + 500;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2098 v3->uItemID = 198;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2099 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2100 case 5: //big
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2101 v10 = rand() % 1001 + 1000;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2102 v3->uItemID = 199;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2103 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2104 case 6: //big
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2105 v10 = rand() % 3001 + 2000;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2106 v3->uItemID = 199;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2107 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2108 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2109 v3->SetIdentified();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2110 v3->uSpecEnchantmentType = v10;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2111 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2112 else
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2113 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2114 pItemsTable->GenerateItem(v9, 0, v3);
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2115 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2116
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2117 v12 = 0;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2118 //generate more items
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2119 for (v11=0; v11<v4; ++v11)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2120 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2121
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2122 if ( v12 >= 140 )
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2123 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2124 while ( !(pChests[i].igChestItems[v12].uItemID==0) &&(v12<140))
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2125 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2126 ++v12;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2127 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2128 v14=&pChests[i].igChestItems[v12];
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2129 v18 = rand() % 100;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2130 if (v18<20)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2131 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2132 v3->Reset();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2133 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2134 else if (v18<60) //generate gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2135 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2136 v10=0;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2137 v3->Reset();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2138 switch (v9)
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2139 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2140 case 1: //small gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2141 v10 = rand() % 51 + 50;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2142 v14->uItemID = 197;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2143 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2144 case 2://small gold
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2145 v10 = rand() % 101 + 100;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2146 v14->uItemID = 197;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2147 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2148 case 3: //medium
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2149 v10 = rand() % 301 + 200;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2150 v14->uItemID = 198;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2151 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2152 case 4: //medium
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2153 v10 = rand() % 501 + 500;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2154 v14->uItemID = 198;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2155 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2156 case 5: //big
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2157 v10 = rand() % 1001 + 1000;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2158 v14->uItemID = 199;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2159 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2160 case 6: //big
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2161 v10 = rand() % 3001 + 2000;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2162 v14->uItemID = 199;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2163 break;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2164 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2165 v14->SetIdentified();
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2166 v14->uSpecEnchantmentType = v10;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2167 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2168 else
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2169 {
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2170 pItemsTable->GenerateItem(v9, 0, v14);
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2171 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2172 ++v12;
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2173 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2174 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2175 else
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2176 v3->GenerateArtifact();
526
214d9d47cf1f Chest working, but items are not laid correctly
Gloval
parents: 484
diff changeset
2177 }
598
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2178 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2179 }
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2180
f8a4a2e0b4c9 fixed random iten generator, chest generator
Gloval
parents: 570
diff changeset
2181 }
461
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2182
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2183
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2184
197461e5acec moved shop generators to item.cpp
Gloval
parents: 436
diff changeset
2185
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2186 // 4505CC: using guessed type int var_A0[32];
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2187 //----- (004B3703) --------------------------------------------------------
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2188 void FillAviableSkillsToTeach( int _this )
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2189 {
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2190 char *v30; // ecx@65
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2191 unsigned int v29; // edx@56
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2192 int v15; // ecx@19
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2193 int v33; // [sp-4h] [bp-2Ch]@23
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2194 int v34; // [sp-4h] [bp-2Ch]@43
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2195 int v21; // ecx@34
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2196 int v35[5]; // [sp+Ch] [bp-1Ch]@8
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2197 int v37=0; // [sp+24h] [bp-4h]@1*
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2198 int i=0;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2199
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2200 dword_F8B1DC = 0;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2201
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2202 switch (_this)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2203 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2204 case 1: //shop weapon
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2205 for (int i=0; i<2; ++i)
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2206 {
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2207 for (int j=0; j<4; ++j)
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2208 {
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2209 if ( i )
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2210 v21 = shopWeap_variation_spc[(unsigned int)window_SpeakInHouse->ptr_1C].item_class[j];
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2211 else
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2212 v21 = shopWeap_variation_ord[(unsigned int)window_SpeakInHouse->ptr_1C].item_class[j];
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2213
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2214 switch (v21)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2215 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2216 case 23: v34 = 37; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2217 case 24: v34 = 38; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2218 case 25: v34 = 39; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2219 case 26: v34 = 40; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2220 case 27: v34 = 41; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2221 case 28: v34 = 42; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2222 case 30: v34 = 36; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2223 default:
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2224 continue;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2225 }
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2226 v37 = sub_4BE571(v34, v35, v37, 5);
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2227 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2228 }
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2229 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2230 case 2: //shop armor
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2231
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2232 for (int i=0; i<2; ++i)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2233 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2234 for (int j=0; j<2; ++j)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2235 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2236 for (int k=0; k<4; ++k)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2237 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2238 if ( i )
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2239 v15 = shopArmr_variation_spc[(unsigned int)window_SpeakInHouse->ptr_1C-15+j].item_class[k];
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2240 else
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2241 v15 = shopArmr_variation_ord[(unsigned int)window_SpeakInHouse->ptr_1C-15+j].item_class[k];
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2242 switch (v15)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2243 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2244 case 31: v33 = 45; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2245 case 32: v33 = 46; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2246 case 33: v33 = 47; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2247 case 34: v33 = 44; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2248 default:
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2249 continue;
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2250 }
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2251 v37 = sub_4BE571(v33, v35, v37, 5);
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2252 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2253 }
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2254 }
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2255 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2256 case 3: //shop magic
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2257 v37 = 2;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2258 v35[0] = 57;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2259 v35[1] = 59;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2260 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2261 case 4: //shop alchemist
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2262 v37 = 2;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2263 v35[0] = 71;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2264 v35[1] = 68;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2265 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2266 case 21: //tavern
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2267 v37 = 3;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2268 v35[0] = 70;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2269 v35[1] = 65;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2270 v35[2] = 62;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2271 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2272 case 23: //temple
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2273 v37 = 3;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2274 v35[0] = 67;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2275 v35[1] = 66;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2276 v35[2] = 58;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2277 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2278 case 30: ///trainig
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2279 v37 = 2;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2280 v35[0] = 69;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2281 v35[1] = 60;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2282 break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2283 }
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2284 for(i=0;i<v37;++i)
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2285 {
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2286 v29=v35[i];
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2287 switch(v29)
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2288 {
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2289 case 40 :v30 = pSkillNames[4]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2290 case 5 : v30 = pSkillNames[23]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2291 case 36 :v30 = pSkillNames[0]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2292 case 37 :v30 = pSkillNames[1]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2293 case 38 :v30 = pSkillNames[2]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2294 case 39 :v30 = pSkillNames[3]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2295 case 41 :v30 = pSkillNames[5]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2296 case 42 :v30 = pSkillNames[6]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2297 case 44 :v30 = pSkillNames[8]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2298 case 45 :v30 = pSkillNames[9]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2299 case 46 :v30 = pSkillNames[10]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2300 case 47 :v30 = pSkillNames[11]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2301 case 66 :v30 = pSkillNames[30]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2302 case 57 :v30 = pSkillNames[21]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2303 case 58 :v30 = pSkillNames[22]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2304 case 60 :v30 = pSkillNames[24]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2305 case 62 :v30 = pSkillNames[26]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2306 case 65 :v30 = pSkillNames[29]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2307 case 67:v30 = pSkillNames[31]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2308 case 68:v30 = pSkillNames[32]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2309 case 69:v30 = pSkillNames[33]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2310 case 70:v30 = pSkillNames[34]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2311 case 71:v30 = pSkillNames[35]; break;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2312 default:
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2313 v30 = pGlobalTXT_LocalizationStrings[127]; //"No Text!"
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2314 }
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2315 pShopOptions[dword_F8B1DC] = v30;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2316 ++dword_F8B1DC;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2317 CreateButtonInColumn(i+1, v29);
463
f7b91ef98ab2 shopgenerators done, except config tables
Gloval
parents: 461
diff changeset
2318 }
473
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2319 pDialogueWindow->_41D08F(i, 1, 0, 2);
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2320 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
7f1b00901cf7 Skill learning menu in shops
Gloval
parents: 470
diff changeset
2321 }
475
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2322
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2323 //----- (004BE571) --------------------------------------------------------
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2324 int sub_4BE571(int a1, int *a2, int a3, int a4)
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2325 {
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2326 int result; // eax@1
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2327 int i; // esi@3
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2328
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2329 result = a3;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2330 if ( a3 < a4 )
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2331 {
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2332 for ( i = 0; i < a3; ++i )
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2333 {
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2334 if ( a1 == a2[i] )
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2335 break;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2336 }
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2337 if ( i == a3 )
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2338 {
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2339 a2[a3] = a1;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2340 result = a3 + 1;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2341 }
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2342 return result;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2343 }
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2344 else
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2345 {
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2346 return a4;
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2347 }
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2348 }
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2349
77430756f06a fix show info item in shop
Gloval
parents: 473
diff changeset
2350