annotate Items.cpp @ 1026:6afa77761a00

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