Compare commits
57
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb0963210e | ||
|
|
30ea96f418 | ||
|
|
96f8486306 | ||
|
|
31ebae050b | ||
|
|
794ac41a41 | ||
|
|
103805998c | ||
|
|
f5b8424266 | ||
|
|
3058ad6002 | ||
|
|
b5e06c9a43 | ||
|
|
6924dc9b49 | ||
|
|
aa0afefe86 | ||
|
|
e8ace59fcd | ||
|
|
5b7442ea37 | ||
|
|
c979b53762 | ||
|
|
a7152750fb | ||
|
|
d1c1572ddb | ||
|
|
792d4d50b3 | ||
|
|
0b995c480d | ||
|
|
85b831db91 | ||
|
|
d63781e5fd | ||
|
|
f8bb455d9f | ||
|
|
65db9fc365 | ||
|
|
275c7e5211 | ||
|
|
32831010c0 | ||
|
|
abda2c1cda | ||
|
|
2016f20d58 | ||
|
|
ec60c38492 | ||
|
|
5b8cc3069f | ||
|
|
bce34954d9 | ||
|
|
71c299c98f | ||
|
|
2048808c75 | ||
|
|
ff6163a685 | ||
|
|
0b9c2bb6b0 | ||
|
|
ac4a05a0c3 | ||
|
|
d7d0de3ae9 | ||
|
|
b625ba5695 | ||
|
|
e097b927de | ||
|
|
c9268424ab | ||
|
|
3c0141d639 | ||
|
|
3222614dd2 | ||
|
|
972c200cd0 | ||
|
|
a28393b16b | ||
|
|
c6813cd653 | ||
|
|
22228857ff | ||
|
|
e313d9ea85 | ||
|
|
f09ffd8a35 | ||
|
|
6199b2cbff | ||
|
|
fb066e7046 | ||
|
|
c30258ef5e | ||
|
|
14c4491469 | ||
|
|
5ad07886ea | ||
|
|
89261fdf8a | ||
|
|
38b62cfdbd | ||
|
|
cd395c73b7 | ||
|
|
7f4e8b3f76 | ||
|
|
1bdaae8807 | ||
|
|
69e335ba9c |
@@ -1,4 +1,5 @@
|
||||
# Local metadata and generated build output
|
||||
/build/
|
||||
.DS_Store
|
||||
._*
|
||||
__pycache__/
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,217 @@
|
||||
1 3 0 71500 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
2 3 0 71501 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
3 3 0 71502 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
4 3 0 71503 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
5 3 0 71504 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
6 3 0 71505 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 7 0 0 -1
|
||||
7 3 0 71506 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
8 3 0 71507 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
9 3 0 71508 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
10 3 0 71509 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
11 3 0 71510 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
12 3 0 71511 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
13 3 2 53002 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
14 3 2 53003 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
15 3 2 53004 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
16 3 2 53005 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
17 3 2 53006 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
18 3 2 53007 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
19 3 2 53008 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
20 3 2 53009 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
21 3 2 53010 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 9 0 0 -1
|
||||
22 3 2 53011 75 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
23 3 2 53012 149 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
24 3 2 53013 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
25 7 0 54706 69 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
26 7 0 54707 69 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
27 7 0 54708 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 38 0 0 -1
|
||||
28 7 0 54709 69 0 0000-00-00 00:00:00 0000-00-00 00:00:00 65 0 0 -1
|
||||
29 7 0 54710 49 0 0000-00-00 00:00:00 0000-00-00 00:00:00 29 0 0 -1
|
||||
30 7 0 54711 39 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
31 3 1 55402 140 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
32 3 1 55405 140 0 0000-00-00 00:00:00 0000-00-00 00:00:00 7 0 0 -1
|
||||
33 3 1 55407 140 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
34 1 0 55001 15 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
35 1 0 55036 20 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
36 1 0 55034 39 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
37 1 0 55033 90 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
38 1 0 55009 10 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
39 4 0 25163 2 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
40 4 0 25164 4 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
41 4 0 25165 5 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
42 4 0 25166 6 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
43 4 0 25167 8 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
44 4 0 25168 8 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
45 4 0 25169 10 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
48 1 0 71035 4 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
49 1 0 30250 10 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
50 1 0 70028 90 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
51 2 1 41119 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
52 2 1 41120 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
53 2 1 41121 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
54 2 1 41122 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
55 2 2 45005 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
56 2 2 45006 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
57 2 2 45057 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
58 2 2 45058 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
59 2 0 40129 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
60 2 0 40130 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
61 2 0 40131 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
62 2 0 40132 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
63 2 0 40133 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
64 2 0 40134 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
65 2 0 40445 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 13 0 0 -1
|
||||
66 2 0 40446 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
67 2 0 40447 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
68 2 0 40448 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
69 2 0 40449 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
70 2 0 40450 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
71 1 0 72319 4 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
72 1 0 72320 2 0 0000-00-00 00:00:00 0000-00-00 00:00:00 7 0 0 -1
|
||||
73 1 0 53998 39 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
74 1 0 53999 69 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
75 6 0 71097 39 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
76 1 0 85009 40 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
77 1 0 71153 19 0 0000-00-00 00:00:00 0000-00-00 00:00:00 48 0 0 -1
|
||||
78 5 1 54003 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 9 0 0 -1
|
||||
79 5 1 54006 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
80 5 1 54009 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
81 5 1 54012 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
82 5 1 54015 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
83 5 1 54018 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
84 5 1 54021 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
85 5 1 54024 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 7 0 0 -1
|
||||
86 5 1 54027 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
87 5 2 54030 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
88 5 2 54033 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
89 5 2 54036 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
90 5 2 54039 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
91 5 2 54042 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
92 5 2 54045 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
93 5 2 54048 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
94 5 2 54051 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
95 5 2 54054 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
96 5 2 54057 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
97 5 2 54060 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
98 5 2 54063 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
99 5 2 54066 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
100 5 2 54069 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
101 5 2 54072 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
102 5 2 54075 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
103 5 2 54078 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
104 5 0 54081 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
105 5 0 54084 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
106 5 0 54087 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
107 5 0 54090 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
108 5 0 54093 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
109 5 0 54096 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
110 5 0 54099 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
111 5 0 54102 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
112 5 0 54105 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
113 5 0 54108 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
114 5 0 54111 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
115 5 0 54114 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 17 0 0 -1
|
||||
116 5 0 54117 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 33 0 0 -1
|
||||
117 5 0 54120 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
118 5 0 54123 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 27 0 0 -1
|
||||
123 0 1 54712 349 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
124 0 1 54713 120 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
125 0 1 54714 549 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
126 0 1 54715 49 0 0000-00-00 00:00:00 0000-00-00 00:00:00 19 0 0 -1
|
||||
127 0 1 54716 79 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
128 0 1 54717 159 0 0000-00-00 00:00:00 0000-00-00 00:00:00 13 0 0 -1
|
||||
129 2 3 86004 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
130 2 3 86008 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
131 2 3 86014 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
132 2 3 86018 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
133 2 3 86024 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
134 2 3 86028 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
135 2 3 86034 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
136 2 3 86038 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
137 2 3 86044 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
138 2 3 86048 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
139 2 3 86054 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
140 2 3 86058 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
141 1 0 71221 39 0 2022-05-27 23:59:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
142 1 0 55008 49 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
143 1 0 55035 9 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
144 6 0 100001 9 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
145 6 0 100002 17 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
146 6 0 77913 69 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
147 6 0 77914 299 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
148 6 0 77915 549 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
149 6 0 100500 4 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
150 1 0 6884 8 0 0000-00-00 00:00:00 0000-00-00 00:00:00 534 0 0 -1
|
||||
153 1 0 70043 10 0 0000-00-00 00:00:00 0000-00-00 00:00:00 39 0 0 -1
|
||||
154 1 0 72067 5 0 0000-00-00 00:00:00 0000-00-00 00:00:00 6 0 0 -1
|
||||
155 1 0 72068 49 0 0000-00-00 00:00:00 0000-00-00 00:00:00 5 0 0 -1
|
||||
170 1 0 70002 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
171 2 4 71233 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
172 2 4 71234 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
173 2 4 71235 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
174 2 4 71236 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
175 2 4 71249 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
176 2 4 71248 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
177 2 4 71254 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
178 2 4 71255 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
179 2 4 71246 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
180 2 4 71247 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
181 2 4 71252 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
182 2 4 71253 99 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
183 5 3 54126 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
184 5 3 54129 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
185 5 3 54132 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
186 5 3 54135 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
187 5 3 54138 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
188 5 3 54141 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
189 5 3 54144 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
190 5 3 54147 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
191 5 3 54150 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
192 5 3 54153 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
193 5 3 54156 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 13 0 0 -1
|
||||
194 5 3 54159 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 16 0 0 -1
|
||||
195 5 3 54162 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 19 0 0 -1
|
||||
197 5 3 54168 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
198 5 3 54171 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
199 5 3 54174 60 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
200 0 2 71230 149 0 2022-09-30 23:59:00 0000-00-00 00:00:00 7 0 0 -1
|
||||
201 0 2 55406 149 0 2022-09-30 23:59:00 0000-00-00 00:00:00 8 0 0 -1
|
||||
202 5 4 54177 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
203 5 4 54180 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 11 0 0 -1
|
||||
204 5 4 54183 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 13 0 0 -1
|
||||
205 5 4 54186 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
206 5 4 54189 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
207 5 4 54192 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
208 5 4 54195 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
209 5 4 54198 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
210 5 4 54201 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
211 5 4 54204 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
212 5 4 54207 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
213 5 4 54210 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
214 5 4 54213 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
215 5 4 54216 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 10 0 0 -1
|
||||
216 5 4 54219 50 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
217 5 5 54222 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
218 5 5 54225 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
219 5 5 54228 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4 0 0 -1
|
||||
220 5 5 54231 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
221 5 5 54234 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
222 5 5 54237 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
223 5 5 54240 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
224 5 5 54243 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 0 0 -1
|
||||
225 5 5 54246 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
226 5 5 54249 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
227 5 5 54252 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 3 0 0 -1
|
||||
228 5 5 54255 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
229 5 5 54258 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
230 5 5 54261 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
231 5 5 54264 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
232 5 5 54267 45 0 0000-00-00 00:00:00 0000-00-00 00:00:00 2 0 0 -1
|
||||
233 1 0 39063 19 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
234 1 0 39064 19 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
235 1 0 71136 29 0 0000-00-00 00:00:00 0000-00-00 00:00:00 12 0 0 -1
|
||||
236 0 0 25159 149 0 2022-10-25 23:59:59 0000-00-00 00:00:00 0 0 0 -1
|
||||
237 0 0 20059 149 0 2022-10-31 23:59:59 0000-00-00 00:00:00 0 0 0 -1
|
||||
240 1 0 77921 1 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
241 1 0 77922 2 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
242 1 0 77923 5 0 0000-00-00 00:00:00 0000-00-00 00:00:00 0 0 0 -1
|
||||
|
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"source_archive": "AVA2/2. Backup SF+SRC and SQL/MYSQL56.tgz",
|
||||
"archive_sha256": "0a578f4036fff69c36d0ad0d4d6692d267284be10689105a173ac30337ec0787",
|
||||
"source_table": "player.ishop_data",
|
||||
"format": "native MyISAM recovered in isolated reference schema; sorted by id; dates preserved",
|
||||
"rows": 217,
|
||||
"tsv_sha256": "7e2fc0ccb630168b0466d097eaa9b41858df1ea0e67ab7b7fad2ba17fc975276"
|
||||
}
|
||||
@@ -0,0 +1,358 @@
|
||||
{
|
||||
"count": 49,
|
||||
"scope": "Existing implemented item systems only. Does not authorize production deployment.",
|
||||
"products": [
|
||||
{
|
||||
"id": 3,
|
||||
"vnum": 71502,
|
||||
"original_price": 349,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"vnum": 71505,
|
||||
"original_price": 349,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"vnum": 71508,
|
||||
"original_price": 349,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"vnum": 71511,
|
||||
"original_price": 349,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 78,
|
||||
"vnum": 54003,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 79,
|
||||
"vnum": 54006,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 80,
|
||||
"vnum": 54009,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 81,
|
||||
"vnum": 54012,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 82,
|
||||
"vnum": 54015,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 83,
|
||||
"vnum": 54018,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 84,
|
||||
"vnum": 54021,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 85,
|
||||
"vnum": 54024,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 86,
|
||||
"vnum": 54027,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 87,
|
||||
"vnum": 54030,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 88,
|
||||
"vnum": 54033,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 89,
|
||||
"vnum": 54036,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 90,
|
||||
"vnum": 54039,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 91,
|
||||
"vnum": 54042,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 92,
|
||||
"vnum": 54045,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 93,
|
||||
"vnum": 54048,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 94,
|
||||
"vnum": 54051,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 95,
|
||||
"vnum": 54054,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 96,
|
||||
"vnum": 54057,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 97,
|
||||
"vnum": 54060,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 98,
|
||||
"vnum": 54063,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 99,
|
||||
"vnum": 54066,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 100,
|
||||
"vnum": 54069,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 101,
|
||||
"vnum": 54072,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 102,
|
||||
"vnum": 54075,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 103,
|
||||
"vnum": 54078,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 170,
|
||||
"vnum": 70002,
|
||||
"original_price": 99,
|
||||
"basis": "AVA2 third-hand pickup status; docs/AVA2-CHEST-PICKUP.md in metin2-client"
|
||||
},
|
||||
{
|
||||
"id": 172,
|
||||
"vnum": 71234,
|
||||
"original_price": 99,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 177,
|
||||
"vnum": 71254,
|
||||
"original_price": 99,
|
||||
"basis": "ported mount costume and mount skin; game/src/port_mount.cpp, client MountScript and staged model resources"
|
||||
},
|
||||
{
|
||||
"id": 183,
|
||||
"vnum": 54126,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 184,
|
||||
"vnum": 54129,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 185,
|
||||
"vnum": 54132,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 186,
|
||||
"vnum": 54135,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 187,
|
||||
"vnum": 54138,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 188,
|
||||
"vnum": 54141,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 189,
|
||||
"vnum": 54144,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 190,
|
||||
"vnum": 54147,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 191,
|
||||
"vnum": 54150,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 192,
|
||||
"vnum": 54153,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 193,
|
||||
"vnum": 54156,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 194,
|
||||
"vnum": 54159,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 195,
|
||||
"vnum": 54162,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 197,
|
||||
"vnum": 54168,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 198,
|
||||
"vnum": 54171,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
},
|
||||
{
|
||||
"id": 199,
|
||||
"vnum": 54174,
|
||||
"original_price": 60,
|
||||
"basis": "ported body/hair/mount-skin fixed enchants; game/src/port_costume_attr.cpp and make_items.ENCHANT_KEEP"
|
||||
}
|
||||
],
|
||||
"candidates_pending_acceptance": [
|
||||
{
|
||||
"id": 144,
|
||||
"vnum": 100001,
|
||||
"original_price": 9,
|
||||
"basis": "dragon soul time charge (percent); game/src/char_item.cpp USE_TIME_CHARGE_PER and item.cpp GiveMoreTime_Per",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 145,
|
||||
"vnum": 100002,
|
||||
"original_price": 17,
|
||||
"basis": "dragon soul time charge (fixed); game/src/char_item.cpp USE_TIME_CHARGE_FIX and item.cpp GiveMoreTime_Fix",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 149,
|
||||
"vnum": 100500,
|
||||
"original_price": 4,
|
||||
"basis": "dragon soul strength refine material (holly bean); game/src/DragonSoul.cpp DSManager::DoRefineStrength",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 233,
|
||||
"vnum": 39063,
|
||||
"original_price": 19,
|
||||
"basis": "gaya market refresh item; game/src/port_gaya.cpp and char_item.cpp USE_RESET_GAYA_SHOP",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 234,
|
||||
"vnum": 39064,
|
||||
"original_price": 19,
|
||||
"basis": "gaya market slot unlock item; game/src/port_gaya.cpp and char_item.cpp USE_EXPAND_GAYA_SHOP",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 240,
|
||||
"vnum": 77921,
|
||||
"original_price": 1,
|
||||
"basis": "copper treasure key for box 77918; game/src/char_item.cpp single-count decrement",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 241,
|
||||
"vnum": 77922,
|
||||
"original_price": 2,
|
||||
"basis": "silver treasure key for box 77919; game/src/char_item.cpp single-count decrement",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
},
|
||||
{
|
||||
"id": 242,
|
||||
"vnum": 77923,
|
||||
"original_price": 5,
|
||||
"basis": "gold treasure key for box 77920; game/src/char_item.cpp single-count decrement",
|
||||
"status": "pending_real_behavior_and_platform_acceptance"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# 属性锁定:聊天链接和活动洗练槽
|
||||
|
||||
2026-10-18,接续其他视图提示。客户端完整说明见 `metin2-client/docs/AVA2-ATTR-LOCK-SNAPSHOTS.md`。
|
||||
|
||||
`port_attr_lock.cpp` 的 `PortAttrLockSend` 通过现有服务端命令发送 `AttrLockItem window cell vnum mask`,顺序紧随自有物品设置/删除/更新、锁定变更或switchbot物品更新。只给 `SwitchbotHelper::IsClientSupported` 识别的新客户端发送,只支持本人 INVENTORY/EQUIPMENT/SWITCHBOT。SQL失败返回mask=-1,不能伪装成未锁定。
|
||||
|
||||
`/attr_lock_sync` 在客户端进入游戏后一秒触发,只同步本人背包/装备及五个有效洗练槽,不接受目标角色参数。两秒限频,跳过多格物品占位格;结束返回 `AttrLockSync`。客户端最多重试三次,断线清缓存,防止加载界面丢命令和重登残留。经典物品封包、锁定规则和数据库结构均不变。
|
||||
|
||||
客户端以属性/孔快照匹配缓存;聊天链接保留发送时的七属性槽和 `mtlock1:mask` 后缀,并支持转发。活动槽保留原“正在自动洗练”说明,追加黄色 `<<锁定属性>>`,停止后恢复普通提示。
|
||||
|
||||
验证:
|
||||
|
||||
- `python3 tests/features/test_attr_lock_snapshots.py` 编译真实发送和同步函数,覆盖版本/窗口、删除、addon锁定组、SQL失败、多格去重和限频。
|
||||
- `python3 tests/features/test_attr_lock_views.py` 原视图权限/归属检查回归通过。
|
||||
- 客户端132项测试、macOS和Android离线构建通过。macOS/sbtest首次登录同步、聊天链接/转发、实际自动洗练、停止/移回和同进程重登通过;手机真机暂停。
|
||||
- 证据:客户端 `build/parity-acceptance-20261018/lock-snapshots-proof-accepted.log`、`lock-snapshots-{link,active,moved,relogin}.json`。测试驱动不进入发行包。
|
||||
|
||||
仅部署sbtest:`game.ava2-parity` SHA256 `8622d6bcd5077609015bf8556bc094236e3100a4d6ed6ee490b3e55f372960a2`。备份与夹具在 `/root/deploy-features/20261018-ava2-parity/attr-snapshots`,其中 `game-before` 为上一轮测试二进制;SQL恢复必须先停止sbtest以刷新缓存。正式服game仍 `40335e41…`,没有修改正式库或服务进程。
|
||||
|
||||
验收后停止sbtest缓存并恢复测试武器原属性/背包159格、原无锁状态及902个71084,原装备1900000015仍为装备槽4;`attr-snapshots/cleanup-result.json` 已保存核对结果。最终中文说明框实际宽348、最长文字308,40像素余量通过。
|
||||
@@ -1,6 +1,6 @@
|
||||
# PORT attribute lock
|
||||
|
||||
AVA2 `ENABLE_LOCK_ATTR`, rebuilt for this server's item layout. Up to two of the five normal attribute slots keep their type and value when the item is rerolled. Source: `src/server/game/src/port_attr_lock.{h,cpp}`, `CItem::ChangeAttribute` / `CopyAttributeTo` (item_attribute.cpp), the cache fields in item.h/item.cpp, the boot hook in main.cpp, and the `lock` verb of `mt_switchbot` (port_switchbot.h).
|
||||
AVA2 `ENABLE_LOCK_ATTR`, rebuilt for this server's item layout. Up to two of the five normal attribute slots keep their type and value when the item is rerolled. Source: `src/server/game/src/port_attr_lock.{h,cpp}`, `CItem::ChangeAttribute` / `CopyAttributeTo` (item_attribute.cpp), the cache fields in item.h/item.cpp, and the boot hook in main.cpp. The `lock` verb of the v1 `mt_switchbot` command was removed with the AVA2 switchbot port (FEATURE-SWITCHBOT.md). Locks are now set only by using 50348 (lock) / 50349 (unlock) on the item. `UseItemEx` passes the material to `PortAttrLockUse`, which reads the 1-based slot from the material's socket 0 and consumes one material on success.
|
||||
|
||||
## Storage
|
||||
|
||||
@@ -24,7 +24,6 @@ CREATE TABLE IF NOT EXISTS mt_item_attr_lock (item_id INT UNSIGNED NOT NULL PRIM
|
||||
|
||||
- Only the five normal slots can be locked; the rare slots 5/6 are not affected. The item must sit in the inventory, not be equipped or in an exchange, not be a costume, and have an attribute set. The slot must hold an attribute.
|
||||
- At most 2 lock groups, and at least one filled slot must stay unlocked. On items with an addon type (`sAddonType`, weapons whose slots 0/1 are the skill / normal hit bonus pair), slots 0 and 1 lock and unlock together and count as one group.
|
||||
- The bot's own item cannot be locked or unlocked while the bot is rolling it (`running`).
|
||||
- Locking is free. AVA2 consumes 50348/50349 per lock or unlock; those vnums do not exist in 203 `item_proto`.
|
||||
- `CItem::ChangeAttribute` (scroll rerolls, the switchbot, the GM command):
|
||||
1. take the effective mask: stored mask ∩ filled slots, with the addon pair kept whole;
|
||||
@@ -36,15 +35,9 @@ CREATE TABLE IF NOT EXISTS mt_item_attr_lock (item_id INT UNSIGNED NOT NULL PRIM
|
||||
With no lock, the effective mask is 0 and the sequence equals the original. The attribute count is kept, and the rare slots are untouched.
|
||||
- Adding an attribute (71085) and rare-attribute scrolls do not look at the lock.
|
||||
|
||||
## Protocol (part of mt_switchbot v1)
|
||||
## Protocol
|
||||
|
||||
```
|
||||
/mt_switchbot 1 lock CELL SLOT toggle the lock on normal slot SLOT (0..4)
|
||||
MTSB1 lock CELL VNUM MASK effective mask; also sent after every attrs_end
|
||||
MTSB1 error lock CODE item equipped no_attr busy running slot max db rate invalid
|
||||
```
|
||||
|
||||
`slot` means out of range or empty. `max` means a third group, or every filled slot locked. `db` means the write failed. Older servers never send a `lock` line, so the client shows no lock buttons there.
|
||||
No dedicated packet. The v1 `/mt_switchbot 1 lock CELL SLOT` / `MTSB1 lock` lines were removed together with that command. What remains is the item-use path above. AVA2's UI for picking the slot and showing the lock in the tooltip is still open (metin2-client docs/AVA2-PARITY-PLAN.md).
|
||||
|
||||
## Verification
|
||||
|
||||
@@ -58,7 +51,7 @@ MTSB1 error lock CODE item equipped no_attr busy running slot max
|
||||
- there is no DB lookup when there are no attributes;
|
||||
- every toggle, effective-mask and group-count rule holds.
|
||||
- It also checks the boot hook, the Makefile, the cache initialisation and that `CopyAttributeTo` copies the lock.
|
||||
- `tests/features/test_switchbot.py` covers the `lock` verb (toggle, `slot`, `max`, `db`, `running`, `no_attr`, `item`, `invalid`, the addon pair) and the lock line after `attrs_end`.
|
||||
- `tests/features/test_switchbot.py` checks that the v1 command (and with it the `lock` verb) is gone.
|
||||
- FreeBSD: full rebuild of game in `/root/metin2-features-dev` (log `attrlock-build.log`; `item.h` changed, so every .cpp was touched).
|
||||
- Live on 2026-10-15, channel-5 test core (13040) with the isolated binary, macOS client, [SA]Admin, armour 11209 (item 20000178, 5 attributes), scroll 71084:
|
||||
- the first boot created the table;
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# AVA2 属性锁定选择与展示
|
||||
|
||||
2026-10-18;首次选择与自有提示验收使用 sbtest game `a324f3d0646ce8e8579c34237bbdc54855be2d5578f54476a27005f0af364765`;后续其他视图验收和当前版本见下节。正式服未变更。
|
||||
|
||||
补齐 AVA2 char_item.cpp 的材料使用契约:无目标使用 50348/50349 进入选择 quest,socket 0 保存1~5;拖放时锁定或解锁。选择返回按 ID 重新解析物品,校验所有者、库存与交易/角色状态。选择不扣材料,锁定只有持久保存成功才扣一张;数据库读取失败拒绝覆盖已有状态。处理放在时装/护符专用分支之前。独立 mt_item_attr_lock 表及现有 ChangeAttribute 保留算法继续使用。
|
||||
|
||||
`/attr_lock_info TOKEN WINDOW CELL` 只读查询自己的背包、装备或洗练槽(每秒限频),含请求序号和 vnum 的响应让客户端拒绝过时提示;SQL 错误发未知掩码而非未锁定。
|
||||
|
||||
两种材料原型从 AVA2 客户端 DumpProto 读取并只合并两行;归档没有材料的选择 quest,中文 attr_lock.quest 根据 C++ 契约补齐。安装器和详细验证见客户端 tools/server/ava2-attr-lock/README.md。
|
||||
|
||||
已实际验证选择4、掩码8、锁定消耗4→3、洗练卷20→19且第4条保持、重复锁定不消耗、重启测试 db/auth/game 和客户端后读回、取消不消耗、解锁4→3。备份为 /root/deploy-features/20261018-ava2-parity/backup-attr-lock 和 backup-attr-lock-install-recheck;QA 专属夹具保存在该目录 private-attr-lock-*,勿纳入发布包。
|
||||
|
||||
直接函数测试 test_attr_lock_use.py 与原 ChangeAttribute 测试 test_attr_lock.py 通过。该次验收未覆盖其他视图,后续见下节。客户端脚本在 OnUpdate 内操作重新登录的早期崩溃及后续帧间驱动重登结果见客户端独立调查记录,不将其扩大为全部物理输入通过。
|
||||
|
||||
## 其他视图只读提示
|
||||
|
||||
源码提交5b8cc30:扩展 `/attr_lock_info token context cell vid`,101/102为当前双方交易,103为当前玩家商店,104/105为自己的已加载仓库/商城仓库,106仅允许现有GM权限查看穿戴槽。除106外vid必须为0。保留原自有物品三参数请求及回复格式,不修改七属性基础包或锁定存储。
|
||||
|
||||
交易按显示格查找,校验互相关联的交易和物品所有者;商店校验访客、在售ID/vnum、所有者和原隐藏高价值物品规则;仓库校验真实容量。SQL失败仍返回未知掩码,查询限频仍每秒一次。
|
||||
|
||||
test_attr_lock_views.py直接编译运行实际函数,覆盖显示格与内部索引不同、访客/归属、关闭容器、隐藏商品、GM权限、非法参数、限频和SQL失败。macOS两个普通QA角色真实验证双方交易、摆摊预览及价格12345保留、商店、NPC仓库和商城仓库的mask8高亮;普通角色查询他人装备被拒绝。随后仅在common_sb临时授权QA角色,真实view_equip验证他人已装备武器高亮。客户端126项回归及macOS/Android离线编译通过;手机按用户要求暂停。
|
||||
|
||||
测试后移除新增账号、角色、物品和临时GM行,恢复主QA两件武器的原装备/背包槽及测试武器无锁状态,备份位于 `/root/deploy-features/20261018-ava2-parity/attr-views`。原CONFIG逐字节一致,sbtest已重启,当前game SHA256为 `03a7b74a1ba440c5af3344441a9bd00413a4aa5a6719fdc2f3f231758260603f`,正式服仍40335e41…。
|
||||
|
||||
聊天链接和活动洗练槽的动态锁定提示仍待做;不能据此认定整个AVA2提示能力已完成。正式服未部署本轮变更。
|
||||
@@ -0,0 +1,16 @@
|
||||
# AVA2 原生批量开箱
|
||||
|
||||
2026-10-18:测试服接入;正式服未部署。客户端完整记录见 metin2-client/docs/AVA2-CHEST-PICKUP.md。
|
||||
|
||||
来源:AVA2 FILES+SRC.tgz 的 game/src/char_item.cpp,ENABLE_MULTI_CHEST 的 OpenChest、GiveItemFromSpecialItemGroupNew、AutoGiveItemChest;cmd_general.cpp 的 chest_drop 和 chestdrop;GC66 DWORD 长度预览布局。
|
||||
|
||||
- 原生入口 `/chest_drop <window> <cell> <count>`,仅普通背包合法格,最多 1000、且只消费该格当前数量。原始基础物品封包仍是 BYTE 数量,单堆仍为 200,没有扩大成 1000。
|
||||
- 独立批量发奖,不再逐次 UseItem。保留特殊组金币/经验/异常效果及批次堆叠、延后更新/任务拾取回调。`/mt_chest` 保留为旧端兼容。
|
||||
- 交易、锁定、装备、死亡/观察/传送、商店/仓库/合成等状态拒绝;保留基础服等级、竞技场与龙魂资格检查。新堆与已有堆都检查孔值后合并。
|
||||
- 适配当前 200 堆叠:大数量奖励分堆,非堆叠逐个创建,MAKECOUNT 的最小量不会使剩余计数下溢;提示汇报实际创建数量。背包不足延续 AVA2 部分成功消耗语义,不把物品掉在地上。
|
||||
- `/chestdrop <vnum>` 只查询有效宝箱组。GC66 帧有 8190 行/65535 字节边界;客户端校验实际长度。
|
||||
- 物品 CItem 延后更新标志在 Initialize 重置。Makefile 为新 include 添加显式依赖,避免旧 Depend 漏编。
|
||||
|
||||
验证:`python3 tests/features/test_ava2_chest.py` 编译并执行真实 include;覆盖余量、合并、孔隔离、满包、状态、等级/龙魂、450 个奖励拆堆、非堆叠及 MAKECOUNT。另保留原 `/mt_chest` 测试。FreeBSD 隔离编译通过;普通 QA 在 sbtest 的真实窗口滑块开启 5 个,背包回调整叠开启其余 15 个。物理按键和 Android 真机仍未验收。
|
||||
|
||||
测试构建与原型备份在 /root/deploy-features/20261018-ava2-parity。回退:停止 sbtest,恢复 backup-pickup-proto 中 conf/db 两套原型(70002),game 链接恢复 sbtest/game.ava2-stones,重启测试 db/auth/channel5。没有操作正式服 share/bin/game。
|
||||
@@ -0,0 +1,38 @@
|
||||
# AVA2 drop tables
|
||||
|
||||
203 drops what AVA2 drops. Tables: `tools/ava2-drops/make_drops.py`. Code: `ITEM_MANAGER::ReadCommonDropNewItemFile` (item_manager_read_tables.cpp), the common-drop block and `GetDropPct` in item_manager.cpp, the load in input_db.cpp. The items AVA2 drops that 40250 lacks come from metin2-client `tools/server/ava2-items` and must be installed in the same deploy (the readers fail on an unknown item vnum and the core stops).
|
||||
|
||||
## Tables
|
||||
|
||||
Built by `make_drops.py <AVA2 locale dir> <203 locale dir> <out dir> <item_proto.txt>...`, the protos being every row the db will load (live item_proto.txt + ava2-items' items-server.tsv).
|
||||
|
||||
| File | Content |
|
||||
|---|---|
|
||||
| mob_drop_item.txt | AVA2's 247 `drop` groups. Entries with an unknown item are removed and the rest renumbered: the reader stops at the first missing index. |
|
||||
| common_drop_new.txt | AVA2's 26 level-range common groups (new file, see below). |
|
||||
| special_item_group.txt | 203's groups; AVA2's groups replace those of the same box vnum (50011, 50082, 50186, 50255) and AVA2-only boxes are added. 50035 keeps 203's group: it is the children's day box on 203 but a GM box on AVA2. |
|
||||
| common_drop_item.txt, etc_drop_item.txt | empty, as on AVA2. |
|
||||
|
||||
`report.json` lists group counts, removed items and replaced boxes.
|
||||
|
||||
## common_drop_new.txt
|
||||
|
||||
```
|
||||
Group <name>
|
||||
{
|
||||
map_index 0 # 0 = every map, otherwise the maps listed
|
||||
level_range <min> <max> # killer level
|
||||
<n> <item vnum> <count> <pct> # pct as a float, chance = pct / 100
|
||||
}
|
||||
```
|
||||
|
||||
A group drops when the monster level is within 20 of the killer, the killer level is in `level_range` and the map matches. Each entry is rolled against `GetDropPct`'s range (base 4,000,000) with probability `pct × 40000`. A missing file is logged and skipped; a parse error or unknown item fails the boot like the other drop files.
|
||||
|
||||
## Changes to the drop code (from AVA2)
|
||||
|
||||
- `GetDropPct`: premium item or glove doubles the drop rate, otherwise +50%; the permanent glove adds 100 (50 with premium) to the denominator bonus. `iRandRange = 4000000 * 100 / (100 + priv + bonus)`; 203 had an operator-precedence bug that fixed the divisor at 100.
|
||||
- PC-bang bonus removed. The event-manager bonus is not ported (203 has no ENABLE_EVENT_MANAGER).
|
||||
- A mob with two `drop` groups no longer reads an uninitialised group pointer.
|
||||
- special_item_group.txt groups may have up to 1023 entries (AVA2's cofreskindop boxes have 267).
|
||||
|
||||
The wiki (`/mt_features ... mob`) lists common_drop_new rows as rule 0 (FEATURE-QUERY-PROTOCOL.md). Not ported: AVA2's `/reload y`; quest-script and hardcoded drops are not compared.
|
||||
@@ -0,0 +1,17 @@
|
||||
# AVA2 原生换线
|
||||
|
||||
来源为 AVA2 启用的 `cmd.cpp move_channel → do_cmd(SCMD_CHANGE_CHANNEL) → timed_event → CHARACTER::MoveChannel`,不是同归档中已注释的另一套 `do_change_channel`。3秒倒计时,重复命令取消;结束时再校验任务、角色、物品操作、地图和对端可用性。
|
||||
|
||||
现有 `WarpSet(x,y,map)` 保留原签名,新增4参重载选择目标频道。普通传送继续走原路径。换线共享原保存/移除实体/GC Warp/P2P switchbot交接,避免另写一套传送清理顺序;不发送 VALID_LOGOUT。
|
||||
|
||||
AVA2 原端口步长100不适合203。`ava2_channel` 通过已有 GG relay 的保留名字 `#ava2_channels` 发送版本化快照,只接收已登记P2P对端身份匹配的频道和P2P端口。游戏端口来自该核心,地图来自 MAP_ALLOW。5秒心跳,30秒过期,断开删除,歧义归属拒绝;范围为1..7频道,99不可切。不会读取玩家输入的IP/端口。
|
||||
|
||||
配套客户端扩展命令:`ChannelList <current> <csv>`、`ChannelEndpoint <target> <ipv4> <gameport>`、`ChannelError unavailable`;频道标题仍发送 AVA2 原 `UpdateServerInfo`。列表只读,每角色每秒最多一次。私人地图没有跨频道路线,保留本频道条目,客户端不会回落到旧退出重登UI。
|
||||
|
||||
离线路由检查:`python3 tests/features/test_ava2_channel_registry.py`。编译必须显式指定隔离的 BINDIR 与 GAMEDIR,默认 Makefile 会部署正式二进制,不可直接裸跑。
|
||||
|
||||
macOS/sbtest已验证5:13040→6:13050→5续洗,active始终1、两套目标表和锁定第4条保持,71084消耗1034→976→919。正常退出重登保留频道6与auth11040;辅助核心关闭后列表移除6,旧目标请求被拒绝。同频道、未开放频道、倒计时取消和任务选择中的拒绝已通过。
|
||||
|
||||
测试版本game hash为2575de51a19dd080f6ecbff2cea8a549df1d8fd66be867bc483a412287fc9114。恢复原CONFIG逐字节核对,辅助13050/14050关闭,sbtest db/auth/core已重启;正式服game仍40335e41…,原15000/11000监听保持。备份、测试日志在 /root/deploy-features/20261018-ava2-parity/native-channel,不提交CONFIG/凭据。
|
||||
|
||||
当前变更仅部署sbtest,不能据此认定正式服已有原生换线。Android仅离线编译,用户暂停手机验收。
|
||||
@@ -0,0 +1,15 @@
|
||||
# AVA2 CG235 拾取
|
||||
|
||||
2026-10-18:仅 sbtest。客户端记录见 metin2-client/docs/AVA2-CHEST-PICKUP.md。
|
||||
|
||||
移植来源为 AVA2 ItemsPickup / CheckItemCanGet、70002 USE_SPECIAL 分支、char.h eAutomaticPickUP。CG235 固定头 5 字节(BYTE + DWORD count)后接 VID 数组与常规序列字节。客户端原版候选收集与 500ms 节流;服务端最多 4096 个 VID,先校验完整帧,再检查地面/距离/所有权/角色状态/分类。
|
||||
|
||||
bit0 开启,1–18 是原版忽略分类。修正原版 CHESTS 使用 ITEM_METIN 的误写为 ITEM_GIFTBOX;未移植职业、时装和稀有度能力不伪造为已支持。原有 /mt_pickup 仅兼容旧端。
|
||||
|
||||
`/setpickupmode <mode> <rarity>` 更新,空参数读取,`PickUPMode` 回传。当前选定的基础 DB 结构不扩大,设置持久化到 `ava2_pickup.mode` / `.rarity` quest 标记;PC 未加载时拒绝读写默认值,QuestLoad/延后登录事件完成后主动同步。冷重启验证曾暴露“初始读取早于 flags 加载”的竞态,现已修复。
|
||||
|
||||
70002 原型恢复 ITEM_USE/USE_SPECIAL;使用后消耗一颗并持久化 705 affect,30 天;已有状态重复使用不消耗。此处按原版只实现状态和键触发批量拾取,不声称周期无人操作拾取。稀有度过滤仅保存配置,稀有度物品系统及界面按钮尚未开放。
|
||||
|
||||
验证:`python3 tests/features/test_ava2_pickup.py` 执行真实封包解析和分类函数,覆盖截断、计数溢出、开关、距离/所有权、宝箱/灵石独立过滤。真实客户端 CG235 验证忽略灵石时只取回药水、取消过滤后取回灵石;激活/重复不消耗及测试 db/auth/core 冷重启后模式、剩余状态、图标和道具数量恢复通过。
|
||||
|
||||
没有正式服部署,未做 Android 真机或跨核心设置同步验收。备份和回滚同 FEATURE-AVA2-CHEST.md。构建必须覆盖 BINDIR 与 GAMEDIR,不能使用默认正式服输出路径。
|
||||
@@ -0,0 +1,14 @@
|
||||
# AVA2 spirit stones (staged on sbtest)
|
||||
|
||||
The stone catalogue and portable generator are in the sibling metin2-client repository:
|
||||
`tools/server/ava2-stones/README.md`. That directory includes the complete source audit, generated patch interface, read-only owned-item impact audit and test results.
|
||||
|
||||
The 138 source ITEM_METIN rows include 20 ordinary +0..+5 chains, special stones and the broken-stone marker. Unsupported wolfman stones and original empty-attribute placeholders are explicitly disabled in the staged data, rather than silently converted to sword resistance or usable zero-effect stones. Existing custom +6 rows remain compatible until a separately backed-up inventory/socket migration.
|
||||
|
||||
This server change aligns the actual ITEM_METIN branch with AVA2's default (ENABLE_ADDSTONE_FAILURE is disabled): insertion always succeeds, and exactly one stone is consumed. Existing destination, wear-flag, duplicate-family and socket checks remain. The selected 40250-compatible three-socket packet format remains unchanged.
|
||||
|
||||
`python3 tests/features/test_stone_socket.py` compiles and executes the actual branch with lightweight dependencies. It verifies success, one-per-stack and last-item removal, duplicate family, equipped/exchange refusal, target type and socket eligibility. Full FreeBSD compilation also succeeded. The staged binary hash is 4b335083a26116771e18c97b3a41b039e1ff28efe93e957494fc62b6c5dfe94d.
|
||||
|
||||
Ordinary QA1017, isolated player_sb/account_sb, confirmed insertion and stack decrement, actual casting-speed +35 and max-HP +1200 deltas, and all three new exclusive-family pairs. The original test equipment was re-equipped after the probes. No production binary, owned item or socket was changed.
|
||||
|
||||
For isolated gmake builds, override both BINDIR and GAMEDIR: the old Makefile automatically moves its output into GAMEDIR after linking. The sbtest proto backups and test fixture backups are under /root/deploy-features/20261017-ava2-stones/.
|
||||
@@ -0,0 +1,17 @@
|
||||
# AVA2 原生追踪和门票商店
|
||||
|
||||
2026-10-18,feature/ava2-unlock;仅 sbtest,正式服 game SHA256 仍为 `40335e41d466fd7379c805749978ad6df9c82f5673a3e5b8881b3bee8767663d`。
|
||||
|
||||
实现为 `new_mob_timer.*`(AVA2 刷新日历和首领状态)、`ava2_track.*`(八副本)、`ava2_track_commands.h`(查询/传送)、`ava2_ticket_shop.*`(原 shop12)。详尽来源、联机证据和未闭合范围见客户端 `docs/AVA2-TRACK.md`。
|
||||
|
||||
`d.track_update` 支持原任务的一参数调用;quest DB 载入完成后补发早期查询。首领 P2P 使用已有变长 relay,避免修改所有 GG 固定包;owner 心跳过期后停止显示其存活。未知/未开放地图不报存活。原日历按星期取模;65535 为存活标记,普通同值倒计时发送 65536。
|
||||
|
||||
八副本优先原冷却标记,重返为次选。203 旧地下墓穴 last_exit_time、火焰 exit_time、蜘蛛 retry_limit_time 也读取;旧蓝龙冷却通过无副作用的现行 Lua settings 读取,正在任务内或缺配置报不可用。读 Lua 的公共实现提取为 `port_dungeon_settings.h`,现有只读副本查询继续复用。
|
||||
|
||||
shop12 不占已有 shop manager ID,只有八个原始报价;使用原 CShop 的同步发奖/空格检查,成功才扣材料,金币价格为零。禁止卖出和任意商店 ID 远程打开;客户端追加 GC_SHOP 子包并校验长度,不改变旧子包。协议和客户端必须一起更新。
|
||||
|
||||
测试:`python3 tests/features/test_ava2_track.py`、`test_ava2_dungeon_track.py`、`test_ava2_ticket_shop.py`。FreeBSD 编译必须同时指定 BINDIR 与 GAMEDIR,默认 Makefile 输出会覆盖生产目录。
|
||||
|
||||
本批追踪部署时的 game SHA256:`8640644b94005a463e9e8244e6c414f1700ab675950e7bd3b0958bee289b1119`。部署及构建日志在 `/root/deploy-features/20261018-ava2-parity/`,此次兼容读取前的 game 备份为 `game-before-legacy-track`。只可用 sbtest stop/restart 脚本切换,不能用生产重启脚本。
|
||||
|
||||
尚未完成:八副本原版任务/门票/等级全量迁移、真实跨核心故障切换、Android 触控、全套资源缺口修复、正式服发布。冷却状态不能替代入口 NPC 的队伍/门票/房间权限检查。
|
||||
@@ -0,0 +1,140 @@
|
||||
# AVA2 items: unlocking the locked systems
|
||||
|
||||
The 478 AVA2 drop items come from metin2-client `tools/server/ava2-items` (see FEATURE-AVA2-DROPS.md). Items of systems 40250 lacks were imported as ITEM_NONE. This branch turns them back into usable items one system at a time. Each phase keeps the AVA2 row (type, subtype, values, applies) once the server and client understand it.
|
||||
|
||||
| Phase | Items | State |
|
||||
|---|---|---|
|
||||
| P1 boxes and keys | 77918–77920 boxes, 77921–77923 keys (`ITEM_TREASURE_BOX` / `ITEM_TREASURE_KEY`, value0 3–5) | done |
|
||||
| P2 stones | 28444 破碑之石+4 (`APPLY_ATTBONUS_STONE`), 28445 Boss stone (`APPLY_ATTBONUS_BOSS`) | done |
|
||||
| P3 dragon armor | 21210–21219 暗龙 (warrior), 21230– 风龙 (assassin), 21250– 魔龙 (sura), 21270– 神龙 (shaman), +0..+9 | done (client) |
|
||||
| P4 sash | 85004 领主 / 85008 大师 / 85014 王朝 / 85018 皇家 披风 (`COSTUME_SASH`, grade 4) | done, not deployed |
|
||||
| P5 mounts | 71502 / 71505 / 71508 / 71511 坐骑时装 (`COSTUME_MOUNT`), 71234 / 71254 坐骑外观 (`COSTUME_MOUNT_SKIN`) + mobs 32012 / 32028 | done, not deployed |
|
||||
| P6 costume enchants | 54001–54078 时装 / 发型强化石, 54124–54174 坐骑外观强化石 (`USE_CHANGE_ATTRIBUTE`); weapon / sash-skin / effect ranges and 53996 stay locked | done, not deployed |
|
||||
| P7 talismans | 护符 chains 9600–10950 (`ARMOR_PENDANT`, +0..+200 per element), 71301 / 71302 / 53996 / 53997 talisman attribute items | done, not deployed |
|
||||
| P8 new rings | 戒指 chains 19500 红宝石 / 19520 石榴石 / 19540 祖母绿 / 19560 蓝宝石 (`ITEM_NEW_RINGS`, +0..+9) | done, not deployed |
|
||||
|
||||
## P1: boxes and keys
|
||||
|
||||
40250 already has both types. A key opens a box when their value0 match (char_item.cpp, `ITEM_TREASURE_KEY`); the box then hands out its special_item_group group (live since the drops deploy). 203's own boxes use value0 0–2, so AVA2's 3–5 don't clash.
|
||||
|
||||
## P2: stone and Boss bonus
|
||||
|
||||
The points exist from the biolog port (POINT_ATTBONUS_STONE 240, POINT_ATTBONUS_BOSS 241, damage in battle.cpp); the apply types did not.
|
||||
|
||||
- `APPLY_ATTBONUS_STONE = 139`, `APPLY_ATTBONUS_BOSS = 140` (common/length.h), the same numbers as AVA2 and the client (`ItemData.h`). 92–138 are reserved for AVA2 applies not ported yet: `aApplyInfo` maps them to POINT_NONE and ProtoReader's `arApplyType` names them `APPLY_RESERVED_<n>`, so array index = apply number.
|
||||
- `CHARACTER::ApplyPoint` handles both like the other additive applies.
|
||||
- ProtoReader is in the db, so **the db binary must be redeployed with the game**; an old db rejects the items' `APPLY_ATTBONUS_*` columns.
|
||||
- The two stones share AVA2's stone family 31 (value5), so a weapon holds only one of them. The 7 guardian weapons keep their AVA2 `APPLY_ATTBONUS_BOSS 5`.
|
||||
|
||||
Test: `tests/features/test_applies.py` (numbering in length.h, constants.cpp, ProtoReader and the client header).
|
||||
|
||||
## P3: dragon armor
|
||||
|
||||
Ordinary `ARMOR_BODY` items; the server needed nothing. All ten refine steps are imported so the refine chain (refine sets 81–89, 203's own costs) works; +9 ends the chain.
|
||||
|
||||
The look is armor shape 32 (value3). The 40250 race msm stop at shape 30, and they cannot be patched from a pack (a bare file name always comes from the root pack). The client therefore registers the shape after each race msm load: script `mt_shapes` (metin2-client `src/platform/ScriptLib/ArmorShapesScript.inc`). The models `<race>_7_1.gr2` (+ LODs, skin) ship in the ava2items pack.
|
||||
|
||||
**Open:** AVA2 requires level 115–120. 203 caps at MAX_LEVEL 105, so nobody can wear the armor, nor the guardian weapons (level 120) already live.
|
||||
|
||||
## P4: sash
|
||||
|
||||
AVA2's sash (acce) system, ported from `Srcs/Server` (`#ifdef __SASH_SYSTEM__`) into `game/src/port_sash.cpp`.
|
||||
|
||||
- Item: `ITEM_COSTUME` / `COSTUME_SASH = 3` (ProtoReader `arSub28`, so **the db binary changes too**). value0 = grade (the four imported sashes are grade 4); socket0 = absorption %, socket1 = vnum of the absorbed weapon/armor. An unrolled grade-4 sash gets 11–25 % on first equip/creation (`SASH_GRADE_4_ABS_*`), combining caps at 19 %.
|
||||
- Slot `WEAR_COSTUME_SASH = 24`; `PART_SASH` follows `PART_HAIR`. The part is not stored in the player table: `SetPlayerProto` clears it and the equipped sash sets it to vnum − 85000, +1000 once absorption reaches 19 % (the client shows the glow above 86000).
|
||||
- **Protocol:** `CHR_EQUIPPART_SASH` is a fifth `awPart` WORD in GC_CHARACTER_ADD / ADD2 / UPDATE, `HEADER_CG_SASH = 211`, `HEADER_GC_SASH = 215`. Old clients break; the server and the client deploy together.
|
||||
- Absorbed bonuses: the sash adds the absorbed item's applies, attributes and (weapons) attack values scaled by absorption, `int(v*abs/100 + .5)` (+1 when positive), in `CItem::ModifyPoints` and battle.cpp. `MTSASH <code>` chat commands report window errors and results to the client (`mt_sash`).
|
||||
- Combine: two sashes of the same grade, price 100k/200k/300k/500k by grade, success 80/70/50/30 %. Absorb: sash + weapon/armor, the material is destroyed.
|
||||
- Window: quest `sash` on 王铁匠 20016 (203 has no NPC 60003), `pc.open_sash(true)` combine / `(false)` absorb: metin2-client `tools/server/sash` (installs `pc.open_sash` into quest_functions).
|
||||
- Client: `src/platform/ScriptLib/SashScript.inc` (`mt_sash`: windows, costume slot, tooltips), models + `item_scale.txt` + effects in the ava2items pack.
|
||||
|
||||
Test: `tests/features/test_sash.py` (numbering, packet layout shared with the client header, quest hook).
|
||||
|
||||
## P5: mount costume and mount skin
|
||||
|
||||
AVA2's `ENABLE_MOUNT_COSTUME_SYSTEM` + `ENABLE_MOUNT_SKIN`, ported 1:1 into `game/src/port_mount.cpp`. They ride on the 40250 horse: the worn costume only changes the horse race.
|
||||
|
||||
- Items: `ITEM_COSTUME` / `COSTUME_MOUNT = 2` and `COSTUME_MOUNT_SKIN = 4` (AVA2 numbers the skin 7; ProtoReader `arSub28` gains `COSTUME_MOUNT_SKIN`, so **the db binary changes again**). value0 = horse race.
|
||||
- 71502 狮子 20113 (怪物强悍 +30 %), 71505 野猪 20110 (破碑 +30 %), 71508 狼 20111 (Boss +30 %), 71511 20112 (双倍经验 30 %).
|
||||
- The applies count while the costume is worn.
|
||||
- Skins 71234 蓝色巴里 → 32012, 71254 白色冬日羊驼 → 32028.
|
||||
- Both subtypes return no attribute set (`GetAttributeSetIndex` −1, the sash too), so they cannot be rerolled.
|
||||
- Slots `WEAR_COSTUME_MOUNT = 25` and `WEAR_COSTUME_MOUNT_SKIN = 26`.
|
||||
- `GetMyHorseVnum`: the worn skin's value0, else the worn mount's value0, else the horse-level race.
|
||||
- Summoning and riding still need horse level ≥ 1, as on AVA2; equipping without a horse says `MTMOUNT need_horse`.
|
||||
- Riding uses horse stamina.
|
||||
- Hooks follow AVA2:
|
||||
- Equipping re-summons.
|
||||
- Taking the mount off sends the horse away; taking the skin off re-summons.
|
||||
- A skin needs a worn mount (`need_mount`). Neither piece changes while riding (`riding`). The mount stays while a skin is worn (`has_skin`).
|
||||
- A worn mount is summoned on login.
|
||||
- `/user_horse_back` also takes the mount off.
|
||||
- Mobs 32012 / 32028 come from the AVA2 mob_proto rows (`mobs-server.tsv`, installed by `install_items.py … <mobs-server.tsv>`).
|
||||
- Client:
|
||||
- RaceManager `__IsNewMountRace` (32000–32100 → `npc_mount`).
|
||||
- `mt_mount` (`MountScript.inc`) registers the npclist rows, adds the costume window slots and renders the `MTMOUNT` messages.
|
||||
- The models ship in the ava2items pack (`MOUNT_MOBS`).
|
||||
|
||||
Test: `tests/features/test_mount.py`.
|
||||
|
||||
## P6: costume enchants
|
||||
|
||||
AVA2's `ENABLE_SPECIAL_COSTUME_ATTR`, in `game/src/port_costume_attr.cpp`. The items are `ITEM_USE` / `USE_CHANGE_ATTRIBUTE`. value0 is the apply type and value1 the value; AVA2 apply numbers equal 203's (P2 aligned 139/140). value2 is the target mask `1 << bonus flag`.
|
||||
|
||||
- Unlocked ranges (make_items `ENCHANT_KEEP`):
|
||||
- 54001–54027 时装 (mask 2, body);
|
||||
- 54028–54078 发型 (4, hair);
|
||||
- 54124–54174 坐骑外观 (16, mount skin).
|
||||
- Still locked, since the target systems don't exist here: 54079– weapon costume (8), 54175– sash skin (32), 54220– effect (64). 53996 became a talisman item in P7.
|
||||
- `CItem::IsCostumeEnchant` (vnum 54001–54267 with a nonzero value2) is checked first in the change/add-attribute case of `UseItemEx`, before the 40250 costume refusal. So an enchant never reaches the reroll code, and dragged onto gear it is refused (`MTCATTR target`).
|
||||
- `CostumeEnchantUse` follows AVA2's checks:
|
||||
- target kind and mask (`target`);
|
||||
- apply none (`none`);
|
||||
- not while worn (`equipped`, the 40250 switcher rule);
|
||||
- at most 3 attributes (`full`);
|
||||
- no duplicate apply (`has`).
|
||||
- Then `AddAttribute`, consume one, `ItemLog COSTUME_ENCHANT`, `done`.
|
||||
- The switchbot never uses enchants: it only looks up the switcher vnums in FEATURE-SWITCHBOT.md.
|
||||
- Client `mt_costume_attr` (`CostumeAttrScript.inc`):
|
||||
- marks matching costumes as usable drop targets (the 40250 inventory already sends every `USE_CHANGE_ATTRIBUTE` drop);
|
||||
- adds the attribute and targets to the enchant tooltip;
|
||||
- renders `MTCATTR`.
|
||||
|
||||
Test: `tests/features/test_costume_attr.py`.
|
||||
|
||||
## P7: talismans
|
||||
|
||||
AVA2's `ITEM_TALISMAN_EQUIPMENT` + `ELEMENT_NEW_BONUSES`, in `game/src/port_pendant.cpp`.
|
||||
|
||||
- Item: `ITEM_ARMOR` / `ARMOR_PENDANT = 7` (ProtoReader `arSub2`, so **the db binary changes again**), worn in `WEAR_PENDANT = 27`. The AVA2 wear flag `WEAR_PENDANT` does not exist here: `FindEquipCell` sends every talisman to the slot before the wear-flag check.
|
||||
- Six chains of 201 items (+0..+200), fire 9600, ice 9830, earth 10060, dark 10290, wind 10520, elect 10750. Each carries `APPLY_ENCHANT_<element>` = its step; the level limit rises from 20 to 60 along the chain.
|
||||
- Refine sets 440–499 (fragment 96001–96006 + 30031 + 33031 ×10, 50000 yang, 100 %) are SQL rows: metin2-client `tools/server/pendant` (`install.sh`, then restart the db).
|
||||
- Applies `APPLY_ENCHANT_ELEC..DARK = 123..128` (AVA2 numbers; the db names are AVA2's, `APPLY_ENCHANT_ELECT` first) → `POINT_ENCHANT_* = 242..247`.
|
||||
- Damage (battle.cpp `CalcAttBonus`): against a monster with `RACE_FLAG_ATT_<element>`, attack +point %, so a +200 talisman triples the attack on those monsters (×(1+200/100)), which is AVA2's own balance. Each flag is its own `if`, as on AVA2. AVA2 leaves out ICE; we include it, since 203 has 83 ice monsters and an ice talisman chain.
|
||||
- Attributes:
|
||||
- The pool is AVA2's item_attr pendant column (20 rows, levels 1–5), kept in a table in `port_pendant.cpp` instead of a new item_attr column (that would change the db boot packet).
|
||||
- `GetAttributeSetIndex` stays −1. So talismans drop without attributes, and the 40250 switchers and the attribute lock refuse them. The switchbot rolls them with 71302 only (pseudo attribute set 9).
|
||||
- 71302 rerolls all attributes (needs at least one; levels 0/10/40/35/15 %). 71301 adds one up to 5, always succeeding (levels 40/50/10 %). No duplicates.
|
||||
- **Deviation:** AVA2's 53996 / 53997 are generic switcher / adder items, a free 40250 gear reroll. Here they work like 71302 / 71301, as their zh names (护符附魔道具 / 护符加持道具) say.
|
||||
- Not while worn (`equipped`), like the 40250 switcher. Any other attribute item dropped on a talisman, or a talisman item dropped on anything else, gets `target`.
|
||||
- Messages: `MTPENDANT target|equipped|empty|changed|full|added` (client `mt_pendant`). `ItemLog PENDANT_CHANGE` / `PENDANT_ADD`.
|
||||
- Not ported: AVA2's element target packet (`ELEMENT_TARGET`, the element icon over the target HP bar).
|
||||
- Client: `ItemData.h` / `PythonItemModule` constants, `c_Equipment_Pendant`, apply texts, and `mt_pendant` (`PendantScript.inc`: the equipment slot under the earring, item drop targets, messages).
|
||||
|
||||
Test: `tests/features/test_pendant.py`; `test_applies.py` covers the 123–128 numbering.
|
||||
|
||||
## P8: new rings
|
||||
|
||||
AVA2's `ENABLE_NEW_RINGS`, in `game/src/port_rings.cpp`.
|
||||
|
||||
- Item: `ITEM_NEW_RINGS = 36` (`ITEM_SHINING = 35` is reserved for the AVA2 numbering and not ported). It is a new ProtoReader type, so **the db binary changes again**. Worn in `WEAR_RINGS_1 = 28` / `WEAR_RINGS_2 = 29`: `FindEquipCell` takes ring slot 1 when free, else slot 2. Rings have no wear flag.
|
||||
- Four chains of 10 (+0..+9). Each step carries a stat (INT / DEX / STR / CON) and a resist against one class. Level limit 90 (203's MAX_LEVEL is 105). They reuse 203's refine sets 46–54, which already have AVA2's materials, so no refine SQL is needed.
|
||||
- Sockets: rings are socket accessories (`IsAccessoryForSocket`). Drills add sockets (up to 3). As with every socket or attribute item in 40250, the ring must not be worn. Each family takes its AVA2 jewel (`CanPutInto`): 19500 → 50635, 19520 → 50636, 19540 → 50637, 19560 → 50638 (19220 → 50634 is in the table, but that family is not imported).
|
||||
- Attributes:
|
||||
- The pool is AVA2's `item_attr_rings` (20 rows, levels 1–5), kept as a table in `port_rings.cpp`. `GetAttributeSetIndex` stays −1, and `PutAttributeWithLevel` branches to the ring pool.
|
||||
- The 40250 switchers and adders (`USE_CHANGE_ATTRIBUTE`, `USE_ADD_ATTRIBUTE`, `USE_ADD_ATTRIBUTE2`) accept rings, with the usual not-while-worn rule. 71151 / 71152 (weapon / armor only) refuse them, by design.
|
||||
- The switchbot rolls rings from this pool (pseudo attribute set 8). The rare (6th / 7th) attributes skip rings. AVA2's `item_attr_rare_rings` is not ported.
|
||||
- Rings drop without attributes: `AlterToMagicItem` only handles weapons and armor.
|
||||
- Client: `ITEM_TYPE_RINGS`, `c_Equipment_Rings1/2` (253 / 254), and `mt_rings` (`RingsScript.inc`). That module adds the two slots beside the shoes, the accessory tooltip (applies, attributes, jewel sockets) and the drop targets for drills, jewels, switchers and adders.
|
||||
|
||||
Test: `tests/features/test_rings.py`.
|
||||
@@ -0,0 +1,111 @@
|
||||
# PORT battle pass
|
||||
|
||||
A monthly mission pass, ported from AVA2's `ENABLE_BATTLE_PASS` (the window behind `uibattlepassex.py`). A season is a time window with up to ten missions. Each mission has its own reward, and a final reward unlocks once every mission is done. The pass is free for every player; AVA2 sold a ticket item (25150–25161), and this port has none.
|
||||
|
||||
Source:
|
||||
- `src/server/game/src/port_battlepass.h`: config, per-player state and bag fit; standard C++ only.
|
||||
- `port_battlepass_runtime.h`: game side, included only by cmd_general.cpp.
|
||||
- `port_battlepass_hooks.h`: hook declarations for the other files.
|
||||
|
||||
Tables: `tools/battlepass/schema.sql`. Season file: `tools/battlepass/port_battlepass.tsv`. Test: `tests/features/test_battlepass.py`.
|
||||
|
||||
## Season file
|
||||
|
||||
The file is `<locale base>/port_battlepass.tsv`, for example `share/locale/newcibn/port_battlepass.tsv`. Every core checks it at most once every 5 s and reloads it when its mtime, size or inode changes, the same rule the event calendar uses. Replace it atomically with a temporary file and `mv`.
|
||||
|
||||
```
|
||||
MTBATTLEPASS 1
|
||||
season ID START END unix seconds, [START, END)
|
||||
mission SLOT TYPE SUB TARGET [VNUM COUNT]x0..3
|
||||
final VNUM COUNT [VNUM COUNT]x0..5
|
||||
```
|
||||
|
||||
- Any error disables the whole file; the game logs `PORT_BP: port_battlepass.tsv disabled: line N: why`. Errors include:
|
||||
- a bad number or a duplicate slot;
|
||||
- overlapping seasons;
|
||||
- a season without missions;
|
||||
- a sub on a type that takes none.
|
||||
- Slot numbers are 1..10. A season ID must never be reused: progress and claims are stored per season ID.
|
||||
- A reward must be a bag item:
|
||||
- not a dragon soul stone;
|
||||
- size 1..3;
|
||||
- at most 24 stacks per claim.
|
||||
|
||||
A bad reward is caught when someone claims it: the answer is `config`, `sys_err` logs it, and the slot stays claimable after the file is fixed.
|
||||
|
||||
| Type | Counts | SUB |
|
||||
|---|---|---|
|
||||
| 1 | monster kills (not boss, not stone) | mob vnum or 0 |
|
||||
| 2 | boss kills (rank ≥ boss) | mob vnum or 0 |
|
||||
| 3 | metin stone kills | stone vnum or 0 |
|
||||
| 4 | seconds online | 0 |
|
||||
| 5 | fish caught | item vnum or 0 |
|
||||
| 6 | successful refines | resulting item vnum or 0 |
|
||||
| 7 | levels gained | 0 |
|
||||
| 8 | gold paid to NPC shops | 0 |
|
||||
| 9 | items sold to NPC shops | item vnum (required) |
|
||||
|
||||
A kill counts for the player that `CHARACTER::Reward` gives the quest kill event to, which is the `DistributeExp` attacker. As in AVA2, it counts only when the monster is within 20 levels of the player. A party member who is not that attacker gets nothing. Type 9 needs a vnum because selling any item could be farmed with cheap shop items.
|
||||
|
||||
The shipped file has seasons 202610–202712 (through 2028-01-01), starting at local midnight on the first of each month (Europe/Berlin, the server's zone). Each has:
|
||||
- eight missions, rewards taken from 40250 items;
|
||||
- a final reward of the three pearls and 70024.
|
||||
|
||||
The targets follow the scale of AVA2's month 10 (`player.battle_pass`).
|
||||
|
||||
## Storage
|
||||
|
||||
```
|
||||
player.mt_battlepass_progress (pid, season, slot, value, target) PRIMARY KEY (pid, season, slot)
|
||||
player.mt_battlepass_claim (pid, season, slot, claimed_at) PRIMARY KEY (pid, season, slot); slot 0 = final
|
||||
```
|
||||
|
||||
**Counting.** Events are counted in memory, as the delta per slot. `CHARACTER::SaveReal`, which covers the periodic save, logout and warp, adds play time, then queues one upsert on the game's ordered SQL connection:
|
||||
|
||||
`value = LEAST(value + delta, target)`
|
||||
|
||||
Because the write adds, a core does not need to have read the row first. Two cores that both see the player during a warp add their own deltas, with no overwrite.
|
||||
|
||||
**Loading.** At the first event or `/mt_bp`, a `FuncQuery` reads the stored values and claims. Flushes queued after that read are added on top. A generation number drops the answers of a session that has already ended.
|
||||
|
||||
**Season change.** The counts of the old season are written while that season is still in the file. The new season then loads its own rows.
|
||||
|
||||
**Claims.** A claim checks four things before writing anything:
|
||||
1. the state is loaded;
|
||||
2. the mission is complete;
|
||||
3. the slot is not claimed yet;
|
||||
4. all the stacks fit in the bag. The fit is first-fit in `GetEmptyInventory` order, and a size-2 or size-3 item stays inside one 45-cell page.
|
||||
|
||||
Only then does it run `INSERT IGNORE` into the claim table synchronously. Only the request whose insert affected a row creates the items, into the cells checked before. A double click, a retry or another core finds the row already there and gets `claimed`. Each item gets an `MT_BP_CLAIM` item log with the hint `SEASON SLOT`, and the character is saved right away.
|
||||
|
||||
Known limits:
|
||||
- If the core crashes between the claim row and the item save, that reward is lost. The claim row and the item log are there for a GM to compensate.
|
||||
- While a warp is in flight, the window can show slightly less progress than is stored. Nothing is lost or counted twice.
|
||||
|
||||
## Protocol
|
||||
|
||||
```
|
||||
/mt_bp 1 info | 1 claim SLOT | 1 close
|
||||
MTBP1 season ID START END NOW COUNT
|
||||
MTBP1 mission SLOT TYPE SUB TARGET VALUE CLAIMED [VNUM COUNT]...
|
||||
MTBP1 final CLAIMED ALLDONE [VNUM COUNT]...
|
||||
MTBP1 end
|
||||
MTBP1 none no season running (or no valid file)
|
||||
MTBP1 progress SLOT VALUE pushed while the window is open
|
||||
MTBP1 done SLOT a mission was finished (always sent)
|
||||
MTBP1 claimed SLOT the reward is in the bag; a full info follows
|
||||
MTBP1 error loading|slot|claimed|incomplete|space|config|db|rate|invalid
|
||||
```
|
||||
|
||||
- `info` before the load is answered as soon as the load arrives.
|
||||
- A `done` for a mission that an event finished before the load is sent when the load arrives.
|
||||
- `info` and `claim` share a 300 ms gap per player (`rate`).
|
||||
- A wrong version, more than three tokens, or a token longer than 10 characters gets no answer.
|
||||
|
||||
## Setup
|
||||
|
||||
1. Apply `tools/battlepass/schema.sql` once.
|
||||
2. Copy `port_battlepass.tsv` to the locale base directory.
|
||||
3. Restart the cores with the new binary.
|
||||
|
||||
Without the file, every `/mt_bp` answers `none` and nothing is counted or written.
|
||||
@@ -1,6 +1,6 @@
|
||||
# PORT batch chest opening, v1
|
||||
|
||||
Date: 2026-10-15. AVA2-style batch opening of gift boxes (reference: AVA2 `ENABLE_MULTI_CHEST`, `/chest_drop`, `CHARACTER::OpenChest`). Source: `src/server/game/src/port_chest.h` (header-only, included from `cmd_general.cpp`), command `mt_chest` (cmd.cpp). It reuses the quiet-INFO hook (`m_portQuietInfo` / `m_portLastInfo`) added for the switchbot. No packet header, no DB schema, no char.h/item.h change.
|
||||
Date: 2026-10-15. AVA2-style batch opening of gift boxes (reference: AVA2 `ENABLE_MULTI_CHEST`, `/chest_drop`, `CHARACTER::OpenChest`). Source: `src/server/game/src/port_chest.h` (header-only, included from `cmd_general.cpp`), command `mt_chest` (cmd.cpp). It reuses the quiet-INFO hook (`m_portQuietInfo` / `m_portLastInfo`) (char.cpp; first added for the v1 switchbot, which no longer uses it). No packet header, no DB schema, no char.h/item.h change.
|
||||
|
||||
AVA2 rewrote the drop loop (`GiveItemFromSpecialItemGroupNew`, `AutoGiveItemChest`, cap 1000). That rewrite is not ported. Here every box goes through the original `CHARACTER::UseItem` → `UseItemEx` `ITEM_GIFTBOX` path, one box at a time, so the original checks, the `special_item_group` roll, gold/exp, `ItemLog` and consumption stay exactly as they are.
|
||||
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
# Level cap 120 + AVA2 105–120 content
|
||||
|
||||
The user decided on 2026-10-16:
|
||||
- raise the level cap from 105 to 120;
|
||||
- for 105–119, use a geometric exp curve that stays under the DWORD limit;
|
||||
- keep the level-delta exp/drop table (`aiPercentByDeltaLev*`) unchanged;
|
||||
- port AVA2's new maps and dungeons, with drops for their monsters.
|
||||
|
||||
## Why the cap alone is not enough
|
||||
|
||||
- **Exp curve.** On the newcibn locale `exp_table` = `exp_table_common`. Its 105–119 entries only moved from 2.33e9 to 2.49e9, so every level cost about the same as 104. AVA2 climbs to 2.05e10, but its table is DWORD, so from 107 on it wraps: 4.37e9 becomes about 7.5e7. That is not copied.
|
||||
- **No monsters.** On 203 the highest normal monster that spawns is level 103 (6006); bosses and stones top out at 105. `PERCENT_LVDELTA` applies to exp, drop chance and gold alike. A player 12 levels above the monster gets 20%, and 15 or more levels above gets 1%. So without new monsters, 105–120 cannot be levelled.
|
||||
- **AVA2 has the content.** 445 monster/stone vnums are AVA2-only, and 348 of them are level 100 or higher. AVA2 also re-levels 47 shared monsters, for example 2493 from 97 to 105 and 3091 from 105 to 115.
|
||||
|
||||
## Phases
|
||||
|
||||
| | What | Where |
|
||||
|---|---|---|
|
||||
| L1 | `MAX_LEVEL: 120`; exp table 105–119 = 2.33e9 → 4.2e9 geometric (constants.cpp); `player.exp` / `player_deleted.exp` → `INT UNSIGNED`. Points are already DWORD on the server, and the client reads exp unsigned. | server, `tools/server/level-120` (client repo) |
|
||||
| L2 | Monsters: AVA2-only rows from AVA2 `db/mob_proto.txt` (not `share/conf`, which is an older copy), zh names, client mob models/motions (Monster, Monster2, NPC2 packs), `npclist`. | server proto + client pack |
|
||||
| L3 | Maps, 100+ first: `plechito_desert_map_01` (101–115), `metin2_map_elemental_04_rework` (103–112), Yohara `eastplain_01–03` + `empirecastle` (85–125), `metin2_map_dawnmist_dungeon_01` (120). Server map dir + index + MAP_ALLOW on a core; client map pack, atlas, minimap, zh map names; reach them through the travel ring / NPC like AVA2's `anillotp` / `tp_npc1`. | both |
|
||||
| L4 | Dungeons: `flame` (107–120, our 351 retuned), `snow` (`n_snow_dungeon_01` 352, 100–120), `meleylair` (212, 113–123, level ≥ 110), `shipdefense` (`defensawe_hydra` 355, 100–120). They need quest functions we lack: `d.global_warp_all_to_base`, `d.mission_notice`, `d.track_update`, `d.spawn_mob_new`, `d.new_kill_all`, `game.check_event`, `npc.set_meley_hp`, `npc.set_protect_flag2`, `npc.set_protect_time`, `npc.get_protect_time`, `npc.set_statu_affect`, `npc.set_statu_clear_aff`, `npc.show_statu`, `npc.dead_by_vnum`. AVA2's `when X.chat.lc_quest("…")` and `lc_quest` strings must become zh literals for our qc. | both |
|
||||
| L5 | Drops: AVA2 gives only 8 of the new monsters drops (203 already has those groups), so the rest are designed in the client repo's `tools/server/ava2-maps/drops_maps.tsv` (tiers normal / elite / boss / stone / gold, plus per-map and per-vnum-range rows) and written by `make_drops_maps.py`. Every drop item must exist in item_proto first, otherwise the core won't boot. | server |
|
||||
| L6 | Test on the sbtest cluster, then deploy with the rest of feature/ava2-unlock (needs approval). | 203 |
|
||||
|
||||
Later, below 105 or separate systems: summer maps `a1/c1_summer`, `metin2_12zi_stage` (zodiac, C++), `kingdoomswar`, `battlefied`. The plechi dungeons (slime/duratus/gold/nightmare/troll/elephant) have maps but no quest in AVA2's quest_list, so they are skipped.
|
||||
|
||||
## Open
|
||||
|
||||
- Whether to take AVA2's new levels for the 47 shared monsters.
|
||||
- Which 203 core carries the new maps. The cores are i386 and each uses about 400 MB.
|
||||
|
||||
## Status
|
||||
|
||||
- L1 done on sbtest (2026-10-16). Exp table 106–120 in constants.cpp. The exp sum in `CHARACTER::PointChange(POINT_EXP)` is now 64-bit, as are the death exp-loss product (char_battle.cpp) and the quest reward check (questpc.cpp). Before that fix, 3.67e9 + 2e9 at level 119 wrapped to 1375032704. Tested with `/set exp` on [SA]Admin:
|
||||
- 105 → 106 at 2.33e9;
|
||||
- 3375032704 (> 2^31) saved to `player_sb.player` and survived `restart.sh`;
|
||||
- +2e9 at 119 → 120;
|
||||
- no more gain at 120.
|
||||
The live schema change and live `MAX_LEVEL: 120` are not applied.
|
||||
- L2/L3 on sbtest (2026-10-17): the 10 maps of `tools/server/ava2-maps/README.md` (client repo) are installed in channel5's own locale/data farm (`sbtest_locale.sh`) and reachable with `/warp x y` (global metres; `/goto #index` does not reach them). Hydra is moved from AVA2's 972800,153600 to 3276800,0, so AVA2 quest coordinates shift by (+2304000, −153600); its entry is `/warp 33089 116`. Mob models render.
|
||||
- Client fix found on the way: after `/warp`, a timer chat (`/bio status`, `/server_bonuses`) sent between the new socket coming online and the core's GC_PHASE reached the core's handshake phase and got the connection closed ("Handshake phase does not handle packet 3"). The client now leaves the "Game" phase on GC_WARP and drops chat outside it.
|
||||
- L5 on sbtest (2026-10-17): 99 drop groups appended (107 generated, the 8 existing kept). A kill test on plechito (`/m` + `/weaken all` + auto hunt) dropped the tier items, the lv115 armor, and the flame/hydra boss materials.
|
||||
- L4 on sbtest (2026-10-17): AVA2's snow / ship defence / Meley quests ported as `snow_dungeon`, `ShipDefense`, `MeleyDungeon` by the client repo's `tools/server/ava2-dungeons` (`make_quests.py` + `install.sh`, see its README). Server side: `port_ava2_dungeon.cpp` (the `d.*` / `npc.*` functions AVA2's quests call), `QUEST_ATTACK_EVENT` (`<vnum>.attack`, Meley's HP phases), the Meley and hydra HP helpers. `d.track_update`, `game.check_event` and the battle pass calls were dropped from the quests instead of ported. The game build is installed only as sbtest's `game.switchbot` (previous one kept as `game.switchbot.pre-l4`). Entry test on the Mac client (key + `/warp` to the NPC + quest dialog → solo → yes): all three dungeons warp in (352, 355, 212), the key is used, the dungeon timers and mob spawns start, and syserr shows no quest errors. Meley full run (2026-10-17, solo GM at level 120 with a temporary sbtest-only damage/HP buff quest, since removed): all 9 floors, the floor-10 chest, and the exit warp back to map 62 (5986,6573) in 837 s; the 3 h cooldown flag is written. Fixes found on the way: `char_battle.cpp` never lets a hit take a dragon statue (6230) below 1 HP, so only the quest's `npc.dead_by_vnum` kills it (AVA2 has the same stuck-lair bug on floor 8); the client's autohunt now skips a target that is hit but takes no damage for 4 s (it stays skipped for 60 s). The client's `mt_dungeon_timer` shows the AVA2 dungeon timer (boss portrait, floor/wave, countdown) in place of the minimap, plus the hydra mast HP bar.
|
||||
- Snow / ship / party runs (2026-10-17), with the fixes they needed:
|
||||
- QUEST_INFO desync: `SendQuestInfoPakcet` sent the header before the optional fields were added, so `qi.size` was short and the client read the rest as a new packet ("Unknown packet header: 212"). The fields are now built first. The client also takes the full size from the flags.
|
||||
- Hydra 6812 (KING, MAGIC) never took damage. The deck stops a player about 620 from its centre, and `battle_melee_attack` allowed only 300 (AVA2 600, still short of 620), so the server dropped every hit as VICTIM_FAR. For a non-PC victim of rank BOSS or higher the limit is now 800. The client gives a boss the 500 centre test of a huge race, like AVA2's `IsBoss()`.
|
||||
- Client autohunt: large targets (defending reach as body size, walk straight at a body in reach when the planner finds no path), escalating skip for a target it keeps stalling on, a new anchor after a teleport (snow floor changes move the player more than 2000), and the immune skip only counts an explicit 0-damage packet.
|
||||
- The snow driver used GM `/purge all` on floors 1/3/4 when a floor was still open after 300 s. This is a test accelerator for floors with 100+ mobs, not autohunt.
|
||||
- Party skill power crash: `CTableBySkill::GetSkillPowerByLevelFromType` indexed its table with `job * 2 + skill_group - 1` and only rejected skill_group 0. [SA]Admin has skill_group 50 (one live row has it too), so the party update event (`CParty::ComputeRolePoint`) crashed the core as soon as that character was in a party. Out-of-range skill groups and levels now return 0.
|
||||
- Results (sbtest, 2026-10-17, Mac client, autohunt):
|
||||
- Ship defence (test character): waves 1→3, the hydra dies, chest 9018 spawns, exit to CapeDragonHead in 450 s, the key is used.
|
||||
- Meley (test character): floors 1→10, the chest, exit to map 62 in 1362 s.
|
||||
- Snow ([SA]Admin): floors 1→10, Nemere dies, exit to map 61 in 3303 s. Floors 1/3/4 needed GM `/purge all` (see above). The quest's `item.remove()` takes the whole stack of seal keys 30331/30333 (same in AVA2), so the driver handed them out one at a time.
|
||||
- Party entry ([SA]Admin leads, Test joins): snow, ship and Meley all take both members in, and each member's key is used.
|
||||
- Deploy package: `/root/deploy-features/20261017-lv120` on 203 (`sh deploy.sh check|go|rollback`).
|
||||
- Follow-ups: client models/motions missing for the hydra chest (race 9018), `defensewave_hydra_boss` drop and minihydra `special_attack1`; autohunt is slow on floors with 200+ mobs; the new maps are reachable only by `/warp` (no travel NPC yet); the sash quest is not deployed; `new_quest_lv52` already raises `is_destination_village` Lua errors on live (questlib.lua's `dofile(GFquestlib.lua)` is commented out).
|
||||
@@ -0,0 +1,56 @@
|
||||
# 材料与消耗品 2000 叠放:实现与验收
|
||||
|
||||
更新时间:2026-10-27。协议 `mt20261030`。已完成双端开发、打包、CH5隔离验收及203正式部署,正式登录已开放。新旧协议不能混用,用户必须升级客户端。
|
||||
|
||||
## 规则与协议
|
||||
|
||||
`port_material_stack_policy.h` 已接入运行时。允许叠放且没有禁止叠放标记的 USE、AUTOUSE、MATERIAL、METIN、RESOURCE、BLEND、EXTRACT,以及实际加载的强化/Cube 配方材料,上限为2000;其他物品保留200。禁止叠放优先,非叠放奖励逐件创建,不修改 proto 标记。生产配置审查清单含854个物品编号,部署机保存 `material-catalogue-production.json`。
|
||||
|
||||
物品数量线路使用 uint16,内部数量及 item 存档使用32位;金币和累计奖励计算保持宽类型。槽位、商品条目数等字段未扩大。背包、仓库、商城仓库、交易、NPC/玩家商店及装备观察结构已经同步;离线商店原有数量为32位,保留该宽度。
|
||||
|
||||
合堆校验原始编号、动态标记、插槽、属性、完整69字节扩展状态及持久化属性锁;锁定或交易中物品拒绝合堆。拆分/丢弃/仓库拆分先完成新物品创建和元数据复制,失败时不扣源数量。属性锁读取失败时拒绝合堆或拆分。
|
||||
|
||||
客户端在登录游戏核心和选择角色前发送版本,服务端在登录/选角/物品加载前拒绝旧版或缺失版本,状态为 VERSION;新版登录页显示升级提示。四位拆分/出售输入与实际物品数量对应。
|
||||
|
||||
## 已通过的隔离验收
|
||||
|
||||
- 199/200/201/255/256/1999/2000 边界;满组拒绝、拆分1000、重新合并、丢弃256、2001非法输入。
|
||||
- 同时运行两个真实客户端,1744材料交易并退回,核对数量;交易后材料按既有规则进入强化材料专用背包。
|
||||
- 普通仓库2000/1744存取、部分拆分与合并、满组拒绝;商城仓库2000取回。
|
||||
- NPC商店购买一组2000,分两次出售256及1744;奖励4001按组发放,不截断。
|
||||
- 属性追加2000→1999,转属性2000→1999,自动洗练继续准确扣除并停止。
|
||||
- Cube配方从单组2000扣除512成功批量制作,再扣除256进行零成功配方,余量1232,产出仅为成功的2件。
|
||||
- game/db重启后数量一致;宽存档回退模式保留整组2000移动,限制新增长200,拆分失败不损失数量。
|
||||
- Mac Android模拟器实际登录,读取2000和256,拆分为两组1000再合并为2000;最终macOS .app真实登录读取2000及256并完成渲染。
|
||||
- 43项Cube回归、14项商店回归、材料规则与实际合堆/拆分元数据检查。旧测试桩的8位数量和过时接口已同步修正;测试边界替身不等于全部正式流程已联机验收。
|
||||
|
||||
## 上线与回退
|
||||
|
||||
`tools/material-stack/migrate.py` 迁移 item、item_orphan_quarantine、shop_item 数量列为 INT UNSIGNED,保持默认值/非空及索引,并比较行数、数量总和及包含全部字段的数据指纹。重复执行不缩窄或重写物品。item_award 已是32位。
|
||||
|
||||
`cluster.py` 按实际 DB_PORT 枚举进程和二进制,维护停服后备份数据库/配置/现役二进制,成套更新 game/db,先以验收账号白名单启动。生产CH1—CH4、auth、game99使用DB15000;CH5及测试auth使用隔离DB15040,不能只按频道编号判断部署范围。候选game/db必须配套重建libsql,不能沿用可能存在ABI不一致的预编译库。
|
||||
|
||||
上线后已有超过200的物品时,严禁回到旧二进制或缩窄数据库。`cluster.py fallback` 使用同一宽协议候选并设置 `PORT_MATERIAL_STACK_LEGACY_MODE=1`,只停止新增长,保留存量的读取、移动和扣除。
|
||||
|
||||
## 正式上线记录
|
||||
|
||||
- 正式14个game/auth核心与db成套更新;CH5隔离服两个活动核心与独立db同步更新。另一个未运行的隔离crosscore路径也指向新版;共19个配置二进制路径逐一核对SHA256。
|
||||
- 正式三个数量列完成迁移;item表245行/5300件、隔离清理表1行/1件、shop_item表325行/2912件,迁移前后相同,完整数据指纹相同。重复执行迁移验证通过。
|
||||
- 新建专用验收账号,正式背包合并/拆分、洗练扣除、仓库存取、game/db重启、CH1→CH2→CH1往返通过。旧原生客户端在角色加载前明确收到VERSION。
|
||||
- 正式原有245件物品逐ID核对,归属、位置、编号和数量全部不变;验收道具单独属于新建账号。
|
||||
- Mac上的Android模拟器安装最终APK后连接正式服:2000→1000+1000→2000,前后完整抽样数量一致。最终macOS.app在真实服务端读取2000和256并完成渲染;签名完整性检查通过。
|
||||
- 追加的满背包验收通过:Cube拒绝时材料和产出不变(本轮未逐笔核对金币);批量开箱拒绝时不扣宝箱;2001奖励落地后腾出空间拾取,总数2001;腾出空间后两箱产生4000道具,每组不超过2000。
|
||||
- 强化从专用背包的2000材料组准确扣1。修复了旧强化只查普通背包的问题,普通/卷轴强化共用先预检再扣除的材料流程;重复材料编号累计校验,材料不足或锁定时不部分扣除。
|
||||
- 批量开箱的客户端中文奖励提示已修复,最终实测4000奖励无编码异常。NPC商店2000买入/256与1744分次出售、玩家商店1744购买并交易退回、落地1000拾取合堆均通过。
|
||||
- 临时测试任务、配方覆盖、商店、满背包填充物已清理;正式和隔离集群的验收白名单已解除,保持新协议版本门槛。
|
||||
|
||||
部署与备份:203 `/root/deploy-features/20261026-stack2000/backup-production-20261027/`。发布进程、迁移结果、配置路径和校验结果保存为同目录上一级的 `release-opened-20261027.json`;私密账号文件不进入交付记录或Git。
|
||||
|
||||
服务端game SHA256:`3a89fa1e13c7f0fa0270bc30969438fe3103aa5ffdacb172b2f86fa71a387f20`。
|
||||
服务端db SHA256:`b23eb7e1de7fc94560848791c154b0f76301239386f8bf11fdcec9ab672c50e4`。
|
||||
|
||||
## 验收边界
|
||||
|
||||
离线商店原有 `PortOfflineShopEconomyReady()==false` 硬开关保持关闭,不能把未发生的离线购买记为联机通过。43项Cube、14项商店、10项宝箱界面回归和材料规则/元数据/强化扣料检查通过;替身边界和此前资源/Wiki回归失败不表示整个游戏完整回归全部通过。手工向旧item_award表写入超出单组上限的批量记录未作联机验收;本轮已验证正常2000仓库及4001游戏奖励的分组通路。
|
||||
|
||||
macOS包为本地ad-hoc签名,未做Developer ID公证。Android APK包含程序,资源沿用现有客户端。本轮最终APK在Mac模拟器完成正式服联机验收;手机中途断开,最后一次中文提示修复后的APK未能再次覆盖安装到真机,不能计为最终真机验收。
|
||||
@@ -0,0 +1,15 @@
|
||||
# AVA2 原生战令、百科查询与活动日历
|
||||
|
||||
使用原生 `uiBattlePassEx`、`uiWiki` / `WikiUI`、Worldard `uiDropItem` 与 `uiEventCalendarNew`,客户端原件哈希及平台适配见对应客户端 `docs/AVA2-NATIVE-SYSTEMS.md`。
|
||||
|
||||
- `/battle_pass info|activate CELL VNUM|reward|close` 使用当前战令赛季和原有领取主键,映射九种已接入的任务。原生模式任务完成自动发奖,满包待重试;最终奖励需点击。旧 `/mt_bp` 保留。SQL 使用配置的 PLAYER_SQL 数据库,不硬编码 player;不要把sbtest进度写入生产。
|
||||
- CG215(6字节)/GC220(114字节):子类型0打开、1反查怪物、6查询怪物掉落、7查询宝箱、8反查宝箱、9/10反查强化家族。GC子类型2打开、3行、4清空、5完成、6拒绝/超限错误。只读当前加载表,单次上限4096行。
|
||||
- `/event_manager info`:AVA2新日历原39号与经典SHOP_SIGN冲突,移到214号,5字节动态头和81字节事件记录。仅对客户端标记mt20261019以上下发新增二进制包。保持经典封包布局。
|
||||
- 日历和真实掉落读取同一个 `port_events.tsv`;UTC开始含、结束不含,并检查频道与帝国。月光宝箱映射AVA2事件8,圣诞袜映射扩展20。目前只接入这两种真实活动,其他活动不会因新窗口出现而自动生效。
|
||||
- 空文件不是有效排期;没有活动时使用 `MTCALENDAR 1` 加换行。没有文件或文件错误时明确显示不可用,不伪造活动。
|
||||
|
||||
测试:30组服务端功能脚本;原战令测试新增自动领奖/重复领取/满包/旧数据;新增 `tests/features/test_native_queries.py` 直接编译实际处理器,验证宽度、正反查、限流、超限、旧客户端与活动作用域。FreeBSD隔离构建及macOS/sbtest已联机验证。测试账号原有物品、任务和战令数据已备份恢复。
|
||||
|
||||
部署工具 `tools/native-systems/deploy.py`:`check`只读;`deploy --candidate PATH --sha256 HASH` 验证候选后备份、优雅停止正式game/auth、更换共享game、恢复13个核心和auth,db保持运行;`rollback --backup DIR` 恢复备份程序。回滚保留已经取得的进度/领取主键,避免再次支付奖励;不回退玩家经济数据。
|
||||
|
||||
203正式服已于2026-10-19 08:31:54(CEST,UTC+02)更新。game SHA256:a8d606ea88731cb5b7bffabbe8ddc78ef806205f6c8a352d78ba6d46a1c6b2f3。备份:`/root/backup-native-systems/20261019-083154`,auth、13个核心和原db运行,sbtest已恢复。生产排期初始化为空,不发布测试活动。首次优雅停止因换页超过55秒,旧程序未替换;旧核心正常退出后重新部署成功,等待窗口已延长至300秒。保留原motion accumulation警告,没有新增PORT_BP/查询/Lua错误。客户端必须同时更新可执行文件及ava2items/wiki资源包。
|
||||
@@ -1,6 +1,6 @@
|
||||
# PORT batch pickup, v1
|
||||
|
||||
AVA2-style batch pickup (reference: AVA2 `do_pickup_all`). One command picks up every ground item the character owns within the normal pickup distance, filtered by category. Source: `src/server/game/src/port_pickup.h`, command `mt_pickup` (cmd.cpp), throttle field `m_portPickupLastCommand` in char.h. It reuses the quiet-INFO hook (`m_portQuietInfo`) added for the switchbot. No packet header, no DB schema, no affect. AVA2's `HEADER_CG_ITEMS_PICKUP` packet and its premium automatic pickup (`AFFECT_AUTO_PICK_UP`, item 70002) are not ported.
|
||||
AVA2-style batch pickup (reference: AVA2 `do_pickup_all`). One command picks up every ground item the character owns within the normal pickup distance, filtered by category. Source: `src/server/game/src/port_pickup.h`, command `mt_pickup` (cmd.cpp), throttle field `m_portPickupLastCommand` in char.h. It reuses the quiet-INFO hook (`m_portQuietInfo`) (char.cpp; first added for the v1 switchbot, which no longer uses it). No packet header, no DB schema, no affect. AVA2's `HEADER_CG_ITEMS_PICKUP` packet and its premium automatic pickup (`AFFECT_AUTO_PICK_UP`, item 70002) are not ported.
|
||||
|
||||
## Rules
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ MTF1 end REQUEST ROW_COUNT
|
||||
MTF1 error REQUEST ERROR
|
||||
```
|
||||
|
||||
MASK: 1 mob drops, 2 chest preview, 4 own stats, 8 item sources, 16 dungeon snapshots, 32 scheduled calendar, 64 switchbot (separate `/mt_switchbot` / `MTSB1` protocol, see FEATURE-SWITCHBOT.md), 256 world bosses (see FEATURE-BOSS-TRACK.md). The current mask is 511. Unknown capability bits are ignored; unknown versions are rejected. Capability advertises the query implementation; missing quest/config can still return unsupported/schedule_unavailable. The client negotiates before business queries; old servers time out to unsupported, not an empty result.
|
||||
MASK: 1 mob drops, 2 chest preview, 4 own stats, 8 item sources, 16 dungeon snapshots, 32 scheduled calendar, 64 was the v1 switchbot (`/mt_switchbot` / `MTSB1`) and is no longer advertised, because the AVA2 switchbot uses its own packets (FEATURE-SWITCHBOT.md), 256 world bosses (see FEATURE-BOSS-TRACK.md). The current mask is 959. Unknown capability bits are ignored; unknown versions are rejected. Capability advertises the query implementation; missing quest/config can still return unsupported/schedule_unavailable. The client negotiates before business queries; old servers time out to unsupported, not an empty result.
|
||||
|
||||
Each drop/chest/source page contains at most 8 rows, with consecutive absolute indices. TOTAL is capped at 4096; stats are one complete bounded snapshot (currently the named keys in kPortStats, less than 128). Client commits only a complete, matching begin/rows/end sequence. Unknown/stale request IDs cannot overwrite the current selection. Each line is bounded below 512 bytes; rows contain IDs and values, not server-provided script/names/markup.
|
||||
|
||||
@@ -39,7 +39,7 @@ Rules:
|
||||
|
||||
| RULE | Meaning of MIN/MAX and weights |
|
||||
|---|---|
|
||||
| 0 | rank common drop; MIN/MAX = eligible player levels |
|
||||
| 0 | rank common drop (common_drop_item.txt) or level-range common drop (common_drop_new.txt, MIN/MAX clipped to monster level ±20); MIN/MAX = eligible player levels |
|
||||
| 1 | independent monster drop group; weight is original configured threshold, not final probability |
|
||||
| 2 | weighted kill group; MIN = original kill-per-drop parameter; weight/group total describe the conditional selection |
|
||||
| 3 | level group; MIN = player minimum level; original denominator 1,000,000 |
|
||||
|
||||
+70
-74
@@ -1,93 +1,89 @@
|
||||
# PORT switchbot (automatic attribute change), v1
|
||||
# PORT switchbot (自动洗练), AVA2 port
|
||||
|
||||
AVA2-style automatic rerolling (reference: AVA2 `new_switchbot.cpp` / `uiswitchbot.py`), rebuilt so that the server stays authoritative and the existing reroll path is unchanged. Source: `src/server/game/src/port_switchbot.h`, command `mt_switchbot` (cmd.cpp), quiet-INFO hook in `CHARACTER::ChatPacket` (char.cpp), fields in char.h. No attribute lock, no DB schema, no packet header, no P2P transfer.
|
||||
AVA2 `ENABLE_SWITCHBOT` ported 1:1 (reference: AVA2 `game/src/new_switchbot.{h,cpp}`, client `PythonSwitchbot.cpp` and `root/uiswitchbot.py`). Classes, API, packets, the window and the 0.1 s roll speed are AVA2's. It replaces the v1 `/mt_switchbot` chat protocol (`MTSB1`, query capability bit 64). That command and its lock verb are gone.
|
||||
|
||||
## Rules
|
||||
Source:
|
||||
- `src/server/game/src/port_switchbot.{h,cpp}`: `SwitchbotHelper`, `CSwitchbot`, `CSwitchbotManager`, `PortSwitchbotBoot`.
|
||||
- `common/length.h`: `SWITCHBOT = 7` in `EWindows` (GROUND is now 8), `SWITCHBOT_SLOT_COUNT 6 / _REAL 5 / ALTERNATIVE_COUNT 2 / NORM_ATTR_NUM 5`, `TItemPos::IsSwitchbotPosition`.
|
||||
- `common/tables.h`: the switchbot tables.
|
||||
|
||||
- Each roll calls the original `CHARACTER::UseItem(scroll cell, target cell)`. All checks, probabilities, the addon handling, `ItemLog CHANGE_ATTRIBUTE` and scroll consumption are the manual path's. That includes the 71151/76023 restriction (weapon/body, level limit <= 40) and the GM quest flag. A roll counts only when exactly one scroll of the chosen vnum was consumed. Otherwise the bot stops with `rejected` and resends the original INFO line once.
|
||||
- The per-roll INFO lines (`属性已变更`) are held back while the bot calls UseItem (`m_portQuietInfo`); all other chat types pass through.
|
||||
- Only `ITEM_USE / USE_CHANGE_ATTRIBUTE` scrolls are accepted. `USE_CHANGE_ATTRIBUTE2` has no handler in this server's UseItemEx.
|
||||
- Target item: inventory cell, not costume, attribute set != -1, at least one attribute, not equipped or in an exchange. It is bound by item ID.
|
||||
- One bot per character. One roll every 250 ms (`PASSES_PER_SEC(1)/4`). Limit 1..1000 rolls.
|
||||
- Targets: up to 2 alternatives, each 1..5 distinct (apply, minimum). An alternative matches when every target is found among the 5 normal attribute slots with value >= minimum. Any matching alternative stops the bot (AVA2 CheckItem semantics). The bot also checks before it starts, so an item that already matches consumes nothing.
|
||||
- Allowed targets are the applies the attribute table can roll for this item's set, excluding the item's base proto applies. The maximum is `lValues[min(maxLevelBySet,5)-1]`. Items with an addon type also allow skill damage 30 / normal hit 65, the item_addon bounds.
|
||||
- Every tick re-checks the state and stops with a reason. This replaces AVA2's hooks into every move/trade path.
|
||||
- Character gone, VID changed (logout or warp) or descriptor lost: the bot is erased silently.
|
||||
- `busy`: dead, warping, `!CanHandleItem()`, exchange, own shop, shop, safebox or cube open.
|
||||
- `item_gone`: the item is missing, has another owner, has left the inventory window or is equipped.
|
||||
- `no_scroll`, `limit`, `matched`, `rejected`, `stopped`.
|
||||
- No offline rolling. Rolls stop when the player leaves, and every completed roll has already been saved and logged by the original path.
|
||||
## Window and items
|
||||
|
||||
## Protocol (CHAT_TYPE_COMMAND, version 1)
|
||||
- Items placed in the `SWITCHBOT` window (cells 0..4) are kept in `m_pointsInstant.pSwitchbotItems` and saved with `window = 'SWITCHBOT'`. The db loads, saves and deletes that window with SAFEBOX and DRAGON_SOUL_INVENTORY (three queries in `ClientManagerPlayer.cpp`).
|
||||
- At boot (game cores only), `PortSwitchbotBoot` adds `'SWITCHBOT'` to the `player.item.window` enum if it is missing. The deploy SQL carries the same ALTER.
|
||||
- `MoveItem` only accepts `SwitchbotHelper::IsValidItem` items into the window. That is AVA2's list: weapons, rings, and armour (body, head, shield, wrist, shoes, necklace, earrings, talisman). Cell 5 is rejected. The move hooks send:
|
||||
- `switchbot_error active` when the item is moved out of a running slot;
|
||||
- `switchbot_error invalid` when the item is not valid for the switchbot.
|
||||
- Drop, give, exchange and safebox refuse switchbot cells: the item has to go back to the inventory first. Shops sell only from the inventory.
|
||||
|
||||
Requests (250 ms per-character throttle; tokens <= 10 chars, <= 30 tokens):
|
||||
## Rolling
|
||||
|
||||
```
|
||||
/mt_switchbot 1 attrs CELL
|
||||
/mt_switchbot 1 start CELL SCROLL_VNUM LIMIT N1 (APPLY MIN)*N1 [N2 (APPLY MIN)*N2]
|
||||
/mt_switchbot 1 stop
|
||||
/mt_switchbot 1 status
|
||||
/mt_switchbot 1 lock CELL SLOT (attribute lock, see FEATURE-ATTR-LOCK.md)
|
||||
```
|
||||
- `CSwitchbot::SwitchItems` runs every 0.1 s (`c_fSpeed`). Each active slot takes one switcher per pass.
|
||||
- A slot finishes when one configured alternative fully matches within the first 5 attributes (AVA2 `CheckItem`). An alternative that isn't configured counts as a match.
|
||||
- Deviations from AVA2 (also listed at the top of `port_switchbot.cpp`):
|
||||
- Cell 5 (AVA2's hidden switcher cell) is never used. Switchers come from the inventory, skipping stacks that are being exchanged, locked or sold in the player's shop.
|
||||
- Which switcher is used follows the manual path:
|
||||
- a talisman takes only 71302;
|
||||
- a weapon or body armour with no level limit above 40 takes 71151 / 76023 first;
|
||||
- everything else takes 71084, then 39028.
|
||||
- A slot whose item has no attributes stops instead of rolling.
|
||||
- Every roll is written to ItemLog as `SWITCHBOT`, with the item id as the hint.
|
||||
- End and stop messages are server commands, which the client turns into localized text:
|
||||
- `switchbot_end <slot>`
|
||||
- `switchbot_stop noattr <slot>`
|
||||
- `switchbot_stop nochanger <slot>`
|
||||
|
||||
Replies:
|
||||
The slot is 0-based. AVA2 sent the locale ids `864` / `865` with slot+1.
|
||||
- Leaving the core deletes the table once it has been sent on. A logout that unregisters the last active slot also stops the event.
|
||||
- The attribute list has two pseudo sets after `ATTRIBUTE_SET_MAX_NUM`: 8 = rings (`port_rings.cpp`) and 9 = talismans (`port_pendant.cpp`).
|
||||
- Warp: `CHARACTER::WarpSet` sends the table over P2P (`HEADER_GG_SWITCHBOT 31`, `TPacketGGSwitchbot`) before `GC_WARP`. The target core keeps it, and `EnterGame` re-registers the slots whose item is still there and restarts the event.
|
||||
|
||||
```
|
||||
MTSB1 attrs CELL VNUM COUNT
|
||||
MTSB1 attr INDEX APPLY MAX (COUNT rows, INDEX 0..COUNT-1)
|
||||
MTSB1 attrs_end CELL COUNT
|
||||
MTSB1 state ACTIVE CELL VNUM ROLLS LIMIT SCROLL SCROLLS REASON
|
||||
MTSB1 lock CELL VNUM MASK (after every attrs_end, and as the reply to lock)
|
||||
MTSB1 error VERB CODE
|
||||
```
|
||||
## Protocol
|
||||
|
||||
`REASON` is one of `running matched limit no_scroll item_gone rejected busy stopped idle`. Error codes:
|
||||
Header numbers, subheaders and field order are AVA2's. The structs are `pack(1)`, and their sizes are pinned with `static_assert` in `port_switchbot.cpp` and in the client (`Packet.h`, `PythonSwitchbot.h`).
|
||||
|
||||
| Code | Meaning |
|
||||
| --- | --- |
|
||||
| `rate` | throttled |
|
||||
| `invalid` | malformed |
|
||||
| `item` | no item in that cell |
|
||||
| `equipped` | equipped or in an exchange |
|
||||
| `no_attr` | the item cannot be rerolled |
|
||||
| `scroll` | the scroll is missing or the wrong type |
|
||||
| `target` | the apply is not allowed, above the maximum or a duplicate |
|
||||
| `running` | this character already has a bot |
|
||||
| `busy` | see the busy states above |
|
||||
| Packet | Header | Layout |
|
||||
| --- | --- | --- |
|
||||
| CG | 171, dynamic | `BYTE header, int size, BYTE subheader, BYTE slot` (7) + `START`: `TSwitchbotAttributeAlternativeTable[2]` (15 each) / `STOP` |
|
||||
| GC | 171, dynamic | same 7-byte head + `UPDATE`: `TSwitchbotTable` (220) / `UPDATE_ITEM`: `TSwitchbotUpdateItem` (40: slot, vnum, count, 3 sockets, 7 attributes) / `SEND_ATTRIBUTE_INFORMATION`: `TSwitchbottAttributeTable[n]` (9) |
|
||||
| GG | 31 | `TPacketGGSwitchbot` (223) |
|
||||
|
||||
A state line is pushed after every roll and when the bot stops. When the reason is `item_gone`, CELL and VNUM are 0.
|
||||
CG is registered in `packet_info.cpp` with `Set(..., true)` and GG with `Set(..., false)`. The 40250 base packets are unchanged.
|
||||
|
||||
Capability: the MTF1 cap mask advertises bit 64 (63 -> 127). Clients that don't know it ignore it, and the client also times out to "unsupported" against old servers.
|
||||
**Version gate.** The client is built with `LOCALE_SERVICE_EUROPE`, so every locale sends `CG_CLIENT_VERSION2`. The new client's timestamp is `1215955205 mt20261016`. 203 is a europe locale and checks the version with `atoi`, which still reads 1215955205. Before `EnterGame` sends anything, it checks `SwitchbotHelper::IsClientSupported`, which looks for `mt<date>` in the timestamp with date >= `PORT_SWITCHBOT_CLIENT_VERSION`. An older client sends `1215955205` only and gets no GC_SWITCHBOT packet. It can't fill the window either. (The non-EU branch sends `mt20261016`.)
|
||||
|
||||
## Verification
|
||||
|
||||
- `tests/features/test_switchbot.py` compiles the production header against stubs of the UseItem/ChatPacket contract. It covers the allowed list (proto exclusion, set filter, level cap, addon), validation, two alternatives, the already-matched start, quiet INFO, limit, `no_scroll`, `rejected` (INFO resent once), `item_gone`, `busy`, stop/status/idle and silent erase on a VID change.
|
||||
- `tests/features/test_queries.py` was updated for cap mask 127.
|
||||
- FreeBSD build of the whole game target on 203 in `/root/metin2-features-dev` (BINDIR=GAMEDIR=`/root/metin2-features-dev/bin`), log `/root/metin2-features-dev/switchbot-build.log`, with no warnings from the new code. The live `/usr/metin2` binary was not replaced and no service was restarted.
|
||||
- Live test on 2026-10-15. 203 ran an extra core (`/usr/metin2/server/channel5/first`: CHANNEL 5, PORT 13040, P2P 14040, MAP_ALLOW 1 21 41) with its `game` symlinked to the isolated binary. The macOS native client (`--live-server 192.168.21.203:11000:13040`) drove [SA]Admin, sword 279, scroll 71084:
|
||||
- `attrs` returned 14 rows for the sword (18 for armor 12019), received complete.
|
||||
- limit 10 → `limit` after 10 rolls. State lines arrived about every 0.24 s (about 4 rolls/s); the scroll count fell 200 → 190.
|
||||
- Two alternatives with minimum 1 → `matched` after 18 rolls.
|
||||
- Start on an item that already matches → `matched` with 0 rolls and no scroll used.
|
||||
- Moving the item 33 → 90 mid-run → the run continued, the state line reported cell 90, and `stop` → `stopped`.
|
||||
- Client exit mid-run (8 rolls) → `log.log` stopped at the exit second. The CHANGE_ATTRIBUTE row count (72 = 10+18+12+12+12+8) stayed the same 20 s later.
|
||||
- Opening a private shop mid-run → `busy` about 1 s after the shop opened (6 rolls). The character needs a shop bundle (50200 or 71049); without one `OpenMyShop` returns before setting `m_pkMyShop`, so no shop opens and the bot correctly keeps rolling.
|
||||
- 76014 with 6 scrolls and limit 10 → `no_scroll` after 6 rolls.
|
||||
- 71151 on the level-90 sword (the original path allows limit level <= 40) → `rejected` with 0 rolls and the scroll kept.
|
||||
- Every roll wrote one `CHANGE_ATTRIBUTE` row. The core's syserr shows no new errors; the `new_quest_lv52` LUA_ERROR also appears on the live cores.
|
||||
- Live acceptance on CH1 (13000) after the deploy, sword 279 and scroll 71084:
|
||||
- two alternatives with minimum 1 → `matched` after 2 rolls;
|
||||
- three attributes at the maximum with limit 10 → `limit` after 10 rolls, scrolls 157 → 147;
|
||||
- `stop` after 1 s → `stopped` after 4 rolls.
|
||||
- Not done yet: Android device validation.
|
||||
- `tests/features/test_switchbot.py` checks:
|
||||
- the window enum, headers, subheaders, struct fields and sizes, on both the server and the client;
|
||||
- the window hooks, the P2P hand-over, the boot ALTER and the switcher choice;
|
||||
- the version gate;
|
||||
- that `/mt_switchbot` is gone.
|
||||
- Client: `metin2-client/tests/wiki/test_switchbot.py` checks that the window script is AVA2 `uiswitchbot.py` verbatim, plus its glue.
|
||||
- Live-tested on 203 on 2026-10-16 with the Mac client and a script driver. Weapons ran on channel5 against the live db. Rings and talismans ran on the isolated sbtest cluster (`metin2-client/tools/server/sbtest`), which has the unlocked protos. Results:
|
||||
- Move in, drag back, start/stop, auto-finish on target, refusal to move out while active, refusal of an invalid item; about 12 rolls/s, ItemLog matches the switchers consumed.
|
||||
- Rings roll from the ring pool with 71084; talismans roll from the talisman pool with 71302 only.
|
||||
- Relog keeps the items (from the db cache, and from MySQL after a restart). The bot stops and the targets are cleared, as in AVA2 (`UnregisterItem` on logout).
|
||||
- Same-core map change (1 → 21 → 1) keeps rolling with the targets kept; it only pauses during the warp.
|
||||
- Cross-core map hand-over was not tested in that initial run; see the later dual-core acceptance below.
|
||||
- The initial 2026-10-16 deployment note is superseded: on 2026-10-17 the live binary was confirmed to contain CSwitchbotManager/switchbot_end and the SWITCHBOT DB window. This does not deploy the later sbtest changes or prove live cross-channel operation.
|
||||
|
||||
## Production deployment
|
||||
## 2026-10-18 补充验收
|
||||
|
||||
- 2026-10-15 14:51, approved by the user. The 203 live cores now run main `3b7e158` (`game` sha256 `0d798ec0…`, the binary the channel-5 core was tested with). The db binary is unchanged. Live `/usr/metin2/src` was at `4577d86`, so the deploy also shipped `1a36719` (query protocol and calendar drop gates; the gates stay inert without `port_events.tsv`).
|
||||
- Package `/root/deploy-features/20261015-features` (`deploy.sh check|go|rollback`, `SHA256SUMS`). The previous `game`/`db` are in `/root/backup-bin/20261015-145122` (recorded in `LAST_BACKUP`), and the replaced `/usr/metin2/src` files are in `src-before/`. `sh deploy.sh rollback` restores both.
|
||||
- The first `go` stopped at `rebuild.sh stop_server` ("server still running" after about 38 s, cores still exiting) before any backup or copy; the second `go` succeeded. `start.sh` was answered with `1`, which starts only CH1 and game99, so CH2–CH4 were started afterwards with each `run.sh` in the `start.sh` order. The channel-5 test core was restarted too, giving the pre-deploy layout of 14 cores plus db and auth. The new syserr entries contain only the existing `new_quest_lv52` LUA_ERROR (present since 2026-09-21).
|
||||
独立 sbtest 的 QA1017,武器起初无类型9;所有备选均只设释放速度9≥1。未手动停止,实际消耗13个71084后,最终含 (9,10),active=0、finished=1,约1.315秒。客户端证据 switchbot-cast-natural.json。跨频道换线仍未验收,不能将本项扩大解释为全部洗练场景通过。
|
||||
|
||||
## Open items
|
||||
## 双核心地图传送验收
|
||||
|
||||
- Attribute lock: done separately in `FEATURE-ATTR-LOCK.md` (table `mt_item_attr_lock`, applied inside `CItem::ChangeAttribute`, so every bot roll keeps the locked slots). The bot's own item cannot be locked or unlocked while it rolls.
|
||||
- In 203 `player.item_proto`, 71084, 71151, 76014, 76023 and 39028 are USE/USE_CHANGE_ATTRIBUTE (subtype 18); 71302 (the AVA2 talisman scroll) does not exist. The bot accepts any `USE_CHANGE_ATTRIBUTE` scroll and leaves item rules to the original path.
|
||||
2026-10-18:临时测试核心13040/P2P14040载入地图1/62,独立13041/P2P14041载入地图61,均为频道5、仅连接db15040。原生追踪传送1→61→62,两次跨核心日志确认;两边均 active=1、两个备选目标相同,第4条锁定属性 (4,6) 不变,71084总数2069→1811→1595。已停止洗练、退回物品并解锁。
|
||||
|
||||
验收后恢复 channel5/first 原CONFIG(逐字节核对),关闭辅助核心并重启sbtest,QA1017离线位置恢复主城。生产game仍为40335e41…,正式服配置未改。日志和配置备份在 /root/deploy-features/20261018-ava2-parity/crosscore;不向版本库提交CONFIG或凭据。
|
||||
|
||||
此项仅验证同频道跨核心地图传送。该次测试时客户端换线仍使用退出重登;后续原生跨频道验收见下节。
|
||||
|
||||
## 原生跨频道续洗验收
|
||||
|
||||
2026-10-18,sbtest临时频道5:13040和频道6:13050均仅加载地图1。按 AVA2 启用的 do_cmd→MoveChannel、MoveChannelDialog 完成5→6→5,无额外人工查询辅助,active全程为1、两套目标表相同,第4条锁定属性 (4,6) 保持,71084总数1034→976→919。往返后主动停止,武器返回背包159格并解锁,数据库锁表记录为0。
|
||||
|
||||
同频道、未开放频道、倒计时取消和任务选择中拒绝均通过;另测换到6后退出重登仍在6/auth11040,回5后关闭辅助核心,列表只剩5且拒绝旧目标6。详见 FEATURE-AVA2-NATIVE-CHANNEL.md。恢复两个原CONFIG并关闭辅助核心,sbtest已重启;正式服game仍40335e41…,本轮换线没有正式部署,Android真机按用户要求暂停。
|
||||
|
||||
2026-10-18 后续:聊天链接和活动洗练槽已补锁定快照并通过sbtest联机验证;见 `FEATURE-ATTR-LOCK-SNAPSHOTS.md`。经典七属性封包保持不变,正式服部署与Android真机验收仍待做。
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
# PORT VIP card
|
||||
|
||||
A card extends all seven original premium services of the account. 40250 has the services but no in-game way to grant them. Source: `src/server/game/src/port_premium.h`, the hook in `CHARACTER::UseItem` (char_item.cpp), the enter-game refresh in input_login.cpp, `CHARACTER::PortSetPremiumTime` (char.h) and `/mt_vip` (cmd_general.cpp, cmd.cpp). Item data (size, flags, names, shop): metin2-client `tools/server/vip-card`.
|
||||
|
||||
## Services
|
||||
|
||||
`account.account` holds one end time per service. The game keeps them in `m_aiPremiumTimes` and shows affect `AFFECT_PREMIUM_START + i` (500..506) as the icon.
|
||||
|
||||
| i | Premium | Column | Effect on newcibn |
|
||||
|---|---|---|---|
|
||||
| 0 | `PREMIUM_EXP` | `silver_expire` | monster exp ×1.2 × `mob_exp_buyer`/100 (char_battle.cpp) |
|
||||
| 1 | `PREMIUM_ITEM` | `gold_expire` | item drop rate |
|
||||
| 2 | `PREMIUM_SAFEBOX` | `safebox_expire` | safebox size 3 (input_db.cpp) |
|
||||
| 3 | `PREMIUM_AUTOLOOT` | `autoloot_expire` | gold goes straight to the bag (char_battle.cpp) |
|
||||
| 4 | `PREMIUM_FISH_MIND` | `fish_mind_expire` | fishing |
|
||||
| 5 | `PREMIUM_MARRIAGE_FAST` | `marriage_fast_expire` | marriage love points |
|
||||
| 6 | `PREMIUM_GOLD` | `money_drop_rate_expire` | gold drop rate |
|
||||
|
||||
## Cards
|
||||
|
||||
| Vnum | Days |
|
||||
|---|---|
|
||||
| 38001 | 7 |
|
||||
| 38002 | 30 |
|
||||
|
||||
Both are unused `ITEM_NONE` rows in 40250. `PortVipUseCard` runs in `UseItem` after the sex check, before any type handling, so the item type does not matter.
|
||||
|
||||
When a card is used:
|
||||
|
||||
1. The card is refused, and not consumed, in two cases:
|
||||
- the player used a card or `/mt_vip` less than 1 s ago (`rate`);
|
||||
- for any service, the remaining time plus the card would exceed 400 days (`full`). The `int` end times stay far below 2038.
|
||||
2. Otherwise one card is consumed, with an `MT_VIP_CARD` item log whose hint is the number of days.
|
||||
3. One `UPDATE` moves every column to `GREATEST(UNIX_TIMESTAMP(col), UNIX_TIMESTAMP()) + days × 86400`. A service that has expired restarts from now; a running one is extended.
|
||||
|
||||
## Freshness
|
||||
|
||||
Auth reads the columns only at login and passes them to the db core's `CLoginData`. Every later player load, such as a warp or a core change, fills `TPlayerTable.aiPremiumTimes` from that login-time copy. So after a card, and on every enter-game, the game reads the row itself.
|
||||
|
||||
`PortVipRefresh` handles this:
|
||||
- It queues `SELECT UNIX_TIMESTAMP(col)... FROM account.account WHERE id=` through `DBManager::FuncQuery`. That is the same ordered queue and connection as the card's `UPDATE`, so the read sees the update.
|
||||
- The answer finds the player again by PID and checks the account ID; if the player has left, nothing happens.
|
||||
- For each service whose end changed, it sets `m_aiPremiumTimes[i]`, then either adds the affect with the remaining duration or removes it if the service has expired.
|
||||
- It logs `PORT_VIP: <name> type <i> end <unix>`.
|
||||
|
||||
The db core is not changed.
|
||||
|
||||
## Protocol
|
||||
|
||||
```
|
||||
/mt_vip 1 status ask for the remaining time
|
||||
MTVIP1 times R0 R1 R2 R3 R4 R5 R6 remaining seconds per service (0 = none), PREMIUM_EXP .. PREMIUM_GOLD
|
||||
MTVIP1 added VNUM DAYS a card was consumed; a times line follows once the row is read back
|
||||
MTVIP1 error CODE rate full invalid
|
||||
```
|
||||
|
||||
- `status` and card use share the 1 s throttle per player.
|
||||
- A wrong version, or more than three tokens, gets no answer; an old client never sends one.
|
||||
- The client (metin2-client `src/platform/ScriptLib/VipScript.inc`, module `mt_vip`) treats a `status` with no answer within 3 s as a server without the feature.
|
||||
|
||||
## Exp bonus
|
||||
|
||||
On newcibn the premium exp branch multiplies by 1.2 and then by `GetMobExpRate`, which returns event flag `mob_exp_buyer` (default 100). `/e mob_exp_buyer 167` gives 1.2 × 1.67 ≈ 2.0, that is +100 %. Event flags live in `player.quest` (pid 0) and every core shares them, so the flag is set once, by a GM, at deploy.
|
||||
|
||||
## Verification
|
||||
|
||||
- `tests/features/test_vip.py` checks the wiring:
|
||||
- the command entry is at the end of `cmd_info`;
|
||||
- the include is outside the `__AUCTION__` block;
|
||||
- the hook sits between the sex check and the summon-item block;
|
||||
- the refresh runs after the login affect loop.
|
||||
- It also compiles the production header against a stub account table, the ordered SQL queue and the affects. It covers:
|
||||
- a 7-day card, the read-back and the icons;
|
||||
- the gap refusal, then a 30-day card stacked onto the current end;
|
||||
- the 400-day cap: no card consumed, no query;
|
||||
- other items left untouched;
|
||||
- the enter-game refresh over stale values;
|
||||
- a service expired by hand, and the `status` command;
|
||||
- a player who leaves before the answer, and a missing account row.
|
||||
- Live test, channel5 (2026-10-15), Admin account with all expire values reset to 0:
|
||||
- 38002 (30 days) set all seven columns to now + 30 days, added affects 500..506 and returned `times 2592000…`.
|
||||
- Two 38001 used through the inventory right-click, 2 s apart, extended to 44 days.
|
||||
- A same-map `/warp` reloaded the player with the login-time 30 days. The refresh logged the seven `PORT_VIP` corrections to 44 days, and the panel showed "剩余 43 天 23 小时" for every service.
|
||||
- Earlier, with premium, autoloot gold went straight to the bag; without it, the gold stayed on the ground.
|
||||
|
||||
## Production deployment
|
||||
|
||||
- Deployed 2026-10-16 (server clock 2026-10-15 20:44) with the user's approval, 0 players online. Server main 69e335b, which includes the `/m` command-prefix fix 3590a06. Game sha256 `8d0bf9f0…` (the channel-5 tested binary); db unchanged.
|
||||
- Package: `/root/deploy-features/20261016-vip` (metin2-client `tools/server` at main 32372c2a).
|
||||
- Binary backup: `/root/backup-bin/20261015-204352`.
|
||||
- Rollback: `sh /root/deploy-features/20261016-vip/deploy.sh rollback`. The data backups are in `/root/backup-vip-card/20261015-204353` and `/root/backup-npcshop/item_mall-20261015-204353`.
|
||||
- `/usr/metin2/src` was synced with the six changed files.
|
||||
- `deploy.sh go` stops every core, then installs the game. It runs `vip-card/install.sh` and the item-mall shop install while the db core is down, since db reads `item_proto.txt` at boot. Then it starts db alone, waits for port 15000, and starts auth, CH1–CH4, game99 and channel5: 14 game, 1 db, 1 auth.
|
||||
- At boot the db core rewrites `player.item_proto` from the txt, with `locale_name` `Noname` for every item; names come from `item_names.txt`. Both cards: size 1, flag 8196, antiflag 256.
|
||||
- `/e mob_exp_buyer 167` was set from CH1. Every core logged `QUEST eventflag mob_exp_buyer 167`, and the row is in `player.quest` (pid 0).
|
||||
- CH1 (13000) acceptance:
|
||||
- `/m 101` spawned and `/purge` removed it.
|
||||
- 9010 (map a1) lists 38001/38002. A buyer from another empire pays the original triple price (shop.cpp), 15 000 000 for a 7-day card.
|
||||
- Two 38001 bought: each takes one cell (a shop buy never merges), and dragging one onto the other gives a stack of 2.
|
||||
- Using one: `added 38001 7`, then `times 4400055…`. The panel shows 50 days 22 hours for all seven services.
|
||||
- syserr only has the pre-existing `new_quest_lv52` LUA_ERROR.
|
||||
+4
-12
@@ -1,5 +1,5 @@
|
||||
CC=clang-devel
|
||||
CXX=clang++-devel
|
||||
CC ?= clang-devel
|
||||
CXX ?= clang++-devel
|
||||
|
||||
PLATFORM = $(shell file /bin/ls | cut -d' ' -f3 | cut -d'-' -f1)
|
||||
BSD_VERSION = $(shell uname -v 2>&1 | cut -d' ' -f2 | cut -d'.' -f1)
|
||||
@@ -11,19 +11,16 @@ default: libthecore libpoly libgame liblua libsql libserverkey game db
|
||||
|
||||
libthecore: .
|
||||
@touch $@/src/Depend
|
||||
$(MAKE) -C $@/src dep
|
||||
$(MAKE) -C $@/src clean
|
||||
$(MAKE) -C $@/src
|
||||
|
||||
libpoly: .
|
||||
@touch $@/Depend
|
||||
$(MAKE) -C $@ dep
|
||||
$(MAKE) -C $@ clean
|
||||
$(MAKE) -C $@
|
||||
|
||||
libgame: .
|
||||
@touch $@/src/Depend
|
||||
$(MAKE) -C $@/src dep
|
||||
$(MAKE) -C $@/src clean
|
||||
$(MAKE) -C $@/src
|
||||
|
||||
@@ -33,28 +30,23 @@ liblua: .
|
||||
|
||||
libsql: .
|
||||
@touch $@/Depend
|
||||
$(MAKE) -C $@ dep
|
||||
$(MAKE) -C $@ clean
|
||||
$(MAKE) -C $@
|
||||
|
||||
libserverkey: .
|
||||
@touch $@/Depend
|
||||
$(MAKE) -C $@ dep
|
||||
$(MAKE) -C $@ clean
|
||||
$(MAKE) -C $@
|
||||
|
||||
game: .
|
||||
@touch $@/src/Depend
|
||||
$(MAKE) -C $@/src dep
|
||||
$(MAKE) -C $@/src clean
|
||||
# $(MAKE) -C $@/src limit_time
|
||||
# $(MAKE) -C $@/src
|
||||
$(MAKE) -C $@/src
|
||||
|
||||
db: .
|
||||
@touch $@/src/Depend
|
||||
$(MAKE) -C $@/src dep
|
||||
$(MAKE) -C $@/src clean
|
||||
# $(MAKE) -C $@/src
|
||||
$(MAKE) -C $@/src
|
||||
|
||||
all:
|
||||
@echo "--------------------------------------"
|
||||
|
||||
@@ -33,6 +33,21 @@ public:
|
||||
|
||||
/// 발렌타인 사랑의 팬던트
|
||||
static const bool IsLovePendant(DWORD vnum) { return 71145 == vnum; }
|
||||
|
||||
#if defined(ENABLE_ATTR_6TH_7TH) || defined(__BL_67_ATTR__)
|
||||
static DWORD Get67MaterialVnum(const int iLevelLimit)
|
||||
{
|
||||
if (iLevelLimit >= 0 && iLevelLimit <= 45)
|
||||
return 39070;
|
||||
if (iLevelLimit >= 46 && iLevelLimit <= 75)
|
||||
return 39071;
|
||||
if (iLevelLimit >= 76 && iLevelLimit <= 105)
|
||||
return 39072;
|
||||
if (iLevelLimit >= 106 && iLevelLimit <= 120)
|
||||
return 39073;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
class CMobVnumHelper
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
#pragma pack(push,1)
|
||||
struct Ava2ShopRequest {
|
||||
uint8_t operation; uint32_t account,player,product,count,expectedVnum; int64_t expectedTotal; char token[33],name[25],ip[16];
|
||||
};
|
||||
struct Ava2ShopReply { uint32_t account,player,size; };
|
||||
struct Ava2ShopProduct {
|
||||
uint32_t id,vnum; int64_t price; int32_t top; uint8_t discount;
|
||||
int32_t expiry,added; int64_t sold; int32_t weekly,monthly,stock;
|
||||
};
|
||||
struct Ava2ShopLog {
|
||||
uint32_t account; char name[25],date[21]; int32_t time; char ip[16];
|
||||
uint32_t product,vnum; int32_t count; int64_t price;
|
||||
};
|
||||
#pragma pack(pop)
|
||||
static_assert(sizeof(Ava2ShopRequest)==103,"itemshop request");
|
||||
static_assert(sizeof(Ava2ShopProduct)==49,"native TIShopData");
|
||||
static_assert(sizeof(Ava2ShopLog)==90,"native TIShopLogData");
|
||||
|
||||
inline bool Ava2ShopTotal(int64_t unit,uint32_t count,uint8_t discount,int64_t& total) {
|
||||
if(unit<0 || unit>1000000000000LL || count<1 || count>20 || discount>100)return false;
|
||||
total=unit*int64_t(count)*(100-discount)/100;return true;
|
||||
}
|
||||
@@ -0,0 +1,153 @@
|
||||
#pragma once
|
||||
#include "cube_recipe.h"
|
||||
#include "economy.h"
|
||||
#include <array>
|
||||
#include <functional>
|
||||
|
||||
// Candidate DB-side batch contract. Not a client packet or permission to mutate
|
||||
// a live actor. A DB coordinator must first establish the matching durable fence.
|
||||
namespace PortCube {
|
||||
struct Item {
|
||||
PortEconomy::Reward value;
|
||||
uint16_t cell=0;
|
||||
bool usable=true;
|
||||
};
|
||||
struct Batch {
|
||||
uint32_t account=0,player=0;
|
||||
uint64_t epoch=0,gold=0;
|
||||
std::string owner,token;
|
||||
Recipe recipe;
|
||||
unsigned attempts=0;
|
||||
std::vector<Item> inventory;
|
||||
// Factory-created templates with reserved, never-reused IDs. No item rows
|
||||
// have been created yet; count=1 is replaced only by successful output.
|
||||
std::vector<PortEconomy::Reward> rewards;
|
||||
};
|
||||
inline bool Identity(const std::string& s) {
|
||||
if(s.size()!=32||s==std::string(32,'0'))return false;
|
||||
return std::all_of(s.begin(),s.end(),[](char c){return (c>='0'&&c<='9')||(c>='a'&&c<='f');});
|
||||
}
|
||||
inline bool Validate(const Batch& b) {
|
||||
Recipe recipe=b.recipe;
|
||||
if(!b.account||!b.player||!b.epoch||!Identity(b.owner)||!Identity(b.token)||
|
||||
b.gold>uint64_t(PortEconomy::GoldLimit)||!Normalize(recipe)||recipe.id>MaxRecipes||recipe.copy||
|
||||
!b.attempts||b.attempts>MaxAttempts||b.inventory.size()>225)return false;
|
||||
// Only canonical normalized recipes are accepted. No uninitialized copy
|
||||
// semantics, duplicate requirements or reordered NPCs enter the journal.
|
||||
if(recipe.npcs!=b.recipe.npcs||recipe.materials.size()!=b.recipe.materials.size()||
|
||||
!std::equal(recipe.materials.begin(),recipe.materials.end(),b.recipe.materials.begin(),
|
||||
[](const Material& a,const Material& c){return a.vnum==c.vnum&&a.count==c.count;}))return false;
|
||||
const uint64_t maximum=uint64_t(recipe.rewardCount)*b.attempts;
|
||||
const unsigned stacks=recipe.stackable?unsigned((maximum+1999)/2000):unsigned(maximum);
|
||||
if(b.rewards.size()!=stacks||stacks>100)return false;
|
||||
std::set<uint32_t> ids;int last=-1;
|
||||
for(const auto& i:b.inventory) {
|
||||
if(!i.value.id||!i.value.vnum||!i.value.count||i.value.count>2000||i.cell>=225||
|
||||
int(i.cell)<=last||!ids.insert(i.value.id).second)return false;
|
||||
last=i.cell;
|
||||
}
|
||||
for(const auto& r:b.rewards)if(!r.id||r.vnum!=recipe.reward||r.count!=1||!ids.insert(r.id).second)return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Explicit little-endian bounded codec, never sizeof(Batch) or padded structs.
|
||||
// It is deliberately separate from the legacy client/game protocol.
|
||||
struct Writer {
|
||||
std::string data;
|
||||
void n(uint64_t value,unsigned bytes){for(unsigned i=0;i<bytes;++i){data+=char(value&255);value>>=8;}}
|
||||
void s(const std::string& text){n(text.size(),2);data+=text;}
|
||||
void reward(const PortEconomy::Reward& r){
|
||||
n(r.id,4);n(r.vnum,4);n(r.count,4);
|
||||
for(auto x:r.sockets)n(uint32_t(x),4);
|
||||
for(unsigned i=0;i<7;++i){n(r.types[i],1);n(uint16_t(r.values[i]),2);}
|
||||
for(auto x:r.extra)n(x,1);
|
||||
}
|
||||
void items(const std::vector<Item>& rows){n(rows.size(),2);for(const auto& i:rows){reward(i.value);n(i.cell,2);n(i.usable,1);}}
|
||||
};
|
||||
struct Reader {
|
||||
const std::string& data;size_t at=0;bool ok=true;
|
||||
explicit Reader(const std::string& value):data(value){}
|
||||
uint64_t n(unsigned bytes){
|
||||
if(!ok||bytes>8||at>data.size()||bytes>data.size()-at){ok=false;return 0;}
|
||||
uint64_t value=0;for(unsigned i=0;i<bytes;++i)value|=uint64_t(uint8_t(data[at++]))<<(8*i);return value;
|
||||
}
|
||||
std::string s(unsigned maximum){const auto count=n(2);if(!ok||count>maximum||count>data.size()-at){ok=false;return {};}
|
||||
std::string value=data.substr(at,size_t(count));at+=size_t(count);return value;}
|
||||
PortEconomy::Reward reward(){
|
||||
PortEconomy::Reward r;r.id=uint32_t(n(4));r.vnum=uint32_t(n(4));r.count=uint32_t(n(4));
|
||||
for(auto& x:r.sockets){uint32_t bits=uint32_t(n(4));std::memcpy(&x,&bits,4);}
|
||||
for(unsigned i=0;i<7;++i){r.types[i]=uint8_t(n(1));uint16_t bits=uint16_t(n(2));std::memcpy(&r.values[i],&bits,2);}
|
||||
for(auto& x:r.extra)x=uint8_t(n(1));return r;
|
||||
}
|
||||
std::vector<Item> items(){
|
||||
const auto count=n(2);if(count>225){ok=false;return {};}
|
||||
std::vector<Item> rows;for(unsigned i=0;i<count&&ok;++i){Item item;item.value=reward();item.cell=uint16_t(n(2));auto usable=n(1);if(usable>1)ok=false;item.usable=usable!=0;rows.push_back(item);}return rows;
|
||||
}
|
||||
};
|
||||
inline std::string Encode(const Batch& b) {
|
||||
Writer w;w.n(1,4);w.n(b.account,4);w.n(b.player,4);w.n(b.epoch,8);w.n(b.gold,8);w.s(b.owner);w.s(b.token);
|
||||
const auto& r=b.recipe;w.n(r.id,4);w.n(r.reward,4);w.n(r.rewardCount,4);w.n(r.gold,4);w.n(r.percent,1);w.n(r.stackable,1);w.n(r.copy,1);w.s(r.category);
|
||||
w.n(r.npcs.size(),1);for(auto n:r.npcs)w.n(n,4);
|
||||
w.n(r.materials.size(),1);for(auto m:r.materials){w.n(m.vnum,4);w.n(m.count,4);}
|
||||
w.n(b.attempts,1);w.items(b.inventory);w.n(b.rewards.size(),1);for(const auto& item:b.rewards)w.reward(item);
|
||||
return w.data;
|
||||
}
|
||||
inline bool Decode(const std::string& data,Batch& out) {
|
||||
if(data.size()>40000)return false;
|
||||
Reader r(data);Batch b;if(r.n(4)!=1)return false;
|
||||
b.account=uint32_t(r.n(4));b.player=uint32_t(r.n(4));b.epoch=r.n(8);b.gold=r.n(8);b.owner=r.s(32);b.token=r.s(32);
|
||||
auto& recipe=b.recipe;recipe.id=uint32_t(r.n(4));recipe.reward=uint32_t(r.n(4));recipe.rewardCount=uint32_t(r.n(4));recipe.gold=uint32_t(r.n(4));recipe.percent=unsigned(r.n(1));
|
||||
auto stack=r.n(1),copy=r.n(1);if(stack>1||copy>1)return false;recipe.stackable=stack!=0;recipe.copy=copy!=0;recipe.category=r.s(24);
|
||||
auto count=r.n(1);if(count>128)return false;for(unsigned i=0;i<count&&r.ok;++i)recipe.npcs.push_back(uint32_t(r.n(4)));
|
||||
count=r.n(1);if(count>5)return false;for(unsigned i=0;i<count&&r.ok;++i){Material m;m.vnum=uint32_t(r.n(4));m.count=uint32_t(r.n(4));recipe.materials.push_back(m);}
|
||||
b.attempts=unsigned(r.n(1));b.inventory=r.items();count=r.n(1);if(count>100)return false;for(unsigned i=0;i<count&&r.ok;++i)b.rewards.push_back(r.reward());
|
||||
if(!r.ok||r.at!=data.size()||!Validate(b)||Encode(b)!=data)return false;out=std::move(b);return true;
|
||||
}
|
||||
struct Proto {unsigned size=0;bool stackable=false;};
|
||||
using Lookup=std::function<Proto(uint32_t)>;
|
||||
struct Settlement {
|
||||
std::string result="invalid";
|
||||
unsigned successes=0;
|
||||
uint64_t fee=0;
|
||||
std::vector<Take> takes;
|
||||
std::vector<Item> awards;
|
||||
};
|
||||
inline Settlement SettlePlan(const Batch& b,const std::string& rolls,const Lookup& lookup) {
|
||||
Settlement s;if(!Validate(b)||rolls.size()!=b.attempts)return s;
|
||||
for(unsigned char roll:rolls){if(roll<1||roll>100)return s;s.successes+=roll<=b.recipe.percent;}
|
||||
const auto reward=lookup(b.recipe.reward);
|
||||
if(reward.size<1||reward.size>3||reward.stackable!=b.recipe.stackable){s.result="item_proto";return s;}
|
||||
std::vector<Input> inputs;for(const auto& i:b.inventory)inputs.push_back({i.value.id,i.value.vnum,i.value.count,i.cell,i.usable});
|
||||
const auto p=Preview(b.recipe,b.attempts,inputs,int64_t(b.gold));
|
||||
if(!p.valid)return s;
|
||||
if(!p.materialsOK){s.result="materials_missing";return s;}
|
||||
if(!p.goldOK){s.result="gold_missing";return s;}
|
||||
auto inventory=b.inventory;
|
||||
auto occupy=[&](const std::vector<Item>& rows,std::array<bool,225>& used)->bool {
|
||||
for(const auto& i:rows) {
|
||||
if(!i.value.count)continue;const auto proto=lookup(i.value.vnum);
|
||||
if(proto.size<1||proto.size>3||(!proto.stackable&&i.value.count!=1)||(i.cell%45)/5+proto.size>9)return false;
|
||||
for(unsigned j=0;j<proto.size;++j){const unsigned at=i.cell+5*j;if(at>=225||used[at])return false;used[at]=true;}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
std::array<bool,225> used={};
|
||||
if(!occupy(inventory,used)){s.result="inventory_invalid";return s;}
|
||||
for(const auto& take:p.takes)for(auto& i:inventory)if(i.value.id==take.id)i.value.count-=take.count;
|
||||
used.fill(false);if(!occupy(inventory,used))return s;
|
||||
uint64_t remaining=uint64_t(b.recipe.rewardCount)*s.successes;unsigned next=0;
|
||||
while(remaining) {
|
||||
unsigned cell=225;
|
||||
for(unsigned at=0;at<225;++at) {
|
||||
if((at%45)/5+reward.size>9)continue;bool free=true;
|
||||
for(unsigned j=0;j<reward.size;++j)if(used[at+5*j])free=false;
|
||||
if(free){cell=at;break;}
|
||||
}
|
||||
if(cell==225){s.awards.clear();s.result="capacity_full";return s;}
|
||||
Item item;item.value=b.rewards[next++];item.value.count=uint32_t(std::min(remaining,uint64_t(reward.stackable?2000:1)));item.cell=uint16_t(cell);
|
||||
for(unsigned j=0;j<reward.size;++j)used[cell+5*j]=true;
|
||||
remaining-=item.value.count;s.awards.push_back(item);
|
||||
}
|
||||
s.result="ok";s.fee=p.gold;s.takes=p.takes;return s;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
#pragma once
|
||||
#include "cube_handshake.h"
|
||||
namespace PortCube {
|
||||
class CraftFlow {
|
||||
public:
|
||||
enum Stage {Idle,WaitPrepare,WaitExecute,Complete,Held};
|
||||
private:
|
||||
Handshake identity;Stage stage=Idle;CraftReceipt receipt;
|
||||
public:
|
||||
Stage State()const{return stage;}
|
||||
const CraftReceipt& Receipt()const{return receipt;}
|
||||
bool MayRetry()const{return stage==WaitPrepare||stage==WaitExecute;}
|
||||
bool Start(const Handshake& bound,bool cleanFrozen,bool sourceAcknowledged) {
|
||||
auto f=bound;f.message=Message::Prepare;f.status=Status::None;f.body.clear();
|
||||
if(stage!=Idle||!cleanFrozen||!sourceAcknowledged||!ValidHandshake(f))return false;identity=std::move(f);stage=WaitPrepare;return true;
|
||||
}
|
||||
Handshake Request()const{auto f=identity;f.message=stage==WaitExecute?Message::Execute:Message::Prepare;return f;}
|
||||
void Invalidate(){if(stage!=Idle)stage=Held;}
|
||||
bool Answer(const Handshake& f,const Batch& b,const Lookup& lookup) {
|
||||
if(b.account!=identity.account||b.player!=identity.player||b.epoch!=identity.epoch||b.owner!=identity.owner||b.token!=identity.token)return false;
|
||||
if(!ValidHandshake(f)||f.message!=Message::CraftAnswer||!SameIdentity(identity,f)||f.cookie!=identity.cookie||!MayRetry()&&stage!=Complete)return false;
|
||||
if(f.status==Status::Held)return MayRetry();
|
||||
if(f.status==Status::Prepared){if(stage==WaitPrepare){stage=WaitExecute;return true;}return stage==WaitExecute;}
|
||||
if(f.status!=Status::Complete||stage==WaitPrepare)return false;
|
||||
CraftReceipt result;if(!DecodeCraftReceipt(f.body,result)||!ValidateCraftReceipt(b,result,lookup))return false;
|
||||
if(stage==Complete){if(EncodeCraftReceipt(receipt)==f.body)return true;stage=Held;return false;}
|
||||
receipt=std::move(result);stage=Complete;return true; // never authorizes local assets, saves, ACK or thaw
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
#pragma once
|
||||
#include "cube_batch.h"
|
||||
|
||||
namespace PortCube {
|
||||
// Transport-independent correlation core. The runtime adapter must bind session
|
||||
// to the actual game peer/character generation and not accept it from a client.
|
||||
class Drain {
|
||||
std::string identity;
|
||||
uint64_t session=0,mainEpoch=0,asyncEpoch=0;
|
||||
unsigned pass=0;
|
||||
bool asyncDone=false,failed=false;
|
||||
public:
|
||||
bool Start(const Batch& batch,uint64_t ownerSession,uint64_t main,uint64_t async) {
|
||||
if(!identity.empty()||!Validate(batch)||!ownerSession)return false;
|
||||
identity=Encode(batch);session=ownerSession;mainEpoch=main;asyncEpoch=async;return true;
|
||||
}
|
||||
// Return 1 only for the FIRST main barrier: adapter must enqueue the second
|
||||
// main FIFO barrier and the async FIFO barrier after processing that callback.
|
||||
// Numbered passes prevent a duplicate first callback completing the drain.
|
||||
unsigned Main(const Batch& b,uint64_t sourceSession,unsigned number,bool error) {
|
||||
if(identity!=Encode(b)||sourceSession!=session||number!=pass+1||number>2)return 0;
|
||||
failed|=error;pass=number;return pass==1?1:2;
|
||||
}
|
||||
bool Async(const Batch& b,uint64_t sourceSession,bool error) {
|
||||
if(identity!=Encode(b)||sourceSession!=session||pass<1||asyncDone)return false;
|
||||
failed|=error;asyncDone=true;return true;
|
||||
}
|
||||
bool Matches(const Batch& b,uint64_t sourceSession)const{return !identity.empty()&&identity==Encode(b)&&sourceSession==session;}
|
||||
bool Complete()const{return pass==2&&asyncDone;}
|
||||
bool Clean(uint64_t main,uint64_t async)const{return Complete()&&!failed&&main==mainEpoch&&async==asyncEpoch;}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
#pragma once
|
||||
#include "cube_store.h"
|
||||
#include "cube_drain.h"
|
||||
#include "cube_gold_intent.h"
|
||||
#include "cube_owner_types.h"
|
||||
|
||||
namespace PortCube {
|
||||
// DB-side lifecycle, not an actor-freeze implementation. Only a trusted runtime
|
||||
// coordinator may call these methods after binding the session and all owners.
|
||||
template<class DB> class FenceStore {
|
||||
DB& db;Lookup lookup;
|
||||
using Rows=PortEconomy::Rows;
|
||||
static std::string N(uint64_t n){return std::to_string(n);}
|
||||
static std::string X(const std::string& s){return "X'"+PortEconomy::Hex(s.data(),s.size())+"'";}
|
||||
bool Q(const std::string& sql,Rows& rows){return db.Query(sql,rows)&&!db.warnings;}
|
||||
bool Run(const std::string& sql){Rows rows;return Q(sql,rows);}
|
||||
bool Change(const std::string& sql){return Run(sql)&&db.affected==1;}
|
||||
struct Guard {DB& db;~Guard(){db.Rollback();}};
|
||||
bool Lock(const Batch& b,Rows& rows) {
|
||||
if(!Run("INSERT INTO port_economy_account_lock(account) VALUES("+N(b.account)+") ON DUPLICATE KEY UPDATE account=VALUES(account)")||
|
||||
!Q("SELECT account FROM port_economy_account_lock WHERE account="+N(b.account)+" FOR UPDATE",rows)||rows.size()!=1)return false;
|
||||
return Q("SELECT account,epoch,owner,request,phase,body,image,drain_state FROM port_cube_fences WHERE pid="+N(b.player)+" FOR UPDATE",rows);
|
||||
}
|
||||
bool Same(const Batch& b,const Rows& rows)const {
|
||||
return rows.size()==1&&rows[0].size()==8&&rows[0][0]==N(b.account)&&rows[0][1]==N(b.epoch)&&rows[0][2]==b.owner&&rows[0][3]==b.token&&rows[0][5]==Encode(b);
|
||||
}
|
||||
static bool Signed(const std::string& s,int64_t low,int64_t high,int64_t& out) {
|
||||
if(s.empty())return false;const bool negative=s[0]=='-';uint64_t n=0;
|
||||
if(!PortEconomy::Number(negative?s.substr(1):s,n,uint64_t(negative?-low:high)))return false;
|
||||
out=negative?-int64_t(n):int64_t(n);return out>=low&&out<=high&&std::to_string(out)==s;
|
||||
}
|
||||
bool Image(const Batch& b,std::string& image) {
|
||||
Rows rows;uint64_t gold=0;
|
||||
if(!Q("SELECT gold FROM player WHERE id="+N(b.player)+" AND account_id="+N(b.account)+" FOR UPDATE",rows)||rows.size()!=1||rows[0].size()!=1||!PortEconomy::Number(rows[0][0],gold,PortEconomy::GoldLimit))return false;
|
||||
std::string columns="id,vnum,count,pos";for(unsigned i=0;i<3;++i)columns+=",socket"+N(i);
|
||||
for(unsigned i=0;i<7;++i)columns+=",attrtype"+N(i)+",attrvalue"+N(i);columns+=",port_extra";
|
||||
if(!Q("SELECT "+columns+" FROM item WHERE owner_id="+N(b.player)+" AND window='INVENTORY' AND pos<225 ORDER BY pos,id FOR UPDATE",rows)||rows.size()>225)return false;
|
||||
std::vector<Item> items;std::set<uint32_t> ids;std::array<bool,225> used={};int last=-1;
|
||||
for(const auto& row:rows) {
|
||||
if(row.size()!=22)return false;
|
||||
Item i;uint64_t n=0;int64_t signedValue=0;
|
||||
auto number=[&](unsigned field,uint64_t max)->bool {return PortEconomy::Number(row[field],n,max);};
|
||||
if(!number(0,UINT32_MAX)||!n)return false;i.value.id=uint32_t(n);
|
||||
if(!number(1,UINT32_MAX)||!n)return false;i.value.vnum=uint32_t(n);
|
||||
if(!number(2,2000)||!n)return false;i.value.count=uint32_t(n);
|
||||
if(!number(3,224))return false;i.cell=uint16_t(n);
|
||||
if(int(i.cell)<=last||!ids.insert(i.value.id).second)return false;last=i.cell;
|
||||
for(unsigned j=0;j<3;++j){if(!Signed(row[4+j],INT32_MIN,INT32_MAX,signedValue))return false;i.value.sockets[j]=int32_t(signedValue);}
|
||||
for(unsigned j=0;j<7;++j){if(!number(7+2*j,255))return false;i.value.types[j]=uint8_t(n);if(!Signed(row[8+2*j],INT16_MIN,INT16_MAX,signedValue))return false;i.value.values[j]=int16_t(signedValue);}
|
||||
if(row[21].size()!=69)return false;std::memcpy(i.value.extra,row[21].data(),69);
|
||||
const auto proto=lookup(i.value.vnum);if(proto.size<1||proto.size>3||(!proto.stackable&&i.value.count!=1)||(i.cell%45)/5+proto.size>9)return false;
|
||||
for(unsigned j=0;j<proto.size;++j){const unsigned cell=i.cell+5*j;if(cell>=225||used[cell])return false;used[cell]=true;}
|
||||
items.push_back(i);
|
||||
}
|
||||
Writer w;w.n(gold,8);w.items(items);image=std::move(w.data);return true;
|
||||
}
|
||||
public:
|
||||
enum Result { Retry, Refused, Done };
|
||||
FenceStore(DB& database,Lookup proto):db(database),lookup(std::move(proto)){}
|
||||
// cachedIds must include ALL owned dirty item IDs captured by the DB adapter
|
||||
// before eviction, not merely the normal-inventory recipe inputs.
|
||||
Result Begin(const Batch& b,const std::vector<uint32_t>& cachedIds,const std::function<bool(bool)>& ownership={}) {
|
||||
if(!Validate(b)||cachedIds.size()>4096)return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;
|
||||
if(Same(b,rows))return !ownership||ownership(true)?Done:Refused; // never invent missing ownership on replay
|
||||
if(!rows.empty()) {
|
||||
uint64_t previous=0;if(rows.size()!=1||rows[0].size()!=8||rows[0][4]!="RELEASED"||rows[0][3]==b.token||!PortEconomy::Number(rows[0][1],previous)||b.epoch<=previous)return Refused;
|
||||
}
|
||||
if(!Q("SELECT token FROM port_economy_pending WHERE pid="+N(b.player)+" FOR UPDATE",rows))return Retry;if(!rows.empty())return Refused;
|
||||
if(!Q("SELECT token FROM port_cube_requests WHERE token='"+b.token+"' FOR UPDATE",rows))return Retry;if(!rows.empty())return Refused;
|
||||
// The drain itself can survive a restart before Prepare. Reserve every
|
||||
// reward ID now, not only after RNG preparation, so boot cannot reuse it.
|
||||
for(const auto& reward:b.rewards) {
|
||||
if(!Q("SELECT id FROM item WHERE id="+N(reward.id)+" UNION ALL SELECT id FROM port_economy_custody WHERE id="+N(reward.id)+" UNION ALL SELECT id FROM port_economy_item_reservations WHERE id="+N(reward.id),rows))return Retry;
|
||||
if(!rows.empty())return Refused;
|
||||
if(!Change("INSERT INTO port_economy_item_reservations(id,request) VALUES("+N(reward.id)+",'"+b.token+"')"))return Retry;
|
||||
}
|
||||
std::set<uint32_t> ids;
|
||||
for(auto id:cachedIds){if(!id)return Refused;ids.insert(id);}
|
||||
for(const auto& i:b.inventory)ids.insert(i.value.id);for(const auto& i:b.rewards)ids.insert(i.id);
|
||||
if(!Q("SELECT id FROM item WHERE owner_id="+N(b.player)+" AND window NOT IN ('MALL','SAFEBOX') FOR UPDATE",rows))return Retry;
|
||||
if(rows.size()>4096)return Refused;
|
||||
for(const auto& row:rows){uint64_t id=0;if(row.size()!=1||!PortEconomy::Number(row[0],id,UINT32_MAX)||!id)return Retry;ids.insert(uint32_t(id));}
|
||||
const auto body=Encode(b);
|
||||
if(!Run("DELETE FROM port_cube_fences WHERE pid="+N(b.player)+" AND phase='RELEASED'")||
|
||||
!Change("INSERT INTO port_cube_fences(pid,account,epoch,owner,request,phase,body,image,drain_state) VALUES("+N(b.player)+","+N(b.account)+","+N(b.epoch)+",'"+b.owner+"','"+b.token+"','DRAINING',"+X(body)+",X'',0)"))return Retry;
|
||||
for(auto id:ids)if(!Change("INSERT INTO port_cube_item_fences(id,pid,epoch,request) VALUES("+N(id)+","+N(b.player)+","+N(b.epoch)+",'"+b.token+"')"))return Retry;
|
||||
if(ownership&&!ownership(false))return Refused;
|
||||
return db.Commit()?Done:Retry;
|
||||
}
|
||||
Result FinishDrain(const Batch& b,const Drain& drain,uint64_t session,uint64_t main,uint64_t async,bool stillOwner) {
|
||||
if(!Validate(b)||!drain.Matches(b,session)||!drain.Complete())return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;if(!Same(b,rows))return Refused;
|
||||
const char* phase=stillOwner&&drain.Clean(main,async)?"FROZEN":"ABORTED";
|
||||
if(rows[0][4]==phase&&rows[0][7]==(std::string(phase)=="FROZEN"?"1":"2"))return Done;
|
||||
if(rows[0][4]!="DRAINING")return Refused;
|
||||
if(!Change("UPDATE port_cube_fences SET phase='"+std::string(phase)+"',drain_state="+(phase==std::string("FROZEN")?"1":"2")+" WHERE pid="+N(b.player)+" AND phase='DRAINING'"))return Retry;
|
||||
return db.Commit()?Done:Retry;
|
||||
}
|
||||
Result AbortUnprepared(const Batch& b) {
|
||||
if(!Validate(b))return Refused;BatchStore<DB> ready(db,lookup);
|
||||
if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;if(!Same(b,rows))return Refused;
|
||||
if(rows[0][4]=="ABORTED"&&rows[0][7]=="2")return Done;
|
||||
if(rows[0][4]!="FROZEN"||rows[0][7]!="1")return Refused;
|
||||
if(!Q("SELECT token FROM port_cube_requests WHERE token='"+b.token+"' FOR UPDATE",rows))return Retry;
|
||||
if(!rows.empty())return Refused; // an ambiguous prepare must be queried, not cancelled blindly
|
||||
if(!Change("UPDATE port_cube_fences SET phase='ABORTED',drain_state=2 WHERE pid="+N(b.player)+" AND phase='FROZEN'")||!db.Commit())return Retry;
|
||||
return Done;
|
||||
}
|
||||
Result Recover(uint32_t account,uint32_t player,Batch& batch,std::string& phase,std::string& image) {
|
||||
batch={};phase.clear();image.clear();if(!account||!player)return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Q("SELECT account,epoch,owner,request,phase,body,image,drain_state FROM port_cube_fences WHERE pid="+N(player)+" AND account="+N(account)+" FOR UPDATE",rows))return Retry;
|
||||
if(rows.empty())return Refused;
|
||||
if(rows.size()!=1||rows[0].size()!=8||!Decode(rows[0][5],batch)||batch.account!=account||batch.player!=player||!Same(batch,rows)||rows[0][6].size()>40000)return Retry;
|
||||
const std::set<std::string> states={"DRAINING","FROZEN","ABORTED","RESYNC","RELEASED"};
|
||||
const auto& stage=rows[0][4];const auto& drained=rows[0][7];
|
||||
if(!states.count(stage)||(stage=="DRAINING"&&drained!="0")||(stage=="FROZEN"&&drained!="1")||(stage=="ABORTED"&&drained!="2")||((stage=="RESYNC"||stage=="RELEASED")&&drained!="1"&&drained!="2"))return Retry;
|
||||
phase=stage;image=rows[0][6];return Done;
|
||||
}
|
||||
Result Resync(const Batch& b,std::string& image,const std::function<bool(const std::string&)>& ownership={}) {
|
||||
image.clear();if(!Validate(b))return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;if(!Same(b,rows))return Refused;
|
||||
const auto phase=rows[0][4],drained=rows[0][7],saved=rows[0][6];
|
||||
if(!ownership){const int owner=OwnerReleaseStatus(db,b);if(owner<0)return Retry;if(!owner)return Refused;}
|
||||
if(phase!="ABORTED"&&phase!="FROZEN"&&phase!="RESYNC")return Refused;
|
||||
if(!Q("SELECT state FROM port_cube_requests WHERE token='"+b.token+"' AND account="+N(b.account)+" AND pid="+N(b.player)+" FOR UPDATE",rows))return Retry;
|
||||
if(drained!="1"&&drained!="2")return Refused;
|
||||
if((drained=="2"&&!rows.empty())||(drained=="1"&&(rows.size()!=1||rows[0].size()!=1||rows[0][0]!="DONE")))return Refused;
|
||||
{const int clear=GoldIntentsStatus(db,b);if(clear<0)return Retry;if(!clear)return Refused;}
|
||||
std::string current;if(!Image(b,current))return Retry;
|
||||
if(ownership&&!ownership(current))return Refused;
|
||||
if(ownership&&phase=="RESYNC"&&saved!=current)return Refused; // never replace an owner's previously issued image
|
||||
if(!Run("UPDATE port_cube_fences SET phase='RESYNC',image="+X(current)+" WHERE pid="+N(b.player))||!db.Commit())return Retry;
|
||||
image=std::move(current);return Done;
|
||||
}
|
||||
// ACK is the exact canonical image, not an FNV hash or a timeout. The game
|
||||
// adapter must verify it has applied that image to this still-frozen owner.
|
||||
Result Release(const Batch& b,const std::string& acknowledged,const std::function<bool(bool)>& ownership={}) {
|
||||
if(!Validate(b)||acknowledged.empty()||acknowledged.size()>40000)return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;if(!Same(b,rows)||rows[0][6]!=acknowledged)return Refused;
|
||||
if(!ownership){const int owner=OwnerReleaseStatus(db,b);if(owner<0)return Retry;if(!owner)return Refused;}
|
||||
if(rows[0][4]=="RELEASED")return !ownership||ownership(true)?Done:Refused;
|
||||
if(rows[0][4]!="RESYNC")return Refused;
|
||||
{const int clear=GoldIntentsStatus(db,b);if(clear<0)return Retry;if(!clear)return Refused;}
|
||||
std::string current;if(!Image(b,current))return Retry;if(current!=acknowledged)return Refused;
|
||||
// Trusted coordinator callback shares this account transaction. It must
|
||||
// validate current ownership and atomically archive/retire the lease.
|
||||
if(ownership&&!ownership(false))return Refused;
|
||||
if(!Run("DELETE FROM port_cube_item_fences WHERE pid="+N(b.player)+" AND epoch="+N(b.epoch)+" AND request='"+b.token+"'")||
|
||||
!Change("UPDATE port_cube_fences SET phase='RELEASED' WHERE pid="+N(b.player)+" AND phase='RESYNC'")||!db.Commit())return Retry;
|
||||
return Done;
|
||||
}
|
||||
// Resume preflight only. A historical Release replay does not reread current
|
||||
// assets; this check MUST lock and validate the current image anew, on the
|
||||
// same pinned connection/account transaction as the authority callback.
|
||||
Result CheckReleasedImage(const Batch& b,const std::string& expected,const std::function<bool()>& authority) {
|
||||
if(!Validate(b)||expected.empty()||expected.size()>40000||!authority)return Refused;
|
||||
BatchStore<DB> ready(db,lookup);if(!ready.Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Lock(b,rows))return Retry;
|
||||
if(!Same(b,rows)||rows[0][4]!="RELEASED"||rows[0][6]!=expected||rows[0][7]!="1")return Refused;
|
||||
{const int clear=GoldIntentsStatus(db,b);if(clear<0)return Retry;if(!clear)return Refused;}
|
||||
std::string current;if(!Image(b,current))return Retry;if(current!=expected||!authority())return Refused;
|
||||
return db.Commit()?Done:Retry;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
#pragma once
|
||||
#include "cube_store.h"
|
||||
#include "cube_gold_source.h"
|
||||
namespace PortCube {
|
||||
// Positive reward intents ONLY. Not a generic PointChange replacement, item
|
||||
// snapshot, permission to mint currency, or proof a source event is legitimate.
|
||||
constexpr unsigned GoldIntentLimit=1024,GoldIntentBytes=129;
|
||||
static_assert(GoldIntentLimit==GoldSourceLimit,"source manifest covers every intent sequence");
|
||||
struct GoldIntent {
|
||||
uint32_t account=0,player=0,sequence=0;
|
||||
uint64_t epoch=0,amount=0;
|
||||
uint8_t source=0; // trusted producer registry: 1 combat, 2 quest, 3 delivery
|
||||
std::string owner,request,event;
|
||||
};
|
||||
inline bool ValidGoldIntent(const GoldIntent& i) {
|
||||
return i.account&&i.player&&i.epoch&&i.sequence&&i.sequence<=GoldIntentLimit&&
|
||||
i.amount&&i.amount<=uint64_t(PortEconomy::GoldLimit)&&i.source>=1&&i.source<=3&&
|
||||
Identity(i.owner)&&Identity(i.request)&&Identity(i.event);
|
||||
}
|
||||
inline bool Matches(const GoldIntent& i,const Batch& b) {
|
||||
return i.account==b.account&&i.player==b.player&&i.epoch==b.epoch&&i.owner==b.owner&&i.request==b.token;
|
||||
}
|
||||
inline std::string EncodeGoldIntent(const GoldIntent& i) {
|
||||
if(!ValidGoldIntent(i))return {};
|
||||
Writer w;w.n(1,4);w.n(i.account,4);w.n(i.player,4);w.n(i.epoch,8);w.n(i.sequence,4);w.n(i.amount,8);w.n(i.source,1);
|
||||
w.data+=i.owner;w.data+=i.request;w.data+=i.event;return w.data;
|
||||
}
|
||||
inline bool DecodeGoldIntent(const std::string& bytes,GoldIntent& i) {
|
||||
i={};if(bytes.size()!=GoldIntentBytes)return false;Reader r(bytes);if(r.n(4)!=1)return false;
|
||||
GoldIntent out;out.account=uint32_t(r.n(4));out.player=uint32_t(r.n(4));out.epoch=r.n(8);out.sequence=uint32_t(r.n(4));out.amount=r.n(8);out.source=uint8_t(r.n(1));
|
||||
out.owner=bytes.substr(r.at,32);out.request=bytes.substr(r.at+32,32);out.event=bytes.substr(r.at+64,32);
|
||||
if(!r.ok||!ValidGoldIntent(out)||EncodeGoldIntent(out)!=bytes)return false;i=std::move(out);return true;
|
||||
}
|
||||
template<class DB> int GoldSchema(DB& db) {
|
||||
PortEconomy::Rows rows;
|
||||
const std::string names="('port_cube_gold_version','port_cube_gold_intents','port_cube_gold_sources')";
|
||||
if(!db.Query("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names,rows)||db.warnings||rows.size()!=1||rows[0].size()!=1)return -1;
|
||||
if(rows[0][0]=="0")return 0;
|
||||
if(rows[0][0]!="3"||!db.Query("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names,rows)||db.warnings||rows.size()!=1||rows[0].size()!=1||rows[0][0]!="3")return -1;
|
||||
if(!db.Query("SELECT version FROM port_cube_gold_version WHERE id=1",rows)||db.warnings||rows.size()!=1||rows[0].size()!=1||rows[0][0]!="2")return -1;
|
||||
return 1;
|
||||
}
|
||||
struct GoldRecord {GoldIntent intent;bool applied=false;uint64_t before=0,after=0;};
|
||||
// Caller holds the account lock. No inferred deltas from a stale game snapshot.
|
||||
template<class DB> bool GoldRecords(DB& db,const Batch& b,std::vector<GoldRecord>& records) {
|
||||
records.clear();PortEconomy::Rows rows;
|
||||
if(!db.Query("SELECT event,seq,account,pid,body,state,before_gold,after_gold FROM port_cube_gold_intents WHERE request='"+b.token+"' ORDER BY seq FOR UPDATE",rows)||db.warnings||rows.size()>GoldIntentLimit)return false;
|
||||
bool pending=false;std::set<std::string> ids;uint64_t previous=0;
|
||||
for(const auto& row:rows) {
|
||||
GoldRecord record;if(row.size()!=8||!DecodeGoldIntent(row[4],record.intent)||!Matches(record.intent,b))return false;
|
||||
const auto& i=record.intent;
|
||||
if(i.sequence!=records.size()+1||row[0]!=i.event||row[1]!=std::to_string(i.sequence)||row[2]!=std::to_string(i.account)||row[3]!=std::to_string(i.player)||!ids.insert(i.event).second)return false;
|
||||
if(!PortEconomy::Number(row[6],record.before,PortEconomy::GoldLimit)||!PortEconomy::Number(row[7],record.after,PortEconomy::GoldLimit))return false;
|
||||
record.applied=row[5]=="APPLIED";
|
||||
if(record.applied) {
|
||||
if(pending||record.before>uint64_t(PortEconomy::GoldLimit)-i.amount||record.after!=record.before+i.amount||(!records.empty()&&record.before!=previous))return false;
|
||||
previous=record.after;
|
||||
} else {if(row[5]!="QUEUED"||record.before||record.after)return false;pending=true;}
|
||||
records.push_back(std::move(record));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
template<class DB> int GoldCreditBase(DB& db,const Batch& b,uint64_t& base) {
|
||||
PortEconomy::Rows rows;typename BatchStore<DB>::Receipt receipt;
|
||||
if(!db.Query("SELECT body,rolls,state,result,successes,fee,awards FROM port_cube_requests WHERE token='"+b.token+"' AND account="+std::to_string(b.account)+" AND pid="+std::to_string(b.player)+" FOR UPDATE",rows)||db.warnings)return -1;
|
||||
if(rows.size()!=1||!BatchStore<DB>::DoneReceipt(b,rows[0],receipt)||receipt.fee>b.gold)return 0;
|
||||
base=b.gold-receipt.fee;return 1;
|
||||
}
|
||||
template<class DB> int GoldIntentsStatus(DB& db,const Batch& b) {
|
||||
const int schema=GoldSchema(db);if(schema==0)return 1;if(schema<0)return -1;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return -1;
|
||||
// Even zero credits need an explicit closed-source proof. SQL emptiness
|
||||
// cannot exclude a local durable intent whose delivery has not arrived.
|
||||
PortEconomy::Rows seals;
|
||||
if(!db.Query("SELECT account,pid,epoch,owner,session,cookie,handle,manifest FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",seals)||db.warnings)return -1;
|
||||
if(seals.empty())return 0;
|
||||
if(seals.size()!=1||seals[0].size()!=8)return -1;
|
||||
const auto& row=seals[0];GoldSourceSeal seal;static_cast<GoldSourceBinding&>(seal)=GoldSourceFor(b,0,0,0);
|
||||
uint64_t cookie=0,handle=0;
|
||||
if(row[0]!=std::to_string(b.account)||row[1]!=std::to_string(b.player)||row[2]!=std::to_string(b.epoch)||row[3]!=b.owner||
|
||||
!PortEconomy::Number(row[4],seal.session)||!PortEconomy::Number(row[5],cookie,UINT32_MAX)||!PortEconomy::Number(row[6],handle,UINT32_MAX))return -1;
|
||||
seal.cookie=uint32_t(cookie);seal.handle=uint32_t(handle);
|
||||
if(EncodeGoldSourceBinding(seal).empty()||!DecodeGoldManifest(row[7],seal.events)||seal.events.size()!=records.size())return -1;
|
||||
for(size_t n=0;n<records.size();++n)if(records[n].intent.event!=seal.events[n])return -1;
|
||||
for(const auto& record:records)if(!record.applied)return 0;
|
||||
if(!records.empty()) {
|
||||
uint64_t base=0,current=0;PortEconomy::Rows rows;
|
||||
const int ready=GoldCreditBase(db,b,base);if(ready<0)return -1;if(!ready||records.front().before!=base)return 0;
|
||||
if(!db.Query("SELECT gold FROM player WHERE id="+std::to_string(b.player)+" AND account_id="+std::to_string(b.account)+" FOR UPDATE",rows)||db.warnings)return -1;
|
||||
if(rows.size()!=1||rows[0].size()!=1||!PortEconomy::Number(rows[0][0],current,PortEconomy::GoldLimit)||current!=records.back().after)return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,189 @@
|
||||
#pragma once
|
||||
#include "cube_gold_intent.h"
|
||||
#include <cerrno>
|
||||
#include <fcntl.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <tuple>
|
||||
#include <unistd.h>
|
||||
|
||||
namespace PortCube {
|
||||
// Core-private, bounded append-only journal. ACK means DB has the immutable
|
||||
// intent, NOT that currency is applied or the actor may thaw. Keep ACK history
|
||||
// so a restarted writer cannot reuse a sequence. No automatic compaction yet.
|
||||
struct GoldDelivery {
|
||||
GoldIntent intent;
|
||||
uint64_t session=0;
|
||||
uint32_t cookie=0,handle=0,ground=0,vnum=0,map=0;
|
||||
};
|
||||
constexpr size_t GoldDeliveryBytes=GoldIntentBytes+28;
|
||||
inline std::string EncodeGoldDelivery(const GoldDelivery& d) {
|
||||
const auto body=EncodeGoldIntent(d.intent);
|
||||
if(body.empty()||d.intent.source!=1||!d.session||!d.cookie||!d.handle||!d.ground||!d.vnum||!d.map)return {};
|
||||
Writer w;w.data=body;w.n(d.session,8);w.n(d.cookie,4);w.n(d.handle,4);w.n(d.ground,4);w.n(d.vnum,4);w.n(d.map,4);return w.data;
|
||||
}
|
||||
inline bool DecodeGoldDelivery(const std::string& body,GoldDelivery& d) {
|
||||
d={};if(body.size()!=GoldDeliveryBytes)return false;GoldDelivery out;
|
||||
if(!DecodeGoldIntent(body.substr(0,GoldIntentBytes),out.intent))return false;
|
||||
Reader r(body);r.at=GoldIntentBytes;out.session=r.n(8);out.cookie=uint32_t(r.n(4));out.handle=uint32_t(r.n(4));
|
||||
out.ground=uint32_t(r.n(4));out.vnum=uint32_t(r.n(4));out.map=uint32_t(r.n(4));
|
||||
if(!r.ok||r.at!=body.size()||EncodeGoldDelivery(out)!=body)return false;d=std::move(out);return true;
|
||||
}
|
||||
inline GoldSourceBinding GoldSourceFor(const GoldDelivery& d) {
|
||||
GoldSourceBinding s;s.account=d.intent.account;s.player=d.intent.player;s.epoch=d.intent.epoch;s.owner=d.intent.owner;s.request=d.intent.request;
|
||||
s.session=d.session;s.cookie=d.cookie;s.handle=d.handle;return s;
|
||||
}
|
||||
class GoldOutbox {
|
||||
struct Record {GoldDelivery delivery;bool acknowledged=false;};
|
||||
struct Closing {GoldSourceBinding binding;unsigned count=0;bool acknowledged=false;};
|
||||
int fd=-1,lock=-1,directory=-1;bool healthy=false;size_t bytes=0;
|
||||
std::string error;std::map<std::string,Record> records;
|
||||
std::map<std::string,Closing> sources;
|
||||
static uint32_t Hash(const std::string& body){uint32_t h=2166136261u;for(unsigned char c:body){h^=c;h*=16777619u;}return h;}
|
||||
bool Fail(const char* reason){healthy=false;error=reason;return false;}
|
||||
static bool PrivateFile(int f){struct stat s={};return fstat(f,&s)==0&&S_ISREG(s.st_mode)&&s.st_nlink==1&&s.st_uid==geteuid()&&!(s.st_mode&0022);}
|
||||
static bool WriteAll(int f,const std::string& body) {
|
||||
size_t at=0;while(at<body.size()){const auto n=write(f,body.data()+at,body.size()-at);if(n<0&&errno==EINTR)continue;if(n<=0)return false;at+=size_t(n);}return true;
|
||||
}
|
||||
static std::string ClosingBody(const Closing& c) {
|
||||
const auto binding=EncodeGoldSourceBinding(c.binding);if(binding.empty()||c.count>GoldSourceLimit)return {};
|
||||
Writer w;w.data=binding;w.n(c.count,4);w.data.resize(GoldDeliveryBytes,'\0');return w.data;
|
||||
}
|
||||
static bool DecodeClosing(const std::string& body,Closing& c) {
|
||||
c={};if(body.size()!=GoldDeliveryBytes)return false;Closing out;
|
||||
if(!DecodeGoldSourceBinding(body.substr(0,GoldSourceBindingBytes),out.binding))return false;
|
||||
Reader r(body);r.at=GoldSourceBindingBytes;out.count=unsigned(r.n(4));if(!r.ok||ClosingBody(out)!=body)return false;c=std::move(out);return true;
|
||||
}
|
||||
bool SourceImage(const GoldSourceBinding& binding,bool requireAck,GoldSourceSeal& seal)const {
|
||||
seal={};if(EncodeGoldSourceBinding(binding).empty())return false;static_cast<GoldSourceBinding&>(seal)=binding;
|
||||
std::vector<std::pair<unsigned,std::string>> ordered;
|
||||
for(const auto& entry:records)if(entry.second.delivery.intent.request==binding.request) {
|
||||
const auto& r=entry.second;
|
||||
if((requireAck&&!r.acknowledged)||EncodeGoldSourceBinding(GoldSourceFor(r.delivery))!=EncodeGoldSourceBinding(binding))return false;
|
||||
ordered.emplace_back(r.delivery.intent.sequence,r.delivery.intent.event);
|
||||
}
|
||||
std::sort(ordered.begin(),ordered.end());for(const auto& e:ordered){if(e.first!=seal.events.size()+1)return false;seal.events.push_back(e.second);}
|
||||
return !EncodeGoldManifest(seal.events).empty();
|
||||
}
|
||||
bool AppendBody(unsigned op,const std::string& body) {
|
||||
Writer w;w.data="CGO1";w.n(op,1);w.data+=body;w.n(Hash(w.data),4);const auto& frame=w.data;
|
||||
if(!healthy||frame.size()!=FrameBytes||bytes>MaxBytes-frame.size())return Fail("gold outbox unavailable/full; retain hold and journal");
|
||||
if(!WriteAll(fd,frame)||fsync(fd)!=0)return Fail("gold outbox write/sync uncertain; quarantine source and retain journal");
|
||||
bytes+=frame.size();return true;
|
||||
}
|
||||
bool Append(unsigned op,const GoldDelivery& d){return AppendBody(op,EncodeGoldDelivery(d));}
|
||||
bool Admit(const GoldDelivery& d)const {
|
||||
if(EncodeGoldDelivery(d).empty()||records.size()>=MaxRecords||sources.count(d.intent.request))return false;
|
||||
unsigned sequence=1;
|
||||
for(const auto& entry:records)if(entry.second.delivery.intent.request==d.intent.request) {
|
||||
const auto& i=entry.second.delivery.intent;
|
||||
if(i.account!=d.intent.account||i.player!=d.intent.player||i.epoch!=d.intent.epoch||i.owner!=d.intent.owner)return false;
|
||||
if(EncodeGoldSourceBinding(GoldSourceFor(entry.second.delivery))!=EncodeGoldSourceBinding(GoldSourceFor(d)))return false;
|
||||
++sequence;
|
||||
}
|
||||
return d.intent.sequence==sequence;
|
||||
}
|
||||
public:
|
||||
static constexpr size_t MaxRecords=8192,MaxBytes=16*1024*1024,FrameBytes=4+1+GoldDeliveryBytes+4;
|
||||
GoldOutbox()=default;GoldOutbox(const GoldOutbox&)=delete;GoldOutbox& operator=(const GoldOutbox&)=delete;
|
||||
~GoldOutbox(){if(fd>=0)close(fd);if(lock>=0)close(lock);if(directory>=0)close(directory);}
|
||||
bool Ready()const{return healthy;}
|
||||
const std::string& Error()const{return error;}
|
||||
bool Open(const std::string& path) {
|
||||
if(fd>=0||lock>=0||directory>=0)return Fail("gold outbox already opened");
|
||||
const auto slash=path.rfind('/');const std::string dir=slash==std::string::npos?".":slash==0?"/":path.substr(0,slash);
|
||||
const std::string name=slash==std::string::npos?path:path.substr(slash+1);
|
||||
if(name.empty()||name=="."||name=="..")return Fail("invalid gold outbox path");
|
||||
if(mkdir(dir.c_str(),0700)!=0&&errno!=EEXIST)return Fail("cannot create gold outbox directory");
|
||||
directory=open(dir.c_str(),O_RDONLY|O_DIRECTORY|O_NOFOLLOW);
|
||||
if(directory<0)return Fail("cannot open gold outbox directory");
|
||||
lock=openat(directory,(name+".lock").c_str(),O_RDWR|O_CREAT|O_NOFOLLOW,0600);
|
||||
if(lock<0||!PrivateFile(lock)||flock(lock,LOCK_EX|LOCK_NB)!=0)return Fail("gold outbox already owned/unsafe lock");
|
||||
fd=openat(directory,name.c_str(),O_RDWR|O_CREAT|O_APPEND|O_NOFOLLOW,0600);
|
||||
if(fd<0||!PrivateFile(fd)||flock(fd,LOCK_EX|LOCK_NB)!=0)return Fail("unsafe/owned gold outbox file");
|
||||
struct stat info={};if(fstat(fd,&info)!=0||info.st_size<0||uint64_t(info.st_size)>MaxBytes)return Fail("gold outbox size invalid");
|
||||
bytes=size_t(info.st_size);
|
||||
if(fsync(fd)!=0||fsync(lock)!=0||fsync(directory)!=0)return Fail("cannot persist gold outbox directory entries");
|
||||
if(bytes%FrameBytes)return Fail("torn gold outbox; retain bytes for repair");
|
||||
for(size_t at=0;at<bytes;at+=FrameBytes) {
|
||||
std::string frame(FrameBytes,'\0');size_t got=0;
|
||||
while(got<frame.size()){const auto n=pread(fd,&frame[got],frame.size()-got,off_t(at+got));if(n<0&&errno==EINTR)continue;if(n<=0)return Fail("cannot read gold outbox");got+=size_t(n);}
|
||||
Reader checksum(frame);checksum.at=FrameBytes-4;
|
||||
if(frame.substr(0,4)!="CGO1"||checksum.n(4)!=Hash(frame.substr(0,FrameBytes-4)))return Fail("corrupt gold outbox; retain bytes for repair");
|
||||
const unsigned op=uint8_t(frame[4]);const auto body=frame.substr(5,GoldDeliveryBytes);
|
||||
if(op==3||op==4) {
|
||||
Closing c;GoldSourceSeal seal;
|
||||
if(!DecodeClosing(body,c)||!SourceImage(c.binding,op==4,seal)||seal.events.size()!=c.count)return Fail("corrupt source close proof");
|
||||
auto it=sources.find(c.binding.request);
|
||||
if(op==3) {
|
||||
if(it!=sources.end()||sources.size()>=MaxRecords)return Fail("duplicate/overfull source close");
|
||||
sources.emplace(c.binding.request,c);
|
||||
} else {
|
||||
if(it==sources.end()||it->second.acknowledged||ClosingBody(it->second)!=body)return Fail("unknown/conflicting source close ACK");
|
||||
it->second.acknowledged=true;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
GoldDelivery d;if(!DecodeGoldDelivery(body,d))return Fail("corrupt gold delivery body");auto it=records.find(d.intent.event);
|
||||
if(op==1) {
|
||||
if(it!=records.end()||!Admit(d))return Fail("conflicting/out-of-order gold outbox claim");
|
||||
records.emplace(d.intent.event,Record{d,false});
|
||||
} else if(op==2) {
|
||||
if(it==records.end()||it->second.acknowledged||EncodeGoldDelivery(it->second.delivery)!=EncodeGoldDelivery(d))return Fail("unknown/conflicting gold outbox ACK");
|
||||
it->second.acknowledged=true;
|
||||
} else return Fail("unknown gold outbox operation");
|
||||
}
|
||||
healthy=true;return true;
|
||||
}
|
||||
unsigned Next(const std::string& request)const {unsigned n=1;for(const auto& r:records)if(r.second.delivery.intent.request==request)++n;return n;}
|
||||
uint64_t Total(const std::string& request)const {
|
||||
uint64_t total=0;for(const auto& r:records)if(r.second.delivery.intent.request==request) {
|
||||
if(total>uint64_t(PortEconomy::GoldLimit)-r.second.delivery.intent.amount)return uint64_t(PortEconomy::GoldLimit);
|
||||
total+=r.second.delivery.intent.amount;
|
||||
}return total;
|
||||
}
|
||||
const GoldDelivery* Find(const std::string& event)const {auto it=records.find(event);return it==records.end()?nullptr:&it->second.delivery;}
|
||||
bool Claim(const GoldDelivery& d) {
|
||||
if(!healthy||EncodeGoldDelivery(d).empty())return false;auto it=records.find(d.intent.event);
|
||||
if(it!=records.end())return EncodeGoldDelivery(it->second.delivery)==EncodeGoldDelivery(d);
|
||||
if(!Admit(d)){error="gold outbox capacity/sequence/identity refused before writing";return false;}
|
||||
if(!Append(1,d))return false;records.emplace(d.intent.event,Record{d,false});return true;
|
||||
}
|
||||
bool Acknowledge(const GoldDelivery& d) {
|
||||
auto it=records.find(d.intent.event);
|
||||
if(!healthy||it==records.end()||EncodeGoldDelivery(it->second.delivery)!=EncodeGoldDelivery(d))return false;
|
||||
if(it->second.acknowledged)return true;
|
||||
if(!Append(2,d))return false;it->second.acknowledged=true;return true;
|
||||
}
|
||||
bool IsClosing(const std::string& request)const{return sources.count(request)!=0;}
|
||||
bool CloseSource(const GoldSourceBinding& binding) {
|
||||
if(!healthy)return false;GoldSourceSeal seal;if(!SourceImage(binding,false,seal))return false;
|
||||
auto it=sources.find(binding.request);Closing c{binding,unsigned(seal.events.size()),false};
|
||||
if(it!=sources.end())return ClosingBody(it->second)==ClosingBody(c);
|
||||
if(sources.size()>=MaxRecords)return false;
|
||||
// Stop new claims DURABLY before waiting for existing delivery ACKs.
|
||||
if(!AppendBody(3,ClosingBody(c)))return false;sources.emplace(binding.request,std::move(c));return true;
|
||||
}
|
||||
bool AcknowledgeSource(const GoldSourceSeal& seal) {
|
||||
if(!healthy)return false;auto it=sources.find(seal.request);GoldSourceSeal expected;
|
||||
if(it==sources.end()||EncodeGoldSourceBinding(seal)!=EncodeGoldSourceBinding(it->second.binding)||!SourceImage(seal,true,expected)||
|
||||
seal.events!=expected.events||seal.events.size()!=it->second.count)return false;
|
||||
if(it->second.acknowledged)return true;
|
||||
if(!AppendBody(4,ClosingBody(it->second)))return false;it->second.acknowledged=true;return true;
|
||||
}
|
||||
bool SourceAcknowledged(const GoldSourceBinding& binding)const {
|
||||
auto it=sources.find(binding.request);return healthy&&it!=sources.end()&&it->second.acknowledged&&EncodeGoldSourceBinding(binding)==EncodeGoldSourceBinding(it->second.binding);
|
||||
}
|
||||
std::vector<GoldSourceSeal> PendingSources()const {
|
||||
std::vector<GoldSourceSeal> out;if(!healthy)return out;
|
||||
for(const auto& entry:sources)if(!entry.second.acknowledged) {
|
||||
GoldSourceSeal seal;if(SourceImage(entry.second.binding,true,seal)&&seal.events.size()==entry.second.count)out.push_back(std::move(seal));
|
||||
}return out;
|
||||
}
|
||||
std::vector<GoldDelivery> Pending()const {
|
||||
std::vector<GoldDelivery> out;if(!healthy)return out;
|
||||
for(const auto& r:records)if(!r.second.acknowledged)out.push_back(r.second.delivery);
|
||||
std::sort(out.begin(),out.end(),[](const auto& a,const auto& b){return std::tie(a.intent.account,a.intent.player,a.intent.request,a.intent.sequence)<std::tie(b.intent.account,b.intent.player,b.intent.request,b.intent.sequence);});return out;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
#pragma once
|
||||
#include "cube_batch.h"
|
||||
namespace PortCube {
|
||||
constexpr unsigned GoldSourceLimit=1024,GoldSourceBindingBytes=96;
|
||||
struct GoldSourceBinding {
|
||||
uint32_t account=0,player=0,cookie=0,handle=0;
|
||||
uint64_t epoch=0,session=0;
|
||||
std::string owner,request;
|
||||
};
|
||||
struct GoldSourceSeal : GoldSourceBinding {std::vector<std::string> events;};
|
||||
inline std::string EncodeGoldSourceBinding(const GoldSourceBinding& s) {
|
||||
if(!s.account||!s.player||!s.epoch||!s.session||!s.cookie||!s.handle||!Identity(s.owner)||!Identity(s.request))return {};
|
||||
Writer w;w.n(s.account,4);w.n(s.player,4);w.n(s.epoch,8);w.data+=s.owner;w.data+=s.request;w.n(s.session,8);w.n(s.cookie,4);w.n(s.handle,4);return w.data;
|
||||
}
|
||||
inline bool DecodeGoldSourceBinding(const std::string& body,GoldSourceBinding& s) {
|
||||
s={};if(body.size()!=GoldSourceBindingBytes)return false;Reader r(body);GoldSourceBinding out;
|
||||
out.account=uint32_t(r.n(4));out.player=uint32_t(r.n(4));out.epoch=r.n(8);out.owner=body.substr(r.at,32);out.request=body.substr(r.at+32,32);r.at+=64;
|
||||
out.session=r.n(8);out.cookie=uint32_t(r.n(4));out.handle=uint32_t(r.n(4));
|
||||
if(!r.ok||r.at!=body.size()||EncodeGoldSourceBinding(out)!=body)return false;s=std::move(out);return true;
|
||||
}
|
||||
inline bool Matches(const GoldSourceBinding& s,const Batch& b) {
|
||||
return s.account==b.account&&s.player==b.player&&s.epoch==b.epoch&&s.owner==b.owner&&s.request==b.token;
|
||||
}
|
||||
inline std::string EncodeGoldManifest(const std::vector<std::string>& events) {
|
||||
if(events.size()>GoldSourceLimit)return {};std::set<std::string> seen;Writer w;w.n(events.size(),4);
|
||||
for(const auto& e:events){if(!Identity(e)||!seen.insert(e).second)return {};w.data+=e;}return w.data;
|
||||
}
|
||||
inline bool DecodeGoldManifest(const std::string& body,std::vector<std::string>& events) {
|
||||
events.clear();if(body.size()<4||body.size()>4+32*GoldSourceLimit)return false;Reader r(body);const auto count=r.n(4);
|
||||
if(count>GoldSourceLimit||body.size()!=4+32*count)return false;
|
||||
std::vector<std::string> out;for(size_t n=0;n<count;++n)out.push_back(body.substr(4+n*32,32));
|
||||
if(EncodeGoldManifest(out)!=body)return false;events=std::move(out);return true;
|
||||
}
|
||||
inline GoldSourceBinding GoldSourceFor(const Batch& b,uint64_t session,uint32_t cookie,uint32_t handle) {
|
||||
GoldSourceBinding s;s.account=b.account;s.player=b.player;s.epoch=b.epoch;s.owner=b.owner;s.request=b.token;s.session=session;s.cookie=cookie;s.handle=handle;return s;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
#pragma once
|
||||
#include "cube_gold_intent.h"
|
||||
namespace PortCube {
|
||||
// Candidate deferred positive-credit backend; actual ingress remains disabled.
|
||||
// Sources must durably identify an event BEFORE acknowledging delivery;
|
||||
// do not divert an already-performed PointChange here or double-credit memory.
|
||||
template<class DB> class GoldIntentStore {
|
||||
DB& db;Lookup lookup;using Rows=PortEconomy::Rows;
|
||||
static std::string N(uint64_t n){return std::to_string(n);}
|
||||
bool Q(const std::string& sql,Rows& rows){return db.Query(sql,rows)&&!db.warnings;}
|
||||
bool Run(const std::string& sql){Rows rows;return Q(sql,rows);}
|
||||
bool Change(const std::string& sql){return Run(sql)&&db.affected==1;}
|
||||
struct Guard {DB& db;~Guard(){db.Rollback();}};
|
||||
bool Account(uint32_t account) {
|
||||
Rows rows;return Run("INSERT INTO port_economy_account_lock(account) VALUES("+N(account)+") ON DUPLICATE KEY UPDATE account=VALUES(account)")&&
|
||||
Q("SELECT account FROM port_economy_account_lock WHERE account="+N(account)+" FOR UPDATE",rows)&&rows.size()==1;
|
||||
}
|
||||
bool Fence(uint32_t account,uint32_t player,Rows& rows) {
|
||||
return Q("SELECT account,epoch,owner,request,phase,body,drain_state FROM port_cube_fences WHERE pid="+N(player)+" AND account="+N(account)+" FOR UPDATE",rows);
|
||||
}
|
||||
static bool Same(const Batch& b,const Rows& rows) {
|
||||
return rows.size()==1&&rows[0].size()==7&&rows[0][0]==N(b.account)&&rows[0][1]==N(b.epoch)&&rows[0][2]==b.owner&&rows[0][3]==b.token&&rows[0][5]==Encode(b);
|
||||
}
|
||||
public:
|
||||
enum Result {Retry,Refused,Stored,Applied,Blocked};
|
||||
struct Receipt {uint64_t before=0,after=0;};
|
||||
GoldIntentStore(DB& database,Lookup proto):db(database),lookup(std::move(proto)){}
|
||||
bool Ready(){BatchStore<DB> base(db,lookup);return base.Ready()&&GoldSchema(db)==1;}
|
||||
Result Enqueue(const Batch& b,const GoldIntent& i) {
|
||||
if(!Validate(b)||!ValidGoldIntent(i)||!Matches(i,b))return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Account(b.account))return Retry;
|
||||
const auto body=EncodeGoldIntent(i);
|
||||
if(!Q("SELECT body,state,before_gold,after_gold FROM port_cube_gold_intents WHERE event='"+i.event+"' FOR UPDATE",rows))return Retry;
|
||||
if(!rows.empty()) {
|
||||
if(rows.size()!=1||rows[0].size()!=4||rows[0][0]!=body)return Refused;
|
||||
uint64_t before=0,after=0;
|
||||
if(!PortEconomy::Number(rows[0][2],before,PortEconomy::GoldLimit)||!PortEconomy::Number(rows[0][3],after,PortEconomy::GoldLimit))return Blocked;
|
||||
if(rows[0][1]=="QUEUED")return !before&&!after?Stored:Blocked;
|
||||
return rows[0][1]=="APPLIED"&&before<=uint64_t(PortEconomy::GoldLimit)-i.amount&&after==before+i.amount?Applied:Blocked;
|
||||
}
|
||||
if(!Fence(b.account,b.player,rows))return Retry;
|
||||
if(!Same(b,rows))return Blocked;
|
||||
const auto phase=rows[0][4];
|
||||
if(phase!="DRAINING"&&phase!="FROZEN"&&phase!="ABORTED")return Blocked;
|
||||
if(!Q("SELECT request FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",rows))return Retry;
|
||||
if(!rows.empty())return Blocked; // exact historical event replay above is still allowed
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return Blocked;
|
||||
if(i.sequence!=records.size()+1)return Refused;
|
||||
if(!Change("INSERT INTO port_cube_gold_intents(event,request,seq,account,pid,body,state,before_gold,after_gold) VALUES('"+i.event+"','"+i.request+"',"+N(i.sequence)+","+N(i.account)+","+N(i.player)+",X'"+PortEconomy::Hex(body.data(),body.size())+"','QUEUED',0,0)"))return Retry;
|
||||
return db.Commit()?Stored:Retry;
|
||||
}
|
||||
Result CloseSource(const Batch& b,const GoldSourceSeal& seal) {
|
||||
const auto manifest=EncodeGoldManifest(seal.events);
|
||||
if(!Validate(b)||!Matches(seal,b)||EncodeGoldSourceBinding(seal).empty()||manifest.empty())return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Account(b.account))return Retry;
|
||||
const std::vector<std::string> expected={N(b.account),N(b.player),N(b.epoch),b.owner,N(seal.session),N(seal.cookie),N(seal.handle),manifest};
|
||||
if(!Q("SELECT account,pid,epoch,owner,session,cookie,handle,manifest FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",rows))return Retry;
|
||||
if(!rows.empty())return rows.size()==1&&rows[0]==expected?Stored:Refused;
|
||||
if(!Fence(b.account,b.player,rows))return Retry;
|
||||
if(!Same(b,rows)||!((rows[0][4]=="FROZEN"&&rows[0][6]=="1")||(rows[0][4]=="ABORTED"&&rows[0][6]=="2")))return Blocked;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return Blocked;
|
||||
if(records.size()!=seal.events.size())return Blocked;
|
||||
for(size_t n=0;n<records.size();++n)if(records[n].intent.event!=seal.events[n])return Refused;
|
||||
if(!Change("INSERT INTO port_cube_gold_sources(request,account,pid,epoch,owner,session,cookie,handle,manifest) VALUES('"+b.token+"',"+N(b.account)+","+N(b.player)+","+N(b.epoch)+",'"+b.owner+"',"+N(seal.session)+","+N(seal.cookie)+","+N(seal.handle)+",X'"+PortEconomy::Hex(manifest.data(),manifest.size())+"')"))return Retry;
|
||||
return db.Commit()?Stored:Retry;
|
||||
}
|
||||
// Recover accepted intents after process restart without caller-supplied
|
||||
// amounts or replacing persisted data. Pure read: does not credit anything.
|
||||
Result Pending(const Batch& b,std::vector<GoldIntent>& pending) {
|
||||
pending.clear();if(!Validate(b))return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};
|
||||
if(!Account(b.account))return Retry;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return Blocked;
|
||||
for(const auto& record:records)if(!record.applied)pending.push_back(record.intent);
|
||||
return Stored;
|
||||
}
|
||||
// Only identity comes from recovery. The persisted event/body and the DONE
|
||||
// Cube receipt determine the amount and expected base. Never auto-settle a
|
||||
// PREPARED craft, overwrite a stale wallet or apply on an aborted drain.
|
||||
Result Apply(const std::string& event,uint32_t account,uint32_t player,Receipt& receipt,
|
||||
const std::function<bool(const GoldIntent&)>& authorize={}) {
|
||||
receipt={};if(!Identity(event)||!account||!player)return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};Rows rows;
|
||||
if(!Account(account)||!Q("SELECT body,state,before_gold,after_gold FROM port_cube_gold_intents WHERE event='"+event+"' AND account="+N(account)+" AND pid="+N(player)+" FOR UPDATE",rows))return Retry;
|
||||
if(rows.empty())return Refused;
|
||||
GoldIntent intent;
|
||||
if(rows.size()!=1||rows[0].size()!=4||!DecodeGoldIntent(rows[0][0],intent)||intent.event!=event||intent.account!=account||intent.player!=player)return Blocked;
|
||||
if(authorize&&!authorize(intent))return Blocked; // same account transaction/pinned connection, including historical replay
|
||||
const auto saved=rows[0];uint64_t before=0,after=0;
|
||||
if(!PortEconomy::Number(saved[2],before,PortEconomy::GoldLimit)||!PortEconomy::Number(saved[3],after,PortEconomy::GoldLimit))return Blocked;
|
||||
if(saved[1]=="APPLIED") {
|
||||
if(before>uint64_t(PortEconomy::GoldLimit)-intent.amount||after!=before+intent.amount)return Blocked;
|
||||
receipt={before,after};return Applied; // historical replay, even after newer epochs
|
||||
}
|
||||
if(saved[1]!="QUEUED"||before||after)return Blocked;
|
||||
if(!Fence(account,player,rows))return Retry;
|
||||
Batch b;if(rows.size()!=1||rows[0].size()!=7||!Decode(rows[0][5],b)||!Same(b,rows)||!Matches(intent,b)||rows[0][4]!="FROZEN"||rows[0][6]!="1")return Blocked;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return Blocked;
|
||||
uint64_t expected=0;const int base=GoldCreditBase(db,b,expected);if(base<0)return Retry;if(!base)return Blocked;
|
||||
unsigned next=1;
|
||||
for(const auto& record:records) {
|
||||
if(!record.applied)break;
|
||||
if(record.before!=expected)return Blocked;expected=record.after;++next;
|
||||
}
|
||||
if(intent.sequence!=next||next>records.size()||records[next-1].intent.event!=event)return Blocked;
|
||||
if(expected>uint64_t(PortEconomy::GoldLimit)-intent.amount)return Blocked;
|
||||
if(!Q("SELECT gold FROM player WHERE id="+N(player)+" AND account_id="+N(account)+" FOR UPDATE",rows))return Retry;
|
||||
uint64_t current=0;if(rows.size()!=1||rows[0].size()!=1||!PortEconomy::Number(rows[0][0],current,PortEconomy::GoldLimit)||current!=expected)return Blocked;
|
||||
const auto target=expected+intent.amount;
|
||||
if(!Change("UPDATE player SET gold=gold+"+N(intent.amount)+" WHERE id="+N(player)+" AND account_id="+N(account)+" AND gold="+N(expected))||
|
||||
!Change("UPDATE port_cube_gold_intents SET state='APPLIED',before_gold="+N(expected)+",after_gold="+N(target)+" WHERE event='"+event+"' AND state='QUEUED'")||!db.Commit())return Retry;
|
||||
receipt={expected,target};return Applied;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
#pragma once
|
||||
#include "cube_batch.h"
|
||||
#include "cube_mutation.h"
|
||||
#include "cube_gold_intent.h"
|
||||
#include "cube_owner_types.h"
|
||||
#include "cube_image.h"
|
||||
#include "cube_receipt.h"
|
||||
|
||||
namespace PortCube {
|
||||
// Internal game/DB only. Neither this header nor the catalogue advertises a
|
||||
// crafting capability. Keep BOTH gates closed until the mutation audit and the
|
||||
// settlement/resync/thaw path are complete. There is no command to toggle them.
|
||||
constexpr uint8_t HandshakeHeader=78;
|
||||
constexpr bool HandshakeEnabled=false,ActorMutationAuditComplete=false;
|
||||
enum class Message : uint8_t { Arm=1,Submit=2,Poll=3,Cancel=4,Answer=5,Invalidate=6,GoldEnqueue=7,GoldAck=8,GoldClose=9,GoldCloseAck=10,RecoveryClaim=11,RecoveryAnswer=12,RecoveryImageRequest=13,RecoveryImageAnswer=14,Prepare=15,Execute=16,CraftAnswer=17,LiveImageRequest=18,LiveImageAnswer=19,LiveImageAck=20,LiveImageAckAnswer=21,LiveReleaseRequest=22,LiveReleaseAnswer=23,LiveResumeCheckRequest=24,LiveResumeCheckAnswer=25 };
|
||||
enum class Status : uint8_t { None=0,Denied=1,Armed=2,Draining=3,Frozen=4,Aborted=5,Held=6,Cancelled=7,GoldStored=8,GoldApplied=9,GoldClosed=10,RecoveryGranted=11,RecoveryClear=12,RecoveryImageReady=13,Prepared=14,Complete=15,LiveImageReady=16,LiveImageAcknowledged=17,LiveReleased=18,LiveResumeChecked=19 };
|
||||
struct Handshake {
|
||||
Message message=Message::Arm;Status status=Status::None;
|
||||
uint32_t account=0,player=0,cookie=0;
|
||||
uint64_t session=0,epoch=0;
|
||||
std::string owner,token,body;
|
||||
};
|
||||
constexpr unsigned HandshakeFixed=102,HandshakeMaximum=HandshakeFixed+40000;
|
||||
inline bool SameIdentity(const Handshake& a,const Handshake& b) {
|
||||
return a.account==b.account&&a.player==b.player&&a.session==b.session&&a.epoch==b.epoch&&a.owner==b.owner&&a.token==b.token;
|
||||
}
|
||||
inline bool ValidHandshake(const Handshake& f) {
|
||||
if(f.message==Message::RecoveryImageRequest||f.message==Message::RecoveryImageAnswer) {
|
||||
OwnerGrant g;std::string image;
|
||||
if(f.message==Message::RecoveryImageAnswer&&f.status==Status::RecoveryImageReady){if(!DecodeRecoveryImage(f.body,g,image))return false;}
|
||||
else if(!DecodeOwnerGrant(f.body,g)||!(f.message==Message::RecoveryImageRequest?f.status==Status::None:f.status==Status::Held))return false;
|
||||
const auto& b=g.binding;return b.account==f.account&&b.player==f.player&&b.session==f.session&&b.cookie==f.cookie&&b.epoch==f.epoch&&b.owner==f.owner&&b.request==f.token;
|
||||
}
|
||||
if(f.message==Message::RecoveryClaim||f.message==Message::RecoveryAnswer) {
|
||||
if(!f.account||!f.player||!f.session)return false;
|
||||
if(f.message==Message::RecoveryAnswer&&f.status==Status::RecoveryGranted) {
|
||||
OwnerGrant g;return DecodeOwnerGrant(f.body,g)&&g.binding.account==f.account&&g.binding.player==f.player&&g.binding.session==f.session&&g.binding.epoch==f.epoch&&g.binding.owner==f.owner&&g.binding.request==f.token&&g.binding.cookie==f.cookie;
|
||||
}
|
||||
return !f.epoch&&!f.cookie&&f.owner==std::string(32,'0')&&f.token==std::string(32,'0')&&f.body.empty()&&
|
||||
(f.message==Message::RecoveryClaim?f.status==Status::None:(f.status==Status::Held||f.status==Status::RecoveryClear));
|
||||
}
|
||||
if(!f.account||!f.player||!f.session||!f.epoch||!Identity(f.owner)||!Identity(f.token)||f.body.size()>40000)return false;
|
||||
if(f.message==Message::LiveResumeCheckRequest||f.message==Message::LiveResumeCheckAnswer) {
|
||||
InventoryImage image;if(!f.cookie)return false;
|
||||
if(f.message==Message::LiveResumeCheckAnswer&&f.status==Status::Held)return f.body.empty();
|
||||
return f.status==(f.message==Message::LiveResumeCheckRequest?Status::None:Status::LiveResumeChecked)&&DecodeInventoryImage(f.body,image);
|
||||
}
|
||||
if(f.message==Message::LiveReleaseRequest||f.message==Message::LiveReleaseAnswer) {
|
||||
InventoryImage image;if(!f.cookie)return false;
|
||||
if(f.message==Message::LiveReleaseAnswer&&f.status==Status::Held)return f.body.empty();
|
||||
return f.status==(f.message==Message::LiveReleaseRequest?Status::None:Status::LiveReleased)&&DecodeInventoryImage(f.body,image);
|
||||
}
|
||||
if(f.message==Message::LiveImageAck||f.message==Message::LiveImageAckAnswer) {
|
||||
InventoryImage image;if(!f.cookie)return false;
|
||||
if(f.message==Message::LiveImageAckAnswer&&f.status==Status::Held)return f.body.empty();
|
||||
return f.status==(f.message==Message::LiveImageAck?Status::None:Status::LiveImageAcknowledged)&&DecodeInventoryImage(f.body,image);
|
||||
}
|
||||
if(f.message==Message::LiveImageRequest)return f.status==Status::None&&f.cookie&&f.body.empty();
|
||||
if(f.message==Message::LiveImageAnswer){InventoryImage image;return f.cookie&&(f.status==Status::Held?f.body.empty():f.status==Status::LiveImageReady&&DecodeInventoryImage(f.body,image));}
|
||||
if(f.message==Message::Prepare||f.message==Message::Execute)return f.status==Status::None&&f.cookie&&f.body.empty();
|
||||
if(f.message==Message::CraftAnswer) {
|
||||
if(!f.cookie)return false;if(f.status==Status::Held||f.status==Status::Prepared)return f.body.empty();
|
||||
CraftReceipt receipt;return f.status==Status::Complete&&DecodeCraftReceipt(f.body,receipt);
|
||||
}
|
||||
if(f.message==Message::GoldClose||f.message==Message::GoldCloseAck) {
|
||||
std::vector<std::string> events;if(!f.cookie||!DecodeGoldManifest(f.body,events))return false;
|
||||
return f.message==Message::GoldClose?f.status==Status::None:f.status==Status::GoldClosed;
|
||||
}
|
||||
if(f.message==Message::GoldEnqueue||f.message==Message::GoldAck) {
|
||||
GoldIntent i;if(!f.cookie||!DecodeGoldIntent(f.body,i)||i.source!=1||i.account!=f.account||i.player!=f.player||i.epoch!=f.epoch||i.owner!=f.owner||i.request!=f.token)return false;
|
||||
return f.message==Message::GoldEnqueue?f.status==Status::None:(f.status==Status::GoldStored||f.status==Status::GoldApplied);
|
||||
}
|
||||
if(f.message==Message::Answer) {
|
||||
if(!f.body.empty()||f.status<Status::Denied||f.status>Status::Cancelled)return false;
|
||||
return (f.status!=Status::Armed&&f.status!=Status::Draining&&f.status!=Status::Frozen&&f.status!=Status::Aborted)||f.cookie;
|
||||
}
|
||||
if(f.status!=Status::None)return false;
|
||||
if(f.message==Message::Arm) {
|
||||
Batch b;if(f.cookie||!Decode(f.body,b))return false;
|
||||
return b.account==f.account&&b.player==f.player&&b.epoch==f.epoch&&b.owner==f.owner&&b.token==f.token;
|
||||
}
|
||||
return (f.message==Message::Submit||f.message==Message::Poll||f.message==Message::Cancel||f.message==Message::Invalidate)&&f.cookie&&f.body.empty();
|
||||
}
|
||||
inline bool IsDbHandshakeReply(Message m){return m==Message::Answer||m==Message::GoldAck||m==Message::GoldCloseAck||m==Message::RecoveryAnswer||m==Message::RecoveryImageAnswer||m==Message::CraftAnswer||m==Message::LiveImageAnswer||m==Message::LiveImageAckAnswer||m==Message::LiveReleaseAnswer||m==Message::LiveResumeCheckAnswer;}
|
||||
inline std::string EncodeHandshake(const Handshake& f) {
|
||||
if(!ValidHandshake(f))return {};
|
||||
Writer w;w.n(HandshakeFixed+f.body.size(),4);w.n(1,1);w.n(unsigned(f.message),1);w.n(unsigned(f.status),1);w.n(0,1);
|
||||
w.n(f.account,4);w.n(f.player,4);w.n(f.cookie,4);w.n(f.session,8);w.n(f.epoch,8);
|
||||
w.data+=f.owner;w.data+=f.token;w.n(f.body.size(),2);w.data+=f.body;return w.data;
|
||||
}
|
||||
// Safe before dereferencing any frame payload, including DB's unaligned 9-byte
|
||||
// outer packet prefix. No struct cast, native long, padding or host byte order.
|
||||
inline bool DecodeHandshake(const char* data,size_t length,Handshake& f) {
|
||||
f={};if(!data||length<HandshakeFixed||length>HandshakeMaximum)return false;
|
||||
const std::string bytes(data,length);Reader r(bytes);
|
||||
if(r.n(4)!=length||r.n(1)!=1)return false;
|
||||
Handshake out;out.message=Message(r.n(1));out.status=Status(r.n(1));if(r.n(1)!=0)return false;
|
||||
out.account=uint32_t(r.n(4));out.player=uint32_t(r.n(4));out.cookie=uint32_t(r.n(4));out.session=r.n(8);out.epoch=r.n(8);
|
||||
if(!r.ok||r.at+64>bytes.size())return false;
|
||||
out.owner=bytes.substr(r.at,32);out.token=bytes.substr(r.at+32,32);r.at+=64;
|
||||
out.body=r.s(40000);
|
||||
if(!r.ok||r.at!=bytes.size()||!ValidHandshake(out))return false;f=std::move(out);return true;
|
||||
}
|
||||
inline Handshake ArmFrame(const Batch& b,uint64_t session) {
|
||||
Handshake f;f.account=b.account;f.player=b.player;f.session=session;f.epoch=b.epoch;f.owner=b.owner;f.token=b.token;f.body=Encode(b);return f;
|
||||
}
|
||||
|
||||
// Transport-independent preparation state machine. This does NOT pause events
|
||||
// or mutate assets. The game adapter must retain a real freeze throughout every
|
||||
// non-Idle state. No timeout or negative/unknown reply is permission to thaw.
|
||||
class ActorHandshake {
|
||||
public:
|
||||
enum Stage { Idle,WaitArm,WaitDrain,Held,WaitCancel };
|
||||
private:
|
||||
Stage stage=Idle;Handshake arm;uint64_t deadline=0;bool submitted=false;uint32_t mutations=0;
|
||||
public:
|
||||
Stage State()const{return stage;}
|
||||
bool BlocksActions()const{return stage!=Idle;}
|
||||
bool Submitted()const{return submitted;}
|
||||
uint32_t Invalidated()const{return mutations;}
|
||||
void Invalidate(uint32_t reason) {
|
||||
if(stage==Idle||!reason)return;
|
||||
mutations|=reason;
|
||||
// Before cookie arrival keep accepting that Arm ACK only to cancel it.
|
||||
// After Submit, nothing can pretend this was a never-submitted batch.
|
||||
if(submitted)stage=Held;
|
||||
}
|
||||
const Handshake& IdentityFrame()const{return arm;}
|
||||
bool Start(const Batch& b,uint64_t session,uint64_t now,bool auditedFreeze) {
|
||||
if(stage!=Idle||!auditedFreeze)return false;
|
||||
auto f=ArmFrame(b,session);if(!ValidHandshake(f))return false;
|
||||
arm=std::move(f);stage=WaitArm;deadline=now;submitted=false;mutations=0;return true;
|
||||
}
|
||||
Handshake Request(Message message)const {
|
||||
Handshake f=arm;f.body.clear();f.message=message;f.status=Status::None;return f;
|
||||
}
|
||||
bool Armed(const Handshake& answer,uint64_t now) {
|
||||
if(stage!=WaitArm||!ValidHandshake(answer)||answer.message!=Message::Answer||answer.status!=Status::Armed||!SameIdentity(arm,answer)||(arm.cookie&&arm.cookie!=answer.cookie))return false;
|
||||
arm.cookie=answer.cookie;deadline=now;return true;
|
||||
}
|
||||
bool Submit(bool snapshotUnchanged,uint64_t now) {
|
||||
if(stage!=WaitArm||!arm.cookie||!snapshotUnchanged||mutations)return false;
|
||||
// Mark BEFORE enqueue: a lost/disconnected send cannot be cancelled or
|
||||
// timed out as if the DB could not have seen it.
|
||||
submitted=true;stage=WaitDrain;deadline=now;return true;
|
||||
}
|
||||
bool Cancel() {
|
||||
if(stage!=WaitArm||!arm.cookie||submitted)return false;stage=WaitCancel;return true;
|
||||
}
|
||||
bool Answer(const Handshake& answer) {
|
||||
if(stage==Idle||!ValidHandshake(answer)||answer.message!=Message::Answer||!SameIdentity(arm,answer)||answer.cookie!=arm.cookie||!arm.cookie)return false;
|
||||
if(stage==WaitCancel&&answer.status==Status::Cancelled&&!submitted){stage=Idle;arm={};return true;}
|
||||
if(answer.status==Status::Held||answer.status==Status::Aborted||answer.status==Status::Frozen){stage=Held;return true;}
|
||||
return false; // Denied/unknown/late Armed never authorize thaw
|
||||
}
|
||||
bool TimedOut(uint64_t now,uint64_t interval=10) {
|
||||
if(stage==Idle||now<deadline||now-deadline<interval)return false;
|
||||
stage=Held;return true;
|
||||
}
|
||||
void LostTransport(){if(stage!=Idle)stage=Held;}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
#pragma once
|
||||
#include "cube_owner_types.h"
|
||||
namespace PortCube {
|
||||
// Existing fence image: gold8 + count2 + at most225*(reward114+cell2+usable1).
|
||||
constexpr unsigned InventoryImageMaximum=26335,RecoveryImageMaximum=OwnerGrantBytes+2+InventoryImageMaximum;
|
||||
struct InventoryImage {uint64_t gold=0;std::vector<Item> items;};
|
||||
inline std::string EncodeInventoryImage(const InventoryImage& i){Writer w;w.n(i.gold,8);w.items(i.items);return w.data;}
|
||||
inline bool DecodeInventoryImage(const std::string& bytes,InventoryImage& out,const Lookup& lookup={}) {
|
||||
out={};if(bytes.size()<10||bytes.size()>InventoryImageMaximum)return false;
|
||||
Reader r(bytes);InventoryImage image;image.gold=r.n(8);image.items=r.items();
|
||||
if(!r.ok||r.at!=bytes.size()||image.gold>uint64_t(PortEconomy::GoldLimit))return false;
|
||||
int last=-1;std::set<uint32_t> ids;std::array<bool,225> used={};
|
||||
for(const auto& item:image.items) {
|
||||
const auto& v=item.value;
|
||||
if(!v.id||!v.vnum||!v.count||v.count>2000||!item.usable||item.cell>=225||int(item.cell)<=last||!ids.insert(v.id).second)return false;last=item.cell;
|
||||
if(lookup) {
|
||||
const auto p=lookup(v.vnum);
|
||||
if(p.size<1||p.size>3||(!p.stackable&&v.count!=1)||(item.cell%45)/5+p.size>9)return false;
|
||||
for(unsigned n=0;n<p.size;++n){const auto at=item.cell+5*n;if(at>=225||used[at])return false;used[at]=true;}
|
||||
}
|
||||
}
|
||||
if(EncodeInventoryImage(image)!=bytes)return false;out=std::move(image);return true;
|
||||
}
|
||||
inline std::string EncodeRecoveryImage(const OwnerGrant& grant,const std::string& image) {
|
||||
InventoryImage decoded;const auto body=EncodeOwnerGrant(grant);
|
||||
if(body.empty()||!DecodeInventoryImage(image,decoded))return {};Writer w;w.data=body;w.s(image);return w.data;
|
||||
}
|
||||
inline bool DecodeRecoveryImage(const std::string& bytes,OwnerGrant& grant,std::string& image) {
|
||||
grant={};image.clear();if(bytes.size()<OwnerGrantBytes+12||bytes.size()>RecoveryImageMaximum)return false;
|
||||
OwnerGrant g;if(!DecodeOwnerGrant(bytes.substr(0,OwnerGrantBytes),g))return false;
|
||||
Reader r(bytes);r.at=OwnerGrantBytes;auto data=r.s(InventoryImageMaximum);InventoryImage decoded;
|
||||
if(!r.ok||r.at!=bytes.size()||!DecodeInventoryImage(data,decoded))return false;
|
||||
grant=std::move(g);image=std::move(data);return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
#pragma once
|
||||
#include "cube_fence.h"
|
||||
#include "cube_owner.h"
|
||||
namespace PortCube {
|
||||
// Optional additive schema. An ACK records an exact applied image; it does not
|
||||
// release a lease, an item fence, or an actor. Never install tables at startup.
|
||||
template<class DB> bool ImageAckSchema(DB& db) {
|
||||
PortEconomy::Rows rows;
|
||||
const std::string names="('port_cube_image_ack_version','port_cube_image_acks')";
|
||||
auto q=[&](const std::string& sql){return db.Query(sql,rows)&&!db.warnings&&rows.size()==1&&rows[0].size()==1;};
|
||||
return q("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names)&&rows[0][0]=="2"&&
|
||||
q("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names)&&rows[0][0]=="2"&&
|
||||
q("SELECT version FROM port_cube_image_ack_version WHERE id=1")&&rows[0][0]=="1";
|
||||
}
|
||||
template<class DB> class ImageAckStore {
|
||||
DB& db;Lookup lookup;
|
||||
static std::string X(const std::string& s){return "X'"+PortEconomy::Hex(s.data(),s.size())+"'";}
|
||||
public:
|
||||
enum Result {Retry,Refused,Stored};
|
||||
ImageAckStore(DB& d,Lookup p):db(d),lookup(std::move(p)){}
|
||||
Result AcknowledgeLive(const Batch& b,const OwnerGrant& grant,const std::string& image) {
|
||||
InventoryImage decoded;
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!DecodeInventoryImage(image,decoded,lookup))return Refused;
|
||||
if(!ImageAckSchema(db))return Retry;
|
||||
OwnerStore<DB> owner(db,lookup);FenceStore<DB> fence(db,lookup);std::string current;
|
||||
// Resync holds the account, fence and current SQL inventory on the same
|
||||
// pinned transaction. Callback writes roll back with its COMMIT failure.
|
||||
const auto result=fence.Resync(b,current,[&](const std::string& actual)->bool {
|
||||
if(actual!=image||!owner.LiveImageWithin(b,grant,image))return false;
|
||||
PortEconomy::Rows rows;
|
||||
auto q=[&](const std::string& sql){return db.Query(sql,rows)&&!db.warnings;};
|
||||
// ACK cannot create the initial issued image or acknowledge a
|
||||
// changed saved image, even when the current SQL happens to match.
|
||||
if(!q("SELECT phase,image FROM port_cube_fences WHERE pid="+std::to_string(b.player)+" FOR UPDATE")||
|
||||
rows.size()!=1||rows[0]!=std::vector<std::string>{"RESYNC",image})return false;
|
||||
const auto body=Encode(b),binding=EncodeOwnerGrant(grant);
|
||||
if(!q("SELECT body,owner_grant,image FROM port_cube_image_acks WHERE request='"+b.token+"' FOR UPDATE"))return false;
|
||||
if(!rows.empty())return rows.size()==1&&rows[0]==std::vector<std::string>{body,binding,image};
|
||||
return q("INSERT INTO port_cube_image_acks(request,body,owner_grant,image) VALUES('"+b.token+"',"+X(body)+","+X(binding)+","+X(image)+")")&&db.affected==1;
|
||||
});
|
||||
return result==FenceStore<DB>::Done?Stored:result==FenceStore<DB>::Retry?Retry:Refused;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
|
||||
namespace PortCube {
|
||||
// Legacy game allocation uses an exclusive upper bound. DB range collision
|
||||
// checks are inclusive, so even touching ranges are rejected for handoff.
|
||||
struct ItemIDRange { uint32_t minimum=0, maximum=0, usable=0; };
|
||||
struct ItemIDPlan {
|
||||
std::vector<uint32_t> ids;
|
||||
uint32_t next=0;
|
||||
bool spare=false;
|
||||
};
|
||||
inline bool ValidItemIDRange(const ItemIDRange& r) {
|
||||
return r.minimum && r.minimum<=r.usable && r.usable<r.maximum;
|
||||
}
|
||||
inline bool PlanItemIDs(const ItemIDRange& active,uint32_t next,
|
||||
const ItemIDRange& spare,unsigned count,ItemIDPlan& out) {
|
||||
// No partial output, wraparound, allocation of the sentinel maximum, or
|
||||
// speculative switch when all IDs already fit in the active range.
|
||||
if(!count||count>100||!ValidItemIDRange(active)||
|
||||
next<active.usable||next>active.maximum)return false;
|
||||
const uint64_t available=uint64_t(active.maximum)-next;
|
||||
const bool switchRange=count>available;
|
||||
if(switchRange && (!ValidItemIDRange(spare)||
|
||||
!(active.maximum<spare.minimum||spare.maximum<active.minimum)||
|
||||
uint64_t(count)-available>uint64_t(spare.maximum)-spare.usable))return false;
|
||||
ItemIDPlan plan;plan.ids.reserve(count);
|
||||
uint32_t cursor=next;
|
||||
for(unsigned i=0;i<count;++i) {
|
||||
if(!plan.spare&&cursor==active.maximum){plan.spare=true;cursor=spare.usable;}
|
||||
plan.ids.push_back(cursor++);
|
||||
}
|
||||
plan.next=cursor;out=std::move(plan);return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
#pragma once
|
||||
#include "cube_craft.h"
|
||||
namespace PortCube {
|
||||
inline bool CraftImage(const Batch& b,const CraftReceipt& receipt,uint64_t credits,const Lookup& lookup,std::string& out) {
|
||||
if(receipt.result!="ok"||!ValidateCraftReceipt(b,receipt,lookup)||receipt.fee>b.gold||
|
||||
credits>uint64_t(PortEconomy::GoldLimit)-(b.gold-receipt.fee))return false;
|
||||
std::string rolls(b.attempts,char(100));for(unsigned i=0;i<receipt.successes;++i)rolls[i]=1;
|
||||
const auto plan=SettlePlan(b,rolls,lookup);if(plan.result!="ok")return false;
|
||||
InventoryImage image;image.gold=b.gold-receipt.fee+credits;image.items=b.inventory;
|
||||
for(auto& item:image.items){item.usable=true;for(const auto& take:plan.takes)if(take.id==item.value.id){if(take.count>item.value.count)return false;item.value.count-=take.count;}}
|
||||
image.items.erase(std::remove_if(image.items.begin(),image.items.end(),[](const Item& i){return !i.value.count;}),image.items.end());
|
||||
image.items.insert(image.items.end(),receipt.awards.begin(),receipt.awards.end());
|
||||
std::sort(image.items.begin(),image.items.end(),[](const Item& a,const Item& c){return a.cell<c.cell;});
|
||||
const auto bytes=EncodeInventoryImage(image);InventoryImage decoded;if(!DecodeInventoryImage(bytes,decoded,lookup))return false;out=bytes;return true;
|
||||
}
|
||||
// Transport state only: adapter must apply/read back and remain held throughout.
|
||||
class LiveImageFlow {
|
||||
public: enum Stage {Idle,Waiting,Ready,Held,Applied,AckWaiting,Acknowledged};
|
||||
private: Stage stage=Idle;Handshake identity;std::string expected;
|
||||
public:
|
||||
Stage State()const{return stage;}bool MayRetry()const{return stage==Waiting;}
|
||||
const std::string& Image()const{return expected;}
|
||||
void Invalidate(){stage=Held;}
|
||||
bool Start(const Handshake& bound,const Batch& b,const CraftReceipt& receipt,uint64_t credits,const Lookup& lookup,bool sealed) {
|
||||
auto f=bound;f.message=Message::LiveImageRequest;f.status=Status::None;f.body.clear();
|
||||
if(stage!=Idle||!sealed||!ValidHandshake(f)||f.account!=b.account||f.player!=b.player||f.epoch!=b.epoch||f.owner!=b.owner||f.token!=b.token||!CraftImage(b,receipt,credits,lookup,expected))return false;
|
||||
identity=std::move(f);stage=Waiting;return true;
|
||||
}
|
||||
Handshake Request()const{return identity;}
|
||||
bool MarkApplied(const std::string& readback) {
|
||||
if(stage!=Ready||readback!=expected){stage=Held;return false;}stage=Applied;return true;
|
||||
}
|
||||
bool BeginAcknowledge(const std::string& readback) {
|
||||
if(stage!=Applied||readback!=expected){stage=Held;return false;}stage=AckWaiting;return true;
|
||||
}
|
||||
bool MayAcknowledge()const{return stage==AckWaiting;}
|
||||
Handshake Acknowledgement()const {
|
||||
auto f=identity;f.message=Message::LiveImageAck;f.body=expected;return f;
|
||||
}
|
||||
bool Answer(const Handshake& f) {
|
||||
if(!ValidHandshake(f)||!SameIdentity(f,identity)||f.cookie!=identity.cookie)return false;
|
||||
if(f.message==Message::LiveImageAckAnswer) {
|
||||
if(stage!=AckWaiting&&stage!=Acknowledged)return false;
|
||||
if(f.status==Status::Held)return stage==AckWaiting;
|
||||
if(f.status!=Status::LiveImageAcknowledged)return false;
|
||||
if(f.body!=expected){stage=Held;return false;}stage=Acknowledged;return true;
|
||||
}
|
||||
if((stage!=Waiting&&stage!=Ready&&stage!=Applied&&stage!=AckWaiting&&stage!=Acknowledged)||f.message!=Message::LiveImageAnswer)return false;
|
||||
if(f.status==Status::Held)return stage==Waiting;
|
||||
if(f.status!=Status::LiveImageReady)return false;
|
||||
if(f.body!=expected){stage=Held;return false;}if(stage==Waiting)stage=Ready;return true;
|
||||
}
|
||||
};
|
||||
// Terminal SQL transport only. A Released result retains both actor and DB
|
||||
// memory holds; it is NOT a resume grant or permission to enable item saves.
|
||||
class LiveReleaseFlow {
|
||||
public: enum Stage {Idle,Waiting,Released,Held};
|
||||
private: Stage stage=Idle;Handshake request;
|
||||
public:
|
||||
Stage State()const{return stage;}
|
||||
bool MayRetry()const{return stage==Waiting;}
|
||||
void Invalidate(){stage=Held;}
|
||||
bool Start(const LiveImageFlow& image,bool locallyReady) {
|
||||
if(stage!=Idle||!locallyReady||image.State()!=LiveImageFlow::Acknowledged)return false;
|
||||
auto f=image.Acknowledgement();f.message=Message::LiveReleaseRequest;
|
||||
if(!ValidHandshake(f))return false;
|
||||
request=std::move(f);stage=Waiting;return true;
|
||||
}
|
||||
Handshake Request()const{return request;}
|
||||
bool Answer(const Handshake& f) {
|
||||
if((stage!=Waiting&&stage!=Released)||!ValidHandshake(f)||f.message!=Message::LiveReleaseAnswer||
|
||||
!SameIdentity(f,request)||f.cookie!=request.cookie)return false;
|
||||
if(f.status==Status::Held)return stage==Waiting;
|
||||
if(f.status!=Status::LiveReleased)return false;
|
||||
if(f.body!=request.body){stage=Held;return false;}
|
||||
stage=Released;return true;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
namespace PortCube {
|
||||
// Preparation admission is conservative, not a change to expiry/reward rules.
|
||||
// No bit grants permission to pause arbitrary timers or drop a mutation.
|
||||
enum Hazard : uint32_t { ItemClock=1,ItemBusy=2,QuestTimer=4,QuestRunning=8,
|
||||
Switcher=16,Party=32,Combat=64,LifeCycle=128,MissingState=256 };
|
||||
enum Mutation : uint32_t { ItemWrite=1,GoldWrite=2,QuestWrite=4,ContextChanged=8,LifecycleWrite=16 };
|
||||
}
|
||||
@@ -0,0 +1,203 @@
|
||||
#pragma once
|
||||
#include "cube_owner_types.h"
|
||||
#include "cube_gold_store.h"
|
||||
#include "cube_image.h"
|
||||
#include <cerrno>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
namespace PortCube {
|
||||
inline std::string OwnerBootNonce() {
|
||||
unsigned char bytes[16];const int fd=open("/dev/urandom",O_RDONLY);if(fd<0)return {};size_t at=0;
|
||||
while(at<sizeof(bytes)){auto n=read(fd,bytes+at,sizeof(bytes)-at);if(n<0&&errno==EINTR)continue;if(n<=0){close(fd);return {};}at+=size_t(n);}close(fd);
|
||||
const auto s=PortEconomy::Hex(bytes,sizeof(bytes));return Identity(s)?s:std::string{};
|
||||
}
|
||||
// DB-main/direct-session authority. A connection-scoped MySQL advisory lock
|
||||
// fences competing brokers; each new boot OR SQL connection advances generation.
|
||||
// There is no wall-clock expiry, auto-adoption, currency write or thaw here.
|
||||
template<class DB> class OwnerStore {
|
||||
DB& db;Lookup lookup;using Rows=PortEconomy::Rows;
|
||||
static std::string N(uint64_t n){return std::to_string(n);}
|
||||
bool Q(const std::string& s,Rows& r){return db.Query(s,r)&&!db.warnings;}
|
||||
bool Run(const std::string& s){Rows r;return Q(s,r);}
|
||||
bool Change(const std::string& s){return Run(s)&&db.affected==1;}
|
||||
struct Guard {DB& db;~Guard(){db.Rollback();}};
|
||||
bool Account(uint32_t id){Rows r;return Run("INSERT INTO port_economy_account_lock(account) VALUES("+N(id)+") ON DUPLICATE KEY UPDATE account=VALUES(account)")&&Q("SELECT account FROM port_economy_account_lock WHERE account="+N(id)+" FOR UPDATE",r)&&r.size()==1;}
|
||||
bool Session(uint64_t& connection,uint64_t& holder) {
|
||||
Rows r;holder=0;
|
||||
if(!Q("SELECT CONNECTION_ID(),IS_USED_LOCK(CONCAT('m2_cube:',DATABASE()))",r)||r.size()!=1||r[0].size()!=2||!PortEconomy::Number(r[0][0],connection)||!connection)return false;
|
||||
return r[0][1].empty()||PortEconomy::Number(r[0][1],holder);
|
||||
}
|
||||
bool LeaderRow(const OwnerLeader& l) {
|
||||
uint64_t connection=0,holder=0;Rows r;
|
||||
return Valid(l)&&Session(connection,holder)&&connection==l.connection&&holder==connection&&
|
||||
Q("SELECT generation,boot,connection_id FROM port_cube_owner_broker WHERE id=1 FOR UPDATE",r)&&r.size()==1&&r[0]==std::vector<std::string>{N(l.generation),l.boot,N(l.connection)};
|
||||
}
|
||||
bool LeaseRows(const Batch& b,Rows& r){return Q("SELECT account,pid,body,revision,generation,boot,connection_id,peer,binding,original_peer,original_binding,phase,revoked_generation,reason FROM port_cube_owner_leases WHERE request='"+b.token+"' FOR UPDATE",r);}
|
||||
static bool DecodeLease(const Batch& b,const Rows& rows,OwnerGrant& active,GoldSourceBinding& original,uint32_t& originalPeer,std::string& phase,uint64_t& revoked) {
|
||||
active={};original={};originalPeer=0;revoked=0;
|
||||
if(rows.size()!=1||rows[0].size()!=14)return false;const auto& r=rows[0];uint64_t peer=0,oldPeer=0,reason=0;
|
||||
if(r[0]!=N(b.account)||r[1]!=N(b.player)||r[2]!=Encode(b)||!PortEconomy::Number(r[3],active.revision)||!PortEconomy::Number(r[4],active.leader.generation)||
|
||||
!PortEconomy::Number(r[6],active.leader.connection)||!PortEconomy::Number(r[7],peer,UINT32_MAX)||!PortEconomy::Number(r[9],oldPeer,UINT32_MAX)||
|
||||
!DecodeGoldSourceBinding(r[8],active.binding)||!DecodeGoldSourceBinding(r[10],original)||!Matches(active.binding,b)||!Matches(original,b)||
|
||||
!PortEconomy::Number(r[12],revoked)||!PortEconomy::Number(r[13],reason,3))return false;
|
||||
active.peer=uint32_t(peer);active.leader.boot=r[5];originalPeer=uint32_t(oldPeer);phase=r[11];
|
||||
return Valid(active)&&originalPeer&&(phase=="LIVE"||phase=="REVOKED"||phase=="ADOPTED")&&((phase=="REVOKED")==bool(revoked))&&((phase=="REVOKED")==bool(reason));
|
||||
}
|
||||
static bool Same(const OwnerGrant& a,const OwnerGrant& b){return SameOwnerGrant(a,b);}
|
||||
public:
|
||||
enum Result {Retry,Refused,Busy,Acquired,Revoked,Adopted};
|
||||
OwnerStore(DB& d,Lookup p):db(d),lookup(std::move(p)){}
|
||||
bool Ready(){GoldIntentStore<DB> gold(db,lookup);return gold.Ready()&&OwnerSchema(db)==1;}
|
||||
Result Acquire(std::string boot,OwnerLeader& leader) {
|
||||
leader={};if(!Identity(boot))return Refused;if(!Ready())return Retry;
|
||||
uint64_t connection=0,holder=0;if(!Session(connection,holder))return Retry;
|
||||
Rows rows;
|
||||
if(holder!=connection) {
|
||||
if(!Q("SELECT GET_LOCK(CONCAT('m2_cube:',DATABASE()),0)",rows)||rows.size()!=1||rows[0].size()!=1)return Retry;
|
||||
if(rows[0][0]!="1")return Busy;
|
||||
}
|
||||
if(!db.Begin())return Retry;Guard guard{db};
|
||||
if(!Q("SELECT generation,boot,connection_id FROM port_cube_owner_broker WHERE id=1 FOR UPDATE",rows)||rows.size()!=1||rows[0].size()!=3)return Retry;
|
||||
uint64_t generation=0,oldConnection=0;
|
||||
if(!PortEconomy::Number(rows[0][0],generation)||!PortEconomy::Number(rows[0][2],oldConnection))return Refused;
|
||||
if(generation&&(!Identity(rows[0][1])||!oldConnection))return Refused;
|
||||
if(!generation&&(rows[0][1]!=std::string(32,'0')||oldConnection))return Refused;
|
||||
if(generation&&rows[0][1]==boot&&oldConnection==connection){leader={boot,generation,connection};return Acquired;}
|
||||
if(generation==UINT64_MAX)return Refused;
|
||||
if(!Change("UPDATE port_cube_owner_broker SET generation="+N(generation+1)+",boot='"+boot+"',connection_id="+N(connection)+" WHERE id=1 AND generation="+N(generation))||!db.Commit())return Retry;
|
||||
leader={boot,generation+1,connection};return Acquired;
|
||||
}
|
||||
bool Current(const OwnerLeader& l){if(!Ready()||!db.Begin())return false;Guard g{db};return LeaderRow(l);}
|
||||
// Called INSIDE FenceStore::Begin's account transaction, after item locks.
|
||||
// Replay can only validate an existing identical row, never invent one.
|
||||
bool BindWithin(const Batch& b,const OwnerGrant& grant,bool replay) {
|
||||
if(!Validate(b)||!Valid(grant)||grant.revision!=1||!Matches(grant.binding,b)||!LeaderRow(grant.leader))return false;
|
||||
Rows rows;if(!LeaseRows(b,rows))return false;
|
||||
if(!rows.empty()) {
|
||||
OwnerGrant existing;GoldSourceBinding original;uint32_t peer=0;std::string phase;uint64_t revoked=0;
|
||||
return DecodeLease(b,rows,existing,original,peer,phase,revoked)&&phase=="LIVE"&&Same(existing,grant)&&peer==grant.peer&&EncodeGoldSourceBinding(original)==EncodeGoldSourceBinding(grant.binding);
|
||||
}
|
||||
if(replay)return false;
|
||||
if(!Q("SELECT request FROM port_cube_owner_leases WHERE account="+N(b.account)+" OR pid="+N(b.player)+" FOR UPDATE",rows)||!rows.empty())return false;
|
||||
const auto body=Encode(b),binding=EncodeGoldSourceBinding(grant.binding);
|
||||
return Change("INSERT INTO port_cube_owner_leases(request,account,pid,body,revision,generation,boot,connection_id,peer,binding,original_peer,original_binding,phase,revoked_generation,reason) VALUES('"+b.token+"',"+N(b.account)+","+N(b.player)+",X'"+PortEconomy::Hex(body.data(),body.size())+"',1,"+N(grant.leader.generation)+",'"+grant.leader.boot+"',"+N(grant.leader.connection)+","+N(grant.peer)+",X'"+PortEconomy::Hex(binding.data(),binding.size())+"',"+N(grant.peer)+",X'"+PortEconomy::Hex(binding.data(),binding.size())+"','LIVE',0,0)");
|
||||
}
|
||||
bool Check(const Batch& b,const OwnerGrant& grant) {
|
||||
if(!Ready()||!db.Begin())return false;Guard guard{db};if(!Account(b.account)||!LeaderRow(grant.leader))return false;
|
||||
Rows rows;OwnerGrant active;GoldSourceBinding original;uint32_t peer=0;std::string phase;uint64_t revoked=0;
|
||||
return LeaseRows(b,rows)&&DecodeLease(b,rows,active,original,peer,phase,revoked)&&phase!="REVOKED"&&Same(active,grant);
|
||||
}
|
||||
// Called inside Prepare/Execute after the account lock, never via a separate
|
||||
// reconnectable preflight. The original live source must be sealed first.
|
||||
bool CraftWithin(const Batch& b,const OwnerGrant& grant) {
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!Ready()||!LeaderRow(grant.leader))return false;
|
||||
Rows rows;OwnerGrant active;GoldSourceBinding original;uint32_t peer=0;std::string phase;uint64_t revoked=0;
|
||||
if(!LeaseRows(b,rows)||!DecodeLease(b,rows,active,original,peer,phase,revoked)||phase!="LIVE"||!Same(active,grant)||peer!=grant.peer||EncodeGoldSourceBinding(original)!=EncodeGoldSourceBinding(grant.binding))return false;
|
||||
if(!Q("SELECT account,epoch,owner,request,phase,body,drain_state FROM port_cube_fences WHERE pid="+N(b.player)+" FOR UPDATE",rows)||rows.size()!=1||rows[0]!=std::vector<std::string>{N(b.account),N(b.epoch),b.owner,b.token,"FROZEN",Encode(b),"1"})return false;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return false;
|
||||
std::vector<std::string> events;for(const auto& record:records)events.push_back(record.intent.event);
|
||||
const std::vector<std::string> proof={N(b.account),N(b.player),N(b.epoch),b.owner,N(original.session),N(original.cookie),N(original.handle),EncodeGoldManifest(events)};
|
||||
return Q("SELECT account,pid,epoch,owner,session,cookie,handle,manifest FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",rows)&&rows.size()==1&&rows[0]==proof;
|
||||
}
|
||||
// Inside Fence.Resync's account transaction on the SAME pinned connection.
|
||||
// A grant alone is insufficient: recheck original source, verified receipt,
|
||||
// current wallet (including zero-credit batches), and all surviving ID locks.
|
||||
private:
|
||||
bool OwnedImageWithin(const Batch& b,const OwnerGrant& grant,const std::string& image,bool live,bool released=false) {
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!Ready()||!LeaderRow(grant.leader))return false;
|
||||
Rows rows;OwnerGrant active;GoldSourceBinding original;uint32_t peer=0;std::string phase;uint64_t revoked=0;
|
||||
if(released) {
|
||||
if(!ReleasedWithin(b,grant))return false;
|
||||
original=grant.binding;peer=grant.peer;
|
||||
} else {
|
||||
if(!LeaseRows(b,rows)||!DecodeLease(b,rows,active,original,peer,phase,revoked)||phase!=(live?"LIVE":"ADOPTED")||!Same(active,grant))return false;
|
||||
if(live&&(peer!=grant.peer||EncodeGoldSourceBinding(original)!=EncodeGoldSourceBinding(grant.binding)))return false;
|
||||
}
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return false;
|
||||
std::vector<std::string> events;for(const auto& record:records){if(!record.applied)return false;events.push_back(record.intent.event);}
|
||||
const std::vector<std::string> proof={N(b.account),N(b.player),N(b.epoch),b.owner,N(original.session),N(original.cookie),N(original.handle),EncodeGoldManifest(events)};
|
||||
if(!Q("SELECT account,pid,epoch,owner,session,cookie,handle,manifest FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",rows)||rows.size()!=1||rows[0]!=proof)return false;
|
||||
typename BatchStore<DB>::Receipt receipt;
|
||||
if(!Q("SELECT body,rolls,state,result,successes,fee,awards FROM port_cube_requests WHERE token='"+b.token+"' AND account="+N(b.account)+" AND pid="+N(b.player)+" FOR UPDATE",rows)||rows.size()!=1||!BatchStore<DB>::DoneReceipt(b,rows[0],receipt)||receipt.result!="ok")return false;
|
||||
const auto plan=SettlePlan(b,rows[0][1],lookup);Writer planned,awarded;planned.items(plan.awards);awarded.items(receipt.awards);
|
||||
if(plan.result!="ok"||plan.fee!=receipt.fee||plan.successes!=receipt.successes||planned.data!=awarded.data)return false;
|
||||
uint64_t gold=b.gold-receipt.fee;
|
||||
for(const auto& record:records){if(record.before!=gold)return false;gold=record.after;}
|
||||
if(!Q("SELECT gold FROM player WHERE id="+N(b.player)+" AND account_id="+N(b.account)+" FOR UPDATE",rows)||rows.size()!=1||rows[0]!=std::vector<std::string>{N(gold)})return false;
|
||||
if(!Q("SELECT id,pid,epoch,request FROM port_cube_item_fences WHERE pid="+N(b.player)+" FOR UPDATE",rows)||rows.size()>8517)return false;
|
||||
if(released&&!rows.empty())return false;
|
||||
std::set<uint32_t> locks;
|
||||
for(const auto& row:rows){uint64_t id=0;if(row.size()!=4||!PortEconomy::Number(row[0],id,UINT32_MAX)||!id||row[1]!=N(b.player)||row[2]!=N(b.epoch)||row[3]!=b.token||!locks.insert(uint32_t(id)).second)return false;}
|
||||
for(const auto& item:b.inventory)if(!released&&!locks.count(item.value.id))return false;
|
||||
std::set<uint32_t> reserved;for(const auto& reward:b.rewards){if(!released&&!locks.count(reward.id))return false;reserved.insert(reward.id);}
|
||||
if(!Q("SELECT id,request FROM port_economy_item_reservations WHERE request='"+b.token+"' FOR UPDATE",rows)||rows.size()!=reserved.size())return false;
|
||||
for(const auto& row:rows){uint64_t id=0;if(row.size()!=2||!PortEconomy::Number(row[0],id,UINT32_MAX)||row[1]!=b.token||!reserved.erase(uint32_t(id)))return false;}
|
||||
if(!reserved.empty()||!Q("SELECT id FROM item WHERE owner_id="+N(b.player)+" AND window NOT IN ('MALL','SAFEBOX') FOR UPDATE",rows)||rows.size()>4096)return false;
|
||||
for(const auto& row:rows){uint64_t id=0;if(row.size()!=1||!PortEconomy::Number(row[0],id,UINT32_MAX)||!id||(!released&&!locks.count(uint32_t(id))))return false;}
|
||||
InventoryImage expected;expected.gold=gold;expected.items=b.inventory;
|
||||
for(auto& item:expected.items){item.usable=true;for(const auto& take:plan.takes)if(take.id==item.value.id){if(take.count>item.value.count)return false;item.value.count-=take.count;}}
|
||||
expected.items.erase(std::remove_if(expected.items.begin(),expected.items.end(),[](const Item& item){return !item.value.count;}),expected.items.end());
|
||||
expected.items.insert(expected.items.end(),receipt.awards.begin(),receipt.awards.end());std::sort(expected.items.begin(),expected.items.end(),[](const Item& a,const Item& c){return a.cell<c.cell;});
|
||||
InventoryImage decoded;return DecodeInventoryImage(image,decoded,lookup)&&EncodeInventoryImage(expected)==image;
|
||||
}
|
||||
public:
|
||||
bool ImageWithin(const Batch& b,const OwnerGrant& grant,const std::string& image){return OwnedImageWithin(b,grant,image,false);}
|
||||
bool LiveImageWithin(const Batch& b,const OwnerGrant& grant,const std::string& image){return OwnedImageWithin(b,grant,image,true);}
|
||||
// Caller holds a released fence/account transaction and checks exact
|
||||
// terminal history. No lease resurrection, save permission or asset writes.
|
||||
bool ReleasedImageWithin(const Batch& b,const OwnerGrant& grant,const std::string& image){return OwnedImageWithin(b,grant,image,true,true);}
|
||||
// Historical terminal reply only, inside the caller's account transaction.
|
||||
// Exact durable receipt is checked by that caller; never clear a newer hold.
|
||||
bool ReleasedWithin(const Batch& b,const OwnerGrant& grant) {
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!Ready()||!LeaderRow(grant.leader))return false;
|
||||
Rows rows;return Q("SELECT request FROM port_cube_owner_leases WHERE account="+N(b.account)+" OR pid="+N(b.player)+" OR request='"+b.token+"' FOR UPDATE",rows)&&rows.empty();
|
||||
}
|
||||
bool Inspect(const Batch& b,const OwnerLeader& l,OwnerGrant& active,std::string& phase,uint64_t& revoked) {
|
||||
active={};phase.clear();revoked=0;
|
||||
if(!Validate(b)||!Ready()||!db.Begin())return false;Guard guard{db};
|
||||
if(!Account(b.account)||!LeaderRow(l))return false;
|
||||
Rows rows;GoldSourceBinding original;uint32_t peer=0;
|
||||
return LeaseRows(b,rows)&&DecodeLease(b,rows,active,original,peer,phase,revoked);
|
||||
}
|
||||
// reason 1/2 is a trusted DB peer-gone/account-owner-ended callback, not a
|
||||
// packet/client boolean. reason 3 requires a strictly newer broker generation.
|
||||
Result Revoke(const Batch& b,const OwnerLeader& l,unsigned reason,const OwnerGrant* lost,OwnerGrant& revokedGrant) {
|
||||
revokedGrant={};if(!Validate(b)||!Valid(l)||reason<1||reason>3||(reason!=3&&(!lost||!Valid(*lost))))return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};if(!Account(b.account)||!LeaderRow(l))return Retry;
|
||||
Rows rows;OwnerGrant active;GoldSourceBinding original;uint32_t peer=0;std::string phase;uint64_t revoked=0;
|
||||
if(!LeaseRows(b,rows)||!DecodeLease(b,rows,active,original,peer,phase,revoked))return Refused;
|
||||
if(reason==3){if(active.leader.generation>=l.generation)return Refused;}
|
||||
else {auto expected=*lost;if(phase=="REVOKED"&&lost->revision!=UINT64_MAX&&active.revision==lost->revision+1)expected.revision=active.revision;
|
||||
if(!Same(active,expected)||active.leader.boot!=l.boot||active.leader.generation!=l.generation||active.leader.connection!=l.connection)return Refused;}
|
||||
if(phase=="REVOKED"&&revoked==l.generation){revokedGrant=active;return Revoked;}
|
||||
if(active.revision==UINT64_MAX)return Refused;
|
||||
if(!Change("UPDATE port_cube_owner_leases SET phase='REVOKED',revision="+N(active.revision+1)+",revoked_generation="+N(l.generation)+",reason="+N(reason)+" WHERE request='"+b.token+"' AND revision="+N(active.revision))||!db.Commit())return Retry;
|
||||
active.revision++;revokedGrant=active;return Revoked;
|
||||
}
|
||||
Result Adopt(const Batch& b,const OwnerLeader& l,uint64_t revokedRevision,uint32_t peer,const GoldSourceBinding& target,OwnerGrant& grant) {
|
||||
grant={};if(!Validate(b)||!Valid(l)||!revokedRevision||revokedRevision==UINT64_MAX||!peer||!Matches(target,b)||EncodeGoldSourceBinding(target).empty())return Refused;
|
||||
if(!Ready()||!db.Begin())return Retry;Guard guard{db};if(!Account(b.account)||!LeaderRow(l))return Retry;
|
||||
Rows rows;OwnerGrant active;GoldSourceBinding original;uint32_t originalPeer=0;std::string phase;uint64_t revoked=0;
|
||||
if(!LeaseRows(b,rows)||!DecodeLease(b,rows,active,original,originalPeer,phase,revoked))return Refused;
|
||||
OwnerGrant expected{l,target,peer,revokedRevision+1};
|
||||
if(phase=="ADOPTED") {if(!Same(active,expected))return Refused;grant=active;return Adopted;}
|
||||
if(phase!="REVOKED"||revoked!=l.generation||active.revision!=revokedRevision)return Refused;
|
||||
if(target.session==original.session||target.session==active.binding.session)return Refused;
|
||||
if(!Q("SELECT account,epoch,owner,request,phase,body,drain_state FROM port_cube_fences WHERE pid="+N(b.player)+" FOR UPDATE",rows)||rows.size()!=1||rows[0].size()!=7)return Refused;
|
||||
const auto fence=rows[0];
|
||||
if(fence[0]!=N(b.account)||fence[1]!=N(b.epoch)||fence[2]!=b.owner||fence[3]!=b.token||fence[5]!=Encode(b)||fence[6]!="1"||(fence[4]!="FROZEN"&&fence[4]!="RESYNC"))return Refused;
|
||||
std::vector<GoldRecord> records;if(!GoldRecords(db,b,records))return Refused;
|
||||
std::vector<std::string> events;for(const auto& r:records)events.push_back(r.intent.event);
|
||||
const std::vector<std::string> proof={N(b.account),N(b.player),N(b.epoch),b.owner,N(original.session),N(original.cookie),N(original.handle),EncodeGoldManifest(events)};
|
||||
if(!Q("SELECT account,pid,epoch,owner,session,cookie,handle,manifest FROM port_cube_gold_sources WHERE request='"+b.token+"' FOR UPDATE",rows)||rows.size()!=1||rows[0]!=proof)return Refused;
|
||||
uint64_t expectedGold=0;if(GoldCreditBase(db,b,expectedGold)!=1)return Refused;
|
||||
bool pending=false;uint64_t future=expectedGold;
|
||||
for(const auto& r:records)if(r.applied){if(pending||r.before!=expectedGold)return Refused;expectedGold=future=r.after;}else{pending=true;if(future>uint64_t(PortEconomy::GoldLimit)-r.intent.amount)return Refused;future+=r.intent.amount;}
|
||||
if(fence[4]=="RESYNC"&&pending)return Refused;
|
||||
if(!Q("SELECT gold FROM player WHERE id="+N(b.player)+" AND account_id="+N(b.account)+" FOR UPDATE",rows)||rows.size()!=1||rows[0].size()!=1||rows[0][0]!=N(expectedGold))return Refused;
|
||||
const auto binding=EncodeGoldSourceBinding(target);
|
||||
if(!Change("UPDATE port_cube_owner_leases SET phase='ADOPTED',revision="+N(expected.revision)+",generation="+N(l.generation)+",boot='"+l.boot+"',connection_id="+N(l.connection)+",peer="+N(peer)+",binding=X'"+PortEconomy::Hex(binding.data(),binding.size())+"',revoked_generation=0,reason=0 WHERE request='"+b.token+"' AND revision="+N(revokedRevision)+" AND phase='REVOKED'")||!db.Commit())return Retry;
|
||||
grant=std::move(expected);return Adopted; // still held; no image/currency/load/thaw side effect
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
#pragma once
|
||||
#include "cube_gold_source.h"
|
||||
#include "economy_store.h"
|
||||
namespace PortCube {
|
||||
struct OwnerLeader {std::string boot;uint64_t generation=0,connection=0;};
|
||||
inline bool Valid(const OwnerLeader& l){return Identity(l.boot)&&l.generation&&l.connection;}
|
||||
struct OwnerGrant {OwnerLeader leader;GoldSourceBinding binding;uint32_t peer=0;uint64_t revision=0;};
|
||||
inline bool Valid(const OwnerGrant& g){return Valid(g.leader)&&g.peer&&g.revision&&!EncodeGoldSourceBinding(g.binding).empty();}
|
||||
inline bool SameOwnerGrant(const OwnerGrant& a,const OwnerGrant& b){return a.leader.boot==b.leader.boot&&a.leader.generation==b.leader.generation&&a.leader.connection==b.leader.connection&&a.peer==b.peer&&a.revision==b.revision&&EncodeGoldSourceBinding(a.binding)==EncodeGoldSourceBinding(b.binding);}
|
||||
constexpr unsigned OwnerGrantBytes=160;
|
||||
inline std::string EncodeOwnerGrant(const OwnerGrant& g) {
|
||||
if(!Valid(g))return {};Writer w;w.data="CRG1";w.data+=g.leader.boot;w.n(g.leader.generation,8);w.n(g.leader.connection,8);w.n(g.peer,4);w.n(g.revision,8);w.data+=EncodeGoldSourceBinding(g.binding);return w.data;
|
||||
}
|
||||
inline bool DecodeOwnerGrant(const std::string& body,OwnerGrant& grant) {
|
||||
grant={};if(body.size()!=OwnerGrantBytes||body.substr(0,4)!="CRG1")return false;
|
||||
Reader r(body);OwnerGrant g;r.at=4;g.leader.boot=body.substr(r.at,32);r.at+=32;
|
||||
g.leader.generation=r.n(8);g.leader.connection=r.n(8);g.peer=uint32_t(r.n(4));g.revision=r.n(8);
|
||||
if(!r.ok||!DecodeGoldSourceBinding(body.substr(r.at),g.binding)||EncodeOwnerGrant(g)!=body)return false;grant=std::move(g);return true;
|
||||
}
|
||||
template<class DB> int OwnerSchema(DB& db) {
|
||||
PortEconomy::Rows rows;const std::string names="('port_cube_owner_version','port_cube_owner_broker','port_cube_owner_leases')";
|
||||
auto query=[&](const std::string& s){return db.Query(s,rows)&&!db.warnings&&rows.size()==1&&rows[0].size()==1;};
|
||||
if(!query("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names))return -1;
|
||||
if(rows[0][0]=="0")return 0;
|
||||
if(rows[0][0]!="3"||!query("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names)||rows[0][0]!="3")return -1;
|
||||
if(!query("SELECT version FROM port_cube_owner_version WHERE id=1")||rows[0][0]!="1")return -1;return 1;
|
||||
}
|
||||
// No legacy/old-owner image ACK can remove item fences for a registered owner.
|
||||
// The adopted-owner image/thaw protocol is a separate required implementation.
|
||||
template<class DB> int OwnerReleaseStatus(DB& db,const Batch& b) {
|
||||
const int schema=OwnerSchema(db);if(schema<0)return -1;if(!schema)return 1;PortEconomy::Rows rows;
|
||||
if(!db.Query("SELECT request FROM port_cube_owner_leases WHERE request='"+b.token+"' OR pid="+std::to_string(b.player)+" FOR UPDATE",rows)||db.warnings)return -1;
|
||||
return rows.empty()?1:0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
#pragma once
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
// PORT: GC93 bounded LE presentation only. Never a craft request or thaw ACK.
|
||||
namespace PortCubeView {
|
||||
constexpr unsigned Slots=225,Quickslots=36,Maximum=32768;
|
||||
constexpr int64_t GoldLimit=2000000000000000LL;
|
||||
struct Quickslot {uint8_t type=0;uint16_t cell=0;};
|
||||
inline bool operator==(const Quickslot& a,const Quickslot& b){return a.type==b.type&&a.cell==b.cell;}
|
||||
struct Item {
|
||||
uint16_t cell=0,count=0;uint32_t id=0,vnum=0,flags=0,anti=0;
|
||||
int32_t sockets[3]={};uint8_t types[7]={};int16_t values[7]={};uint8_t extra[69]={};
|
||||
};
|
||||
struct Frame {uint64_t epoch=0,gold=0;std::vector<Item> items;std::array<Quickslot,Quickslots> quickslots={};};
|
||||
inline bool Valid(const Frame& f) {
|
||||
if(!f.epoch||f.gold>uint64_t(GoldLimit)||f.items.size()>Slots)return false;
|
||||
int last=-1;std::set<uint32_t> ids;
|
||||
for(const auto& i:f.items)if(i.cell>=Slots||int(i.cell)<=last||!i.id||!i.vnum||!i.count||i.count>2000||!ids.insert(i.id).second)return false;else last=i.cell;
|
||||
for(const auto& q:f.quickslots)if(q.type>3||(!q.type&&q.cell))return false;
|
||||
return true;
|
||||
}
|
||||
struct Writer {std::string bytes;void n(uint64_t v,unsigned width){for(unsigned j=0;j<width;++j)bytes+=char(v>>(8*j));}};
|
||||
struct Reader {const std::string& bytes;size_t at=0;bool ok=true;uint64_t n(unsigned width){if(at+width>bytes.size()){ok=false;return 0;}uint64_t v=0;for(unsigned j=0;j<width;++j)v|=uint64_t(uint8_t(bytes[at++]))<<(8*j);return v;}};
|
||||
inline std::string Encode(const Frame& f) {
|
||||
if(!Valid(f))return {};Writer w;w.n(11,1);w.bytes+="CCP1";w.n(f.epoch,8);w.n(f.gold,8);w.n(f.items.size(),2);w.n(Quickslots,1);
|
||||
for(const auto& q:f.quickslots){w.n(q.type,1);w.n(q.cell,2);}
|
||||
for(const auto& i:f.items) {
|
||||
w.n(i.cell,2);w.n(i.count,2);w.n(i.id,4);w.n(i.vnum,4);w.n(i.flags,4);w.n(i.anti,4);
|
||||
for(auto v:i.sockets)w.n(uint32_t(v),4);
|
||||
for(unsigned j=0;j<7;++j){w.n(i.types[j],1);w.n(uint16_t(i.values[j]),2);}
|
||||
w.bytes.append(reinterpret_cast<const char*>(i.extra),69);
|
||||
}
|
||||
return w.bytes.size()+5<=Maximum?w.bytes:std::string{};
|
||||
}
|
||||
inline bool Decode(const std::string& bytes,Frame& out) {
|
||||
out={};if(bytes.size()<132||bytes.size()+5>Maximum||uint8_t(bytes[0])!=11||bytes.substr(1,4)!="CCP1")return false;
|
||||
Reader r{bytes};r.at=5;Frame f;f.epoch=r.n(8);f.gold=r.n(8);const auto count=r.n(2);
|
||||
if(count>Slots||r.n(1)!=Quickslots||bytes.size()!=132+122*count)return false;
|
||||
for(auto& q:f.quickslots){q.type=uint8_t(r.n(1));q.cell=uint16_t(r.n(2));}
|
||||
for(unsigned j=0;j<count;++j) {
|
||||
Item i;i.cell=uint16_t(r.n(2));i.count=uint16_t(r.n(2));i.id=uint32_t(r.n(4));i.vnum=uint32_t(r.n(4));i.flags=uint32_t(r.n(4));i.anti=uint32_t(r.n(4));
|
||||
for(auto& v:i.sockets){uint32_t bits=uint32_t(r.n(4));std::memcpy(&v,&bits,4);}
|
||||
for(unsigned k=0;k<7;++k){i.types[k]=uint8_t(r.n(1));uint16_t bits=uint16_t(r.n(2));std::memcpy(&i.values[k],&bits,2);}
|
||||
for(auto& v:i.extra)v=uint8_t(r.n(1));f.items.push_back(i);
|
||||
}
|
||||
if(!r.ok||r.at!=bytes.size()||!Valid(f)||Encode(f)!=bytes)return false;out=std::move(f);return true;
|
||||
}
|
||||
// Snapshot old bindings ONCE before installing any new items. Never bind a
|
||||
// consumed item's shortcut to a new reward merely reusing the same cell.
|
||||
inline bool Rebind(const std::vector<Item>& before,const Frame& after,const std::array<Quickslot,Quickslots>& original,std::array<Quickslot,Quickslots>& result) {
|
||||
if(!Valid(after))return false;std::set<uint16_t> cells;std::set<uint32_t> ids;
|
||||
for(const auto& i:before)if(i.cell>=Slots||!i.id||!cells.insert(i.cell).second||!ids.insert(i.id).second)return false;
|
||||
auto plan=original;
|
||||
for(auto& q:plan) {
|
||||
if(q.type>3||(!q.type&&q.cell))return false;if(q.type!=1||q.cell>=Slots)continue;
|
||||
const auto old=std::find_if(before.begin(),before.end(),[&](const Item& i){return i.cell==q.cell;});
|
||||
const auto next=old==before.end()?after.items.end():std::find_if(after.items.begin(),after.items.end(),[&](const Item& i){return i.id==old->id;});
|
||||
if(next==after.items.end())q={};else q.cell=next->cell;
|
||||
}
|
||||
result=plan;return true;
|
||||
}
|
||||
inline std::string Packet(const Frame& f){const auto body=Encode(f);if(body.empty())return {};Writer w;w.n(93,1);w.n(body.size()+5,4);return w.bytes+body;}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
#pragma once
|
||||
#include <cerrno>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
namespace PortCube {
|
||||
class CraftEntropy {
|
||||
int fd=-1;
|
||||
public:
|
||||
CraftEntropy():fd(open("/dev/urandom",O_RDONLY|O_CLOEXEC)){}
|
||||
CraftEntropy(const CraftEntropy&)=delete;CraftEntropy& operator=(const CraftEntropy&)=delete;
|
||||
~CraftEntropy(){if(fd>=0)close(fd);}
|
||||
unsigned Draw() {
|
||||
if(fd<0)return 0;
|
||||
for(unsigned attempts=0;attempts<1024;++attempts) {
|
||||
unsigned char byte=0;ssize_t n;do{n=read(fd,&byte,1);}while(n<0&&errno==EINTR);
|
||||
if(n!=1)return 0;if(byte<200)return unsigned(byte)%100+1; // unbiased two samples per outcome
|
||||
}
|
||||
return 0; // no deterministic fallback or unbounded source failure loop
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
#pragma once
|
||||
#include "cube_batch.h"
|
||||
namespace PortCube {
|
||||
struct CraftReceipt {std::string result;unsigned successes=0;uint64_t fee=0;std::vector<Item> awards;};
|
||||
inline unsigned CraftCode(const std::string& name) {
|
||||
const std::vector<std::string> names={"ok","gold_changed","inventory_changed","materials_missing","gold_missing","capacity_full","item_proto","inventory_invalid"};
|
||||
const auto found=std::find(names.begin(),names.end(),name);return found==names.end()?0:unsigned(found-names.begin())+1;
|
||||
}
|
||||
inline std::string EncodeCraftReceipt(const CraftReceipt& receipt) {
|
||||
const auto code=CraftCode(receipt.result);
|
||||
if(!code||receipt.successes>100||receipt.fee>uint64_t(PortEconomy::GoldLimit)||receipt.awards.size()>100||
|
||||
(code!=1&&(receipt.successes||receipt.fee||!receipt.awards.empty())))return {};
|
||||
std::set<uint32_t> ids;std::set<uint16_t> cells;
|
||||
for(const auto& item:receipt.awards)if(!item.value.id||!item.value.vnum||!item.value.count||item.value.count>2000||!item.usable||item.cell>=225||!ids.insert(item.value.id).second||!cells.insert(item.cell).second)return {};
|
||||
Writer w;w.data="CCR1";w.n(code,1);w.n(receipt.successes,1);w.n(receipt.fee,8);w.items(receipt.awards);return w.data;
|
||||
}
|
||||
inline bool DecodeCraftReceipt(const std::string& bytes,CraftReceipt& out) {
|
||||
out={};if(bytes.size()<16||bytes.size()>11716||bytes.substr(0,4)!="CCR1")return false;Reader r(bytes);r.at=4;
|
||||
const auto code=r.n(1);const std::vector<std::string> names={"ok","gold_changed","inventory_changed","materials_missing","gold_missing","capacity_full","item_proto","inventory_invalid"};
|
||||
if(!code||code>names.size())return false;CraftReceipt receipt;receipt.result=names[size_t(code)-1];receipt.successes=unsigned(r.n(1));receipt.fee=r.n(8);receipt.awards=r.items();
|
||||
if(!r.ok||r.at!=bytes.size()||EncodeCraftReceipt(receipt)!=bytes)return false;out=std::move(receipt);return true;
|
||||
}
|
||||
inline bool ValidateCraftReceipt(const Batch& b,const CraftReceipt& receipt,const Lookup& lookup) {
|
||||
if(!Validate(b)||EncodeCraftReceipt(receipt).empty())return false;if(receipt.result!="ok")return true;
|
||||
if(receipt.successes>b.attempts||(!b.recipe.percent&&receipt.successes)||(b.recipe.percent==100&&receipt.successes!=b.attempts))return false;
|
||||
std::string rolls(b.attempts,char(100));for(unsigned n=0;n<receipt.successes;++n)rolls[n]=char(1);
|
||||
const auto plan=SettlePlan(b,rolls,lookup);Writer actual,expected;actual.items(receipt.awards);expected.items(plan.awards);
|
||||
return plan.result=="ok"&&plan.successes==receipt.successes&&plan.fee==receipt.fee&&actual.data==expected.data;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
#pragma once
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <iomanip>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
// PORT: read-only normalization and consumption planning. No inventory mutation,
|
||||
// RNG, durable receipt, or implicit permission to craft lives in this layer.
|
||||
namespace PortCube {
|
||||
constexpr unsigned MaxAttempts=100,MaxRecipes=4096;
|
||||
struct Material {uint32_t vnum=0,count=0;};
|
||||
struct Recipe {
|
||||
uint32_t id=0,reward=0,rewardCount=0,gold=0;
|
||||
unsigned percent=0;bool stackable=false,copy=false;
|
||||
std::string category="WORLDARD";
|
||||
std::vector<uint32_t> npcs;
|
||||
std::vector<Material> materials;
|
||||
};
|
||||
inline bool Normalize(Recipe& r) {
|
||||
if(!r.id||!r.reward||!r.rewardCount||r.rewardCount>2000||(!r.stackable&&r.rewardCount!=1)||
|
||||
r.percent>100||r.npcs.empty()||r.npcs.size()>128||r.materials.empty()||r.materials.size()>5||
|
||||
r.category.empty()||r.category.size()>24)return false;
|
||||
for(char c:r.category)if(!((c>='a'&&c<='z')||(c>='A'&&c<='Z')||(c>='0'&&c<='9')||c=='_'))return false;
|
||||
for(auto npc:r.npcs)if(!npc||npc>65535)return false;
|
||||
std::sort(r.npcs.begin(),r.npcs.end());r.npcs.erase(std::unique(r.npcs.begin(),r.npcs.end()),r.npcs.end());
|
||||
std::vector<Material> merged;
|
||||
for(auto m:r.materials) {
|
||||
if(!m.vnum||!m.count||m.count>2000)return false;
|
||||
auto it=std::find_if(merged.begin(),merged.end(),[&](const Material& a){return a.vnum==m.vnum;});
|
||||
if(it==merged.end())merged.push_back(m);
|
||||
else {if(it->count>2000-m.count)return false;it->count+=m.count;}
|
||||
}
|
||||
r.materials=merged;return true;
|
||||
}
|
||||
inline std::string Fingerprint(const std::string& text) {
|
||||
uint64_t hash=14695981039346656037ULL;
|
||||
for(unsigned char c:text){hash^=c;hash*=1099511628211ULL;}
|
||||
std::ostringstream s;s<<std::hex<<std::setw(16)<<std::setfill('0')<<hash;return s.str();
|
||||
}
|
||||
inline std::string Revision(const Recipe& r) {
|
||||
std::ostringstream s;s<<r.id<<':'<<r.reward<<':'<<r.rewardCount<<':'<<r.gold<<':'<<r.percent<<':'<<r.stackable<<':'<<r.copy<<':'<<r.category;
|
||||
for(auto n:r.npcs)s<<":n"<<n;
|
||||
for(auto m:r.materials)s<<":m"<<m.vnum<<','<<m.count;
|
||||
return Fingerprint(s.str()); // staleness fingerprint, not a cryptographic authorization token
|
||||
}
|
||||
struct Input {uint32_t id=0,vnum=0,count=0;uint16_t cell=0;bool usable=true;};
|
||||
struct Take {uint32_t id=0,vnum=0,count=0,before=0;uint16_t cell=0;};
|
||||
struct Plan {
|
||||
bool valid=false,materialsOK=false,goldOK=false;
|
||||
uint64_t gold=0,rewardMaximum=0;
|
||||
std::vector<uint64_t> needed,available;
|
||||
std::vector<Take> takes;
|
||||
};
|
||||
inline Plan Preview(Recipe recipe,unsigned attempts,std::vector<Input> inputs,int64_t gold) {
|
||||
Plan p;if(!Normalize(recipe)||!attempts||attempts>MaxAttempts||gold<0||inputs.size()>225)return p;
|
||||
std::set<uint32_t> ids;std::set<uint16_t> cells;
|
||||
for(auto i:inputs)if(!i.id||!i.vnum||!i.count||i.count>2000||i.cell>=225||!ids.insert(i.id).second||!cells.insert(i.cell).second)return p;
|
||||
std::sort(inputs.begin(),inputs.end(),[](const Input& a,const Input& b){return a.cell<b.cell;});
|
||||
p.gold=uint64_t(recipe.gold)*attempts;p.rewardMaximum=uint64_t(recipe.rewardCount)*attempts;
|
||||
p.goldOK=uint64_t(gold)>=p.gold;p.materialsOK=true;
|
||||
for(auto m:recipe.materials) {
|
||||
const uint64_t need=uint64_t(m.count)*attempts;uint64_t available=0,left=need;
|
||||
for(auto i:inputs)if(i.usable&&i.vnum==m.vnum) {
|
||||
available+=i.count;const auto count=static_cast<uint32_t>(std::min(left,uint64_t(i.count)));
|
||||
if(count)p.takes.push_back({i.id,i.vnum,count,i.count,i.cell});left-=count;
|
||||
}
|
||||
p.needed.push_back(need);p.available.push_back(available);p.materialsOK&=available>=need;
|
||||
}
|
||||
p.valid=true;return p;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
#pragma once
|
||||
#include "cube_handshake.h"
|
||||
namespace PortCube {
|
||||
inline Handshake RecoveryRequest(uint32_t account,uint32_t player,uint64_t session) {
|
||||
Handshake f;f.message=Message::RecoveryClaim;f.account=account;f.player=player;f.session=session;f.owner=f.token=std::string(32,'0');return f;
|
||||
}
|
||||
// This pre-load coordinator never grants actor action permission. Clear only
|
||||
// authorizes a normal load request, whose DB guards must still run again.
|
||||
class RecoveryFlow {
|
||||
public:
|
||||
enum Stage {Idle,Waiting,Held,Granted,Clear,Loading,ImageReady};
|
||||
private:
|
||||
Handshake request;OwnerGrant grant;Stage stage=Idle;bool lost=false;std::string image;
|
||||
public:
|
||||
Stage State()const{return stage;}
|
||||
const OwnerGrant& Grant()const{return grant;}
|
||||
const Handshake& Request()const{return request;}
|
||||
const std::string& Image()const{return image;}
|
||||
bool MayRequestImage()const{return !lost&&stage==Granted;}
|
||||
Handshake ImageRequest()const {
|
||||
Handshake f=request;f.message=Message::RecoveryImageRequest;const auto& b=grant.binding;
|
||||
f.cookie=b.cookie;f.epoch=b.epoch;f.owner=b.owner;f.token=b.request;f.body=EncodeOwnerGrant(grant);return f;
|
||||
}
|
||||
bool Start(uint32_t account,uint32_t player,uint64_t session) {
|
||||
auto f=RecoveryRequest(account,player,session);if(stage!=Idle||!ValidHandshake(f))return false;request=std::move(f);stage=Waiting;return true;
|
||||
}
|
||||
bool MayRetry()const{return !lost&&(stage==Waiting||stage==Held);}
|
||||
void LostTransport(){if(stage!=Idle){lost=true;stage=Held;image.clear();}}
|
||||
bool Answer(uint32_t handle,const Handshake& f) {
|
||||
if(lost||stage==Idle||stage==Loading||!ValidHandshake(f)||f.account!=request.account||f.player!=request.player||f.session!=request.session)return false;
|
||||
if(f.message==Message::RecoveryImageAnswer) {
|
||||
if(stage!=Granted&&stage!=ImageReady)return false;
|
||||
OwnerGrant g;std::string data;
|
||||
if(f.status==Status::Held){return stage==Granted&&DecodeOwnerGrant(f.body,g)&&g.binding.handle==handle&&SameOwnerGrant(g,grant);}
|
||||
if(!DecodeRecoveryImage(f.body,g,data)||g.binding.handle!=handle||!SameOwnerGrant(g,grant))return false;
|
||||
if(stage==ImageReady){if(data==image)return true;LostTransport();return false;}
|
||||
image=std::move(data);stage=ImageReady;return true;
|
||||
}
|
||||
if(f.message!=Message::RecoveryAnswer)return false;
|
||||
if(f.status==Status::RecoveryGranted) {
|
||||
OwnerGrant g;if(!DecodeOwnerGrant(f.body,g)||g.binding.handle!=handle)return false;
|
||||
if(stage==Granted||stage==ImageReady)return SameOwnerGrant(g,grant);
|
||||
if(stage==Clear)return false;grant=std::move(g);stage=Granted;return true;
|
||||
}
|
||||
if(stage==Granted||stage==Clear||stage==ImageReady)return false;
|
||||
stage=f.status==Status::RecoveryClear?Clear:Held;return true;
|
||||
}
|
||||
bool TakeClear(){if(lost||stage!=Clear)return false;stage=Loading;return true;}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
#pragma once
|
||||
#include "cube_image_ack.h"
|
||||
namespace PortCube {
|
||||
template<class DB> bool ReleaseSchema(DB& db) {
|
||||
PortEconomy::Rows rows;const std::string names="('port_cube_release_version','port_cube_releases')";
|
||||
auto q=[&](const std::string& sql){return db.Query(sql,rows)&&!db.warnings&&rows.size()==1&&rows[0].size()==1;};
|
||||
return q("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names)&&rows[0][0]=="2"&&
|
||||
q("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names)&&rows[0][0]=="2"&&
|
||||
q("SELECT version FROM port_cube_release_version WHERE id=1")&&rows[0][0]=="1";
|
||||
}
|
||||
// Terminal SQL decision, NOT actor readiness or permission to thaw. The runtime
|
||||
// keeps its save/load gate until an independently verified resume handoff.
|
||||
template<class DB> class ReleaseStore {
|
||||
DB& db;Lookup lookup;
|
||||
static std::string X(const std::string& s){return "X'"+PortEconomy::Hex(s.data(),s.size())+"'";}
|
||||
public:
|
||||
enum Result {Retry,Refused,Released};
|
||||
ReleaseStore(DB& d,Lookup p):db(d),lookup(std::move(p)){}
|
||||
enum CheckResult {CheckRetry,CheckRefused,Checked};
|
||||
CheckResult CheckResumeLive(const Batch& b,const OwnerGrant& grant,const std::string& image) {
|
||||
InventoryImage decoded;
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!DecodeInventoryImage(image,decoded,lookup))return CheckRefused;
|
||||
if(!ImageAckSchema(db)||!ReleaseSchema(db))return CheckRetry;
|
||||
OwnerStore<DB> owner(db,lookup);FenceStore<DB> fence(db,lookup);
|
||||
const auto result=fence.CheckReleasedImage(b,image,[&]()->bool{
|
||||
PortEconomy::Rows rows;const std::vector<std::string> exact={Encode(b),EncodeOwnerGrant(grant),image};
|
||||
auto q=[&](const std::string& sql){return db.Query(sql,rows)&&!db.warnings;};
|
||||
if(!q("SELECT body,owner_grant,image FROM port_cube_image_acks WHERE request='"+b.token+"' FOR UPDATE")||rows.size()!=1||rows[0]!=exact)return false;
|
||||
if(!q("SELECT body,owner_grant,image FROM port_cube_releases WHERE request='"+b.token+"' FOR UPDATE")||rows.size()!=1||rows[0]!=exact)return false;
|
||||
if(!q("SELECT id FROM port_cube_item_fences WHERE pid="+std::to_string(b.player)+" OR request='"+b.token+"' FOR UPDATE")||!rows.empty())return false;
|
||||
return owner.ReleasedImageWithin(b,grant,image);
|
||||
});
|
||||
return result==FenceStore<DB>::Done?Checked:result==FenceStore<DB>::Retry?CheckRetry:CheckRefused;
|
||||
}
|
||||
Result ReleaseLive(const Batch& b,const OwnerGrant& grant,const std::string& image) {
|
||||
InventoryImage decoded;
|
||||
if(!Validate(b)||!Valid(grant)||!Matches(grant.binding,b)||!DecodeInventoryImage(image,decoded,lookup))return Refused;
|
||||
if(!ImageAckSchema(db)||!ReleaseSchema(db))return Retry;
|
||||
OwnerStore<DB> owner(db,lookup);FenceStore<DB> fence(db,lookup);
|
||||
const auto result=fence.Release(b,image,[&](bool replay)->bool {
|
||||
PortEconomy::Rows rows;auto q=[&](const std::string& sql){return db.Query(sql,rows)&&!db.warnings;};
|
||||
const std::vector<std::string> exact={Encode(b),EncodeOwnerGrant(grant),image};
|
||||
if(!q("SELECT body,owner_grant,image FROM port_cube_image_acks WHERE request='"+b.token+"' FOR UPDATE")||rows.size()!=1||rows[0]!=exact)return false;
|
||||
if(replay&&!owner.ReleasedWithin(b,grant))return false;
|
||||
if(!replay&&!owner.LiveImageWithin(b,grant,image))return false;
|
||||
if(!replay&&(!q("SELECT id FROM port_cube_item_fences WHERE request='"+b.token+"' AND pid<>"+std::to_string(b.player)+" FOR UPDATE")||!rows.empty()))return false;
|
||||
if(!q("SELECT body,owner_grant,image FROM port_cube_releases WHERE request='"+b.token+"' FOR UPDATE"))return false;
|
||||
if(replay) {
|
||||
if(rows.size()!=1||rows[0]!=exact)return false;
|
||||
// A terminal replay cannot bless a partially removed fence.
|
||||
return q("SELECT id FROM port_cube_item_fences WHERE pid="+std::to_string(b.player)+" OR request='"+b.token+"' FOR UPDATE")&&rows.empty();
|
||||
}
|
||||
if(!rows.empty())return false; // terminal history with LIVE lease is inconsistent
|
||||
if(!q("INSERT INTO port_cube_releases(request,body,owner_grant,image) VALUES('"+b.token+"',"+X(exact[0])+","+X(exact[1])+","+X(image)+")")||db.affected!=1)return false;
|
||||
return q("DELETE FROM port_cube_owner_leases WHERE request='"+b.token+"' AND phase='LIVE' AND revision="+std::to_string(grant.revision))&&db.affected==1;
|
||||
});
|
||||
return result==FenceStore<DB>::Done?Released:result==FenceStore<DB>::Retry?Retry:Refused;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,169 @@
|
||||
#pragma once
|
||||
#include "cube_batch.h"
|
||||
#include "economy_store.h"
|
||||
|
||||
namespace PortCube {
|
||||
// Candidate DB transaction engine. Nothing calls it from the live game yet.
|
||||
// Shared economy ID tombstones ensure prepared factory IDs cannot be recycled
|
||||
// by the existing DB restart high-water algorithm, even after a rejected batch.
|
||||
template<class DB> class BatchStore {
|
||||
DB& db;Lookup lookup;
|
||||
using Rows=PortEconomy::Rows;
|
||||
static std::string N(uint64_t value){return std::to_string(value);}
|
||||
// Silent truncation is an error even on a non-strict MySQL connection.
|
||||
bool Q(const std::string& sql,Rows& rows){return db.Query(sql,rows)&&db.warnings==0;}
|
||||
bool Run(const std::string& sql){Rows rows;return Q(sql,rows);}
|
||||
bool Change(const std::string& sql){return Run(sql)&&db.affected==1;}
|
||||
bool One(const std::string& sql,Rows& rows){return Q(sql,rows)&&rows.size()==1;}
|
||||
struct Guard {DB& db;~Guard(){db.Rollback();}};
|
||||
bool LockAccount(uint32_t account){Rows rows;return Run("INSERT INTO port_economy_account_lock(account) VALUES("+N(account)+") ON DUPLICATE KEY UPDATE account=VALUES(account)")&&One("SELECT account FROM port_economy_account_lock WHERE account="+N(account)+" FOR UPDATE",rows);}
|
||||
int Fence(const Batch& b) {
|
||||
Rows rows;
|
||||
if(!Q("SELECT epoch,owner,request,phase,body,drain_state FROM port_cube_fences WHERE pid="+N(b.player)+" AND account="+N(b.account)+" FOR UPDATE",rows))return -1;
|
||||
if(rows.size()!=1||rows[0].size()!=6||rows[0][0]!=N(b.epoch)||rows[0][1]!=b.owner||rows[0][2]!=b.token||rows[0][3]!="FROZEN"||rows[0][4]!=Encode(b)||rows[0][5]!="1")return 0;
|
||||
if(!Q("SELECT id,epoch,request FROM port_cube_item_fences WHERE pid="+N(b.player)+" FOR UPDATE",rows))return -1;
|
||||
std::set<uint32_t> locked;
|
||||
for(const auto& row:rows){uint64_t id=0;if(row.size()!=3||!PortEconomy::Number(row[0],id,UINT32_MAX)||!id||row[1]!=N(b.epoch)||row[2]!=b.token||!locked.insert(uint32_t(id)).second)return 0;}
|
||||
for(const auto& item:b.inventory)if(!locked.count(item.value.id))return 0;
|
||||
for(const auto& item:b.rewards)if(!locked.count(item.id))return 0;
|
||||
if(!Q("SELECT token FROM port_economy_pending WHERE pid="+N(b.player)+" FOR UPDATE",rows))return -1;
|
||||
return rows.empty()?1:0;
|
||||
}
|
||||
static std::string Columns() {
|
||||
std::string s="id,vnum,count,pos";
|
||||
for(unsigned i=0;i<3;++i)s+=",socket"+N(i);
|
||||
for(unsigned i=0;i<7;++i)s+=",attrtype"+N(i)+",attrvalue"+N(i);
|
||||
return s+",port_extra";
|
||||
}
|
||||
static std::vector<std::string> ItemRow(const Item& i) {
|
||||
const auto& item=i.value;std::vector<std::string> row={N(item.id),N(item.vnum),N(item.count),N(i.cell)};
|
||||
for(auto socket:item.sockets)row.push_back(std::to_string(socket));
|
||||
for(unsigned n=0;n<7;++n){row.push_back(N(item.types[n]));row.push_back(std::to_string(item.values[n]));}
|
||||
row.emplace_back(reinterpret_cast<const char*>(item.extra),sizeof(item.extra));return row;
|
||||
}
|
||||
bool Inventory(const Batch& b,bool& matches) {
|
||||
Rows rows;if(!Q("SELECT "+Columns()+" FROM item WHERE owner_id="+N(b.player)+" AND window='INVENTORY' AND pos<225 ORDER BY pos,id FOR UPDATE",rows))return false;
|
||||
matches=rows.size()==b.inventory.size();
|
||||
for(unsigned i=0;matches&&i<rows.size();++i)matches=rows[i]==ItemRow(b.inventory[i]);
|
||||
return true;
|
||||
}
|
||||
bool Insert(uint32_t player,const Item& i) {
|
||||
const auto row=ItemRow(i);std::string values;
|
||||
for(unsigned n=0;n+1<row.size();++n){if(n)values+=',';values+=row[n];}
|
||||
values+=",X'"+PortEconomy::Hex(row.back().data(),row.back().size())+"'";
|
||||
return Change("INSERT INTO item("+Columns()+",owner_id,window) VALUES("+values+","+N(player)+",'INVENTORY')");
|
||||
}
|
||||
public:
|
||||
enum Result { Retry, Rejected, Prepared, Complete, Blocked };
|
||||
struct Receipt {std::string result;unsigned successes=0;uint64_t fee=0;std::vector<Item> awards;};
|
||||
BatchStore(DB& database,Lookup proto):db(database),lookup(std::move(proto)){}
|
||||
// Read-only validation shared with deferred-credit recovery. Never execute
|
||||
// PREPARED just to inspect a receipt; callers must hold the account lock.
|
||||
static bool DoneReceipt(const Batch& b,const std::vector<std::string>& saved,Receipt& receipt) {
|
||||
receipt={};if(!Validate(b)||saved.size()!=7||saved[0]!=Encode(b)||saved[2]!="DONE")return false;
|
||||
uint64_t successes=0,fee=0;Reader r(saved[6]);auto awards=r.items();
|
||||
if(!PortEconomy::Number(saved[4],successes,b.attempts)||!PortEconomy::Number(saved[5],fee,PortEconomy::GoldLimit)||!r.ok||r.at!=saved[6].size())return false;
|
||||
const std::set<std::string> results={"ok","gold_changed","inventory_changed","materials_missing","gold_missing","capacity_full","item_proto","inventory_invalid"};
|
||||
if(!results.count(saved[3])||saved[1].size()!=b.attempts)return false;
|
||||
unsigned rolled=0;for(unsigned char roll:saved[1]){if(roll<1||roll>100)return false;rolled+=roll<=b.recipe.percent;}
|
||||
if(saved[3]!="ok") {if(successes||fee||!awards.empty())return false;}
|
||||
else {
|
||||
if(successes!=rolled||fee!=uint64_t(b.recipe.gold)*b.attempts||fee>b.gold)return false;
|
||||
uint64_t remaining=successes*b.recipe.rewardCount;std::set<unsigned> cells;
|
||||
if(awards.size()>b.rewards.size())return false;
|
||||
for(unsigned n=0;n<awards.size();++n) {
|
||||
if(!remaining||awards[n].cell>=225||!awards[n].usable||!cells.insert(awards[n].cell).second)return false;
|
||||
auto expected=b.rewards[n];expected.count=uint32_t(std::min(remaining,uint64_t(b.recipe.stackable?2000:1)));
|
||||
Writer actual,image;actual.reward(awards[n].value);image.reward(expected);
|
||||
if(actual.data!=image.data)return false;remaining-=expected.count;
|
||||
}
|
||||
if(remaining)return false;
|
||||
}
|
||||
receipt={saved[3],unsigned(successes),fee,std::move(awards)};return true;
|
||||
}
|
||||
bool Ready() {
|
||||
Rows rows;
|
||||
if(!One("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN ('player','item','port_cube_version','port_cube_requests','port_cube_fences','port_cube_item_fences','port_economy_account_lock','port_economy_item_reservations','port_economy_custody','port_economy_pending','port_economy_version')",rows)||rows[0][0]!="11"||
|
||||
!One("SELECT version FROM port_cube_version WHERE id=1",rows)||rows[0][0]!="2"||
|
||||
!One("SELECT version FROM port_economy_version WHERE id=1",rows)||rows[0][0]!="1")return false;
|
||||
// Do not silently discard a future item column. All item state must be
|
||||
// covered by both the snapshot comparison and the reward factory image.
|
||||
if(!Q("SHOW COLUMNS FROM item",rows))return false;
|
||||
std::set<std::string> expected={"id","owner_id","window","pos","count","vnum","port_extra"};
|
||||
for(unsigned i=0;i<3;++i)expected.insert("socket"+N(i));
|
||||
for(unsigned i=0;i<7;++i){expected.insert("attrtype"+N(i));expected.insert("attrvalue"+N(i));}
|
||||
for(const auto& row:rows) {
|
||||
if(row.empty()||!expected.erase(row[0]))return false;
|
||||
if(row[0]=="port_extra"&&(row.size()<3||(row[1]!="varbinary(69)"&&row[1]!="binary(69)")||row[2]!="NO"))return false;
|
||||
}
|
||||
return expected.empty();
|
||||
}
|
||||
// Draw callback is DB-side trusted RNG, called ONLY for a newly accepted
|
||||
// identity. Every draw is durable before any asset mutation is attempted.
|
||||
Result Prepare(const Batch& b,const std::function<unsigned()>& draw,const std::function<bool()>& authorize={}) {
|
||||
if(!Validate(b))return Rejected;
|
||||
if(!Ready()||!db.Begin())return Retry;
|
||||
Guard guard{db};
|
||||
Rows rows;const auto body=Encode(b);
|
||||
auto stop=[](Result result){return result;};
|
||||
if(!LockAccount(b.account))return stop(Retry);
|
||||
if(authorize&&!authorize())return stop(Blocked);
|
||||
if(!Q("SELECT body,state FROM port_cube_requests WHERE token='"+b.token+"' FOR UPDATE",rows))return stop(Retry);
|
||||
if(!rows.empty()) {
|
||||
if(rows.size()!=1||rows[0].size()!=2||rows[0][0]!=body||(rows[0][1]!="PREPARED"&&rows[0][1]!="DONE"))return stop(Rejected);
|
||||
// Even DONE requests replay without drawing or touching assets.
|
||||
return stop(Prepared);
|
||||
}
|
||||
const int fence=Fence(b);if(fence<=0)return stop(fence<0?Retry:Blocked);
|
||||
for(const auto& reward:b.rewards) {
|
||||
if(!Q("SELECT id FROM item WHERE id="+N(reward.id)+" UNION ALL SELECT id FROM port_economy_custody WHERE id="+N(reward.id),rows))return stop(Retry);
|
||||
if(!rows.empty())return stop(Rejected);
|
||||
if(!Q("SELECT request FROM port_economy_item_reservations WHERE id="+N(reward.id)+" FOR UPDATE",rows))return stop(Retry);
|
||||
if(rows.empty()) {if(!Change("INSERT INTO port_economy_item_reservations(id,request) VALUES("+N(reward.id)+",'"+b.token+"')"))return stop(Retry);}
|
||||
else if(rows.size()!=1||rows[0].size()!=1||rows[0][0]!=b.token)return stop(Rejected);
|
||||
}
|
||||
std::string rolls;for(unsigned i=0;i<b.attempts;++i){const auto roll=draw();if(roll<1||roll>100)return stop(Rejected);rolls+=char(roll);}
|
||||
if(!Change("INSERT INTO port_cube_requests(token,account,pid,body,rolls,state,result,successes,fee,awards) VALUES('"+b.token+"',"+N(b.account)+","+N(b.player)+",X'"+PortEconomy::Hex(body.data(),body.size())+"',X'"+PortEconomy::Hex(rolls.data(),rolls.size())+"','PREPARED','prepared',0,0,X'0000')")||!db.Commit())return stop(Retry);
|
||||
return Prepared;
|
||||
}
|
||||
// Identity-only recovery loads the complete immutable request and fixed RNG
|
||||
// from storage. A disconnected caller cannot supply a replacement snapshot.
|
||||
Result Execute(const std::string& token,uint32_t account,uint32_t player,Receipt& receipt,const std::function<bool(const Batch&)>& authorize={}) {
|
||||
receipt={};if(!Identity(token)||!account||!player)return Rejected;
|
||||
if(!Ready()||!db.Begin())return Retry;
|
||||
Guard guard{db};
|
||||
auto stop=[](Result result){return result;};Rows rows;
|
||||
if(!LockAccount(account)||!Q("SELECT body,rolls,state,result,successes,fee,awards FROM port_cube_requests WHERE token='"+token+"' AND account="+N(account)+" AND pid="+N(player)+" FOR UPDATE",rows))return stop(Retry);
|
||||
if(rows.empty())return stop(Rejected);
|
||||
if(rows.size()!=1||rows[0].size()!=7)return stop(Retry);
|
||||
const auto saved=rows[0];Batch b;uint64_t fee=0;
|
||||
if(!Decode(saved[0],b)||b.token!=token||b.account!=account||b.player!=player)return stop(Retry);
|
||||
if(authorize&&!authorize(b))return stop(Blocked);
|
||||
if(saved[2]=="DONE") {
|
||||
return stop(DoneReceipt(b,saved,receipt)?Complete:Retry);
|
||||
}
|
||||
if(saved[2]!="PREPARED")return stop(Retry);
|
||||
const int fence=Fence(b);if(fence<=0)return stop(fence<0?Retry:Blocked);
|
||||
if(!One("SELECT gold FROM player WHERE id="+N(player)+" AND account_id="+N(account)+" FOR UPDATE",rows)||rows[0].size()!=1||!PortEconomy::Number(rows[0][0],fee,PortEconomy::GoldLimit))return stop(Retry);
|
||||
Settlement plan;
|
||||
if(fee!=b.gold)plan.result="gold_changed";
|
||||
else {
|
||||
bool matches=false;if(!Inventory(b,matches))return stop(Retry);
|
||||
if(!matches)plan.result="inventory_changed";
|
||||
else plan=SettlePlan(b,saved[1],lookup);
|
||||
}
|
||||
if(plan.result=="invalid")return stop(Retry); // corrupt persisted input: quarantine, never charge
|
||||
if(plan.result=="ok") {
|
||||
for(const auto& take:plan.takes) {
|
||||
const std::string where=" WHERE id="+N(take.id)+" AND owner_id="+N(player)+" AND window='INVENTORY' AND count="+N(take.before);
|
||||
if(!Change(take.count==take.before?"DELETE FROM item"+where:"UPDATE item SET count=count-"+N(take.count)+where))return stop(Retry);
|
||||
}
|
||||
if(plan.fee&&!Change("UPDATE player SET gold=gold-"+N(plan.fee)+" WHERE id="+N(player)+" AND account_id="+N(account)+" AND gold="+N(b.gold)))return stop(Retry);
|
||||
for(const auto& award:plan.awards)if(!Insert(player,award))return stop(Retry);
|
||||
} else {plan.successes=0;plan.fee=0;plan.awards.clear();}
|
||||
Writer awards;awards.items(plan.awards);
|
||||
if(!Change("UPDATE port_cube_requests SET state='DONE',result='"+plan.result+"',successes="+N(plan.successes)+",fee="+N(plan.fee)+",awards=X'"+PortEconomy::Hex(awards.data.data(),awards.data.size())+"' WHERE token='"+token+"' AND state='PREPARED'")||!db.Commit())return stop(Retry);
|
||||
receipt={plan.result,plan.successes,plan.fee,std::move(plan.awards)};return Complete;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
|
||||
// Internal game/db protocol only. No client-supplied identity or price is trusted.
|
||||
namespace PortEconomy {
|
||||
constexpr uint8_t Header = 77;
|
||||
enum Operation : uint8_t { List=1, Buy, Refund, Claim, Cancel, Withdraw, GayaBuy, GayaRefresh, GayaExpand, Status, GayaRetire, UiStatus };
|
||||
// Reserved terminal generation: preserve the catalogue as an audit tombstone.
|
||||
constexpr uint64_t RetiredGeneration=INT64_MAX;
|
||||
constexpr int64_t GoldLimit=2000000000000000LL;
|
||||
#pragma pack(push,1)
|
||||
struct Offer { uint32_t vnum=0,count=0;int32_t price=0;uint8_t bought=0; };
|
||||
#pragma pack(pop)
|
||||
struct Reward {
|
||||
uint32_t id=0,vnum=0,count=0;
|
||||
int32_t sockets[3]={};uint8_t types[7]={};int16_t values[7]={};uint8_t extra[69]={};
|
||||
};
|
||||
struct Request {
|
||||
uint32_t version=1,account=0,player=0;
|
||||
uint8_t operation=0;
|
||||
char token[33]={};
|
||||
alignas(8) uint64_t reference=0;
|
||||
alignas(8) int64_t price=0;
|
||||
alignas(8) int64_t expectedGold=0;
|
||||
int32_t expectedGem=0,expectedOpen=0,deadline=0,nextDeadline=0;
|
||||
uint32_t item=0,itemVnum=0,itemCount=0;
|
||||
alignas(8) uint64_t generation=0;
|
||||
uint8_t slot=0,rewardCount=0;
|
||||
Offer offers[27],nextOffers[27];
|
||||
Reward rewards[10];
|
||||
Request() { std::memset(this,0,sizeof(*this));version=1; }
|
||||
};
|
||||
struct Reply { uint32_t account,player;uint8_t ok;char message[240]; };
|
||||
static_assert(sizeof(Offer)==13 && sizeof(Reward)==116,"stable item/offer records");
|
||||
static_assert(sizeof(Request)==1976 && sizeof(Reply)==252,"stable internal request/reply layout");
|
||||
static_assert(sizeof(Request)<8192,"bounded durable request");
|
||||
inline bool Token(const char* s) {
|
||||
if(s[32])return false;
|
||||
for(unsigned i=0;i<32;++i)if(!((s[i]>='0'&&s[i]<='9')||(s[i]>='a'&&s[i]<='f')))return false;
|
||||
return true;
|
||||
}
|
||||
inline bool Offers(const Offer* offers) {
|
||||
for(unsigned i=0;i<27;++i) {
|
||||
const auto& o=offers[i];
|
||||
if(!o.vnum || !o.count || o.count>2000 || o.price<1 || o.price>1000000 || o.bought>1)return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
inline bool Valid(const Request& r) {
|
||||
if(r.version!=1 || !r.player || !r.account || !Token(r.token) || r.operation<List || r.operation>UiStatus ||
|
||||
r.expectedGold<0 || r.expectedGold>GoldLimit || r.expectedGem<0 || r.expectedGem>1000000 ||
|
||||
r.expectedOpen<0 || r.expectedOpen>18 || r.rewardCount>10)return false;
|
||||
if(r.operation==UiStatus && (r.reference>1000000 || r.slot>2 || !r.generation || r.generation>UINT32_MAX))return false;
|
||||
if(r.operation==Status && r.reference>1000000)return false;
|
||||
if(r.operation!=GayaBuy && r.rewardCount)return false;
|
||||
if(r.operation==List && (!r.item || !r.itemVnum || !r.itemCount || r.price<1 || r.price>GoldLimit))return false;
|
||||
if((r.operation==Buy || r.operation==Refund || r.operation==Claim || r.operation==Cancel) && !r.reference)return false;
|
||||
if(r.operation==GayaBuy && (r.slot>=27 || !Offers(r.offers) || !r.rewardCount))return false;
|
||||
if(r.operation==GayaRefresh && (!Offers(r.nextOffers) || r.nextDeadline<=0 || (r.item && !r.itemCount)))return false;
|
||||
if(r.operation==GayaExpand && (!r.item || !r.itemCount || r.expectedOpen>=18))return false;
|
||||
for(unsigned i=0;i<r.rewardCount;++i) {
|
||||
if(!r.rewards[i].id || !r.rewards[i].vnum || !r.rewards[i].count || r.rewards[i].count>2000)return false;
|
||||
for(unsigned j=0;j<i;++j)if(r.rewards[j].id==r.rewards[i].id)return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
inline std::string Hex(const void* data,size_t size) {
|
||||
const auto* p=static_cast<const unsigned char*>(data);static const char hex[]="0123456789abcdef";
|
||||
std::string out;out.reserve(size*2);
|
||||
for(size_t i=0;i<size;++i){out+=hex[p[i]>>4];out+=hex[p[i]&15];}return out;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
#pragma once
|
||||
#include "economy_store.h"
|
||||
#include <mysql/mysql.h>
|
||||
#include <mysql/errmsg.h>
|
||||
|
||||
namespace PortEconomy {
|
||||
// Use only on the DB main thread's direct connection. Automatic reconnection
|
||||
// remains off for the entire lifetime, including ambiguous COMMIT recovery.
|
||||
class Mysql {
|
||||
MYSQL* connection;
|
||||
bool active=false;
|
||||
bool pinned=false;
|
||||
unsigned previousTimeout=0;
|
||||
unsigned long thread=0;
|
||||
public:
|
||||
uint64_t affected=0,inserted=0,warnings=0;
|
||||
std::function<void(const std::string&)> afterStatement;
|
||||
explicit Mysql(MYSQL* handle):connection(handle) {
|
||||
// Reconnect only BEFORE entering the pinned transaction scope. Without
|
||||
// this step a dead direct handle could keep pending orders retrying
|
||||
// forever when no unrelated legacy query happens to reconnect it.
|
||||
my_bool allowReconnect=true;
|
||||
if(mysql_options(connection,MYSQL_OPT_RECONNECT,&allowReconnect)!=0 || mysql_ping(connection)!=0)return;
|
||||
my_bool reconnect=false;pinned=mysql_options(connection,MYSQL_OPT_RECONNECT,&reconnect)==0;
|
||||
thread=mysql_thread_id(connection);
|
||||
Rows rows;uint64_t value=0;
|
||||
if(Query("SELECT @@session.innodb_lock_wait_timeout",rows)&&rows.size()==1&&Number(rows[0][0],value,UINT32_MAX))previousTimeout=static_cast<unsigned>(value);
|
||||
}
|
||||
~Mysql(){Rollback();if(previousTimeout){Rows rows;Query("SET SESSION innodb_lock_wait_timeout="+std::to_string(previousTimeout),rows);}my_bool reconnect=true;mysql_options(connection,MYSQL_OPT_RECONNECT,&reconnect);}
|
||||
bool Query(const std::string& sql,Rows& rows) {
|
||||
rows.clear();affected=0;inserted=0;warnings=0;
|
||||
if(!pinned || mysql_thread_id(connection)!=thread || mysql_real_query(connection,sql.data(),static_cast<unsigned long>(sql.size())))return false;
|
||||
MYSQL_RES* result=mysql_store_result(connection);
|
||||
if(result) {
|
||||
MYSQL_ROW row;const unsigned fields=mysql_num_fields(result);
|
||||
while((row=mysql_fetch_row(result))) {
|
||||
const unsigned long* lengths=mysql_fetch_lengths(result);std::vector<std::string> values;
|
||||
for(unsigned i=0;i<fields;++i)values.emplace_back(row[i]?std::string(row[i],lengths[i]):std::string());
|
||||
rows.push_back(std::move(values));
|
||||
}
|
||||
const bool ok=mysql_errno(connection)==0;mysql_free_result(result);if(!ok)return false;
|
||||
} else if(mysql_field_count(connection))return false;
|
||||
affected=mysql_affected_rows(connection);inserted=mysql_insert_id(connection);warnings=mysql_warning_count(connection);
|
||||
if(afterStatement)afterStatement(sql);
|
||||
return mysql_thread_id(connection)==thread;
|
||||
}
|
||||
bool Begin(){Rows rows;if(active||!previousTimeout||!Query("SET SESSION innodb_lock_wait_timeout=3",rows)||!Query("START TRANSACTION",rows))return false;active=true;return true;}
|
||||
bool Commit(){Rows rows;if(!active||!Query("COMMIT",rows))return false;active=false;return true;}
|
||||
void Rollback(){if(active){Rows rows;Query("ROLLBACK",rows);active=false;}}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,250 @@
|
||||
#pragma once
|
||||
#include "economy.h"
|
||||
#include <array>
|
||||
#include <functional>
|
||||
#include <limits>
|
||||
#include <vector>
|
||||
|
||||
namespace PortEconomy {
|
||||
using Rows=std::vector<std::vector<std::string>>;
|
||||
inline bool Number(const std::string& s,uint64_t& out,uint64_t max=UINT64_MAX) {
|
||||
if(s.empty())return false;uint64_t n=0;
|
||||
for(char c:s){if(c<'0'||c>'9'||uint64_t(c-'0')>max||n>(max-uint64_t(c-'0'))/10)return false;n=n*10+uint64_t(c-'0');}
|
||||
out=n;return true;
|
||||
}
|
||||
// DB must supply Query(sql, rows), affected and inserted, plus Begin/Commit/Rollback.
|
||||
// This store NEVER runs against an online character or an undrained cache. The
|
||||
// DB coordinator owns that fence; game processes never execute these mutations.
|
||||
template<class DB> class Store {
|
||||
DB& db;
|
||||
std::function<unsigned(uint32_t)> size;
|
||||
std::string outcome;
|
||||
uint64_t reference=0;
|
||||
bool sqlOK=true;
|
||||
static std::string N(uint64_t n){return std::to_string(n);}
|
||||
bool Q(const std::string& sql,Rows& rows){if(!sqlOK)return false;sqlOK=db.Query(sql,rows);return sqlOK;}
|
||||
bool Run(const std::string& sql){Rows rows;return Q(sql,rows);}
|
||||
bool One(const std::string& sql,Rows& rows){return Q(sql,rows)&&rows.size()==1;}
|
||||
bool Change(const std::string& sql){return Run(sql)&&db.affected==1;}
|
||||
bool Reject(const char* why){outcome=why;return false;}
|
||||
bool Quest(uint32_t pid,const char* state,uint64_t& value) {
|
||||
Rows rows;if(!Q("SELECT lValue FROM quest WHERE dwPID="+N(pid)+" AND szName='gem' AND szState='"+state+"' FOR UPDATE",rows))return false;
|
||||
value=0;return rows.empty()||(rows.size()==1&&Number(rows[0][0],value,INT32_MAX));
|
||||
}
|
||||
bool SetQuest(uint32_t pid,const char* state,uint64_t value){
|
||||
return Run("INSERT INTO quest(dwPID,szName,szState,lValue) VALUES("+N(pid)+",'gem','"+state+"',"+N(value)+") ON DUPLICATE KEY UPDATE lValue=VALUES(lValue)");
|
||||
}
|
||||
bool Catalog(const Request& r,Offer* offers,uint64_t& generation,int32_t& deadline) {
|
||||
Rows rows;if(!Q("SELECT generation,deadline,offers FROM port_economy_gaya WHERE pid="+N(r.player)+" FOR UPDATE",rows))return false;
|
||||
if(rows.empty()) {
|
||||
if(r.generation || !Offers(r.offers) || r.deadline<0)return Reject("catalog_changed");
|
||||
std::memcpy(offers,r.offers,sizeof(r.offers));generation=0;deadline=r.deadline;return true;
|
||||
}
|
||||
uint64_t time=0;
|
||||
if(rows.size()!=1 || !Number(rows[0][0],generation) || !Number(rows[0][1],time,INT32_MAX) || rows[0][2].size()!=sizeof(r.offers))return Reject("catalog_corrupt");
|
||||
std::memcpy(offers,rows[0][2].data(),sizeof(r.offers));deadline=static_cast<int32_t>(time);
|
||||
if(!Offers(offers) || generation!=r.generation || deadline!=r.deadline || std::memcmp(offers,r.offers,sizeof(r.offers)))return Reject("catalog_changed");
|
||||
return true;
|
||||
}
|
||||
bool SaveCatalog(uint32_t pid,const Offer* offers,uint64_t generation,int32_t deadline) {
|
||||
if(generation>=RetiredGeneration-1 || !Offers(offers) || deadline<0)return Reject("catalog_corrupt");
|
||||
return Run("INSERT INTO port_economy_gaya(pid,generation,deadline,offers) VALUES("+N(pid)+","+N(generation+1)+","+N(static_cast<uint32_t>(deadline))+",X'"+Hex(offers,27*sizeof(Offer))+"') ON DUPLICATE KEY UPDATE generation=VALUES(generation),deadline=VALUES(deadline),offers=VALUES(offers)");
|
||||
}
|
||||
// Mall uses a 5x9 grid per page, three pages. Retain original item IDs and
|
||||
// every stored item column. Unknown sizes and malformed grids fail closed.
|
||||
bool MallCell(uint32_t account,uint32_t vnum,unsigned& cell) {
|
||||
const unsigned height=size(vnum);if(height<1 || height>3)return Reject("item_proto");
|
||||
std::array<bool,135> used={};Rows rows;
|
||||
if(!Q("SELECT pos,vnum FROM item WHERE owner_id="+N(account)+" AND window='MALL' FOR UPDATE",rows))return false;
|
||||
for(const auto& row:rows) {
|
||||
uint64_t pos=0,id=0;if(!Number(row[0],pos,134)||!Number(row[1],id,UINT32_MAX))return Reject("mall_corrupt");
|
||||
const unsigned h=size(static_cast<uint32_t>(id));if(h<1 || h>3 || (pos%45)/5+h>9)return Reject("mall_corrupt");
|
||||
for(unsigned j=0;j<h;++j){const size_t at=static_cast<size_t>(pos)+5*j;if(used[at])return Reject("mall_corrupt");used[at]=true;}
|
||||
}
|
||||
for(unsigned pos=0;pos<135;++pos) {
|
||||
if((pos%45)/5+height>9)continue;bool free=true;
|
||||
for(unsigned j=0;j<height;++j)if(used[pos+5*j])free=false;
|
||||
if(free){cell=pos;return true;}
|
||||
}
|
||||
return Reject("mall_full");
|
||||
}
|
||||
bool Deliver(uint32_t item,uint32_t account,uint32_t vnum) {
|
||||
unsigned cell=0;if(!MallCell(account,vnum,cell))return false;
|
||||
// Copy all columns by ordinal: readiness checks exact custody/item schema.
|
||||
if(!Change("INSERT INTO item SELECT * FROM port_economy_custody WHERE id="+N(item)))return false;
|
||||
return Change("UPDATE item SET owner_id="+N(account)+",window='MALL',pos="+N(cell)+" WHERE id="+N(item))&&
|
||||
Change("DELETE FROM port_economy_custody WHERE id="+N(item));
|
||||
}
|
||||
bool Consume(const Request& r,uint32_t vnum) {
|
||||
Rows rows;uint64_t count=0;
|
||||
if(!One("SELECT count FROM item WHERE id="+N(r.item)+" AND owner_id="+N(r.player)+" AND window='INVENTORY' AND pos<225 AND vnum="+N(vnum)+" FOR UPDATE",rows)||!Number(rows[0][0],count,2000)||!count||count!=r.itemCount)return Reject("consumable_changed");
|
||||
if(count==1)return Change("DELETE FROM item WHERE id="+N(r.item));
|
||||
return Change("UPDATE item SET count=count-1 WHERE id="+N(r.item));
|
||||
}
|
||||
bool Apply(const Request& r,uint64_t gold) {
|
||||
const std::string pid=N(r.player),aid=N(r.account);
|
||||
Rows rows;uint64_t a=0,b=0,c=0,d=0;
|
||||
switch(r.operation) {
|
||||
case List:
|
||||
if(!One("SELECT id FROM item WHERE id="+N(r.item)+" AND owner_id="+pid+" AND window='INVENTORY' AND vnum="+N(r.itemVnum)+" AND count="+N(r.itemCount)+" AND pos<225 FOR UPDATE",rows))return Reject("item_changed");
|
||||
if(!Change("INSERT INTO port_economy_custody SELECT * FROM item WHERE id="+N(r.item))||!Change("DELETE FROM item WHERE id="+N(r.item)))return false;
|
||||
if(!Change("INSERT INTO port_economy_listings(owner,account,item,price,state) VALUES("+pid+","+aid+","+N(r.item)+","+N(static_cast<uint64_t>(r.price))+",'OPEN')"))return false;
|
||||
reference=db.inserted;return reference!=0;
|
||||
case Buy:
|
||||
if(!One("SELECT owner,item,price,state FROM port_economy_listings WHERE id="+N(r.reference)+" FOR UPDATE",rows)||
|
||||
!Number(rows[0][0],a,UINT32_MAX)||!Number(rows[0][1],b,UINT32_MAX)||!Number(rows[0][2],c,GoldLimit)||rows[0][3]!="OPEN"||a==r.player||!c||c>gold||r.price!=static_cast<int64_t>(c))return Reject("listing_changed");
|
||||
if(!Change("UPDATE player SET gold=gold-"+N(c)+" WHERE id="+pid+" AND gold>="+N(c))||
|
||||
!Change("INSERT INTO port_economy_orders(request,listing,buyer,account,price,state) VALUES('"+std::string(r.token)+"',"+N(r.reference)+","+pid+","+aid+","+N(c)+",'READY')"))return false;
|
||||
reference=db.inserted;
|
||||
return Change("UPDATE port_economy_listings SET state='RESERVED',active_order="+N(reference)+" WHERE id="+N(r.reference));
|
||||
case Refund: case Claim:
|
||||
if(!One("SELECT listing,price,state FROM port_economy_orders WHERE id="+N(r.reference)+" AND buyer="+pid+" AND account="+aid+" FOR UPDATE",rows)||
|
||||
!Number(rows[0][0],a)||!Number(rows[0][1],b,GoldLimit))return Reject("order_missing");
|
||||
if(rows[0][2]==(r.operation==Claim?"CLAIMED":"REFUNDED")){reference=r.reference;return true;}
|
||||
if(rows[0][2]!="READY")return Reject("order_terminal");
|
||||
if(!One("SELECT owner,item,active_order FROM port_economy_listings WHERE id="+N(a)+" AND state='RESERVED' FOR UPDATE",rows)||
|
||||
!Number(rows[0][0],c,UINT32_MAX)||!Number(rows[0][1],d,UINT32_MAX)||rows[0][2]!=N(r.reference))return Reject("custody_changed");
|
||||
if(r.operation==Refund) {
|
||||
if(gold>uint64_t(GoldLimit)-b)return Reject("gold_limit");
|
||||
if(!Change("UPDATE player SET gold=gold+"+N(b)+" WHERE id="+pid)||!Change("UPDATE port_economy_listings SET state='OPEN',active_order=0 WHERE id="+N(a)))return false;
|
||||
} else {
|
||||
if(!One("SELECT vnum FROM port_economy_custody WHERE id="+N(d)+" FOR UPDATE",rows))return Reject("custody_missing");
|
||||
uint64_t vnum=0;if(!Number(rows[0][0],vnum,UINT32_MAX)||!Deliver(static_cast<uint32_t>(d),r.account,static_cast<uint32_t>(vnum)))return false;
|
||||
if(!Run("INSERT INTO port_economy_credit(pid,amount) VALUES("+N(c)+",0) ON DUPLICATE KEY UPDATE pid=VALUES(pid)")||
|
||||
!One("SELECT amount FROM port_economy_credit WHERE pid="+N(c)+" FOR UPDATE",rows)||!Number(rows[0][0],c,GoldLimit)||c>uint64_t(GoldLimit)-b)return Reject("seller_credit_limit");
|
||||
// Owner was decoded above; use the immutable listing relationship.
|
||||
if(!Change("UPDATE port_economy_credit SET amount=amount+"+N(b)+" WHERE pid=(SELECT owner FROM port_economy_listings WHERE id="+N(a)+")")||
|
||||
!Change("UPDATE port_economy_listings SET state='SOLD' WHERE id="+N(a)))return false;
|
||||
}
|
||||
reference=r.reference;
|
||||
return Change("UPDATE port_economy_orders SET state='"+std::string(r.operation==Claim?"CLAIMED":"REFUNDED")+"' WHERE id="+N(r.reference));
|
||||
case Cancel:
|
||||
if(!One("SELECT item FROM port_economy_listings WHERE id="+N(r.reference)+" AND owner="+pid+" AND state='OPEN' FOR UPDATE",rows)||!Number(rows[0][0],a,UINT32_MAX))return Reject("listing_changed");
|
||||
if(!One("SELECT vnum FROM port_economy_custody WHERE id="+N(a)+" FOR UPDATE",rows)||!Number(rows[0][0],b,UINT32_MAX)||!Deliver(static_cast<uint32_t>(a),r.account,static_cast<uint32_t>(b)))return false;
|
||||
reference=r.reference;return Change("UPDATE port_economy_listings SET state='CANCELLED' WHERE id="+N(r.reference));
|
||||
case Withdraw:
|
||||
if(!One("SELECT amount FROM port_economy_credit WHERE pid="+pid+" FOR UPDATE",rows)||!Number(rows[0][0],a,GoldLimit)||!a)return Reject("no_credit");
|
||||
if(gold>uint64_t(GoldLimit)-a)return Reject("gold_limit");
|
||||
return Change("UPDATE player SET gold=gold+"+N(a)+" WHERE id="+pid)&&Change("UPDATE port_economy_credit SET amount=0 WHERE pid="+pid);
|
||||
case GayaRetire: {
|
||||
// Explicit retirement never destroys a positive wallet, custody,
|
||||
// refundable order or seller credit. Keep offers/deadline for audit.
|
||||
if(!Quest(r.player,"points",a)||!Quest(r.player,"open_slot",b)||
|
||||
a!=static_cast<uint64_t>(r.expectedGem)||b!=static_cast<uint64_t>(r.expectedOpen))return Reject("wallet_changed");
|
||||
if(a)return Reject("gaya_balance_remaining");
|
||||
if(!One("SELECT (EXISTS(SELECT 1 FROM port_economy_listings WHERE owner="+pid+" AND state IN('OPEN','RESERVED')))+(EXISTS(SELECT 1 FROM port_economy_orders WHERE buyer="+pid+" AND state='READY'))+(EXISTS(SELECT 1 FROM port_economy_credit WHERE pid="+pid+" AND amount<>0))",rows)||rows[0][0]!="0")return Reject("assets_remaining");
|
||||
if(!One("SELECT generation,deadline,offers FROM port_economy_gaya WHERE pid="+pid+" FOR UPDATE",rows)||
|
||||
!Number(rows[0][0],c,RetiredGeneration)||rows[0][2].size()!=sizeof(r.offers))return Reject("catalog_corrupt");
|
||||
Offer retained[27];std::memcpy(retained,rows[0][2].data(),sizeof(retained));
|
||||
if(!Offers(retained))return Reject("catalog_corrupt");
|
||||
reference=c;
|
||||
if(c==RetiredGeneration)return true;
|
||||
return Change("UPDATE port_economy_gaya SET generation="+N(RetiredGeneration)+" WHERE pid="+pid);
|
||||
}
|
||||
case GayaBuy: case GayaRefresh: case GayaExpand: {
|
||||
if(!Q("SELECT generation FROM port_economy_gaya WHERE pid="+pid+" FOR UPDATE",rows))return false;
|
||||
if(!rows.empty()&&(!Number(rows[0][0],a,RetiredGeneration)||a==RetiredGeneration))return Reject("gaya_retired");
|
||||
uint64_t gem=0,open=0,generation=0;int32_t deadline=0;Offer offers[27];
|
||||
if(!Quest(r.player,"points",gem)||!Quest(r.player,"open_slot",open)||gem!=static_cast<uint64_t>(r.expectedGem)||open!=static_cast<uint64_t>(r.expectedOpen))return Reject("wallet_changed");
|
||||
if(r.operation==GayaExpand) {
|
||||
if(open>=18||!Consume(r,39064))return Reject("consumable_changed");
|
||||
return SetQuest(r.player,"open_slot",open+1);
|
||||
}
|
||||
if(!Catalog(r,offers,generation,deadline))return false;
|
||||
if(r.operation==GayaRefresh) {
|
||||
if(r.nextDeadline<deadline || (!r.item && r.nextDeadline==deadline))return Reject("refresh_changed");
|
||||
if(r.item) {if(!Consume(r,39063))return false;}
|
||||
else {if(!One("SELECT UNIX_TIMESTAMP()",rows)||!Number(rows[0][0],a)||uint64_t(deadline)>a)return Reject("refresh_early");}
|
||||
for(const auto& offer:r.nextOffers)if(offer.bought)return Reject("catalog_changed");
|
||||
return SaveCatalog(r.player,r.nextOffers,generation,r.nextDeadline)&&SetQuest(r.player,"left_time",static_cast<uint32_t>(r.nextDeadline));
|
||||
}
|
||||
auto& offer=offers[r.slot];
|
||||
if(offer.bought|| (r.slot>=9 && open<uint64_t(r.slot-8)) || gem<static_cast<uint32_t>(offer.price))return Reject("offer_unavailable");
|
||||
uint64_t total=0;
|
||||
for(unsigned i=0;i<r.rewardCount;++i) {
|
||||
const auto& reward=r.rewards[i];if(reward.vnum!=offer.vnum)return Reject("reward_changed");total+=reward.count;
|
||||
unsigned cell=0;if(!MallCell(r.account,reward.vnum,cell))return false;
|
||||
std::string columns="id,owner_id,window,pos,count,vnum",values=N(reward.id)+","+aid+",'MALL',"+N(cell)+","+N(reward.count)+","+N(reward.vnum);
|
||||
for(unsigned j=0;j<3;++j){columns+=",socket"+N(j);values+=","+std::to_string(reward.sockets[j]);}
|
||||
for(unsigned j=0;j<7;++j){columns+=",attrtype"+N(j)+",attrvalue"+N(j);values+=","+N(reward.types[j])+","+std::to_string(reward.values[j]);}
|
||||
columns+=",port_extra";values+=",X'"+Hex(reward.extra,sizeof(reward.extra))+"'";
|
||||
if(!Change("INSERT INTO item("+columns+") VALUES("+values+")"))return false;
|
||||
}
|
||||
if(total!=offer.count)return Reject("reward_changed");
|
||||
offer.bought=1;
|
||||
return SetQuest(r.player,"points",gem-static_cast<uint32_t>(offer.price))&&SaveCatalog(r.player,offers,generation,deadline);
|
||||
}
|
||||
default:return Reject("invalid_operation");
|
||||
}
|
||||
}
|
||||
public:
|
||||
Store(DB& database,std::function<unsigned(uint32_t)> itemSize):db(database),size(itemSize){}
|
||||
// Readiness is checked on every entry, so a missing/nontransactional table
|
||||
// never silently downgrades a payment to autocommit.
|
||||
bool Ready() {
|
||||
Rows rows;sqlOK=true;
|
||||
if(!One("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN ('player','item','quest','port_economy_custody','port_economy_requests','port_economy_pending','port_economy_listings','port_economy_orders','port_economy_credit','port_economy_gaya','port_economy_version','port_economy_account_lock','port_economy_item_reservations')",rows)||rows[0][0]!="13")return false;
|
||||
if(!One("SELECT version FROM port_economy_version WHERE id=1",rows)||rows[0][0]!="1")return false;
|
||||
Rows item,custody;
|
||||
return Q("SHOW COLUMNS FROM item",item)&&Q("SHOW COLUMNS FROM port_economy_custody",custody)&&item==custody;
|
||||
}
|
||||
bool Enqueue(const Request& r) {
|
||||
if(!Valid(r)||(r.operation==Status||r.operation==UiStatus)||!Ready()||!db.Begin())return false;
|
||||
Rows rows;bool success=false;
|
||||
const std::string token=r.token,body=Hex(&r,sizeof(r));
|
||||
if(Q("SELECT account,pid,body FROM port_economy_requests WHERE token='"+token+"' FOR UPDATE",rows)) {
|
||||
if(!rows.empty())success=rows.size()==1&&rows[0][0]==N(r.account)&&rows[0][1]==N(r.player)&&rows[0][2].size()==sizeof(r)&&!std::memcmp(rows[0][2].data(),&r,sizeof(r));
|
||||
else {
|
||||
success=true;
|
||||
for(unsigned i=0;i<r.rewardCount && success;++i) {
|
||||
Rows existing;
|
||||
success=Q("SELECT id FROM item WHERE id="+N(r.rewards[i].id)+" UNION ALL SELECT id FROM port_economy_custody WHERE id="+N(r.rewards[i].id),existing)&&existing.empty()&&
|
||||
Change("INSERT INTO port_economy_item_reservations(id,request) VALUES("+N(r.rewards[i].id)+",'"+token+"')");
|
||||
}
|
||||
success=success&&Change("INSERT INTO port_economy_pending(pid,token) VALUES("+N(r.player)+",'"+token+"')")&&
|
||||
Change("INSERT INTO port_economy_requests(token,account,pid,body,state,result,reference) VALUES('"+token+"',"+N(r.account)+","+N(r.player)+",X'"+body+"','PENDING','queued',0)");
|
||||
}
|
||||
}
|
||||
if(success&&db.Commit())return true;db.Rollback();return false;
|
||||
}
|
||||
enum Result { Retry, None, Settled };
|
||||
bool Abort(uint32_t pid,uint32_t account) {
|
||||
if(!Ready()||!db.Begin())return false;
|
||||
Rows rows;
|
||||
bool done=One("SELECT r.token FROM port_economy_pending p JOIN port_economy_requests r ON r.token=p.token WHERE p.pid="+N(pid)+" AND r.pid="+N(pid)+" AND r.account="+N(account)+" AND r.state='PENDING' FOR UPDATE",rows)&&
|
||||
Change("UPDATE port_economy_requests SET state='DONE',result='save_failed' WHERE pid="+N(pid)+" AND account="+N(account)+" AND state='PENDING'")&&
|
||||
Run("DELETE FROM port_economy_pending WHERE pid="+N(pid));
|
||||
if(done&&db.Commit())return true;db.Rollback();return false;
|
||||
}
|
||||
Result Settle(uint32_t pid,uint32_t account) {
|
||||
if(!Ready()||!db.Begin())return Retry;
|
||||
Rows rows;Request r;uint64_t gold=0;
|
||||
if(!Q("SELECT token FROM port_economy_pending WHERE pid="+N(pid)+" FOR UPDATE",rows)){db.Rollback();return Retry;}
|
||||
if(rows.empty()){db.Rollback();return None;}
|
||||
const std::string token=rows[0][0];
|
||||
if(!One("SELECT body FROM port_economy_requests WHERE token='"+token+"' AND account="+N(account)+" AND pid="+N(pid)+" AND state='PENDING' FOR UPDATE",rows)||rows[0][0].size()!=sizeof(r)){db.Rollback();return Retry;}
|
||||
std::memcpy(&r,rows[0][0].data(),sizeof(r));
|
||||
if(!Valid(r)||r.player!=pid||r.account!=account||std::string(r.token)!=token){db.Rollback();return Retry;}
|
||||
if(!Run("INSERT INTO port_economy_account_lock(account) VALUES("+N(account)+") ON DUPLICATE KEY UPDATE account=VALUES(account)")||!One("SELECT account FROM port_economy_account_lock WHERE account="+N(account)+" FOR UPDATE",rows)){db.Rollback();return Retry;}
|
||||
if(!One("SELECT gold FROM player WHERE id="+N(pid)+" AND account_id="+N(account)+" FOR UPDATE",rows)||!Number(rows[0][0],gold,GoldLimit)){db.Rollback();return Retry;}
|
||||
// A save lost before logout cannot authorize spending an older snapshot.
|
||||
outcome="ok";reference=0;
|
||||
if(gold!=static_cast<uint64_t>(r.expectedGold))outcome="wallet_changed";
|
||||
else {
|
||||
// Validation failures may happen after tentative writes (e.g. mall
|
||||
// fills midway through a multi-stack reward). Roll back to savepoint.
|
||||
if(!Run("SAVEPOINT economy_operation")){db.Rollback();return Retry;}
|
||||
if(!Apply(r,gold)) {
|
||||
if(!sqlOK){db.Rollback();return Retry;}
|
||||
if(!Run("ROLLBACK TO SAVEPOINT economy_operation")){db.Rollback();return Retry;}
|
||||
if(outcome=="ok")outcome="state_changed";reference=0;
|
||||
}
|
||||
}
|
||||
if(!Change("UPDATE port_economy_requests SET state='DONE',result='"+outcome+"',reference="+N(reference)+" WHERE token='"+token+"'")||
|
||||
!Change("DELETE FROM port_economy_pending WHERE pid="+N(pid))||!db.Commit()){db.Rollback();return Retry;}
|
||||
return Settled;
|
||||
}
|
||||
const std::string& Outcome()const{return outcome;}
|
||||
uint64_t Reference()const{return reference;}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
#pragma once
|
||||
#include "economy_store.h"
|
||||
|
||||
namespace PortEconomy {
|
||||
// Bounded, ASCII-only presentation over the existing authenticated DB reply.
|
||||
// Build the complete snapshot before emitting any frames. No UI read mutates
|
||||
// wallets, item ownership or order state, and no display slot is an asset ID.
|
||||
constexpr unsigned ViewPageSize=20;
|
||||
inline bool SignedNumber(const std::string& text,int64_t& out,int64_t minimum,int64_t maximum) {
|
||||
const bool negative=!text.empty()&&text[0]=='-';uint64_t value=0;
|
||||
if(!Number(negative?text.substr(1):text,value,negative?static_cast<uint64_t>(-minimum):static_cast<uint64_t>(maximum)))return false;
|
||||
out=negative?-static_cast<int64_t>(value):static_cast<int64_t>(value);return out>=minimum&&out<=maximum;
|
||||
}
|
||||
inline bool HexBytes(const std::string& text,size_t bytes) {
|
||||
if(text.size()!=bytes*2)return false;
|
||||
for(char c:text)if(!((c>='0'&&c<='9')||(c>='a'&&c<='f')||(c>='A'&&c<='F')))return false;
|
||||
return true;
|
||||
}
|
||||
template<class DB> bool View(DB& db,const Request& r,std::function<unsigned(uint32_t)> height,std::vector<std::string>& frames) {
|
||||
frames.clear();Rows rows;if(!Valid(r)||r.operation!=UiStatus)return false;
|
||||
// Transaction-scoped isolation applies to this read only, not later wallet
|
||||
// settlements on the shared direct connection.
|
||||
if(!db.Query("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ",rows)||!db.Begin())return false;
|
||||
auto fail=[&](){db.Rollback();frames.clear();return false;};
|
||||
const auto pid=std::to_string(r.player),aid=std::to_string(r.account),seq=std::to_string(r.generation);
|
||||
if(!db.Query("SELECT amount FROM port_economy_credit WHERE pid="+pid,rows)||rows.size()>1)return fail();
|
||||
uint64_t credit=0;if(!rows.empty()&&!Number(rows[0][0],credit,GoldLimit))return fail();
|
||||
std::string columns="c.vnum,c.count,"+std::string(r.slot==2?"o.state":"l.state")+",c.socket0,c.socket1,c.socket2";
|
||||
for(unsigned i=0;i<7;++i)columns+=",c.attrtype"+std::to_string(i)+",c.attrvalue"+std::to_string(i);
|
||||
columns+=",HEX(c.port_extra)";
|
||||
std::string sql=r.slot==2 ? "SELECT o.id,o.price,l.owner,"+columns+" FROM port_economy_orders o JOIN port_economy_listings l ON l.id=o.listing LEFT JOIN port_economy_custody c ON c.id=l.item WHERE o.buyer="+pid+" AND o.account="+aid+" AND o.state='READY'" :
|
||||
"SELECT l.id,l.price,l.owner,"+columns+" FROM port_economy_listings l LEFT JOIN port_economy_custody c ON c.id=l.item WHERE "+
|
||||
(r.slot==1?"l.owner="+pid+" AND l.state IN('OPEN','RESERVED')":std::string("l.state='OPEN'")+(r.item?" AND l.owner="+std::to_string(r.item):""));
|
||||
sql+=" ORDER BY "+std::string(r.slot==2?"o.id":"l.id")+" DESC LIMIT 21 OFFSET "+std::to_string(r.reference*ViewPageSize);
|
||||
if(!db.Query(sql,rows)||rows.size()>ViewPageSize+1)return fail();
|
||||
const bool more=rows.size()>ViewPageSize;if(more)rows.pop_back();
|
||||
frames.push_back("MTECON1 begin "+seq+" "+std::to_string(r.slot)+" "+std::to_string(r.reference)+" "+std::to_string(rows.size())+" "+std::to_string(more)+" "+std::to_string(credit));
|
||||
for(size_t index=0;index<rows.size();++index) {
|
||||
const auto& row=rows[index];if(row.size()!=24)return fail();
|
||||
uint64_t id=0,price=0,owner=0,vnum=0,count=0;
|
||||
if(!Number(row[0],id)||!id||!Number(row[1],price,GoldLimit)||!price||!Number(row[2],owner,UINT32_MAX)||!owner||
|
||||
!Number(row[3],vnum,UINT32_MAX)||!vnum||!Number(row[4],count,2000)||!count)return fail();
|
||||
unsigned state=row[5]=="OPEN"?0:row[5]=="RESERVED"?1:row[5]=="READY"?2:3;
|
||||
const unsigned size=height(static_cast<uint32_t>(vnum));if(state==3||size<1||size>3)return fail();
|
||||
std::string item="MTECON1 row "+seq+" "+std::to_string(index)+" "+std::to_string(id)+" "+std::to_string(price)+" "+std::to_string(owner)+" "+std::to_string(state)+" "+std::to_string(vnum)+" "+std::to_string(count)+" "+std::to_string(size);
|
||||
for(unsigned i=6;i<9;++i){int64_t socket=0;if(!SignedNumber(row[i],socket,INT32_MIN,INT32_MAX))return fail();item+=" "+std::to_string(socket);}
|
||||
frames.push_back(item);
|
||||
uint8_t attrs[21]={};
|
||||
for(unsigned i=0;i<7;++i){uint64_t type=0;int64_t value=0;
|
||||
if(!Number(row[9+2*i],type,UINT8_MAX)||!SignedNumber(row[10+2*i],value,INT16_MIN,INT16_MAX))return fail();
|
||||
const auto bits=static_cast<uint16_t>(value);attrs[3*i]=static_cast<uint8_t>(type);attrs[3*i+1]=static_cast<uint8_t>(bits&255);attrs[3*i+2]=static_cast<uint8_t>(bits>>8);
|
||||
}
|
||||
std::string extra=row[23];if(extra.empty())extra=std::string(138,'0');if(!HexBytes(extra,69))return fail();
|
||||
frames.push_back("MTECON1 meta "+seq+" "+std::to_string(index)+" "+Hex(attrs,sizeof(attrs))+extra);
|
||||
}
|
||||
// A supplied receipt is scoped to the current account/player. On a fresh
|
||||
// process the latest result is informational; actionable assets come from
|
||||
// the authoritative orders/listings/credit views above.
|
||||
if(!db.Query("SELECT state,result,reference FROM port_economy_requests WHERE pid="+pid+" AND account="+aid+
|
||||
(std::string(r.token)==std::string(32,'0')?" ORDER BY created_at DESC,token DESC LIMIT 1":" AND token='"+std::string(r.token)+"'"),rows)||rows.size()>1)return fail();
|
||||
if(!rows.empty()) {
|
||||
uint64_t reference=0;
|
||||
if(rows[0].size()!=3||!Number(rows[0][2],reference)||rows[0][1].size()>64||(rows[0][0]!="DONE"&&rows[0][0]!="PENDING"))return fail();
|
||||
frames.push_back("MTECON1 result "+seq+" "+rows[0][0]+" "+(rows[0][1].empty()?std::string("00"):Hex(rows[0][1].data(),rows[0][1].size()))+" "+std::to_string(reference));
|
||||
}
|
||||
frames.push_back("MTECON1 end "+seq);
|
||||
for(const auto& frame:frames)if(frame.size()>=sizeof(Reply::message))return fail();
|
||||
if(!db.Commit())return fail();return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
#pragma once
|
||||
#include <cerrno>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <fcntl.h>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
// A separate lifetime lock survives replacement of the catalogue inode. Wallet
|
||||
// and item persistence are separate: this file is not an economic transaction.
|
||||
class PortGayaCatalogFile {
|
||||
int directory_=-1, lock_=-1;
|
||||
bool healthy_=false;
|
||||
std::string name_, error_;
|
||||
bool Fail(const char* reason) { healthy_=false;error_=reason;return false; }
|
||||
static uint32_t Hash(const std::string& s) {
|
||||
uint32_t h=2166136261u;for(unsigned char c:s){h^=c;h*=16777619u;}return h;
|
||||
}
|
||||
static bool Number(const std::string& s,uint64_t maximum,uint64_t& out) {
|
||||
if(s.empty())return false;
|
||||
uint64_t n=0;
|
||||
for(char c:s){if(c<'0'||c>'9'||uint64_t(c-'0')>maximum||n>(maximum-uint64_t(c-'0'))/10)return false;n=n*10+uint64_t(c-'0');}
|
||||
out=n;return true;
|
||||
}
|
||||
template<class Item> static bool Valid(unsigned slot,const Item& item) {
|
||||
return slot<27 && item.itemVnum && item.itemCount>0 && item.itemCount<=2000 && item.itemPrice>0 && item.itemPrice<=1000000;
|
||||
}
|
||||
public:
|
||||
enum Result { Error, Missing, Loaded };
|
||||
PortGayaCatalogFile()=default;
|
||||
PortGayaCatalogFile(const PortGayaCatalogFile&)=delete;
|
||||
PortGayaCatalogFile& operator=(const PortGayaCatalogFile&)=delete;
|
||||
~PortGayaCatalogFile(){if(lock_>=0)close(lock_);if(directory_>=0)close(directory_);}
|
||||
bool Ready()const{return healthy_;}
|
||||
const std::string& ErrorText()const{return error_;}
|
||||
bool Open(const std::string& directory,uint32_t player) {
|
||||
if(directory_>=0 || !player)return Fail("invalid or already opened catalogue");
|
||||
// Only the configured data directory is created. Parent directories must exist.
|
||||
if(mkdir(directory.c_str(),0700)!=0 && errno!=EEXIST)return Fail("cannot create catalogue directory");
|
||||
directory_=open(directory.c_str(),O_RDONLY|O_DIRECTORY|O_NOFOLLOW);
|
||||
if(directory_<0)return Fail("cannot open catalogue directory");
|
||||
name_=std::to_string(player);
|
||||
lock_=openat(directory_,(name_+".lock").c_str(),O_RDWR|O_CREAT|O_NOFOLLOW,0600);
|
||||
if(lock_<0)return Fail("cannot open catalogue lock");
|
||||
struct stat info={};
|
||||
if(fstat(lock_,&info)!=0 || !S_ISREG(info.st_mode) || flock(lock_,LOCK_EX|LOCK_NB)!=0)
|
||||
return Fail("catalogue already owned or invalid lock file");
|
||||
healthy_=true;return true;
|
||||
}
|
||||
template<class Item> Result Load(std::map<uint8_t,Item>& output,int& refresh) {
|
||||
if(!healthy_)return Error;
|
||||
int fd=openat(directory_,name_.c_str(),O_RDONLY|O_NOFOLLOW);
|
||||
if(fd<0){if(errno==ENOENT){output.clear();refresh=0;return Missing;}Fail("cannot read catalogue");return Error;}
|
||||
struct stat info={};
|
||||
if(fstat(fd,&info)!=0 || !S_ISREG(info.st_mode) || info.st_size<1 || info.st_size>16384){close(fd);Fail("invalid catalogue file");return Error;}
|
||||
std::string bytes;char buf[1024];bool readOK=true;
|
||||
for(;;){ssize_t n=read(fd,buf,sizeof(buf));if(n<0&&errno==EINTR)continue;if(n<0){readOK=false;break;}if(!n)break;bytes.append(buf,size_t(n));if(bytes.size()>16384){readOK=false;break;}}
|
||||
close(fd);
|
||||
if(!readOK || bytes.empty() || bytes.back()!='\n'){Fail("truncated catalogue");return Error;}
|
||||
const auto newline=bytes.find('\n');std::string header=bytes.substr(0,newline),body=bytes.substr(newline+1);
|
||||
int decodedRefresh=0;
|
||||
if(header!="index-vnum-count-price-buyed") {
|
||||
std::istringstream fields(header);std::string version,deadline,checksum,tail;uint64_t parsed=0;
|
||||
if(!(fields>>version>>deadline>>checksum) || fields>>tail || version!="gaya-v2" || !Number(deadline,INT32_MAX,parsed) || checksum!=std::to_string(Hash(body))) {
|
||||
Fail("invalid catalogue header or checksum");return Error;
|
||||
}
|
||||
decodedRefresh=static_cast<int>(parsed);
|
||||
}
|
||||
std::map<uint8_t,Item> decoded;std::istringstream rows(body);std::string line;
|
||||
while(std::getline(rows,line)) {
|
||||
std::istringstream fields(line);std::string tokens[5],tail;uint64_t values[5]={};
|
||||
if(!(fields>>tokens[0]>>tokens[1]>>tokens[2]>>tokens[3]>>tokens[4]) || fields>>tail ||
|
||||
!Number(tokens[0],26,values[0]) || !Number(tokens[1],UINT32_MAX,values[1]) ||
|
||||
!Number(tokens[2],2000,values[2]) || !Number(tokens[3],1000000,values[3]) || !Number(tokens[4],1,values[4])) {
|
||||
Fail("invalid catalogue row");return Error;
|
||||
}
|
||||
Item item={};item.itemVnum=static_cast<uint32_t>(values[1]);item.itemCount=static_cast<uint32_t>(values[2]);item.itemPrice=static_cast<int>(values[3]);item.itemBuyed=values[4]!=0;
|
||||
if(!Valid(unsigned(values[0]),item) || !decoded.emplace(uint8_t(values[0]),item).second){Fail("invalid or duplicate catalogue slot");return Error;}
|
||||
}
|
||||
if(decoded.empty()){Fail("empty catalogue");return Error;}
|
||||
output.swap(decoded);refresh=decodedRefresh;return Loaded;
|
||||
}
|
||||
template<class Item> bool Save(const std::map<uint8_t,Item>& items,int refresh) {
|
||||
if(!healthy_)return false;
|
||||
if(items.empty() || items.size()>27 || refresh<0)return Fail("invalid catalogue snapshot");
|
||||
std::ostringstream rows;
|
||||
for(const auto& row:items){if(!Valid(row.first,row.second))return Fail("invalid catalogue snapshot row");const auto& i=row.second;rows<<unsigned(row.first)<<' '<<i.itemVnum<<' '<<i.itemCount<<' '<<i.itemPrice<<' '<<(i.itemBuyed?1:0)<<'\n';}
|
||||
const std::string body=rows.str(),bytes="gaya-v2 "+std::to_string(refresh)+" "+std::to_string(Hash(body))+"\n"+body;
|
||||
const std::string temporary=name_+".tmp."+std::to_string(getpid());
|
||||
int fd=openat(directory_,temporary.c_str(),O_WRONLY|O_CREAT|O_EXCL|O_NOFOLLOW,0600);
|
||||
if(fd<0)return Fail("cannot create catalogue snapshot");
|
||||
bool written=true;size_t offset=0;
|
||||
while(offset<bytes.size()){ssize_t n=write(fd,bytes.data()+offset,bytes.size()-offset);if(n<0&&errno==EINTR)continue;if(n<=0){written=false;break;}offset+=size_t(n);}
|
||||
if(written && fsync(fd)!=0)written=false;
|
||||
if(close(fd)!=0)written=false;
|
||||
if(!written){unlinkat(directory_,temporary.c_str(),0);return Fail("catalogue write/fsync failed; old snapshot retained");}
|
||||
if(renameat(directory_,temporary.c_str(),directory_,name_.c_str())!=0){unlinkat(directory_,temporary.c_str(),0);return Fail("catalogue replace failed; old snapshot retained");}
|
||||
if(fsync(directory_)!=0)return Fail("catalogue directory fsync failed; snapshot outcome requires reload");
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
inline bool PortGayaNextRefresh(int64_t now,int previous,bool elapsedCadence,int& next) {
|
||||
const int64_t period=5*60*60;
|
||||
if(now<0 || now>INT32_MAX-period || previous<0)return false;
|
||||
int64_t result=now+period;
|
||||
if(elapsedCadence && previous>0) {
|
||||
if(previous>now)result=previous;
|
||||
else result=int64_t(previous)+((now-previous)/period+1)*period;
|
||||
}
|
||||
if(result>INT32_MAX)return false;
|
||||
next=static_cast<int>(result);return true;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
// Compare against bounded differences: never negate caller-supplied INT64_MIN.
|
||||
inline bool PortGoldCanChange(int64_t balance,int64_t delta,int64_t maximum) {
|
||||
return maximum>=0 && balance>=0 && balance<=maximum && delta>=-balance && delta<=maximum-balance;
|
||||
}
|
||||
inline bool PortGoldTotal(int64_t price,uint32_t count,int64_t maximum,int64_t& total) {
|
||||
if(price<=0 || !count || maximum<0 || price>maximum/int64_t(count))return false;
|
||||
total=price*int64_t(count);return true;
|
||||
}
|
||||
+114
-51
@@ -9,7 +9,7 @@ enum EItemMisc
|
||||
ITEM_LIMIT_MAX_NUM = 2,
|
||||
ITEM_APPLY_MAX_NUM = 3,
|
||||
ITEM_SOCKET_MAX_NUM = 3,
|
||||
ITEM_MAX_COUNT = 200,
|
||||
ITEM_MAX_COUNT = 2000,
|
||||
ITEM_ATTRIBUTE_MAX_NUM = 7,
|
||||
ITEM_ATTRIBUTE_MAX_LEVEL = 5,
|
||||
ITEM_AWARD_WHY_MAX_LEN = 50,
|
||||
@@ -31,8 +31,8 @@ enum EItemDragonSoulSockets
|
||||
ITEM_SOCKET_DRAGON_SOUL_ACTIVE_IDX = 2,
|
||||
ITEM_SOCKET_CHARGING_AMOUNT_IDX = 2,
|
||||
};
|
||||
// 헐 이거 미친거 아니야?
|
||||
// 나중에 소켓 확장하면 어쩌려고 이지랄 -_-;;;
|
||||
// � �거 미친거 아니야?
|
||||
// 나중ì—� 소켓 확장하면 ì–´ì©Œë ¤ê³ ì�´ì§€ëž„ -_-;;;
|
||||
enum EItemUniqueSockets
|
||||
{
|
||||
ITEM_SOCKET_UNIQUE_SAVE_TIME = ITEM_SOCKET_MAX_NUM - 2,
|
||||
@@ -42,18 +42,18 @@ enum EItemUniqueSockets
|
||||
enum EItemTypes
|
||||
{
|
||||
ITEM_NONE, //0
|
||||
ITEM_WEAPON, //1//무기
|
||||
ITEM_ARMOR, //2//갑옷
|
||||
ITEM_USE, //3//아이템 사용
|
||||
ITEM_WEAPON, //1//무기
|
||||
ITEM_ARMOR, //2//갑옷
|
||||
ITEM_USE, //3//아�템 사용
|
||||
ITEM_AUTOUSE, //4
|
||||
ITEM_MATERIAL, //5
|
||||
ITEM_SPECIAL, //6 //스페셜 아이템
|
||||
ITEM_SPECIAL, //6 //스페셜 아�템
|
||||
ITEM_TOOL, //7
|
||||
ITEM_LOTTERY, //8//복권
|
||||
ITEM_ELK, //9//돈
|
||||
ITEM_LOTTERY, //8//복권
|
||||
ITEM_ELK, //9//�
|
||||
ITEM_METIN, //10
|
||||
ITEM_CONTAINER, //11
|
||||
ITEM_FISH, //12//낚시
|
||||
ITEM_FISH, //12//낚시
|
||||
ITEM_ROD, //13
|
||||
ITEM_RESOURCE, //14
|
||||
ITEM_CAMPFIRE, //15
|
||||
@@ -61,23 +61,28 @@ enum EItemTypes
|
||||
ITEM_SKILLBOOK, //17
|
||||
ITEM_QUEST, //18
|
||||
ITEM_POLYMORPH, //19
|
||||
ITEM_TREASURE_BOX, //20//보물상자
|
||||
ITEM_TREASURE_KEY, //21//보물상자 열쇠
|
||||
ITEM_TREASURE_BOX, //20//보물��
|
||||
ITEM_TREASURE_KEY, //21//보물ìƒ�ìž� ì—´ì‡
|
||||
ITEM_SKILLFORGET, //22
|
||||
ITEM_GIFTBOX, //23
|
||||
ITEM_PICK, //24
|
||||
ITEM_HAIR, //25//머리
|
||||
ITEM_TOTEM, //26//토템
|
||||
ITEM_BLEND, //27//생성될때 랜덤하게 속성이 붙는 약물
|
||||
ITEM_COSTUME, //28//코스츔 아이템 (2011년 8월 추가된 코스츔 시스템용 아이템)
|
||||
ITEM_DS, //29 //용혼석
|
||||
ITEM_SPECIAL_DS, //30 // 특수한 용혼석 (DS_SLOT에 착용하는 UNIQUE 아이템이라 생각하면 됨)
|
||||
ITEM_EXTRACT, //31 추출도구.
|
||||
ITEM_SECONDARY_COIN, //32 ?? 명도전??
|
||||
ITEM_RING, //33 반지
|
||||
ITEM_BELT, //34 벨트
|
||||
ITEM_HAIR, //25//머리
|
||||
ITEM_TOTEM, //26//í† í…œ
|
||||
ITEM_BLEND, //27//ìƒ�성ë� 때 ëžœë�¤í•˜ê²Œ ì†�성ì�´ 붙는 약물
|
||||
ITEM_COSTUME, //28//코스츔 아�템 (2011년 8월 추가� 코스츔 시스템용 아�템)
|
||||
ITEM_DS, //29 //용혼�
|
||||
ITEM_SPECIAL_DS, //30 // 특수한 용혼� (DS_SLOT� 착용하는 UNIQUE 아�템�� ��하면 �)
|
||||
ITEM_EXTRACT, //31 추출�구.
|
||||
ITEM_SECONDARY_COIN, //32 ?? 명ë�„ì „??
|
||||
ITEM_RING, //33 반지
|
||||
ITEM_BELT, //34 벨트
|
||||
ITEM_SHINING, //35 AVA2 shining (not ported, keeps the AVA2 numbering)
|
||||
ITEM_NEW_RINGS, //36 AVA2 new rings (port_rings.cpp), worn in WEAR_RINGS_1/2
|
||||
ITEM_PET, // PORT: AVA2 growable pets, explicit item type 37.
|
||||
};
|
||||
|
||||
enum EShiningSubTypes { SHINING_WEAPON, SHINING_ARMOR, SHINING_SPECIAL };
|
||||
|
||||
enum EMetinSubTypes
|
||||
{
|
||||
METIN_NORMAL,
|
||||
@@ -94,6 +99,9 @@ enum EWeaponSubTypes
|
||||
WEAPON_FAN,
|
||||
WEAPON_ARROW,
|
||||
WEAPON_MOUNT_SPEAR,
|
||||
// PORT: preserve AVA2 numeric positions; reserving claw does not enable Wolfman.
|
||||
WEAPON_CLAW = 8,
|
||||
WEAPON_QUIVER = 9,
|
||||
WEAPON_NUM_TYPES,
|
||||
};
|
||||
|
||||
@@ -106,16 +114,42 @@ enum EArmorSubTypes
|
||||
ARMOR_FOOTS,
|
||||
ARMOR_NECK,
|
||||
ARMOR_EAR,
|
||||
ARMOR_PENDANT, // 7 AVA2 talisman (ITEM_TALISMAN_EQUIPMENT), worn in WEAR_PENDANT
|
||||
ARMOR_NUM_TYPES
|
||||
};
|
||||
|
||||
enum ECostumeSubTypes
|
||||
{
|
||||
COSTUME_BODY = ARMOR_BODY, // [중요!!] ECostumeSubTypes enum value는 종류별로 EArmorSubTypes의 그것과 같아야 함.
|
||||
COSTUME_HAIR = ARMOR_HEAD, // 이는 코스츔 아이템에 추가 속성을 붙이겠다는 사업부의 요청에 따라서 기존 로직을 활용하기 위함임.
|
||||
COSTUME_BODY = ARMOR_BODY, // [중요!!] ECostumeSubTypes enum value는 종류별로 EArmorSubTypes� 그것과 같아야 함.
|
||||
COSTUME_HAIR = ARMOR_HEAD, // ì�´ëŠ” 코스츔 ì•„ì�´í…œì—� 추가 ì†�성ì�„ ë¶™ì�´ê² 다는 사업부ì�˜ ìš”ì²ì—� ë”°ë�¼ì„œ 기존 로ì§�ì�„ 활용하기 위함임.
|
||||
COSTUME_MOUNT = 2, // AVA2 mount costume (value0 = horse race)
|
||||
COSTUME_SASH = 3, // AVA2 sash (85001..85024)
|
||||
COSTUME_MOUNT_SKIN = 4, // AVA2 mount skin (value0 = horse race, needs COSTUME_MOUNT)
|
||||
COSTUME_WEAPON = 5, // PORT: preserve existing mount-skin subtype 4.
|
||||
COSTUME_NEW_SASH = 6,
|
||||
COSTUME_PET = 7,
|
||||
COSTUME_NUM_TYPES,
|
||||
};
|
||||
|
||||
enum EPetSubTypes
|
||||
{
|
||||
PET_LEVELABLE,
|
||||
PET_EGG,
|
||||
PET_TRANSPORTBOX,
|
||||
PET_PROTEIN,
|
||||
PET_CHANGE_NAME_ITEM,
|
||||
PET_DEW,
|
||||
PET_SKILL,
|
||||
PET_PRIMIUM_FEEDSTUFF,
|
||||
PET_ATTR_CHANGE,
|
||||
PET_ATTR_DETERMINE,
|
||||
PET_EXPFOOD_PER,
|
||||
PET_SKILL_DEL_BOOK,
|
||||
PET_SKILL_ALL_DEL_BOOK,
|
||||
PET_EXPFOOD,
|
||||
PET_FEEDSTUFF,
|
||||
};
|
||||
|
||||
enum EDragonSoulSubType
|
||||
{
|
||||
DS_SLOT1,
|
||||
@@ -215,8 +249,8 @@ enum EUseSubTypes
|
||||
USE_UNBIND,
|
||||
USE_TIME_CHARGE_PER,
|
||||
USE_TIME_CHARGE_FIX, // 28
|
||||
USE_PUT_INTO_BELT_SOCKET, // 29 벨트 소켓에 사용할 수 있는 아이템
|
||||
USE_PUT_INTO_RING_SOCKET, // 30 반지 소켓에 사용할 수 있는 아이템 (유니크 반지 말고, 새로 추가된 반지 슬롯)
|
||||
USE_PUT_INTO_BELT_SOCKET, // 29 벨트 소켓ì—� ì‚¬ìš©í• ìˆ˜ 있는 ì•„ì�´í…œ
|
||||
USE_PUT_INTO_RING_SOCKET, // 30 반지 소켓ì—� ì‚¬ìš©í• ìˆ˜ 있는 ì•„ì�´í…œ (ìœ ë‹ˆí�¬ 반지 ë§�ê³ , 새로 추가ë�œ 반지 슬롯)
|
||||
};
|
||||
|
||||
enum EExtractSubTypes
|
||||
@@ -270,7 +304,7 @@ enum EItemFlag
|
||||
{
|
||||
ITEM_FLAG_REFINEABLE = (1 << 0),
|
||||
ITEM_FLAG_SAVE = (1 << 1),
|
||||
ITEM_FLAG_STACKABLE = (1 << 2), // 여러개 합칠 수 있음
|
||||
ITEM_FLAG_STACKABLE = (1 << 2), // 여러개 í•©ì¹ ìˆ˜ 있ì�Œ
|
||||
ITEM_FLAG_COUNT_PER_1GOLD = (1 << 3),
|
||||
ITEM_FLAG_SLOW_QUERY = (1 << 4),
|
||||
ITEM_FLAG_UNUSED01 = (1 << 5), // UNUSED
|
||||
@@ -287,24 +321,27 @@ enum EItemFlag
|
||||
|
||||
enum EItemAntiFlag
|
||||
{
|
||||
ITEM_ANTIFLAG_FEMALE = (1 << 0), // 여성 사용 불가
|
||||
ITEM_ANTIFLAG_MALE = (1 << 1), // 남성 사용 불가
|
||||
ITEM_ANTIFLAG_WARRIOR = (1 << 2), // 무사 사용 불가
|
||||
ITEM_ANTIFLAG_ASSASSIN = (1 << 3), // 자객 사용 불가
|
||||
ITEM_ANTIFLAG_SURA = (1 << 4), // 수라 사용 불가
|
||||
ITEM_ANTIFLAG_SHAMAN = (1 << 5), // 무당 사용 불가
|
||||
ITEM_ANTIFLAG_GET = (1 << 6), // 집을 수 없음
|
||||
ITEM_ANTIFLAG_DROP = (1 << 7), // 버릴 수 없음
|
||||
ITEM_ANTIFLAG_SELL = (1 << 8), // 팔 수 없음
|
||||
ITEM_ANTIFLAG_EMPIRE_A = (1 << 9), // A 제국 사용 불가
|
||||
ITEM_ANTIFLAG_EMPIRE_B = (1 << 10), // B 제국 사용 불가
|
||||
ITEM_ANTIFLAG_EMPIRE_C = (1 << 11), // C 제국 사용 불가
|
||||
ITEM_ANTIFLAG_SAVE = (1 << 12), // 저장되지 않음
|
||||
ITEM_ANTIFLAG_GIVE = (1 << 13), // 거래 불가
|
||||
ITEM_ANTIFLAG_PKDROP = (1 << 14), // PK시 떨어지지 않음
|
||||
ITEM_ANTIFLAG_STACK = (1 << 15), // 합칠 수 없음
|
||||
ITEM_ANTIFLAG_MYSHOP = (1 << 16), // 개인 상점에 올릴 수 없음
|
||||
ITEM_ANTIFLAG_SAFEBOX = (1 << 17), // 창고에 넣을 수 없음
|
||||
ITEM_ANTIFLAG_FEMALE = (1 << 0), // 여성 사용 불가
|
||||
ITEM_ANTIFLAG_MALE = (1 << 1), // 남성 사용 불가
|
||||
ITEM_ANTIFLAG_WARRIOR = (1 << 2), // 무사 사용 불가
|
||||
ITEM_ANTIFLAG_ASSASSIN = (1 << 3), // �� 사용 불가
|
||||
ITEM_ANTIFLAG_SURA = (1 << 4), // 수� 사용 불가
|
||||
ITEM_ANTIFLAG_SHAMAN = (1 << 5), // 무당 사용 불가
|
||||
ITEM_ANTIFLAG_GET = (1 << 6), // 집� 수 없�
|
||||
ITEM_ANTIFLAG_DROP = (1 << 7), // 버릴 수 없�
|
||||
ITEM_ANTIFLAG_SELL = (1 << 8), // 팔 수 없�
|
||||
ITEM_ANTIFLAG_EMPIRE_A = (1 << 9), // A ì œêµ ì‚¬ìš© 불가
|
||||
ITEM_ANTIFLAG_EMPIRE_B = (1 << 10), // B ì œêµ ì‚¬ìš© 불가
|
||||
ITEM_ANTIFLAG_EMPIRE_C = (1 << 11), // C ì œêµ ì‚¬ìš© 불가
|
||||
ITEM_ANTIFLAG_SAVE = (1 << 12), // ì €ìž¥ë�˜ì§€ 않ì�Œ
|
||||
ITEM_ANTIFLAG_GIVE = (1 << 13), // 거래 불가
|
||||
ITEM_ANTIFLAG_PKDROP = (1 << 14), // PK시 떨어지지 않�
|
||||
ITEM_ANTIFLAG_STACK = (1 << 15), // í•©ì¹ ìˆ˜ ì—†ì�Œ
|
||||
ITEM_ANTIFLAG_MYSHOP = (1 << 16), // ê°œì�¸ ìƒ�ì �ì—� 올릴 수 ì—†ì�Œ
|
||||
ITEM_ANTIFLAG_SAFEBOX = (1 << 17), // ì°½ê³ ì—� ë„£ì�„ 수 ì—†ì�Œ
|
||||
#ifdef ENABLE_WOLFMAN_CHARACTER
|
||||
ITEM_ANTIFLAG_WOLFMAN = (1 << 18), // ¼öÀÎÁ· »ç¿ë ºÒ°¡
|
||||
#endif
|
||||
};
|
||||
|
||||
enum EItemWearableFlag
|
||||
@@ -335,16 +372,16 @@ enum ELimitTypes
|
||||
LIMIT_CON,
|
||||
LIMIT_PCBANG,
|
||||
|
||||
/// 착용 여부와 상관 없이 실시간으로 시간 차감 (socket0에 소멸 시간이 박힘: unix_timestamp 타입)
|
||||
/// 착용 여부와 �관 없� 실시간으로 시간 차� (socket0� 소멸 시간� 박힘: unix_timestamp 타입)
|
||||
LIMIT_REAL_TIME,
|
||||
|
||||
/// 아이템을 맨 처음 사용(혹은 착용) 한 순간부터 리얼타임 타이머 시작
|
||||
/// 최초 사용 전에는 socket0에 사용가능시간(초단위, 0이면 프로토의 limit value값 사용) 값이 쓰여있다가
|
||||
/// 아이템 사용시 socket1에 사용 횟수가 박히고 socket0에 unix_timestamp 타입의 소멸시간이 박힘.
|
||||
/// 아�템� 맨 처� 사용(혹� 착용) 한 순간부터 리얼타임 타�머 시작
|
||||
/// 최초 사용 ì „ì—�는 socket0ì—� 사용가능시간(초단위, 0ì�´ë©´ í”„ë¡œí† ì�˜ limit valueê°’ 사용) ê°’ì�´ 쓰여있다가
|
||||
/// ì•„ì�´í…œ 사용시 socket1ì—� 사용 횟수가 ë°•ížˆê³ socket0ì—� unix_timestamp 타입ì�˜ 소멸시간ì�´ 박힘.
|
||||
LIMIT_REAL_TIME_START_FIRST_USE,
|
||||
|
||||
/// 아이템을 착용 중일 때만 사용 시간이 차감되는 아이템
|
||||
/// socket0에 남은 시간이 초단위로 박힘. (아이템 최초 사용시 해당 값이 0이면 프로토의 limit value값을 socket0에 복사)
|
||||
/// 아�템� 착용 중� 때만 사용 시간� 차��는 아�템
|
||||
/// socket0ì—� 남ì�€ 시간ì�´ 초단위로 박힘. (ì•„ì�´í…œ 최초 사용시 해당 ê°’ì�´ 0ì�´ë©´ í”„ë¡œí† ì�˜ limit valueê°’ì�„ socket0ì—� 복사)
|
||||
LIMIT_TIMER_BASED_ON_WEAR,
|
||||
|
||||
LIMIT_MAX_NUM
|
||||
@@ -368,4 +405,30 @@ enum ERefineType
|
||||
REFINE_TYPE_BDRAGON,
|
||||
};
|
||||
|
||||
// AVA2 sash: combine two sashes of one grade into the next grade / absorb a weapon or body armor.
|
||||
enum ESashInfo
|
||||
{
|
||||
SASH_GRADE_VALUE_FIELD = 0, // item value0 = grade 1..4
|
||||
SASH_ABSORPTION_SOCKET = 0, // socket0 = absorption %
|
||||
SASH_ABSORBED_SOCKET = 1, // socket1 = vnum of the absorbed item
|
||||
SASH_GRADE_1_ABS = 1,
|
||||
SASH_GRADE_2_ABS = 5,
|
||||
SASH_GRADE_3_ABS = 10,
|
||||
SASH_GRADE_4_ABS_MIN = 11,
|
||||
SASH_GRADE_4_ABS_MAX = 25,
|
||||
SASH_GRADE_4_ABS_MAX_COMB = 19,
|
||||
SASH_GRADE_4_ABS_RANGE = 5,
|
||||
SASH_EFFECT_FROM_ABS = 19,
|
||||
SASH_CLEAN_ATTR_VALUE0 = 7,
|
||||
SASH_WINDOW_MAX_MATERIALS = 2,
|
||||
SASH_GRADE_1_PRICE = 100000,
|
||||
SASH_GRADE_2_PRICE = 200000,
|
||||
SASH_GRADE_3_PRICE = 300000,
|
||||
SASH_GRADE_4_PRICE = 500000,
|
||||
SASH_COMBINE_GRADE_1 = 80,
|
||||
SASH_COMBINE_GRADE_2 = 70,
|
||||
SASH_COMBINE_GRADE_3 = 50,
|
||||
SASH_COMBINE_GRADE_4 = 30,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
+225
-73
@@ -1,6 +1,9 @@
|
||||
#ifndef __INC_METIN_II_LENGTH_H__
|
||||
#define __INC_METIN_II_LENGTH_H__
|
||||
|
||||
// Feature-dependent wire layouts must not depend on a caller's include order.
|
||||
#include "service.h"
|
||||
|
||||
#define WORD_MAX 0xffff
|
||||
enum EMisc
|
||||
{
|
||||
@@ -8,10 +11,19 @@ enum EMisc
|
||||
IP_ADDRESS_LENGTH = 15,
|
||||
LOGIN_MAX_LEN = 30,
|
||||
PASSWD_MAX_LEN = 16,
|
||||
#ifdef ENABLE_PLAYER_PER_ACCOUNT5
|
||||
PLAYER_PER_ACCOUNT = 5,
|
||||
#else
|
||||
PLAYER_PER_ACCOUNT = 4,
|
||||
#endif
|
||||
ACCOUNT_STATUS_MAX_LEN = 8,
|
||||
CHARACTER_NAME_MAX_LEN = 24,
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
OFFLINE_SHOP_HOST_ITEM_MAX_NUM = 80,
|
||||
SHOP_SIGN_MAX_LEN = 45,
|
||||
#else
|
||||
SHOP_SIGN_MAX_LEN = 32,
|
||||
#endif
|
||||
INVENTORY_PAGE_SIZE = 45, // 5 x 9
|
||||
INVENTORY_PAGE_COUNT = 5, // MT: 40250 ships 2 pages (90 cells)
|
||||
INVENTORY_MAX_NUM = INVENTORY_PAGE_SIZE * INVENTORY_PAGE_COUNT,
|
||||
@@ -24,10 +36,10 @@ enum EMisc
|
||||
|
||||
GUILD_NAME_MAX_LEN = 12,
|
||||
|
||||
SHOP_HOST_ITEM_MAX_NUM = 40, /* 호스트의 최대 아이템 개수 */
|
||||
SHOP_GUEST_ITEM_MAX_NUM = 18, /* 게스트의 최대 아이템 개수 */
|
||||
SHOP_HOST_ITEM_MAX_NUM = 40, /* 호스트� 최대 아�템 개수 */
|
||||
SHOP_GUEST_ITEM_MAX_NUM = 18, /* 게스트� 최대 아�템 개수 */
|
||||
|
||||
SHOP_PRICELIST_MAX_NUM = 40, ///< 개인상점 가격정보 리스트에서 유지할 가격정보의 최대 갯수
|
||||
SHOP_PRICELIST_MAX_NUM = 40, ///< ê°œì�¸ìƒ�ì � ê°€ê²©ì •ë³´ 리스트ì—�서 ìœ ì§€í• ê°€ê²©ì •ë³´ì�˜ 최대 갯수
|
||||
|
||||
CHAT_MAX_LEN = 512,
|
||||
|
||||
@@ -41,6 +53,9 @@ enum EMisc
|
||||
|
||||
PLAYER_EXP_TABLE_MAX = 120,
|
||||
PLAYER_MAX_LEVEL_CONST = 120,
|
||||
#ifdef ENABLE_CONQUEROR_LEVEL
|
||||
PLAYER_MAX_CONQUEROR_LEVEL_CONST = 30,
|
||||
#endif
|
||||
|
||||
GUILD_MAX_LEVEL = 20,
|
||||
MOB_MAX_LEVEL = 100,
|
||||
@@ -48,6 +63,13 @@ enum EMisc
|
||||
ATTRIBUTE_MAX_VALUE = 20,
|
||||
CHARACTER_PATH_MAX_NUM = 64,
|
||||
SKILL_MAX_NUM = 255,
|
||||
|
||||
#ifdef ENABLE_NEW_PET_SYSTEM
|
||||
PET_MAX_EVOLUTION_CONST = 3,
|
||||
PET_MAX_LEVEL_CONST = 120,
|
||||
PET_APPLY_MAX_NUM = 3,
|
||||
PET_SKILLS_MAX_NUM = 15,
|
||||
#endif
|
||||
SKILLBOOK_DELAY_MIN = 64800,
|
||||
SKILLBOOK_DELAY_MAX = 108000,
|
||||
SKILL_MAX_LEVEL = 40,
|
||||
@@ -64,10 +86,11 @@ enum EMisc
|
||||
DRAGON_SOUL_REFINE_GRID_SIZE = 15,
|
||||
MAX_AMOUNT_OF_MALL_BONUS = 20,
|
||||
|
||||
WEAR_MAX_NUM = 32,
|
||||
WEAR_MAX_NUM = 40, // PORT: shop costume/pet/shining equipment.
|
||||
|
||||
//LIMIT_GOLD
|
||||
GOLD_MAX = 2000000000,
|
||||
GOLD_MAX_64 = 2000000000000000LL,
|
||||
|
||||
MAX_PASSPOD = 8 ,
|
||||
|
||||
@@ -84,21 +107,33 @@ enum EMisc
|
||||
|
||||
BELT_INVENTORY_SLOT_COUNT = BELT_INVENTORY_SLOT_WIDTH * BELT_INVENTORY_SLOT_HEIGHT,
|
||||
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
SPECIAL_INVENTORY_PAGE_COLUMN = 5,
|
||||
SPECIAL_INVENTORY_PAGE_ROW = 9,
|
||||
SPECIAL_INVENTORY_PAGE_SIZE = SPECIAL_INVENTORY_PAGE_COLUMN * SPECIAL_INVENTORY_PAGE_ROW,
|
||||
SPECIAL_INVENTORY_PAGE_COUNT = 4,
|
||||
SPECIAL_INVENTORY_MAX_NUM = SPECIAL_INVENTORY_PAGE_SIZE * SPECIAL_INVENTORY_PAGE_COUNT,
|
||||
#endif
|
||||
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
UNLOCK_INVENTORY_MAX = 6,
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
**** 현재까지 할당 된 아이템 영역 정리 (DB상 Item Position) ****
|
||||
**** 현재까지 í• ë‹¹ ë�œ ì•„ì�´í…œ ì˜�ì— ì •ë¦¬ (DBìƒ� Item Position) ****
|
||||
+------------------------------------------------------+ 0
|
||||
| 캐릭터 기본 인벤토리 (45칸 * 2페이지) 90칸 |
|
||||
| ìº�ë¦í„° 기본 ì�¸ë²¤í† 리 (45칸 * 2페ì�´ì§€) 90칸 |
|
||||
+------------------------------------------------------+ 225 = INVENTORY_MAX_NUM(225) MT: 5 pages; 40250 had 90 and every cell below moved by +135
|
||||
| 캐릭터 장비 창 (착용중인 아이템) 32칸 |
|
||||
| ìº�ë¦í„° 장비 ì°½ (착용중ì�¸ ì•„ì�´í…œ) 32칸 |
|
||||
+------------------------------------------------------+ 257 = INVENTORY_MAX_NUM(225) + WEAR_MAX_NUM(32)
|
||||
| 용혼석 장비 창 (착용중인 용혼석) 12칸 |
|
||||
| 용혼� 장비 창 (착용중� 용혼�) 12칸 |
|
||||
+------------------------------------------------------+ 269 = 257 + DS_SLOT_MAX(6) * DRAGON_SOUL_DECK_MAX_NUM(2)
|
||||
| 용혼석 장비 창 예약 (아직 미사용) 18칸 |
|
||||
| 용혼� 장비 창 예약 (아� 미사용) 18칸 |
|
||||
+------------------------------------------------------+ 287 = 269 + DS_SLOT_MAX(6) * DRAGON_SOUL_DECK_RESERVED_MAX_NUM(3)
|
||||
| 벨트 인벤토리 (벨트 착용시에만 벨트 레벨에 따라 활성)|
|
||||
| 벨트 ì�¸ë²¤í† 리 (벨트 착용시ì—�ë§Œ 벨트 ë ˆë²¨ì—� ë”°ë�¼ 활성)|
|
||||
+------------------------------------------------------+ 303 = 287 + BELT_INVENTORY_SLOT_COUNT(16) = INVENTORY_AND_EQUIP_CELL_MAX
|
||||
| 미사용 |
|
||||
| 미사용 |
|
||||
+------------------------------------------------------+ ??
|
||||
*/
|
||||
};
|
||||
@@ -133,12 +168,25 @@ enum EWearPositions
|
||||
WEAR_COSTUME_BODY, // 19
|
||||
WEAR_COSTUME_HAIR, // 20
|
||||
|
||||
WEAR_RING1, // 21 : 신규 반지슬롯1 (왼쪽)
|
||||
WEAR_RING2, // 22 : 신규 반지슬롯2 (오른쪽)
|
||||
WEAR_RING1, // 21 : ì‹ ê·œ 반지슬롯1 (왼쪽)
|
||||
WEAR_RING2, // 22 : ì‹ ê·œ 반지슬롯2 (오른쪽)
|
||||
|
||||
WEAR_BELT, // 23 : 신규 벨트슬롯
|
||||
WEAR_BELT, // 23 : ì‹ ê·œ 벨트슬롯
|
||||
WEAR_COSTUME_SASH, // 24 : AVA2 sash
|
||||
WEAR_COSTUME_MOUNT, // 25 : AVA2 mount costume
|
||||
WEAR_COSTUME_MOUNT_SKIN, // 26 : AVA2 mount skin
|
||||
WEAR_PENDANT, // 27 : AVA2 talisman (ARMOR_PENDANT)
|
||||
WEAR_RINGS_1, // 28 : AVA2 new ring (ITEM_NEW_RINGS)
|
||||
WEAR_RINGS_2, // 29 : AVA2 new ring
|
||||
|
||||
WEAR_MAX = 32 //
|
||||
WEAR_COSTUME_WEAPON = 30,
|
||||
WEAR_COSTUME_PET = 31,
|
||||
WEAR_PET = 32,
|
||||
WEAR_COSTUME_NEW_SASH = 33,
|
||||
WEAR_SHINING_WEAPON = 34,
|
||||
WEAR_SHINING_ARMOR = 35,
|
||||
WEAR_SHINING_SPECIAL = 36,
|
||||
WEAR_MAX = 40 // PORT: extended appearance equipment.
|
||||
};
|
||||
|
||||
enum EDragonSoulDeckType
|
||||
@@ -147,7 +195,7 @@ enum EDragonSoulDeckType
|
||||
DRAGON_SOUL_DECK_1,
|
||||
DRAGON_SOUL_DECK_MAX_NUM = 2,
|
||||
|
||||
DRAGON_SOUL_DECK_RESERVED_MAX_NUM = 3, // NOTE: 중요! 아직 사용중이진 않지만, 3페이지 분량을 예약 해 둠. DS DECK을 늘릴 경우 반드시 그 수만큼 RESERVED에서 차감해야 함!
|
||||
DRAGON_SOUL_DECK_RESERVED_MAX_NUM = 3, // NOTE: 중요! ì•„ì§� 사용중ì�´ì§„ 않지만, 3페ì�´ì§€ 분량ì�„ 예약 í•´ ë‘ . DS DECKì�„ 늘릴 경우 반드시 ê·¸ 수만í�¼ RESERVEDì—�서 ì°¨ê°�해야 함!
|
||||
};
|
||||
|
||||
enum ESex
|
||||
@@ -169,7 +217,7 @@ enum EDirection
|
||||
DIR_MAX_NUM
|
||||
};
|
||||
|
||||
#define ABILITY_MAX_LEVEL 10 /* 기술 최대 레벨 */
|
||||
#define ABILITY_MAX_LEVEL 10 /* ê¸°ìˆ ìµœëŒ€ ë ˆë²¨ */
|
||||
|
||||
enum EAbilityDifficulty
|
||||
{
|
||||
@@ -182,9 +230,9 @@ enum EAbilityDifficulty
|
||||
|
||||
enum EAbilityCategory
|
||||
{
|
||||
CATEGORY_PHYSICAL, /* 신체적 어빌리티 */
|
||||
CATEGORY_MENTAL, /* 정신적 어빌리티 */
|
||||
CATEGORY_ATTRIBUTE, /* 능력 어빌리티 */
|
||||
CATEGORY_PHYSICAL, /* ì‹ ì²´ì � 어빌리티 */
|
||||
CATEGORY_MENTAL, /* ì •ì‹ ì � 어빌리티 */
|
||||
CATEGORY_ATTRIBUTE, /* ëŠ¥ë ¥ 어빌리티 */
|
||||
CATEGORY_NUM_TYPES
|
||||
};
|
||||
|
||||
@@ -194,6 +242,9 @@ enum EJobs
|
||||
JOB_ASSASSIN,
|
||||
JOB_SURA,
|
||||
JOB_SHAMAN,
|
||||
#ifdef ENABLE_WOLFMAN_CHARACTER
|
||||
JOB_WOLFMAN, // ¼öÀÎÁ·. °³¹ßÄÚµå¸íÀÌ WOLFMAN. (±âȹÀÚ°¡ Á¤Çß¾¸. ³ªÁß¿¡ WOLF GIRL »ý°Üµµ ³ªÇÑÅ× ¸Ó¶óÇÏÁö¸¶¼À¤Ð¤Ð)
|
||||
#endif
|
||||
JOB_MAX_NUM
|
||||
};
|
||||
|
||||
@@ -247,6 +298,7 @@ enum EParts
|
||||
PART_WEAPON,
|
||||
PART_HEAD,
|
||||
PART_HAIR,
|
||||
PART_SASH,
|
||||
|
||||
PART_MAX_NUM,
|
||||
PART_WEAPON_SUB,
|
||||
@@ -254,13 +306,13 @@ enum EParts
|
||||
|
||||
enum EChatType
|
||||
{
|
||||
CHAT_TYPE_TALKING, /* 그냥 채팅 */
|
||||
CHAT_TYPE_INFO, /* 정보 (아이템을 집었다, 경험치를 얻었다. 등) */
|
||||
CHAT_TYPE_NOTICE, /* 공지사항 */
|
||||
CHAT_TYPE_PARTY, /* 파티말 */
|
||||
CHAT_TYPE_GUILD, /* 길드말 */
|
||||
CHAT_TYPE_COMMAND, /* 일반 명령 */
|
||||
CHAT_TYPE_SHOUT, /* 외치기 */
|
||||
CHAT_TYPE_TALKING, /* 그냥 채팅 */
|
||||
CHAT_TYPE_INFO, /* ì •ë³´ (ì•„ì�´í…œì�„ 집었다, 경험치를 얻었다. 등) */
|
||||
CHAT_TYPE_NOTICE, /* ê³µì§€ì‚¬í• */
|
||||
CHAT_TYPE_PARTY, /* 파티� */
|
||||
CHAT_TYPE_GUILD, /* 길드� */
|
||||
CHAT_TYPE_COMMAND, /* ì�¼ë°˜ ëª…ë ¹ */
|
||||
CHAT_TYPE_SHOUT, /* 외치기 */
|
||||
CHAT_TYPE_WHISPER,
|
||||
CHAT_TYPE_BIG_NOTICE,
|
||||
CHAT_TYPE_MONARCH_NOTICE,
|
||||
@@ -289,6 +341,16 @@ enum ECharacterPosition
|
||||
POSITION_MAX_NUM
|
||||
};
|
||||
|
||||
#ifdef ENABLE_CONQUEROR_LEVEL
|
||||
enum EConquerorMap
|
||||
{
|
||||
EASTPLAIN_01 = 129,
|
||||
EASTPLAIN_02 = 130,
|
||||
EASTPLAIN_03 = 131,
|
||||
EMPIRECASTLE = 132,
|
||||
};
|
||||
#endif
|
||||
|
||||
enum EGMLevels
|
||||
{
|
||||
GM_PLAYER,
|
||||
@@ -321,7 +383,10 @@ enum ECharType
|
||||
CHAR_TYPE_PC,
|
||||
CHAR_TYPE_POLYMORPH_PC,
|
||||
CHAR_TYPE_HORSE,
|
||||
CHAR_TYPE_GOTO
|
||||
CHAR_TYPE_GOTO,
|
||||
#ifdef ENABLE_NEW_PET_SYSTEM
|
||||
CHAR_TYPE_PET,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum EBattleType
|
||||
@@ -403,39 +468,70 @@ enum EApplyTypes
|
||||
APPLY_ATTBONUS_SURA, // 61
|
||||
APPLY_ATTBONUS_SHAMAN, // 62
|
||||
APPLY_ATTBONUS_MONSTER, // 63
|
||||
APPLY_MALL_ATTBONUS, // 64 공격력 +x%
|
||||
APPLY_MALL_DEFBONUS, // 65 방어력 +x%
|
||||
APPLY_MALL_EXPBONUS, // 66 경험치 +x%
|
||||
APPLY_MALL_ITEMBONUS, // 67 아이템 드롭율 x/10배
|
||||
APPLY_MALL_GOLDBONUS, // 68 돈 드롭율 x/10배
|
||||
APPLY_MAX_HP_PCT, // 69 최대 생명력 +x%
|
||||
APPLY_MAX_SP_PCT, // 70 최대 정신력 +x%
|
||||
APPLY_SKILL_DAMAGE_BONUS, // 71 스킬 데미지 * (100+x)%
|
||||
APPLY_NORMAL_HIT_DAMAGE_BONUS, // 72 평타 데미지 * (100+x)%
|
||||
APPLY_SKILL_DEFEND_BONUS, // 73 스킬 데미지 방어 * (100-x)%
|
||||
APPLY_NORMAL_HIT_DEFEND_BONUS, // 74 평타 데미지 방어 * (100-x)%
|
||||
APPLY_PC_BANG_EXP_BONUS, // 75 PC방 아이템 EXP 보너스
|
||||
APPLY_PC_BANG_DROP_BONUS, // 76 PC방 아이템 드롭율 보너스
|
||||
APPLY_MALL_ATTBONUS, // 64 ê³µê²©ë ¥ +x%
|
||||
APPLY_MALL_DEFBONUS, // 65 ë°©ì–´ë ¥ +x%
|
||||
APPLY_MALL_EXPBONUS, // 66 경험치 +x%
|
||||
APPLY_MALL_ITEMBONUS, // 67 ì•„ì�´í…œ 드ë¡ìœ¨ x/10ë°°
|
||||
APPLY_MALL_GOLDBONUS, // 68 ë�ˆ 드ë¡ìœ¨ x/10ë°°
|
||||
APPLY_MAX_HP_PCT, // 69 최대 ìƒ�ëª…ë ¥ +x%
|
||||
APPLY_MAX_SP_PCT, // 70 최대 ì •ì‹ ë ¥ +x%
|
||||
APPLY_SKILL_DAMAGE_BONUS, // 71 스킬 �미지 * (100+x)%
|
||||
APPLY_NORMAL_HIT_DAMAGE_BONUS, // 72 �타 �미지 * (100+x)%
|
||||
APPLY_SKILL_DEFEND_BONUS, // 73 스킬 �미지 방어 * (100-x)%
|
||||
APPLY_NORMAL_HIT_DEFEND_BONUS, // 74 �타 �미지 방어 * (100-x)%
|
||||
APPLY_PC_BANG_EXP_BONUS, // 75 PC방 아�템 EXP 보너스
|
||||
APPLY_PC_BANG_DROP_BONUS, // 76 PCë°© ì•„ì�´í…œ 드ë¡ìœ¨ 보너스
|
||||
|
||||
APPLY_EXTRACT_HP_PCT, // 77 사용시 HP 소모
|
||||
APPLY_EXTRACT_HP_PCT, // 77 사용시 HP 소모
|
||||
|
||||
APPLY_RESIST_WARRIOR, // 78 무사에게 저항
|
||||
APPLY_RESIST_ASSASSIN, // 79 자객에게 저항
|
||||
APPLY_RESIST_SURA, // 80 수라에게 저항
|
||||
APPLY_RESIST_SHAMAN, // 81 무당에게 저항
|
||||
APPLY_ENERGY, // 82 기력
|
||||
APPLY_DEF_GRADE, // 83 방어력. DEF_GRADE_BONUS는 클라에서 두배로 보여지는 의도된 버그(...)가 있다.
|
||||
APPLY_COSTUME_ATTR_BONUS, // 84 코스튬 아이템에 붙은 속성치 보너스
|
||||
APPLY_MAGIC_ATTBONUS_PER, // 85 마법 공격력 +x%
|
||||
APPLY_MELEE_MAGIC_ATTBONUS_PER, // 86 마법 + 밀리 공격력 +x%
|
||||
APPLY_RESIST_WARRIOR, // 78 무사ì—�게 ì €í•
|
||||
APPLY_RESIST_ASSASSIN, // 79 ìž�ê°�ì—�게 ì €í•
|
||||
APPLY_RESIST_SURA, // 80 수ë�¼ì—�게 ì €í•
|
||||
APPLY_RESIST_SHAMAN, // 81 무당ì—�게 ì €í•
|
||||
APPLY_ENERGY, // 82 ê¸°ë ¥
|
||||
APPLY_DEF_GRADE, // 83 ë°©ì–´ë ¥. DEF_GRADE_BONUS는 í�´ë�¼ì—�서 ë‘�배로 보여지는 ì�˜ë�„ë�œ 버그(...)ê°€ 있다.
|
||||
APPLY_COSTUME_ATTR_BONUS, // 84 코스튬 아�템� 붙� �성치 보너스
|
||||
APPLY_MAGIC_ATTBONUS_PER, // 85 마법 ê³µê²©ë ¥ +x%
|
||||
APPLY_MELEE_MAGIC_ATTBONUS_PER, // 86 마법 + 밀리 ê³µê²©ë ¥ +x%
|
||||
|
||||
APPLY_RESIST_ICE, // 87 냉기 저항
|
||||
APPLY_RESIST_EARTH, // 88 대지 저항
|
||||
APPLY_RESIST_DARK, // 89 어둠 저항
|
||||
APPLY_RESIST_ICE, // 87 냉기 ì €í•
|
||||
APPLY_RESIST_EARTH, // 88 대지 ì €í•
|
||||
APPLY_RESIST_DARK, // 89 ì–´ë‘ ì €í•
|
||||
|
||||
APPLY_ANTI_CRITICAL_PCT, //90 크리티컬 저항
|
||||
APPLY_ANTI_PENETRATE_PCT, //91 관통타격 저항
|
||||
APPLY_ANTI_CRITICAL_PCT, //90 í�¬ë¦¬í‹°ì»¬ ì €í•
|
||||
APPLY_ANTI_PENETRATE_PCT, //91 관통타격 ì €í•
|
||||
|
||||
#ifdef ENABLE_WOLFMAN_CHARACTER
|
||||
APPLY_BLEEDING_REDUCE = 92, //92
|
||||
APPLY_BLEEDING_PCT = 93, //93
|
||||
APPLY_ATTBONUS_WOLFMAN = 94, //94
|
||||
APPLY_RESIST_WOLFMAN = 95, //95
|
||||
APPLY_RESIST_CLAW = 96, //96
|
||||
#endif
|
||||
|
||||
|
||||
// PORT AVA2 bonus numbering (AVA2 common/length.h): 92-138 are AVA2 applies not ported yet,
|
||||
// kept free so later ports and the client item_proto keep AVA2's numbers.
|
||||
// AVA2 ELEMENT_NEW_BONUSES: attack bonus % against monsters of the element (RACE_FLAG_ATT_*), on the talismans.
|
||||
APPLY_RESIST_MAGIC_REDUCTION = 98, // AVA2 ENABLE_MAGIC_REDUCTION_SYSTEM.
|
||||
APPLY_RESIST_HUMAN = 99, // AVA2 growing-pet skill 17.
|
||||
#ifdef ENABLE_CONQUEROR_LEVEL
|
||||
APPLY_SUNGMA_STR = 119,
|
||||
APPLY_SUNGMA_HP = 120,
|
||||
APPLY_SUNGMA_MOVE = 121,
|
||||
APPLY_SUNGMA_INMUNE = 122,
|
||||
#endif
|
||||
APPLY_ENCHANT_ELEC = 123,
|
||||
APPLY_ENCHANT_FIRE = 124,
|
||||
APPLY_ENCHANT_ICE = 125,
|
||||
APPLY_ENCHANT_WIND = 126,
|
||||
APPLY_ENCHANT_EARTH = 127,
|
||||
APPLY_ENCHANT_DARK = 128,
|
||||
#ifdef ENABLE_WOLFMAN_CHARACTER
|
||||
APPLY_ATTBONUS_CLAW = 138,
|
||||
#endif
|
||||
APPLY_ATTBONUS_STONE = 139,
|
||||
APPLY_ATTBONUS_BOSS = 140,
|
||||
|
||||
MAX_APPLY_NUM, //
|
||||
};
|
||||
@@ -455,6 +551,21 @@ enum EOnIdleEvents
|
||||
ON_IDLE_MAX_NUM
|
||||
};
|
||||
|
||||
// PORT: AVA2 ENABLE_SWITCHBOT (port_switchbot.cpp). Slot 5 is AVA2's hidden scroll cell; this port keeps
|
||||
// the table width but never stores an item there.
|
||||
enum SwitchbotValues
|
||||
{
|
||||
SWITCHBOT_SLOT_COUNT = 6,
|
||||
SWITCHBOT_SLOT_COUNT_REAL = 5,
|
||||
SWITCHBOT_ALTERNATIVE_COUNT = 2,
|
||||
SWITCHBOT_NORM_ATTR_NUM = 5, // AVA2 MAX_NORM_ATTR_NUM
|
||||
//1 = Switching Item
|
||||
//2 = Yang
|
||||
SWITCHBOT_PRICE_TYPE = 1,
|
||||
//Amount Swtichting Items the Yang-Price
|
||||
SWITCHBOT_PRICE_AMOUNT = 1,
|
||||
};
|
||||
|
||||
enum EWindows
|
||||
{
|
||||
RESERVED_WINDOW,
|
||||
@@ -464,6 +575,14 @@ enum EWindows
|
||||
MALL,
|
||||
DRAGON_SOUL_INVENTORY,
|
||||
BELT_INVENTORY,
|
||||
SWITCHBOT, // PORT: 7 = player.item.window enum 'SWITCHBOT' (appended after BELT_INVENTORY)
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
UPGRADE_INVENTORY, // 8
|
||||
BOOK_INVENTORY, // 9
|
||||
STONE_INVENTORY, // 10
|
||||
CHANGE_INVENTORY, // 11
|
||||
COSTUME_INVENTORY, // 12
|
||||
#endif
|
||||
#ifdef __AUCTION__
|
||||
AUCTION,
|
||||
#endif
|
||||
@@ -524,6 +643,9 @@ enum EMobEnchants
|
||||
MOB_ENCHANT_STUN,
|
||||
MOB_ENCHANT_CRITICAL,
|
||||
MOB_ENCHANT_PENETRATE,
|
||||
#if defined(ENABLE_WOLFMAN_CHARACTER) && !defined(USE_MOB_BLEEDING_AS_POISON)
|
||||
MOB_ENCHANT_BLEEDING,
|
||||
#endif
|
||||
MOB_ENCHANTS_MAX_NUM
|
||||
};
|
||||
|
||||
@@ -540,6 +662,12 @@ enum EMobResists
|
||||
MOB_RESIST_MAGIC,
|
||||
MOB_RESIST_WIND,
|
||||
MOB_RESIST_POISON,
|
||||
#if defined(ENABLE_WOLFMAN_CHARACTER) && !defined(USE_MOB_BLEEDING_AS_POISON)
|
||||
MOB_RESIST_BLEEDING,
|
||||
#endif
|
||||
#if defined(ENABLE_WOLFMAN_CHARACTER) && !defined(USE_MOB_CLAW_AS_DAGGER)
|
||||
MOB_RESIST_CLAW,
|
||||
#endif
|
||||
MOB_RESISTS_MAX_NUM
|
||||
};
|
||||
|
||||
@@ -586,7 +714,7 @@ enum EGuildWarState
|
||||
GUILD_WAR_OVER,
|
||||
GUILD_WAR_RESERVE,
|
||||
|
||||
GUILD_WAR_DURATION = 30*60, // 1시간
|
||||
GUILD_WAR_DURATION = 30*60, // 1시간
|
||||
GUILD_WAR_WIN_POINT = 1000,
|
||||
GUILD_WAR_LADDER_HALF_PENALTY_TIME = 12*60*60,
|
||||
};
|
||||
@@ -630,13 +758,13 @@ enum EMoneyLogType
|
||||
|
||||
enum EPremiumTypes
|
||||
{
|
||||
PREMIUM_EXP, // 경험치가 1.2배
|
||||
PREMIUM_ITEM, // 아이템 드롭율이 2배
|
||||
PREMIUM_SAFEBOX, // 창고가 1칸에서 3칸
|
||||
PREMIUM_AUTOLOOT, // 돈 자동 줍기
|
||||
PREMIUM_FISH_MIND, // 고급 물고기 낚일 확률 상승
|
||||
PREMIUM_MARRIAGE_FAST, // 금실 증가 양을 빠르게합니다.
|
||||
PREMIUM_GOLD, // 돈 드롭율이 1.5배
|
||||
PREMIUM_EXP, // 경험치가 1.2배
|
||||
PREMIUM_ITEM, // ì•„ì�´í…œ 드ë¡ìœ¨ì�´ 2ë°°
|
||||
PREMIUM_SAFEBOX, // ì°½ê³ ê°€ 1칸ì—�서 3칸
|
||||
PREMIUM_AUTOLOOT, // � �� �기
|
||||
PREMIUM_FISH_MIND, // ê³ ê¸‰ ë¬¼ê³ ê¸° 낚ì�¼ í™•ë¥ ìƒ�승
|
||||
PREMIUM_MARRIAGE_FAST, // 금실 ì¦�ê°€ ì–‘ì�„ ë¹ ë¥´ê²Œí•©ë‹ˆë‹¤.
|
||||
PREMIUM_GOLD, // ë�ˆ 드ë¡ìœ¨ì�´ 1.5ë°°
|
||||
PREMIUM_MAX_NUM = 9
|
||||
};
|
||||
|
||||
@@ -666,10 +794,12 @@ enum SPECIAL_EFFECT
|
||||
SE_AUTO_HPUP,
|
||||
SE_AUTO_SPUP,
|
||||
|
||||
SE_EQUIP_RAMADAN_RING, // 라마단 초승달의 반지(71135) 착용할 때 이펙트 (발동이펙트임, 지속이펙트 아님)
|
||||
SE_EQUIP_HALLOWEEN_CANDY, // 할로윈 사탕을 착용(-_-;)한 순간에 발동하는 이펙트
|
||||
SE_EQUIP_HAPPINESS_RING, // 크리스마스 행복의 반지(71143) 착용할 때 이펙트 (발동이펙트임, 지속이펙트 아님)
|
||||
SE_EQUIP_LOVE_PENDANT, // 발렌타인 사랑의 팬던트(71145) 착용할 때 이펙트 (발동이펙트임, 지속이펙트 아님)
|
||||
SE_EQUIP_RAMADAN_RING, // ë�¼ë§ˆë‹¨ 초승달ì�˜ 반지(71135) ì°©ìš©í• ë•Œ ì�´íŽ™íŠ¸ (ë°œë�™ì�´íŽ™íŠ¸ìž„, ì§€ì†�ì�´íŽ™íŠ¸ 아님)
|
||||
SE_EQUIP_HALLOWEEN_CANDY, // í• ë¡œìœˆ 사탕ì�„ ì°©ìš©(-_-;)한 순간ì—� ë°œë�™í•˜ëŠ” ì�´íŽ™íŠ¸
|
||||
SE_EQUIP_HAPPINESS_RING, // í�¬ë¦¬ìŠ¤ë§ˆìŠ¤ 행복ì�˜ 반지(71143) ì°©ìš©í• ë•Œ ì�´íŽ™íŠ¸ (ë°œë�™ì�´íŽ™íŠ¸ìž„, ì§€ì†�ì�´íŽ™íŠ¸ 아님)
|
||||
SE_EQUIP_LOVE_PENDANT, // ë°œë Œíƒ€ì�¸ 사랑ì�˜ 팬ë�˜íЏ(71145) ì°©ìš©í• ë•Œ ì�´íŽ™íŠ¸ (ë°œë�™ì�´íŽ™íŠ¸ìž„, ì§€ì†�ì�´íŽ™íŠ¸ 아님)
|
||||
SE_EFFECT_SASH_SUCCEDED, // AVA2 sash combine success
|
||||
SE_EFFECT_SASH_EQUIP,
|
||||
} ;
|
||||
|
||||
enum ETeenFlags
|
||||
@@ -684,10 +814,10 @@ enum ETeenFlags
|
||||
|
||||
#include "item_length.h"
|
||||
|
||||
// inventory의 position을 나타내는 구조체
|
||||
// int와의 암시적 형변환이 있는 이유는,
|
||||
// 인벤 관련된 모든 함수가 window_type은 받지 않고, cell 하나만 받았기 때문에,(기존에는 인벤이 하나 뿐이어서 inventory type이란게 필요없었기 때문에,)
|
||||
// 인벤 관련 모든 함수 호출부분을 수정하는 것이 난감하기 떄문이다.
|
||||
// inventory� position� 나타내는 구조체
|
||||
// int와ì�˜ 암시ì � 형변환ì�´ 있는 ì�´ìœ 는,
|
||||
// ì�¸ë²¤ ê´€ë ¨ë�œ ëª¨ë“ í•¨ìˆ˜ê°€ window_typeì�€ 받지 ì•Šê³ , cell 하나만 받았기 때문ì—�,(기존ì—�는 ì�¸ë²¤ì�´ 하나 ë¿�ì�´ì–´ì„œ inventory typeì�´ëž€ê²Œ 필요없었기 때문ì—�,)
|
||||
// ì�¸ë²¤ ê´€ë ¨ ëª¨ë“ í•¨ìˆ˜ 호출부분ì�„ ìˆ˜ì •í•˜ëŠ” 것ì�´ 난ê°�하기 떄문ì�´ë‹¤.
|
||||
|
||||
enum EDragonSoulRefineWindowSize
|
||||
{
|
||||
@@ -736,7 +866,17 @@ typedef struct SItemPos
|
||||
return cell < INVENTORY_AND_EQUIP_SLOT_MAX;
|
||||
case DRAGON_SOUL_INVENTORY:
|
||||
return cell < (DRAGON_SOUL_INVENTORY_MAX_NUM);
|
||||
// 동적으로 크기가 정해지는 window는 valid 체크를 할 수가 없다.
|
||||
case SWITCHBOT:
|
||||
return cell < SWITCHBOT_SLOT_COUNT;
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
case UPGRADE_INVENTORY:
|
||||
case BOOK_INVENTORY:
|
||||
case STONE_INVENTORY:
|
||||
case CHANGE_INVENTORY:
|
||||
case COSTUME_INVENTORY:
|
||||
return cell < SPECIAL_INVENTORY_MAX_NUM;
|
||||
#endif
|
||||
// ë�™ì �으로 í�¬ê¸°ê°€ ì •í•´ì§€ëŠ” window는 valid ì²´í�¬ë¥¼ í• ìˆ˜ê°€ 없다.
|
||||
case SAFEBOX:
|
||||
case MALL:
|
||||
return false;
|
||||
@@ -775,6 +915,18 @@ typedef struct SItemPos
|
||||
return INVENTORY == window_type && cell < INVENTORY_MAX_NUM;
|
||||
}
|
||||
|
||||
bool IsSwitchbotPosition() const
|
||||
{
|
||||
return SWITCHBOT == window_type && cell < SWITCHBOT_SLOT_COUNT;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
bool IsSpecialInventoryPosition() const
|
||||
{
|
||||
return (window_type >= UPGRADE_INVENTORY && window_type <= COSTUME_INVENTORY) && (cell < SPECIAL_INVENTORY_MAX_NUM);
|
||||
}
|
||||
#endif
|
||||
|
||||
bool operator==(const struct SItemPos& rhs) const
|
||||
{
|
||||
return (window_type == rhs.window_type) && (cell == rhs.cell);
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
// The legacy offline shop has no durable, atomic custody/payment/delivery order.
|
||||
// Keep ALL mutation and startup expiry cleanup closed until the replacement has
|
||||
// passed cross-core DB-failure recovery acceptance. No event/GM flag can bypass it.
|
||||
inline bool PortOfflineShopEconomyReady() { return false; }
|
||||
@@ -0,0 +1,32 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
|
||||
// User-authorized extension. Chance uses basis points; zero disables that source.
|
||||
struct PortPointDropRule {
|
||||
int chance, minimum, maximum, minimumLevel, maximumOverlevel, dailyCap;
|
||||
bool valid() const {
|
||||
return chance >= 0 && chance <= 10000 && minimum >= 1 && maximum >= minimum &&
|
||||
maximum <= 1000000 && minimumLevel >= 0 && maximumOverlevel >= 0 && dailyCap >= 0;
|
||||
}
|
||||
bool eligible(int targetLevel, int playerLevel) const {
|
||||
return valid() && chance > 0 && targetLevel >= minimumLevel && playerLevel > 0 &&
|
||||
(!maximumOverlevel || playerLevel - targetLevel <= maximumOverlevel);
|
||||
}
|
||||
};
|
||||
|
||||
template<class Lookup> PortPointDropRule PortPointRule(Lookup flag, bool stone) {
|
||||
const std::string prefix = stone ? "points_stone_" : "points_mob_";
|
||||
const int minimum = flag(prefix + "min");
|
||||
const int maximum = flag(prefix + "max");
|
||||
return {flag(prefix + "chance"), minimum ? minimum : 1,
|
||||
maximum ? maximum : (minimum ? minimum : 1), flag("points_min_level"),
|
||||
flag("points_max_overlevel"), flag("points_daily_cap")};
|
||||
}
|
||||
|
||||
inline uint32_t PortPointDropAmount(uint32_t requested, uint64_t earned, uint32_t cap) {
|
||||
if (!cap) return requested;
|
||||
if (earned >= cap) return 0;
|
||||
return static_cast<uint32_t>(std::min<uint64_t>(requested, cap - earned));
|
||||
}
|
||||
@@ -0,0 +1,131 @@
|
||||
#pragma once
|
||||
#include "ava2_itemshop.h"
|
||||
#include <cerrno>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <ctime>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <fcntl.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
// A separate lifetime lock survives atomic compaction. The current data file is
|
||||
// locked too, so an already-running legacy append-only writer excludes startup.
|
||||
class PointJournal {
|
||||
struct Entry { Ava2ShopRequest request; uint64_t created; };
|
||||
int fd_=-1, lock_=-1, directory_=-1;
|
||||
bool healthy_=false;
|
||||
uint64_t bytes_=0;
|
||||
std::string name_, error_;
|
||||
std::map<std::string,Entry> pending_;
|
||||
bool Fail(const char* reason){healthy_=false;error_=reason;return false;}
|
||||
static uint32_t Hash(const std::string& data){uint32_t h=2166136261u;for(unsigned char c:data){h^=c;h*=16777619u;}return h;}
|
||||
static bool Token(const std::string& s){if(s.size()!=32)return false;for(char c:s)if(!((c>='0'&&c<='9')||(c>='a'&&c<='f')||(c>='A'&&c<='F')))return false;return true;}
|
||||
static bool Terminal(unsigned status){return status==0 || status==1 || status==2 || status==7;}
|
||||
static bool Regular(int fd){struct stat info={};return fstat(fd,&info)==0 && S_ISREG(info.st_mode);}
|
||||
static bool Unsigned(std::istringstream& in,uint64_t& value,uint64_t maximum){
|
||||
std::string text;if(!(in>>text)||text.empty())return false;value=0;
|
||||
for(unsigned char c:text){if(c<'0'||c>'9')return false;const unsigned digit=c-'0';if(value>maximum/10 || (value==maximum/10 && digit>maximum%10))return false;value=value*10+digit;}return true;
|
||||
}
|
||||
static Ava2ShopRequest Canonical(const Ava2ShopRequest& r){
|
||||
Ava2ShopRequest result={};result.operation=3;result.account=r.account;result.player=r.player;result.product=r.product;result.count=r.count;result.expectedVnum=r.expectedVnum;memcpy(result.token,r.token,32);return result;
|
||||
}
|
||||
static std::string IntentPayload(const Entry& entry){
|
||||
const auto& r=entry.request;std::ostringstream out;out<<"INTENT v2 "<<r.token<<' '<<r.account<<' '<<r.player<<' '<<r.product<<' '<<r.count<<' '<<r.expectedVnum<<' '<<entry.created;return out.str();
|
||||
}
|
||||
static std::string Record(const std::string& payload){char checksum[16];snprintf(checksum,sizeof(checksum)," %08x\n",Hash(payload));return payload+checksum;}
|
||||
static bool WriteAll(int fd,const std::string& line){
|
||||
size_t offset=0;while(offset<line.size()){const ssize_t n=write(fd,line.data()+offset,line.size()-offset);if(n<0&&errno==EINTR)continue;if(n<=0)return false;offset+=static_cast<size_t>(n);}return true;
|
||||
}
|
||||
bool Append(const std::string& payload){
|
||||
if(!healthy_)return false;const auto line=Record(payload);
|
||||
if(!WriteAll(fd_,line))return Fail("journal write failed; issuance paused; retain original journal for repair");
|
||||
if(fsync(fd_)!=0)return Fail("journal fsync failed; issuance paused; settlement may replay with same token");
|
||||
bytes_+=line.size();return true;
|
||||
}
|
||||
public:
|
||||
PointJournal()=default;
|
||||
PointJournal(const PointJournal&)=delete;
|
||||
~PointJournal(){if(fd_>=0)close(fd_);if(lock_>=0)close(lock_);if(directory_>=0)close(directory_);}
|
||||
bool Ready()const{return healthy_;}
|
||||
const std::string& Error()const{return error_;}
|
||||
bool NeedsCompaction()const{return healthy_ && bytes_>=1024*1024 && (bytes_-4096)/512>pending_.size();}
|
||||
bool Open(const std::string& path,std::map<std::string,Ava2ShopRequest>& pending){
|
||||
if(fd_>=0 || directory_>=0)return Fail("journal already open");
|
||||
const auto slash=path.rfind('/');const std::string dir=slash==std::string::npos?".":slash==0?"/":path.substr(0,slash);
|
||||
name_=slash==std::string::npos?path:path.substr(slash+1);
|
||||
if(name_.empty()||name_=="."||name_=="..")return Fail("invalid journal filename");
|
||||
if(mkdir(dir.c_str(),0700)!=0&&errno!=EEXIST)return Fail("cannot create journal directory");
|
||||
directory_=open(dir.c_str(),O_RDONLY|O_DIRECTORY|O_NOFOLLOW);if(directory_<0)return Fail("cannot open journal directory");
|
||||
const std::string lockName=name_+".lock";
|
||||
lock_=openat(directory_,lockName.c_str(),O_RDWR|O_CREAT|O_NOFOLLOW,0600);
|
||||
if(lock_<0||!Regular(lock_)||flock(lock_,LOCK_EX|LOCK_NB)!=0)return Fail("journal lock unavailable or already owned");
|
||||
fd_=openat(directory_,name_.c_str(),O_RDWR|O_CREAT|O_APPEND|O_NOFOLLOW,0600);
|
||||
if(fd_<0||!Regular(fd_))return Fail("cannot open regular journal");
|
||||
if(flock(fd_,LOCK_EX|LOCK_NB)!=0)return Fail("journal already owned by another process");
|
||||
struct stat info={};if(fstat(fd_,&info)!=0||info.st_size<0)return Fail("cannot stat journal");bytes_=static_cast<uint64_t>(info.st_size);
|
||||
if(fsync(fd_)!=0||fsync(lock_)!=0||fsync(directory_)!=0)return Fail("cannot persist journal directory entry");
|
||||
const int reader=dup(fd_);if(reader<0)return Fail("cannot duplicate journal reader");
|
||||
FILE* input=fdopen(reader,"r");if(!input){close(reader);return Fail("cannot read journal");}
|
||||
pending.clear();rewind(input);char line[512];bool valid=true;
|
||||
while(fgets(line,sizeof(line),input)){
|
||||
const size_t size=strlen(line);if(!size||line[size-1]!='\n'){valid=false;break;}
|
||||
std::string raw(line,size-1);std::istringstream fields(raw);std::string op,version,token,tail;fields>>op>>version>>token;
|
||||
if(!Token(token)||(version!="v1"&&version!="v2")){valid=false;break;}
|
||||
if(version=="v2"){
|
||||
const auto split=raw.rfind(' ');unsigned checksum=0;char extra=0;
|
||||
if(split==std::string::npos||sscanf(raw.c_str()+split+1,"%8x%c",&checksum,&extra)!=1||checksum!=Hash(raw.substr(0,split))){valid=false;break;}
|
||||
fields.clear();fields.str(raw.substr(0,split));fields>>op>>version>>token;
|
||||
}
|
||||
if(op=="INTENT"){
|
||||
Entry entry={};auto& r=entry.request;r.operation=3;uint64_t account=0,player=0,product=0,count=0,level=0;
|
||||
if(!Unsigned(fields,account,UINT32_MAX)||!Unsigned(fields,player,UINT32_MAX)||!Unsigned(fields,product,UINT32_MAX)||
|
||||
!Unsigned(fields,count,1000000)||!Unsigned(fields,level,255)||!Unsigned(fields,entry.created,UINT64_MAX)||fields>>tail||!account||!player||!product||!count||!level){valid=false;break;}
|
||||
r.account=static_cast<uint32_t>(account);r.player=static_cast<uint32_t>(player);r.product=static_cast<uint32_t>(product);r.count=static_cast<uint32_t>(count);r.expectedVnum=static_cast<uint32_t>(level);memcpy(r.token,token.c_str(),32);
|
||||
const auto found=pending_.find(token);
|
||||
if(found!=pending_.end()&&memcmp(&found->second.request,&r,sizeof(r))!=0){valid=false;break;}
|
||||
pending_[token]=entry;pending[token]=r;
|
||||
}else if(op=="DONE"){
|
||||
uint64_t status=0,granted=0,balance=0,created=0;
|
||||
if(!Unsigned(fields,status,255)||!Terminal(static_cast<unsigned>(status))||!Unsigned(fields,granted,1000000)||!Unsigned(fields,balance,INT64_MAX)||!Unsigned(fields,created,UINT64_MAX)||fields>>tail||(status!=0&&granted!=0)){valid=false;break;}
|
||||
const auto found=pending_.find(token);
|
||||
if(found!=pending_.end() && granted>found->second.request.count){valid=false;break;}
|
||||
pending_.erase(token);pending.erase(token);
|
||||
}else{valid=false;break;}
|
||||
}
|
||||
if(ferror(input))valid=false;fclose(input);
|
||||
if(!valid)return Fail("corrupt journal: preserve bytes, pause issuance and repair tail before resuming");
|
||||
healthy_=true;return true;
|
||||
}
|
||||
bool Intent(const Ava2ShopRequest& r){
|
||||
if(r.operation!=3 || r.token[32] || !Token(std::string(r.token,32)) || !r.account || !r.player || !r.product || !r.count || r.count>1000000 || !r.expectedVnum || r.expectedVnum>255){error_="invalid reward intent";return false;}
|
||||
Entry entry={Canonical(r),static_cast<uint64_t>(time(0))};const auto found=pending_.find(r.token);
|
||||
if(found!=pending_.end() && memcmp(&found->second.request,&entry.request,sizeof(r))!=0){error_="conflicting reward intent";return false;}
|
||||
if(!Append(IntentPayload(entry)))return false;pending_[r.token]=entry;return true;
|
||||
}
|
||||
bool Done(const char* token,uint8_t status,uint32_t granted,int64_t balance){
|
||||
if(!token || strnlen(token,33)!=32 || !Token(std::string(token,32)) || balance<0 || !Terminal(status) || (status!=0 && granted!=0)){error_="invalid reward completion";return false;}
|
||||
const auto found=pending_.find(token);
|
||||
if(found==pending_.end() || granted>found->second.request.count){error_="unknown or excessive reward completion";return false;}
|
||||
std::ostringstream out;out<<"DONE v2 "<<token<<' '<<unsigned(status)<<' '<<granted<<' '<<balance<<' '<<uint64_t(time(0));
|
||||
if(!Append(out.str()))return false;pending_.erase(found);return true;
|
||||
}
|
||||
bool Compact(){
|
||||
if(!healthy_)return false;
|
||||
const std::string temporary=name_+".compact."+std::to_string(getpid());
|
||||
const int next=openat(directory_,temporary.c_str(),O_RDWR|O_CREAT|O_EXCL|O_APPEND|O_NOFOLLOW,0600);
|
||||
if(next<0)return Fail("cannot create journal compact snapshot; original retained");
|
||||
uint64_t size=0;bool valid=flock(next,LOCK_EX|LOCK_NB)==0;
|
||||
for(const auto& entry:pending_){if(!valid)break;const auto line=Record(IntentPayload(entry.second));valid=WriteAll(next,line);size+=line.size();}
|
||||
if(valid)valid=fsync(next)==0;
|
||||
if(!valid){close(next);unlinkat(directory_,temporary.c_str(),0);return Fail("cannot persist journal compact snapshot; original retained");}
|
||||
if(renameat(directory_,temporary.c_str(),directory_,name_.c_str())!=0){close(next);unlinkat(directory_,temporary.c_str(),0);return Fail("cannot publish journal compact snapshot; original retained");}
|
||||
const int previous=fd_;fd_=next;bytes_=size;
|
||||
const bool synced=fsync(directory_)==0;close(previous);
|
||||
if(!synced)return Fail("journal compact directory sync failed; issuance paused; both snapshots retain pending intentions");
|
||||
return true;
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,34 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
// PORT: supplementary AVA2 pet/rarity state. Classic item packets retain 3 sockets / 7 attributes.
|
||||
#pragma pack(push,1)
|
||||
struct PortItemExtra {
|
||||
int32_t sockets[5];
|
||||
uint8_t types[8];
|
||||
int16_t values[8];
|
||||
char name[25];
|
||||
};
|
||||
#pragma pack(pop)
|
||||
static_assert(sizeof(PortItemExtra)==69,"extended item state");
|
||||
|
||||
inline std::string PortItemExtraHex(const PortItemExtra& extra) {
|
||||
static const char digits[]="0123456789abcdef";
|
||||
const auto p=reinterpret_cast<const unsigned char*>(&extra);
|
||||
std::string result(sizeof(extra)*2,'0');
|
||||
for(unsigned i=0;i<sizeof(extra);++i){result[2*i]=digits[p[i]>>4];result[2*i+1]=digits[p[i]&15];}
|
||||
return result;
|
||||
}
|
||||
inline bool PortItemExtraRead(const char* hex,PortItemExtra& extra) {
|
||||
PortItemExtra decoded = {};
|
||||
if(!hex)return false;
|
||||
if(!*hex){extra=decoded;return true;}
|
||||
if(std::strlen(hex)!=sizeof(decoded)*2)return false;
|
||||
auto nibble=[](char c){return c>='0' && c<='9'?c-'0':c>='A' && c<='F'?c-'A'+10:c>='a' && c<='f'?c-'a'+10:-1;};
|
||||
auto p=reinterpret_cast<unsigned char*>(&decoded);
|
||||
for(unsigned i=0;i<sizeof(decoded);++i){int a=nibble(hex[2*i]),b=nibble(hex[2*i+1]);if(a<0 || b<0)return false;p[i]=static_cast<unsigned char>((a<<4)|b);}
|
||||
if(decoded.name[24]!=0)return false;
|
||||
extra=decoded;return true;
|
||||
}
|
||||
@@ -4,8 +4,24 @@
|
||||
#define ENABLE_AUTODETECT_INTERNAL_IP
|
||||
#define ENABLE_PROXY_IP
|
||||
#define ENABLE_PORT_SECURITY
|
||||
#define _IMPROVED_PACKET_ENCRYPTION_ // 패킷 암호화 개선
|
||||
#define _IMPROVED_PACKET_ENCRYPTION_
|
||||
//#define __AUCTION__
|
||||
#define __PET_SYSTEM__
|
||||
#define ENABLE_NEW_PET_SYSTEM
|
||||
#define ENABLE_ATTR_6TH_7TH
|
||||
#define __BL_67_ATTR__
|
||||
#define ENABLE_SPECIAL_STORAGE
|
||||
#define ENABLE_WOLFMAN_CHARACTER
|
||||
#ifdef ENABLE_WOLFMAN_CHARACTER
|
||||
#define USE_MOB_BLEEDING_AS_POISON
|
||||
#define USE_MOB_CLAW_AS_DAGGER
|
||||
#endif
|
||||
#define ENABLE_CONQUEROR_LEVEL
|
||||
#define ENABLE_PLAYER_PER_ACCOUNT5
|
||||
#define UNLOCK_INVENTORY_WORLDARD
|
||||
#define ENABLE_OFFLINESHOP_SYSTEM
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
#define ENABLE_SHOP_SEARCH_SYSTEM
|
||||
#endif
|
||||
#define __UDP_BLOCK__
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
#pragma once
|
||||
#include "gold_bounds.h"
|
||||
// Free NPC items are valid. Invalid or unrepresentable quotes never mutate output.
|
||||
inline bool PortShopQuote(int64_t price, bool otherEmpire, int64_t maximum, int64_t& quote) {
|
||||
const int multiplier = otherEmpire ? 3 : 1;
|
||||
if (price < 0 || maximum < 0 || price > maximum / multiplier) return false;
|
||||
quote = price * multiplier;
|
||||
return true;
|
||||
}
|
||||
inline bool PortShopSettlement(int64_t price, int rate, int64_t maximum, int64_t& tax, int64_t& proceeds) {
|
||||
if (price < 0 || price > maximum || rate < 0 || rate > 100) return false;
|
||||
// Quotient/remainder also keeps this valid if the configured maximum grows.
|
||||
tax = (price / 100) * rate + (price % 100) * rate / 100;
|
||||
proceeds = price - tax;
|
||||
return true;
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
#pragma once
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include <cstddef>
|
||||
#include <deque>
|
||||
#include <map>
|
||||
|
||||
// DB-main-thread-only ownership router for results from the SAME player async
|
||||
// FIFO. SQL worker threads never access this registry. Tokens are opaque integers
|
||||
// in pvUserData, never pointers to an actor, ticket object or reclaimed memory.
|
||||
namespace PortSQLFence {
|
||||
enum Kind : unsigned { Economy=0, Cube=1 };
|
||||
template<class Message> class Router {
|
||||
struct Ticket {Kind kind;uint32_t logical;};
|
||||
uint32_t next=0,maximum;
|
||||
std::size_t capacity;
|
||||
uint64_t failures=0;
|
||||
std::map<uint32_t,Ticket> pending;
|
||||
std::array<std::deque<Message*>,2> ready;
|
||||
void Fault(){if(failures!=UINT64_MAX)++failures;}
|
||||
public:
|
||||
explicit Router(uint32_t maxToken=UINT32_MAX,std::size_t limit=8192):maximum(maxToken),capacity(limit){}
|
||||
~Router(){Clear();}
|
||||
Router(const Router&)=delete;Router& operator=(const Router&)=delete;
|
||||
uint32_t Reserve(Kind kind,uint32_t logical) {
|
||||
if(unsigned(kind)>1||!logical||next>=maximum||pending.size()+ready[0].size()+ready[1].size()>=capacity)return 0;
|
||||
const auto token=++next;pending.emplace(token,Ticket{kind,logical});return token;
|
||||
}
|
||||
bool Complete(Message* message) {
|
||||
if(!message){Fault();return false;}
|
||||
const auto raw=reinterpret_cast<uintptr_t>(message->pvUserData);
|
||||
auto it=raw<=UINT32_MAX?pending.find(uint32_t(raw)):pending.end();
|
||||
if(it==pending.end()){delete message;Fault();return false;}
|
||||
const auto ticket=it->second;pending.erase(it);
|
||||
message->pvUserData=reinterpret_cast<void*>(uintptr_t(ticket.logical));
|
||||
ready[unsigned(ticket.kind)].push_back(message);return true;
|
||||
}
|
||||
Message* Pop(Kind kind) {
|
||||
if(unsigned(kind)>1||ready[unsigned(kind)].empty())return nullptr;
|
||||
auto* message=ready[unsigned(kind)].front();ready[unsigned(kind)].pop_front();return message;
|
||||
}
|
||||
uint64_t Failures()const{return failures;}
|
||||
void Clear() {
|
||||
pending.clear();for(auto& queue:ready){for(auto* message:queue)delete message;queue.clear();}
|
||||
// Never recycle a token during this DB process, even on connection reset.
|
||||
Fault();
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef __INC_METIN_II_STL_H__
|
||||
#define __INC_METIN_II_STL_H__
|
||||
|
||||
#include <cctype>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <map>
|
||||
@@ -19,7 +20,7 @@
|
||||
inline void stl_lowers(std::string& rstRet)
|
||||
{
|
||||
for (size_t i = 0; i < rstRet.length(); ++i)
|
||||
rstRet[i] = tolower(rstRet[i]);
|
||||
rstRet[i] = static_cast<char>(std::tolower(static_cast<unsigned char>(rstRet[i])));
|
||||
}
|
||||
|
||||
struct stringhash
|
||||
|
||||
+387
-87
@@ -1,3 +1,4 @@
|
||||
#include "port_item_extra.h"
|
||||
#ifndef __INC_TABLES_H__
|
||||
#define __INC_TABLES_H__
|
||||
|
||||
@@ -6,7 +7,7 @@
|
||||
typedef DWORD IDENT;
|
||||
|
||||
/**
|
||||
* @version 05/06/10 Bang2ni - Myshop Pricelist 관련 패킷 HEADER_XX_MYSHOP_PRICELIST_XXX 추가
|
||||
* @version 05/06/10 Bang2ni - Myshop Pricelist 관련 패킷 HEADER_XX_MYSHOP_PRICELIST_XXX 추가
|
||||
*/
|
||||
enum
|
||||
{
|
||||
@@ -104,8 +105,8 @@ enum
|
||||
HEADER_GD_BILLING_CHECK = 106,
|
||||
HEADER_GD_MALL_LOAD = 107,
|
||||
|
||||
HEADER_GD_MYSHOP_PRICELIST_UPDATE = 108, ///< 가격정보 갱신 요청
|
||||
HEADER_GD_MYSHOP_PRICELIST_REQ = 109, ///< 가격정보 리스트 요청
|
||||
HEADER_GD_MYSHOP_PRICELIST_UPDATE = 108, ///< 가격정보 갱신 요청
|
||||
HEADER_GD_MYSHOP_PRICELIST_REQ = 109, ///< 가격정보 리스트 요청
|
||||
|
||||
HEADER_GD_BLOCK_CHAT = 110,
|
||||
|
||||
@@ -116,21 +117,21 @@ enum
|
||||
// END_OF_PCBANG_IP_LIST_BY_AUTH
|
||||
|
||||
HEADER_GD_HAMMER_OF_TOR = 114,
|
||||
HEADER_GD_RELOAD_ADMIN = 115, ///<운영자 정보 요청
|
||||
HEADER_GD_BREAK_MARRIAGE = 116, ///< 결혼 파기
|
||||
HEADER_GD_ELECT_MONARCH = 117, ///< 군주 투표
|
||||
HEADER_GD_CANDIDACY = 118, ///< 군주 등록
|
||||
HEADER_GD_ADD_MONARCH_MONEY = 119, ///< 군주 돈 증가
|
||||
HEADER_GD_TAKE_MONARCH_MONEY = 120, ///< 군주 돈 감소
|
||||
HEADER_GD_COME_TO_VOTE = 121, ///< 표결
|
||||
HEADER_GD_RMCANDIDACY = 122, ///< 후보 제거 (운영자)
|
||||
HEADER_GD_SETMONARCH = 123, ///<군주설정 (운영자)
|
||||
HEADER_GD_RMMONARCH = 124, ///<군주삭제
|
||||
HEADER_GD_RELOAD_ADMIN = 115, ///<운영자 정보 요청
|
||||
HEADER_GD_BREAK_MARRIAGE = 116, ///< 결혼 파기
|
||||
HEADER_GD_ELECT_MONARCH = 117, ///< 군주 투표
|
||||
HEADER_GD_CANDIDACY = 118, ///< 군주 등록
|
||||
HEADER_GD_ADD_MONARCH_MONEY = 119, ///< 군주 돈 증가
|
||||
HEADER_GD_TAKE_MONARCH_MONEY = 120, ///< 군주 돈 감소
|
||||
HEADER_GD_COME_TO_VOTE = 121, ///< 표결
|
||||
HEADER_GD_RMCANDIDACY = 122, ///< 후보 제거 (운영자)
|
||||
HEADER_GD_SETMONARCH = 123, ///<군주설정 (운영자)
|
||||
HEADER_GD_RMMONARCH = 124, ///<군주삭제
|
||||
HEADER_GD_DEC_MONARCH_MONEY = 125,
|
||||
|
||||
HEADER_GD_CHANGE_MONARCH_LORD = 126,
|
||||
HEADER_GD_BLOCK_COUNTRY_IP = 127, // 광대역 IP-Block
|
||||
HEADER_GD_BLOCK_EXCEPTION = 128, // 광대역 IP-Block 예외
|
||||
HEADER_GD_BLOCK_COUNTRY_IP = 127, // 광대역 IP-Block
|
||||
HEADER_GD_BLOCK_EXCEPTION = 128, // 광대역 IP-Block 예외
|
||||
|
||||
HEADER_GD_REQ_CHANGE_GUILD_MASTER = 129,
|
||||
|
||||
@@ -139,7 +140,7 @@ enum
|
||||
HEADER_GD_UPDATE_HORSE_NAME = 131,
|
||||
HEADER_GD_REQ_HORSE_NAME = 132,
|
||||
|
||||
HEADER_GD_DC = 133, // Login Key를 지움
|
||||
HEADER_GD_DC = 133, // Login Key를 지움
|
||||
|
||||
HEADER_GD_VALID_LOGOUT = 134,
|
||||
|
||||
@@ -155,6 +156,9 @@ enum
|
||||
|
||||
HEADER_GD_UPDATE_CHANNELSTATUS = 139,
|
||||
HEADER_GD_REQUEST_CHANNELSTATUS = 140,
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
HEADER_GD_OFFLINESHOP = 146,
|
||||
#endif
|
||||
|
||||
HEADER_GD_SETUP = 0xff,
|
||||
|
||||
@@ -202,6 +206,9 @@ enum
|
||||
HEADER_DG_PARTY_STATE_CHANGE = 63,
|
||||
HEADER_DG_PARTY_HEAL_USE = 64,
|
||||
HEADER_DG_PARTY_SET_MEMBER_LEVEL = 65,
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
HEADER_DG_OFFLINESHOP = 66,
|
||||
#endif
|
||||
|
||||
HEADER_DG_TIME = 90,
|
||||
HEADER_DG_ITEM_ID_RANGE = 91,
|
||||
@@ -257,23 +264,23 @@ enum
|
||||
HEADER_DG_WEDDING_START = 155,
|
||||
HEADER_DG_WEDDING_END = 156,
|
||||
|
||||
HEADER_DG_MYSHOP_PRICELIST_RES = 157, ///< 가격정보 리스트 응답
|
||||
HEADER_DG_RELOAD_ADMIN = 158, ///< 운영자 정보 리로드
|
||||
HEADER_DG_BREAK_MARRIAGE = 159, ///< 결혼 파기
|
||||
HEADER_DG_ELECT_MONARCH = 160, ///< 군주 투표
|
||||
HEADER_DG_CANDIDACY = 161, ///< 군주 등록
|
||||
HEADER_DG_ADD_MONARCH_MONEY = 162, ///< 군주 돈 증가
|
||||
HEADER_DG_TAKE_MONARCH_MONEY = 163, ///< 군주 돈 감소
|
||||
HEADER_DG_COME_TO_VOTE = 164, ///< 표결
|
||||
HEADER_DG_RMCANDIDACY = 165, ///< 후보 제거 (운영자)
|
||||
HEADER_DG_SETMONARCH = 166, ///<군주설정 (운영자)
|
||||
HEADER_DG_RMMONARCH = 167, ///<군주삭제
|
||||
HEADER_DG_MYSHOP_PRICELIST_RES = 157, ///< 가격정보 리스트 응답
|
||||
HEADER_DG_RELOAD_ADMIN = 158, ///< 운영자 정보 리로드
|
||||
HEADER_DG_BREAK_MARRIAGE = 159, ///< 결혼 파기
|
||||
HEADER_DG_ELECT_MONARCH = 160, ///< 군주 투표
|
||||
HEADER_DG_CANDIDACY = 161, ///< 군주 등록
|
||||
HEADER_DG_ADD_MONARCH_MONEY = 162, ///< 군주 돈 증가
|
||||
HEADER_DG_TAKE_MONARCH_MONEY = 163, ///< 군주 돈 감소
|
||||
HEADER_DG_COME_TO_VOTE = 164, ///< 표결
|
||||
HEADER_DG_RMCANDIDACY = 165, ///< 후보 제거 (운영자)
|
||||
HEADER_DG_SETMONARCH = 166, ///<군주설정 (운영자)
|
||||
HEADER_DG_RMMONARCH = 167, ///<군주삭제
|
||||
HEADER_DG_DEC_MONARCH_MONEY = 168,
|
||||
|
||||
HEADER_DG_CHANGE_MONARCH_LORD_ACK = 169,
|
||||
HEADER_DG_UPDATE_MONARCH_INFO = 170,
|
||||
HEADER_DG_BLOCK_COUNTRY_IP = 171, // 광대역 IP-Block
|
||||
HEADER_DG_BLOCK_EXCEPTION = 172, // 광대역 IP-Block 예외 account
|
||||
HEADER_DG_BLOCK_COUNTRY_IP = 171, // 광대역 IP-Block
|
||||
HEADER_DG_BLOCK_EXCEPTION = 172, // 광대역 IP-Block 예외 account
|
||||
|
||||
HEADER_DG_ACK_CHANGE_GUILD_MASTER = 173,
|
||||
|
||||
@@ -360,6 +367,10 @@ typedef struct SSimplePlayer
|
||||
long lAddr;
|
||||
WORD wPort;
|
||||
BYTE skill_group;
|
||||
#ifdef ENABLE_CONQUEROR_LEVEL
|
||||
BYTE byConquerorLevel;
|
||||
BYTE bySungmaST, bySungmaHP, bySungmaMove, bySungmaInmune;
|
||||
#endif
|
||||
} TSimplePlayer;
|
||||
|
||||
typedef struct SAccountTable
|
||||
@@ -393,11 +404,12 @@ typedef struct SPlayerItem
|
||||
DWORD count;
|
||||
|
||||
DWORD vnum;
|
||||
long alSockets[ITEM_SOCKET_MAX_NUM]; // 소켓번호
|
||||
long alSockets[ITEM_SOCKET_MAX_NUM]; // 소켓번호
|
||||
|
||||
TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_MAX_NUM];
|
||||
|
||||
DWORD owner;
|
||||
PortItemExtra extra; // PORT: internal game/db state, not a classic client packet.
|
||||
} TPlayerItem;
|
||||
|
||||
typedef struct SQuickslot
|
||||
@@ -437,7 +449,7 @@ typedef struct SPlayerTable
|
||||
short st, ht, dx, iq;
|
||||
|
||||
DWORD exp;
|
||||
INT gold;
|
||||
int64_t gold;
|
||||
|
||||
BYTE dir;
|
||||
INT x, y, z;
|
||||
@@ -486,6 +498,20 @@ typedef struct SPlayerTable
|
||||
DWORD logoff_interval;
|
||||
|
||||
int aiPremiumTimes[PREMIUM_MAX_NUM];
|
||||
#ifdef ENABLE_CONQUEROR_LEVEL
|
||||
BYTE conquerorlevel;
|
||||
BYTE conqueror_level_step;
|
||||
short sungma_str, sungma_hp, sungma_move, sungma_inmune;
|
||||
DWORD conqueror_exp;
|
||||
short conqueror_point;
|
||||
#endif
|
||||
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
DWORD inventory_unlock[UNLOCK_INVENTORY_MAX];
|
||||
#endif
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
unsigned long long shopFlag;
|
||||
#endif
|
||||
} TPlayerTable;
|
||||
|
||||
typedef struct SMobSkillLevel
|
||||
@@ -606,19 +632,20 @@ typedef struct SSkillTable
|
||||
typedef struct SShopItemTable
|
||||
{
|
||||
DWORD vnum;
|
||||
BYTE count;
|
||||
WORD count;
|
||||
|
||||
TItemPos pos; // PC 상점에만 이용
|
||||
DWORD price; // PC, shop_table_ex.txt 상점에만 이용
|
||||
BYTE display_pos; // PC, shop_table_ex.txt 상점에만 이용, 보일 위치.
|
||||
TItemPos pos; // PC 상점에만 이용
|
||||
int64_t price; // PC, shop_table_ex.txt 상점에만 이용
|
||||
BYTE display_pos; // PC, shop_table_ex.txt 상점에만 이용, 보일 위치.
|
||||
} TShopItemTable;
|
||||
static_assert(sizeof(TShopItemTable)==18,"gold64 private shop wire size");
|
||||
|
||||
typedef struct SShopTable
|
||||
{
|
||||
DWORD dwVnum;
|
||||
DWORD dwNPCVnum;
|
||||
|
||||
BYTE byItemCount;
|
||||
WORD byItemCount;
|
||||
TShopItemTable items[SHOP_HOST_ITEM_MAX_NUM];
|
||||
} TShopTable;
|
||||
|
||||
@@ -674,12 +701,12 @@ typedef struct SItemTable : public SEntityTable
|
||||
BYTE bSpecular;
|
||||
BYTE bGainSocketPct;
|
||||
|
||||
short int sAddonType; // 기본 속성
|
||||
short int sAddonType; // 기본 속성
|
||||
|
||||
// 아래 limit flag들은 realtime에 체크 할 일이 많고, 아이템 VNUM당 고정된 값인데,
|
||||
// 현재 구조대로 매번 아이템마다 필요한 경우에 LIMIT_MAX_NUM까지 루프돌면서 체크하는 부하가 커서 미리 저장 해 둠.
|
||||
char cLimitRealTimeFirstUseIndex; // 아이템 limit 필드값 중에서 LIMIT_REAL_TIME_FIRST_USE 플래그의 위치 (없으면 -1)
|
||||
char cLimitTimerBasedOnWearIndex; // 아이템 limit 필드값 중에서 LIMIT_TIMER_BASED_ON_WEAR 플래그의 위치 (없으면 -1)
|
||||
// 아래 limit flag들은 realtime에 체크 할 일이 많고, 아이템 VNUM당 고정된 값인데,
|
||||
// 현재 구조대로 매번 아이템마다 필요한 경우에 LIMIT_MAX_NUM까지 루프돌면서 체크하는 부하가 커서 미리 저장 해 둠.
|
||||
char cLimitRealTimeFirstUseIndex; // 아이템 limit 필드값 중에서 LIMIT_REAL_TIME_FIRST_USE 플래그의 위치 (없으면 -1)
|
||||
char cLimitTimerBasedOnWearIndex; // 아이템 limit 필드값 중에서 LIMIT_TIMER_BASED_ON_WEAR 플래그의 위치 (없으면 -1)
|
||||
|
||||
} TItemTable;
|
||||
|
||||
@@ -717,7 +744,7 @@ typedef struct SPlayerLoadPacket
|
||||
{
|
||||
DWORD account_id;
|
||||
DWORD player_id;
|
||||
BYTE account_index; /* account 에서의 위치 */
|
||||
BYTE account_index; /* account 에서의 위치 */
|
||||
} TPlayerLoadPacket;
|
||||
|
||||
typedef struct SPlayerCreatePacket
|
||||
@@ -756,7 +783,7 @@ typedef struct SSafeboxTable
|
||||
{
|
||||
DWORD dwID;
|
||||
BYTE bSize;
|
||||
DWORD dwGold;
|
||||
int64_t dwGold;
|
||||
WORD wItemCount;
|
||||
} TSafeboxTable;
|
||||
|
||||
@@ -794,9 +821,9 @@ typedef struct SEmpireSelectPacket
|
||||
typedef struct SPacketGDSetup
|
||||
{
|
||||
char szPublicIP[16]; // Public IP which listen to users
|
||||
BYTE bChannel; // 채널
|
||||
WORD wListenPort; // 클라이언트가 접속하는 포트 번호
|
||||
WORD wP2PPort; // 서버끼리 연결 시키는 P2P 포트 번호
|
||||
BYTE bChannel; // 채널
|
||||
WORD wListenPort; // 클라이언트가 접속하는 포트 번호
|
||||
WORD wP2PPort; // 서버끼리 연결 시키는 P2P 포트 번호
|
||||
long alMaps[32];
|
||||
DWORD dwLoginCount;
|
||||
BYTE bAuthServer;
|
||||
@@ -974,8 +1001,8 @@ typedef struct SPacketGuildWar
|
||||
long lInitialScore;
|
||||
} TPacketGuildWar;
|
||||
|
||||
// Game -> DB : 상대적 변화값
|
||||
// DB -> Game : 토탈된 최종값
|
||||
// Game -> DB : 상대적 변화값
|
||||
// DB -> Game : 토탈된 최종값
|
||||
typedef struct SPacketGuildWarScore
|
||||
{
|
||||
DWORD dwGuildGainPoint;
|
||||
@@ -996,8 +1023,8 @@ typedef struct SRefineTable
|
||||
//DWORD result_vnum;
|
||||
DWORD id;
|
||||
BYTE material_count;
|
||||
int cost; // 소요 비용
|
||||
int prob; // 확률
|
||||
int cost; // 소요 비용
|
||||
int prob; // 확률
|
||||
TRefineMaterial materials[REFINE_MATERIAL_MAX_NUM];
|
||||
} TRefineTable;
|
||||
|
||||
@@ -1082,14 +1109,14 @@ typedef struct SPacketGDLoginByKey
|
||||
} TPacketGDLoginByKey;
|
||||
|
||||
/**
|
||||
* @version 05/06/08 Bang2ni - 지속시간 추가
|
||||
* @version 05/06/08 Bang2ni - 지속시간 추가
|
||||
*/
|
||||
typedef struct SPacketGiveGuildPriv
|
||||
{
|
||||
BYTE type;
|
||||
int value;
|
||||
DWORD guild_id;
|
||||
time_t duration_sec; ///< 지속시간
|
||||
time_t duration_sec; ///< 지속시간
|
||||
} TPacketGiveGuildPriv;
|
||||
typedef struct SPacketGiveEmpirePriv
|
||||
{
|
||||
@@ -1124,7 +1151,7 @@ typedef struct SPacketDGChangeCharacterPriv
|
||||
} TPacketDGChangeCharacterPriv;
|
||||
|
||||
/**
|
||||
* @version 05/06/08 Bang2ni - 지속시간 추가
|
||||
* @version 05/06/08 Bang2ni - 지속시간 추가
|
||||
*/
|
||||
typedef struct SPacketDGChangeGuildPriv
|
||||
{
|
||||
@@ -1132,7 +1159,7 @@ typedef struct SPacketDGChangeGuildPriv
|
||||
int value;
|
||||
DWORD guild_id;
|
||||
BYTE bLog;
|
||||
time_t end_time_sec; ///< 지속시간
|
||||
time_t end_time_sec; ///< 지속시간
|
||||
} TPacketDGChangeGuildPriv;
|
||||
|
||||
typedef struct SPacketDGChangeEmpirePriv
|
||||
@@ -1148,31 +1175,31 @@ typedef struct SPacketMoneyLog
|
||||
{
|
||||
BYTE type;
|
||||
DWORD vnum;
|
||||
INT gold;
|
||||
int64_t gold;
|
||||
} TPacketMoneyLog;
|
||||
|
||||
typedef struct SPacketGDGuildMoney
|
||||
{
|
||||
DWORD dwGuild;
|
||||
INT iGold;
|
||||
int64_t iGold;
|
||||
} TPacketGDGuildMoney;
|
||||
|
||||
typedef struct SPacketDGGuildMoneyChange
|
||||
{
|
||||
DWORD dwGuild;
|
||||
INT iTotalGold;
|
||||
int64_t iTotalGold;
|
||||
} TPacketDGGuildMoneyChange;
|
||||
|
||||
typedef struct SPacketDGGuildMoneyWithdraw
|
||||
{
|
||||
DWORD dwGuild;
|
||||
INT iChangeGold;
|
||||
int64_t iChangeGold;
|
||||
} TPacketDGGuildMoneyWithdraw;
|
||||
|
||||
typedef struct SPacketGDGuildMoneyWithdrawGiveReply
|
||||
{
|
||||
DWORD dwGuild;
|
||||
INT iChangeGold;
|
||||
int64_t iChangeGold;
|
||||
BYTE bGiveSuccess;
|
||||
} TPacketGDGuildMoneyWithdrawGiveReply;
|
||||
|
||||
@@ -1313,27 +1340,27 @@ typedef struct
|
||||
DWORD dwPID2;
|
||||
} TPacketWeddingEnd;
|
||||
|
||||
/// 개인상점 가격정보의 헤더. 가변 패킷으로 이 뒤에 byCount 만큼의 TItemPriceInfo 가 온다.
|
||||
/// 개인상점 가격정보의 헤더. 가변 패킷으로 이 뒤에 byCount 만큼의 TItemPriceInfo 가 온다.
|
||||
typedef struct SPacketMyshopPricelistHeader
|
||||
{
|
||||
DWORD dwOwnerID; ///< 가격정보를 가진 플레이어 ID
|
||||
BYTE byCount; ///< 가격정보 갯수
|
||||
DWORD dwOwnerID; ///< 가격정보를 가진 플레이어 ID
|
||||
BYTE byCount; ///< 가격정보 갯수
|
||||
} TPacketMyshopPricelistHeader;
|
||||
|
||||
/// 개인상점의 단일 아이템에 대한 가격정보
|
||||
/// 개인상점의 단일 아이템에 대한 가격정보
|
||||
typedef struct SItemPriceInfo
|
||||
{
|
||||
DWORD dwVnum; ///< 아이템 vnum
|
||||
DWORD dwPrice; ///< 가격
|
||||
DWORD dwVnum; ///< 아이템 vnum
|
||||
DWORD dwPrice; ///< 가격
|
||||
} TItemPriceInfo;
|
||||
|
||||
/// 개인상점 아이템 가격정보 리스트 테이블
|
||||
/// 개인상점 아이템 가격정보 리스트 테이블
|
||||
typedef struct SItemPriceListTable
|
||||
{
|
||||
DWORD dwOwnerID; ///< 가격정보를 가진 플레이어 ID
|
||||
BYTE byCount; ///< 가격정보 리스트의 갯수
|
||||
DWORD dwOwnerID; ///< 가격정보를 가진 플레이어 ID
|
||||
BYTE byCount; ///< 가격정보 리스트의 갯수
|
||||
|
||||
TItemPriceInfo aPriceInfo[SHOP_PRICELIST_MAX_NUM]; ///< 가격정보 리스트
|
||||
TItemPriceInfo aPriceInfo[SHOP_PRICELIST_MAX_NUM]; ///< 가격정보 리스트
|
||||
} TItemPriceListTable;
|
||||
|
||||
typedef struct
|
||||
@@ -1354,12 +1381,12 @@ typedef struct SPacketPCBangIP
|
||||
//ADMIN_MANAGER
|
||||
typedef struct TAdminInfo
|
||||
{
|
||||
int m_ID; //고유ID
|
||||
char m_szAccount[32]; //계정
|
||||
char m_szName[32]; //캐릭터이름
|
||||
char m_szContactIP[16]; //접근아이피
|
||||
char m_szServerIP[16]; //서버아이피
|
||||
int m_Authority; //권한
|
||||
int m_ID; //고유ID
|
||||
char m_szAccount[32]; //계정
|
||||
char m_szName[32]; //캐릭터이름
|
||||
char m_szContactIP[16]; //접근아이피
|
||||
char m_szServerIP[16]; //서버아이피
|
||||
int m_Authority; //권한
|
||||
} tAdminInfo;
|
||||
//END_ADMIN_MANAGER
|
||||
|
||||
@@ -1380,20 +1407,20 @@ typedef struct SPacketReloadAdmin
|
||||
|
||||
typedef struct TMonarchInfo
|
||||
{
|
||||
DWORD pid[4]; // 군주의 PID
|
||||
int64_t money[4]; // 군주의 별개 돈
|
||||
char name[4][32]; // 군주의 이름
|
||||
char date[4][32]; // 군주 등록 날짜
|
||||
DWORD pid[4]; // 군주의 PID
|
||||
int64_t money[4]; // 군주의 별개 돈
|
||||
char name[4][32]; // 군주의 이름
|
||||
char date[4][32]; // 군주 등록 날짜
|
||||
} MonarchInfo;
|
||||
|
||||
typedef struct TMonarchElectionInfo
|
||||
{
|
||||
DWORD pid; // 투표 한사람 PID
|
||||
DWORD selectedpid; // 투표 당한 PID ( 군주 참가자 )
|
||||
char date[32]; // 투표 날짜
|
||||
DWORD pid; // 투표 한사람 PID
|
||||
DWORD selectedpid; // 투표 당한 PID ( 군주 참가자 )
|
||||
char date[32]; // 투표 날짜
|
||||
} MonarchElectionInfo;
|
||||
|
||||
// 군주 출마자
|
||||
// 군주 출마자
|
||||
typedef struct tMonarchCandidacy
|
||||
{
|
||||
DWORD pid;
|
||||
@@ -1465,14 +1492,14 @@ typedef struct tNeedLoginLogInfo
|
||||
DWORD dwPlayerID;
|
||||
} TPacketNeedLoginLogInfo;
|
||||
|
||||
//독일 선물 알림 기능 테스트용 패킷 정보
|
||||
//독일 선물 알림 기능 테스트용 패킷 정보
|
||||
typedef struct tItemAwardInformer
|
||||
{
|
||||
char login[LOGIN_MAX_LEN + 1];
|
||||
char command[20]; //명령어
|
||||
unsigned int vnum; //아이템
|
||||
char command[20]; //명령어
|
||||
unsigned int vnum; //아이템
|
||||
} TPacketItemAwardInfromer;
|
||||
// 선물 알림 기능 삭제용 패킷 정보
|
||||
// 선물 알림 기능 삭제용 패킷 정보
|
||||
typedef struct tDeleteAwardID
|
||||
{
|
||||
DWORD dwID;
|
||||
@@ -1484,5 +1511,278 @@ typedef struct SChannelStatus
|
||||
BYTE bStatus;
|
||||
} TChannelStatus;
|
||||
|
||||
// PORT: AVA2 ENABLE_SWITCHBOT tables (port_switchbot.cpp). TSwitchbotTable goes to the client as is
|
||||
// (SUBHEADER_GC_SWITCHBOT_UPDATE) and between cores (HEADER_GG_SWITCHBOT): 220 bytes.
|
||||
struct TSwitchbotAttributeAlternativeTable
|
||||
{
|
||||
TPlayerItemAttribute attributes[SWITCHBOT_NORM_ATTR_NUM];
|
||||
|
||||
bool IsConfigured() const
|
||||
{
|
||||
|
||||
for (BYTE i = 0; i < SWITCHBOT_NORM_ATTR_NUM; ++i)
|
||||
{
|
||||
if (attributes[i].bType && attributes[i].sValue)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
struct TSwitchbotTable
|
||||
{
|
||||
DWORD player_id;
|
||||
bool active[SWITCHBOT_SLOT_COUNT];
|
||||
bool finished[SWITCHBOT_SLOT_COUNT];
|
||||
DWORD items[SWITCHBOT_SLOT_COUNT];
|
||||
TSwitchbotAttributeAlternativeTable alternatives[SWITCHBOT_SLOT_COUNT][SWITCHBOT_ALTERNATIVE_COUNT];
|
||||
|
||||
TSwitchbotTable() : player_id(0)
|
||||
{
|
||||
memset(&items, 0, sizeof(items));
|
||||
memset(&alternatives, 0, sizeof(alternatives));
|
||||
memset(&active, false, sizeof(active));
|
||||
memset(&finished, false, sizeof(finished));
|
||||
}
|
||||
};
|
||||
|
||||
// PORT: AVA2 declares max_value as long; int keeps the 4-byte wire width the client mirrors with LONG.
|
||||
struct TSwitchbottAttributeTable
|
||||
{
|
||||
BYTE attribute_set;
|
||||
int apply_num;
|
||||
int max_value;
|
||||
};
|
||||
|
||||
#ifdef ENABLE_NEW_PET_SYSTEM
|
||||
enum EPetOptions
|
||||
{
|
||||
EPetOption_Followable = 1 << 0,
|
||||
EPetOption_Mountable = 1 << 1,
|
||||
EPetOption_Summonable = 1 << 2,
|
||||
EPetOption_Combatable = 1 << 3,
|
||||
};
|
||||
|
||||
enum m_petMisc
|
||||
{
|
||||
NORMAL_PET = 0,
|
||||
NORMAL_LEVEL_PET = 1,
|
||||
};
|
||||
|
||||
enum EPetPointTypes
|
||||
{
|
||||
POINT_PET_DURATION = 0,
|
||||
POINT_PET_LEVEL = 1,
|
||||
POINT_PET_EXP = 2,
|
||||
POINT_PET_EVOLVE = 3,
|
||||
POINT_PET_SKILLCOUNT = 4,
|
||||
|
||||
POINT_PET_BONUS_1 = 5,
|
||||
POINT_PET_BONUS_2 = 6,
|
||||
POINT_PET_BONUS_3 = 7,
|
||||
|
||||
POINT_PET_SKILL_INDEX_1 = 100,
|
||||
POINT_PET_SKILL_INDEX_2,
|
||||
POINT_PET_SKILL_INDEX_3,
|
||||
POINT_PET_SKILL_INDEX_4,
|
||||
POINT_PET_SKILL_INDEX_5,
|
||||
POINT_PET_SKILL_INDEX_6,
|
||||
POINT_PET_SKILL_INDEX_7,
|
||||
POINT_PET_SKILL_INDEX_8,
|
||||
POINT_PET_SKILL_INDEX_9,
|
||||
POINT_PET_SKILL_INDEX_10,
|
||||
POINT_PET_SKILL_INDEX_11,
|
||||
POINT_PET_SKILL_INDEX_12,
|
||||
POINT_PET_SKILL_INDEX_13,
|
||||
POINT_PET_SKILL_INDEX_14,
|
||||
POINT_PET_SKILL_INDEX_15 = 114,
|
||||
|
||||
POINT_PET_SKILL_LEVEL_1 = 150,
|
||||
POINT_PET_SKILL_LEVEL_2,
|
||||
POINT_PET_SKILL_LEVEL_3,
|
||||
POINT_PET_SKILL_LEVEL_4,
|
||||
POINT_PET_SKILL_LEVEL_5,
|
||||
POINT_PET_SKILL_LEVEL_6,
|
||||
POINT_PET_SKILL_LEVEL_7,
|
||||
POINT_PET_SKILL_LEVEL_8,
|
||||
POINT_PET_SKILL_LEVEL_9,
|
||||
POINT_PET_SKILL_LEVEL_10,
|
||||
POINT_PET_SKILL_LEVEL_11,
|
||||
POINT_PET_SKILL_LEVEL_12,
|
||||
POINT_PET_SKILL_LEVEL_13,
|
||||
POINT_PET_SKILL_LEVEL_14,
|
||||
POINT_PET_SKILL_LEVEL_15 = 164,
|
||||
};
|
||||
|
||||
typedef struct SPetApply
|
||||
{
|
||||
BYTE bType;
|
||||
long lValue;
|
||||
} TPetApply;
|
||||
|
||||
typedef struct SPetSkill
|
||||
{
|
||||
BYTE bType;
|
||||
short sLevel;
|
||||
} TPetSkill;
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
typedef struct offline_shop_item
|
||||
{
|
||||
DWORD id;
|
||||
DWORD owner_id;
|
||||
BYTE pos;
|
||||
int count;
|
||||
long long price;
|
||||
DWORD vnum;
|
||||
long alSockets[ITEM_SOCKET_MAX_NUM];
|
||||
TPlayerItemAttribute aAttr[ITEM_ATTRIBUTE_MAX_NUM];
|
||||
BYTE status;
|
||||
char szBuyerName[CHARACTER_NAME_MAX_LEN+1];
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
DWORD transmutation;
|
||||
#endif
|
||||
char szOwnerName[CHARACTER_NAME_MAX_LEN+1];
|
||||
PortItemExtra extra;
|
||||
} OFFLINE_SHOP_ITEM;
|
||||
|
||||
typedef struct ShopLog {
|
||||
char name[CHARACTER_NAME_MAX_LEN+1];
|
||||
char date[25];
|
||||
DWORD itemVnum;
|
||||
DWORD itemCount;
|
||||
long long price;
|
||||
} TShopLog;
|
||||
|
||||
typedef struct SShopDecoration {
|
||||
char sign[SHOP_SIGN_MAX_LEN + 1];
|
||||
DWORD owner_id;
|
||||
BYTE vnum;
|
||||
BYTE type;
|
||||
} TShopDecoration;
|
||||
|
||||
typedef struct SGDOfflineShopCreate
|
||||
{
|
||||
DWORD owner_id;
|
||||
char owner_name[CHARACTER_NAME_MAX_LEN+1];
|
||||
char sign[SHOP_SIGN_MAX_LEN + 1];
|
||||
long x;
|
||||
long y;
|
||||
long z;
|
||||
DWORD mapindex;
|
||||
DWORD type;
|
||||
BYTE channel;
|
||||
unsigned long long slotflag;
|
||||
OFFLINE_SHOP_ITEM items[OFFLINE_SHOP_HOST_ITEM_MAX_NUM];
|
||||
long long price;
|
||||
ShopLog log[OFFLINE_SHOP_HOST_ITEM_MAX_NUM];
|
||||
int time;
|
||||
} TOfflineShop;
|
||||
|
||||
typedef struct SOfflineShopBuy
|
||||
{
|
||||
OFFLINE_SHOP_ITEM item;
|
||||
DWORD customer_id;
|
||||
char customer_name[CHARACTER_NAME_MAX_LEN + 1];
|
||||
ShopLog log;
|
||||
int log_index;
|
||||
} TOfflineShopBuy;
|
||||
|
||||
typedef struct SOfflineShopChangeTitle
|
||||
{
|
||||
DWORD owner_id;
|
||||
char sign[SHOP_SIGN_MAX_LEN + 1];
|
||||
} TOfflineShopChangeTitle;
|
||||
|
||||
typedef struct SOfflineShopItemTable
|
||||
{
|
||||
DWORD vnum;
|
||||
int count;
|
||||
TItemPos pos;
|
||||
long long price;
|
||||
BYTE display_pos;
|
||||
} TOfflineShopItemTable;
|
||||
|
||||
typedef struct SOfflineShopAddItem
|
||||
{
|
||||
TItemPos bPos;
|
||||
BYTE bDisplayPos;
|
||||
long long lPrice;
|
||||
} TOfflineShopAddItem;
|
||||
|
||||
typedef struct SOfflineShopOpenSlot
|
||||
{
|
||||
DWORD owner_id;
|
||||
unsigned long long flag;
|
||||
} TOfflineShopOpenSlot;
|
||||
|
||||
typedef struct SOfflineShopBackItem
|
||||
{
|
||||
DWORD owner_id;
|
||||
OFFLINE_SHOP_ITEM items[OFFLINE_SHOP_HOST_ITEM_MAX_NUM];
|
||||
} TOfflineShopBackItem;
|
||||
|
||||
enum {
|
||||
// db
|
||||
CREATE_OFFLINESHOP,
|
||||
DESTROY_OFFLINESHOP,
|
||||
REMOVE_ITEM,
|
||||
ADD_ITEM,
|
||||
BUY_ITEM,
|
||||
WITHDRAW_MONEY,
|
||||
CHANGE_TITLE,
|
||||
CLEAR_LOG,
|
||||
CHANGE_DECORATION,
|
||||
CHANGE_OPEN_SLOT,
|
||||
TIME_DONE,
|
||||
GET_BACK_ITEM,
|
||||
ADD_TIME,
|
||||
};
|
||||
|
||||
struct shop_decoration {
|
||||
BYTE subheader;
|
||||
TShopDecoration decoration;
|
||||
};
|
||||
|
||||
struct shop_create {
|
||||
BYTE subheader;
|
||||
TOfflineShop offlineshop;
|
||||
};
|
||||
|
||||
struct shop_buy {
|
||||
BYTE subheader;
|
||||
TOfflineShopBuy buyItem;
|
||||
};
|
||||
|
||||
struct shop_title {
|
||||
BYTE subheader;
|
||||
TOfflineShopChangeTitle title;
|
||||
};
|
||||
|
||||
struct shop_owner {
|
||||
BYTE subheader;
|
||||
DWORD owner_id;
|
||||
};
|
||||
|
||||
struct shop_item {
|
||||
BYTE subheader;
|
||||
OFFLINE_SHOP_ITEM item;
|
||||
};
|
||||
|
||||
struct shop_slot {
|
||||
BYTE subheader;
|
||||
TOfflineShopOpenSlot ch;
|
||||
};
|
||||
|
||||
struct shop_back {
|
||||
BYTE subheader;
|
||||
TOfflineShopBackItem back;
|
||||
};
|
||||
#endif
|
||||
|
||||
#pragma pack()
|
||||
#endif
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#include <cerrno>
|
||||
#include <cstdlib>
|
||||
/*----- atoi function -----*/
|
||||
inline bool str_to_number (bool& out, const char *in)
|
||||
{
|
||||
@@ -73,17 +75,33 @@ inline bool str_to_number (unsigned long& out, const char *in)
|
||||
|
||||
inline bool str_to_number (long long& out, const char *in)
|
||||
{
|
||||
if (0==in || 0==in[0]) return false;
|
||||
|
||||
out = (long long) strtoull(in, NULL, 10);
|
||||
return true;
|
||||
if(!in || !*in)return false;
|
||||
errno=0;char* end=NULL;const long long value=strtoll(in,&end,10);
|
||||
if(errno==ERANGE || end==in || *end)return false;
|
||||
char* dst = reinterpret_cast<char*>(&out);
|
||||
const char* src = reinterpret_cast<const char*>(&value);
|
||||
for (size_t i = 0; i < sizeof(long long); ++i) dst[i] = src[i];
|
||||
return true;
|
||||
}
|
||||
inline bool str_to_number (unsigned long long& out, const char *in)
|
||||
{
|
||||
if(!in || !*in || ((*in<'0'||*in>'9')&&*in!='+'))return false;
|
||||
errno=0;char* end=NULL;const unsigned long long value=strtoull(in,&end,10);
|
||||
if(errno==ERANGE || end==in || *end)return false;
|
||||
char* dst = reinterpret_cast<char*>(&out);
|
||||
const char* src = reinterpret_cast<const char*>(&value);
|
||||
for (size_t i = 0; i < sizeof(unsigned long long); ++i) dst[i] = src[i];
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool str_to_number (float& out, const char *in)
|
||||
{
|
||||
if (0==in || 0==in[0]) return false;
|
||||
|
||||
out = (float) strtof(in, NULL);
|
||||
float val = (float) strtof(in, NULL);
|
||||
char* dst = reinterpret_cast<char*>(&out);
|
||||
const char* src = reinterpret_cast<const char*>(&val);
|
||||
for (size_t i = 0; i < sizeof(float); ++i) dst[i] = src[i];
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -91,7 +109,10 @@ inline bool str_to_number (double& out, const char *in)
|
||||
{
|
||||
if (0==in || 0==in[0]) return false;
|
||||
|
||||
out = (double) strtod(in, NULL);
|
||||
double val = (double) strtod(in, NULL);
|
||||
char* dst = reinterpret_cast<char*>(&out);
|
||||
const char* src = reinterpret_cast<const char*>(&val);
|
||||
for (size_t i = 0; i < sizeof(double); ++i) dst[i] = src[i];
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
// The DB boot stream prefixes each table with two WORDs. Its transport accepts
|
||||
// an int byte length, so validate every count/product before emitting any bytes.
|
||||
class PortBootSizer {
|
||||
uint64_t bytes_;
|
||||
bool valid_;
|
||||
public:
|
||||
explicit PortBootSizer(uint64_t fixed):bytes_(fixed),valid_(fixed<=INT32_MAX){}
|
||||
bool Add(uint64_t count,uint64_t stride) {
|
||||
if(!valid_ || count>UINT16_MAX || stride>UINT16_MAX ||
|
||||
bytes_>INT32_MAX-4 || (count && stride>(INT32_MAX-4-bytes_)/count)) {
|
||||
valid_=false;return false;
|
||||
}
|
||||
bytes_+=4+count*stride;return true;
|
||||
}
|
||||
bool Valid()const{return valid_;}
|
||||
uint32_t Bytes()const{return valid_?static_cast<uint32_t>(bytes_):0;}
|
||||
};
|
||||
@@ -143,7 +143,7 @@ void AuctionManager::LoadAuctionItem()
|
||||
for (int i = 0; i < rows; ++i)
|
||||
{
|
||||
MYSQL_ROW row = mysql_fetch_row(res);
|
||||
TPlayerItem item;
|
||||
TPlayerItem item={};
|
||||
|
||||
int cur = 0;
|
||||
|
||||
|
||||
@@ -0,0 +1,232 @@
|
||||
// AVA2 GC93 catalogue with transactional, replay-safe purchases.
|
||||
#include "stdafx.h"
|
||||
#include "ClientManager.h"
|
||||
#include "Config.h"
|
||||
#include "DBManager.h"
|
||||
#include "ItemAwardManager.h"
|
||||
#include "../../common/ava2_itemshop.h"
|
||||
#include "../../common/point_drop.h"
|
||||
#include <cerrno>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <cctype>
|
||||
#include <algorithm>
|
||||
namespace {
|
||||
using Query=std::unique_ptr<SQLMsg>;
|
||||
Query query(const std::string& sql) { return Query(CDBManager::instance().DirectQuery(sql.c_str(),SQL_PLAYER)); }
|
||||
bool ok(const Query& q) { return q && !q->uiSQLErrno && q->Get(); }
|
||||
bool run(const std::string& sql) { auto q=query(sql);return ok(q); }
|
||||
std::string decimal(uint64_t n) { return std::to_string(n); }
|
||||
std::string escape(const char* text) { char out[513];size_t n=strnlen(text,255);CDBManager::instance().EscapeString(out,text,n);return std::string(out); }
|
||||
std::string accountDB() {
|
||||
char a[257]={},p[257]={};
|
||||
if (!CConfig::instance().GetValue("SQL_ACCOUNT",a,256) || !CConfig::instance().GetValue("SQL_PLAYER",p,256)) return "";
|
||||
std::string ah,ad,au,ap,ph,pd,pu,pp;int aport=3306,pport=3306;
|
||||
std::istringstream as(a),ps(p);as>>ah>>ad>>au>>ap>>aport;ps>>ph>>pd>>pu>>pp>>pport;
|
||||
if (ah!=ph || aport!=pport || ad.empty()) return ""; // One MySQL connection must own the whole transaction.
|
||||
for (auto c:ad) if (!std::isalnum(static_cast<unsigned char>(c)) && c!='_') return "";
|
||||
return "`"+ad+"`";
|
||||
}
|
||||
bool transactional(const std::string& account) {
|
||||
auto q=query("SELECT COUNT(*) FROM information_schema.tables WHERE ENGINE='InnoDB' AND ((TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('ishop_data','port_itemshop_orders','item_award')) OR (TABLE_SCHEMA='"+account.substr(1,account.size()-2)+"' AND TABLE_NAME='account'))");
|
||||
if (!ok(q) || !q->Get()->uiNumRows)return false;
|
||||
return atoi(mysql_fetch_row(q->Get()->pSQLResult)[0])==4;
|
||||
}
|
||||
struct Transaction {
|
||||
bool active; MYSQL* connection; unsigned previousTimeout;
|
||||
Transaction():active(false),connection(CDBManager::instance().DirectHandle(SQL_PLAYER)),previousTimeout(50) {
|
||||
// A reconnect inside a transaction would silently resume subsequent statements in autocommit.
|
||||
my_bool reconnect=false;mysql_options(connection,MYSQL_OPT_RECONNECT,&reconnect);
|
||||
auto settings=query("SELECT @@session.innodb_lock_wait_timeout");
|
||||
if(!ok(settings) || settings->Get()->uiNumRows!=1)return;
|
||||
previousTimeout=strtoul(mysql_fetch_row(settings->Get()->pSQLResult)[0],0,10);
|
||||
active=run("SET SESSION innodb_lock_wait_timeout=3") && run("START TRANSACTION");
|
||||
}
|
||||
~Transaction(){
|
||||
if(mysql_errno(connection)!=CR_SERVER_LOST && mysql_errno(connection)!=CR_SERVER_GONE_ERROR) {
|
||||
if(active)run("ROLLBACK");
|
||||
if(mysql_errno(connection)!=CR_SERVER_LOST && mysql_errno(connection)!=CR_SERVER_GONE_ERROR)
|
||||
run("SET SESSION innodb_lock_wait_timeout="+decimal(previousTimeout));
|
||||
}
|
||||
my_bool reconnect=true;mysql_options(connection,MYSQL_OPT_RECONNECT,&reconnect);
|
||||
}
|
||||
bool commit(){if(!active || !run("COMMIT"))return false;active=false;return true;}
|
||||
};
|
||||
template<class T>void append(std::vector<char>& out,const T& value){const char* p=reinterpret_cast<const char*>(&value);out.insert(out.end(),p,p+sizeof(value));}
|
||||
void reply(CPeer* peer,DWORD handle,const Ava2ShopRequest& request,const std::vector<char>& out) {
|
||||
if (out.empty() || out.size()>32763)return;
|
||||
Ava2ShopReply h={request.account,request.player,uint32_t(out.size())};
|
||||
peer->EncodeHeader(76,handle,sizeof(h)+out.size());peer->Encode(&h,sizeof(h));peer->Encode(out.data(),out.size());
|
||||
}
|
||||
bool productNumber(const char* text,int64_t& value,int64_t minimum,int64_t maximum) {
|
||||
if(!text || !*text)return false;
|
||||
const char* digits=text;if(*digits=='-' && minimum<0)++digits;
|
||||
if(!*digits)return false;for(const char* p=digits;*p;++p)if(*p<'0'||*p>'9')return false;
|
||||
errno=0;char* end=nullptr;const long long parsed=strtoll(text,&end,10);
|
||||
if(errno==ERANGE || *end || parsed<minimum || parsed>maximum)return false;
|
||||
value=parsed;return true;
|
||||
}
|
||||
Ava2ShopProduct product(MYSQL_ROW r) {
|
||||
Ava2ShopProduct p={};int64_t n[10]={};
|
||||
const int64_t minimum[10]={1,1,0,0,0,0,0,0,0,-1};
|
||||
const int64_t maximum[10]={UINT32_MAX,UINT32_MAX,1000000000000LL,100,INT32_MAX,INT32_MAX,INT64_MAX,INT32_MAX,INT32_MAX,INT32_MAX};
|
||||
if(!r)return p;
|
||||
for(unsigned i=0;i<10;++i)if(!productNumber(r[i],n[i],minimum[i],maximum[i]))return p;
|
||||
p.id=static_cast<uint32_t>(n[0]);p.vnum=static_cast<uint32_t>(n[1]);p.price=n[2];p.discount=static_cast<uint8_t>(n[3]);p.expiry=static_cast<int32_t>(n[4]);p.added=static_cast<int32_t>(n[5]);p.sold=n[6];p.weekly=static_cast<int32_t>(n[7]);p.monthly=static_cast<int32_t>(n[8]);p.stock=static_cast<int32_t>(n[9]);return p;
|
||||
}
|
||||
const char* fields="id,itemVnum,itemPrice,discount,IFNULL(UNIX_TIMESTAMP(offerTime),0),IFNULL(UNIX_TIMESTAMP(addedTime),0),sellCount,week_limit,month_limit,maxSellCount";
|
||||
bool valid(const Ava2ShopProduct& p) {return p.id && p.vnum && p.price>=0 && p.price<=1000000000000LL && p.discount<=100 && p.weekly>=0 && p.monthly>=0 && p.stock>=-1;}
|
||||
}
|
||||
void CClientManager::Ava2ItemShop(CPeer* peer,DWORD handle,const char* data,DWORD length) {
|
||||
if (length!=sizeof(Ava2ShopRequest))return;
|
||||
Ava2ShopRequest r;memcpy(&r,data,sizeof(r));
|
||||
if (r.operation>3 || !r.account || !r.player || r.token[32] || r.name[24] || r.ip[15])return;
|
||||
if(r.operation==3) {
|
||||
// This operation has no client command. Only an authenticated game peer may report a kill.
|
||||
if(!peer->GetChannel() || strlen(r.token)!=32 || r.count<1 || r.count>1000000 || !r.expectedVnum || r.expectedVnum>255)return;
|
||||
for(char c:std::string(r.token))if(!std::isxdigit(static_cast<unsigned char>(c)))return;
|
||||
const std::string adb=accountDB(),aid=decimal(r.account);
|
||||
uint8_t status=6;uint32_t granted=0;int64_t balance=0;
|
||||
auto mob=std::find_if(m_vec_mobTable.begin(),m_vec_mobTable.end(),[&](const TMobTable& m){return m.dwVnum==r.product;});
|
||||
const bool validMob=mob!=m_vec_mobTable.end() && (mob->bType==0 || mob->bType==2);
|
||||
const auto rule=PortPointRule([&](const std::string& key){auto it=m_map_lEventFlag.find(key);return it==m_map_lEventFlag.end()?0:int(it->second);},validMob && mob->bType==2);
|
||||
// Reward replay must remain available after catalogue/mob/rule changes. Only
|
||||
// the two tables participating in this economic transaction are prerequisites.
|
||||
auto engine=adb.empty()?Query():query("SELECT COUNT(*) FROM information_schema.tables WHERE ENGINE='InnoDB' AND ((TABLE_SCHEMA=DATABASE() AND TABLE_NAME='port_point_rewards') OR (TABLE_SCHEMA='"+adb.substr(1,adb.size()-2)+"' AND TABLE_NAME='account'))");
|
||||
if(!adb.empty() && ok(engine) && engine->Get()->uiNumRows==1 && atoi(mysql_fetch_row(engine->Get()->pSQLResult)[0])==2) {
|
||||
Transaction tx;
|
||||
if(tx.active) {
|
||||
auto wallet=query("SELECT coins FROM "+adb+".account WHERE id="+aid+" FOR UPDATE");
|
||||
if(ok(wallet) && wallet->Get()->uiNumRows==0)status=2; // Deleted account: terminal, never retry a new award.
|
||||
else if(ok(wallet) && wallet->Get()->uiNumRows==1) {
|
||||
balance=strtoll(mysql_fetch_row(wallet->Get()->pSQLResult)[0],0,10);
|
||||
auto previous=query("SELECT account_id,vnum,requested,amount,player_id FROM port_point_rewards WHERE token='"+std::string(r.token)+"'");
|
||||
if(ok(previous) && previous->Get()->uiNumRows==1) {
|
||||
auto row=mysql_fetch_row(previous->Get()->pSQLResult);
|
||||
if(strtoul(row[0],0,10)==r.account && strtoul(row[1],0,10)==r.product && strtoul(row[2],0,10)==r.count && strtoul(row[4],0,10)==r.player){granted=strtoul(row[3],0,10);status=0;}else status=7;
|
||||
} else if(ok(previous)) {
|
||||
// Ownership/rules apply to new awards. They must not hide a committed token
|
||||
// after a character deletion/transfer or a live configuration change.
|
||||
auto owner=query("SELECT account_id FROM player WHERE id="+decimal(r.player));
|
||||
if(ok(owner) && (owner->Get()->uiNumRows!=1 || strtoul(mysql_fetch_row(owner->Get()->pSQLResult)[0],0,10)!=r.account))status=2;
|
||||
else if(ok(owner)) {
|
||||
if(!validMob || !rule.eligible(mob->bLevel,r.expectedVnum) || r.count<uint32_t(rule.minimum) || r.count>uint32_t(rule.maximum))status=1;
|
||||
else {
|
||||
auto dateQ=query("SELECT CURDATE()");
|
||||
if(ok(dateQ) && dateQ->Get()->uiNumRows==1) {
|
||||
const std::string rewardDay = mysql_fetch_row(dateQ->Get()->pSQLResult)[0];
|
||||
auto earned=query("SELECT COALESCE(SUM(amount),0) FROM port_point_rewards WHERE account_id="+aid+" AND reward_day='"+rewardDay+"'");
|
||||
if(ok(earned) && earned->Get()->uiNumRows==1) {
|
||||
granted=PortPointDropAmount(r.count,strtoull(mysql_fetch_row(earned->Get()->pSQLResult)[0],0,10),rule.dailyCap);
|
||||
if(balance<0 || uint64_t(balance)>uint64_t(INT64_MAX)-granted){status=1;granted=0;}
|
||||
else {
|
||||
bool success=run("UPDATE "+adb+".account SET coins=coins+"+decimal(granted)+" WHERE id="+aid);
|
||||
success=success && run("INSERT INTO port_point_rewards(token,account_id,player_id,vnum,requested,amount,reward_day) VALUES('"+std::string(r.token)+"',"+aid+","+decimal(r.player)+","+decimal(r.product)+","+decimal(r.count)+","+decimal(granted)+",'"+rewardDay+"')");
|
||||
if(success){if(tx.commit()){balance+=granted;status=0;}else status=8;}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
std::vector<char> out;append(out,uint8_t(9));append(out,status);out.insert(out.end(),r.token,r.token+32);append(out,granted);append(out,balance);
|
||||
reply(peer,handle,r,out);return;
|
||||
}
|
||||
auto login=GetLoginDataByAID(r.account);
|
||||
if (!login || !login->IsPlay() || login->GetConnectedPeerHandle()!=peer->GetHandle())return;
|
||||
bool owned=false;for (const auto& p:login->GetAccountRef().players)if(p.dwID==r.player)owned=true;
|
||||
if(!owned)return;
|
||||
std::vector<char> out;
|
||||
const std::string adb=accountDB(),aid=decimal(r.account);
|
||||
int64_t balance=0;
|
||||
auto wallet=adb.empty()?Query():query("SELECT coins FROM "+adb+".account WHERE id="+aid);
|
||||
if(!ok(wallet) || wallet->Get()->uiNumRows!=1) {
|
||||
append(out,uint8_t(8));reply(peer,handle,r,out);return;
|
||||
}
|
||||
balance=strtoll(mysql_fetch_row(wallet->Get()->pSQLResult)[0],0,10);
|
||||
if(r.operation==0) {
|
||||
auto rows=query(std::string("SELECT ")+fields+",categoryType,categorySubType FROM ishop_data WHERE enabled=1 ORDER BY categoryType,categorySubType,id LIMIT 511");
|
||||
if (!ok(rows) || rows->Get()->uiNumRows>510) {append(out,uint8_t(8));reply(peer,handle,r,out);return;}
|
||||
std::map<uint8_t,std::map<uint8_t,std::vector<Ava2ShopProduct>>> catalogue;
|
||||
MYSQL_ROW row;
|
||||
while((row=mysql_fetch_row(rows->Get()->pSQLResult))) {
|
||||
auto p=product(row);int64_t cat=0,sub=0;
|
||||
if(!productNumber(row[10],cat,0,7) || !productNumber(row[11],sub,0,9))continue;
|
||||
if(!valid(p) || cat<0 || cat>7 || sub<0 || sub>9 || (!m_map_itemTableByVnum.count(p.vnum) || m_map_itemTableByVnum.at(p.vnum)->bType==ITEM_NONE))continue;
|
||||
catalogue[static_cast<uint8_t>(cat)][static_cast<uint8_t>(sub)].push_back(p);
|
||||
}
|
||||
std::vector<Ava2ShopProduct*> ranked;
|
||||
for(auto& cat:catalogue)for(auto& sub:cat.second)for(auto& p:sub.second)ranked.push_back(&p);
|
||||
std::sort(ranked.begin(),ranked.end(),[](const Ava2ShopProduct* a,const Ava2ShopProduct* b){return a->sold!=b->sold?a->sold>b->sold:a->id<b->id;});
|
||||
for(size_t i=0;i<ranked.size();++i)ranked[i]->top=int32_t(i+1);
|
||||
append(out,uint8_t(0));append(out,balance);append(out,int32_t(time(0)));append(out,int32_t(catalogue.size()));
|
||||
for (auto& cat:catalogue) {
|
||||
append(out,cat.first);append(out,uint8_t(cat.second.size()));
|
||||
for(auto& sub:cat.second) {
|
||||
if(sub.second.size()>255){out.clear();append(out,uint8_t(8));reply(peer,handle,r,out);return;}
|
||||
append(out,sub.first);append(out,uint8_t(sub.second.size()));for(auto& p:sub.second)append(out,p);
|
||||
}
|
||||
}
|
||||
} else if(r.operation==1) {
|
||||
auto rows=query("SELECT player_name,created_at,UNIX_TIMESTAMP(created_at),ip,product,vnum,quantity,paid FROM port_itemshop_orders WHERE account_id="+aid+" ORDER BY id DESC LIMIT 100");
|
||||
if(!ok(rows)){append(out,uint8_t(8));reply(peer,handle,r,out);return;}
|
||||
append(out,uint8_t(1));append(out,int32_t(rows->Get()->uiNumRows));MYSQL_ROW row;
|
||||
while((row=mysql_fetch_row(rows->Get()->pSQLResult))) {
|
||||
Ava2ShopLog log={};log.account=r.account;strlcpy(log.name,row[0],sizeof(log.name));strlcpy(log.date,row[1],sizeof(log.date));log.time=atoi(row[2]);strlcpy(log.ip,row[3],sizeof(log.ip));log.product=strtoul(row[4],0,10);log.vnum=strtoul(row[5],0,10);log.count=atoi(row[6]);log.price=strtoll(row[7],0,10);append(out,log);
|
||||
}
|
||||
} else {
|
||||
if (r.count<1 || r.count>20 || strlen(r.token)!=32)return;
|
||||
for(char c:std::string(r.token))if(!std::isxdigit(static_cast<unsigned char>(c)))return;
|
||||
uint8_t status=6; // unavailable; errors always leave balance/stock/awards untouched
|
||||
if(transactional(adb)) {
|
||||
Transaction tx;
|
||||
if(tx.active) {
|
||||
auto locked=query("SELECT coins FROM "+adb+".account WHERE id="+aid+" FOR UPDATE");
|
||||
if(ok(locked) && locked->Get()->uiNumRows==1) {
|
||||
balance=strtoll(mysql_fetch_row(locked->Get()->pSQLResult)[0],0,10);
|
||||
auto previous=query("SELECT product,quantity,paid,vnum FROM port_itemshop_orders WHERE account_id="+aid+" AND token='"+r.token+"'");
|
||||
if(ok(previous) && previous->Get()->uiNumRows) {
|
||||
auto row=mysql_fetch_row(previous->Get()->pSQLResult);
|
||||
status=(strtoul(row[0],0,10)==r.product && strtoul(row[1],0,10)==r.count && strtoll(row[2],0,10)==r.expectedTotal && strtoul(row[3],0,10)==r.expectedVnum)?0:7;
|
||||
} else if(ok(previous)) {
|
||||
auto rows=query(std::string("SELECT ")+fields+" FROM ishop_data WHERE enabled=1 AND id="+decimal(r.product)+" FOR UPDATE");
|
||||
if(ok(rows) && rows->Get()->uiNumRows==1) {
|
||||
auto p=product(mysql_fetch_row(rows->Get()->pSQLResult));
|
||||
auto proto=m_map_itemTableByVnum.find(p.vnum);
|
||||
if(valid(p) && proto!=m_map_itemTableByVnum.end() && proto->second->bType!=ITEM_NONE) {
|
||||
int64_t price=0;Ava2ShopTotal(p.price,r.count,p.discount,price);
|
||||
status=0;
|
||||
if(price!=r.expectedTotal || p.vnum!=r.expectedVnum)status=9;
|
||||
else if(balance<price || balance<0)status=1;
|
||||
else if(p.stock>=0 && uint32_t(p.stock)<r.count)status=4;
|
||||
else if(p.expiry && time(0)>p.expiry)status=5;
|
||||
if(!status && (p.weekly || p.monthly)) {
|
||||
auto limits=query("SELECT IFNULL(SUM(IF(created_at>=DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY),quantity,0)),0),IFNULL(SUM(quantity),0) FROM port_itemshop_orders WHERE account_id="+aid+" AND product="+decimal(p.id)+" AND created_at>=DATE_FORMAT(NOW(),'%Y-%m-01')-INTERVAL 7 DAY");
|
||||
// Month and week are computed independently across month boundaries.
|
||||
auto month=query("SELECT IFNULL(SUM(quantity),0) FROM port_itemshop_orders WHERE account_id="+aid+" AND product="+decimal(p.id)+" AND created_at>=DATE_FORMAT(NOW(),'%Y-%m-01')");
|
||||
if(!ok(limits)||!ok(month))status=6;
|
||||
else {auto a=mysql_fetch_row(limits->Get()->pSQLResult);auto b=mysql_fetch_row(month->Get()->pSQLResult);if(p.weekly && strtoull(a[0],0,10)+r.count>uint64_t(p.weekly))status=2;else if(p.monthly && strtoull(b[0],0,10)+r.count>uint64_t(p.monthly))status=3;}
|
||||
}
|
||||
if(!status) {
|
||||
bool success=run("UPDATE "+adb+".account SET coins=coins-"+decimal(price)+" WHERE id="+aid) && run("UPDATE ishop_data SET sellCount=sellCount+"+decimal(r.count)+",maxSellCount=IF(maxSellCount<0,-1,maxSellCount-"+decimal(r.count)+") WHERE id="+decimal(p.id));
|
||||
success=success && run("INSERT INTO port_itemshop_orders(account_id,token,product,vnum,quantity,paid,player_name,ip) VALUES("+aid+",'"+r.token+"',"+decimal(p.id)+","+decimal(p.vnum)+","+decimal(r.count)+","+decimal(price)+",'"+escape(r.name)+"','"+escape(login->GetIP())+"')");
|
||||
const bool stackable=(proto->second->dwFlags&ITEM_FLAG_STACKABLE)!=0;
|
||||
for(uint32_t left=r.count;success && left;) {
|
||||
uint32_t count=stackable?left:1;left-=count;
|
||||
success=run("INSERT INTO item_award(login,vnum,count,mall,why,given_time) VALUES('"+escape(login->GetAccountRef().login)+"',"+decimal(p.vnum)+","+decimal(count)+",1,'ISHOP:"+r.token+"',NOW())");
|
||||
}
|
||||
if(success){if(tx.commit())balance-=price;else status=8;}else status=6;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
append(out,uint8_t(7));out.insert(out.end(),r.token,r.token+32);append(out,status);append(out,balance);
|
||||
}
|
||||
reply(peer,handle,r,out);
|
||||
}
|
||||
@@ -138,6 +138,9 @@ void CItemCache::OnFlush()
|
||||
p->aAttr[6].bType, p->aAttr[6].sValue);
|
||||
}
|
||||
|
||||
const std::string extraHex=PortItemExtraHex(p->extra);
|
||||
iLen += snprintf(szColumns+iLen,sizeof(szColumns)-iLen,", port_extra");
|
||||
iValueLen += snprintf(szValues+iValueLen,sizeof(szValues)-iValueLen,", X'%s'",extraHex.c_str());
|
||||
char szItemQuery[QUERY_MAX_LEN + QUERY_MAX_LEN];
|
||||
snprintf(szItemQuery, sizeof(szItemQuery), "REPLACE INTO item%s (%s) VALUES(%s)", GetTablePostfix(), szColumns, szValues);
|
||||
|
||||
|
||||
+299
-224
File diff suppressed because it is too large
Load Diff
@@ -12,6 +12,7 @@
|
||||
#include "Peer.h"
|
||||
#include "DBManager.h"
|
||||
#include "LoginData.h"
|
||||
#include "CubeRuntime.h"
|
||||
|
||||
class CPlayerTableCache;
|
||||
class CItemCache;
|
||||
@@ -30,7 +31,50 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
|
||||
|
||||
class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
{
|
||||
struct EconomyFence { DWORD account=0; bool primed=false,mainDone=false,asyncDone=false,asyncQueued=false,failed=false; uint64_t mainFailures=0,asyncFailures=0,routerFailures=0; time_t nextAttempt=0; DWORD peer=0,handle=0; TPlayerLoadPacket load={}; };
|
||||
std::map<DWORD,std::pair<uint64_t,uint64_t>> m_economyEnqueueEpoch;
|
||||
std::map<DWORD,EconomyFence> m_economyFences;
|
||||
std::map<DWORD,DWORD> m_economyOwners;
|
||||
std::set<DWORD> m_economyClosed;
|
||||
DWORD m_cubeCookie=0;
|
||||
uint64_t m_cubeWorkCursor=0;
|
||||
std::map<DWORD,PortCube::RuntimeDrain> m_cubeDrains;
|
||||
std::string m_cubeOwnerBoot;
|
||||
bool CubeDrainOwner(const PortCube::RuntimeDrain&,bool=false);
|
||||
bool CubeAuthorityCheck(const PortCube::RuntimeDrain&,bool);
|
||||
void CubeAuthorityRevoke(PortCube::RuntimeDrain&,unsigned);
|
||||
void CubeDrainFinalize(PortCube::RuntimeDrain&);
|
||||
public:
|
||||
void EconomyRequest(CPeer*,DWORD,const char*,DWORD);
|
||||
bool EconomyBeforeLoad(CPeer*,DWORD,TPlayerLoadPacket*);
|
||||
void EconomyTick();
|
||||
void EconomyMainFence(DWORD,bool);
|
||||
bool EconomySaveAllowed(CPeer*,DWORD);
|
||||
bool EconomyItemWritable(DWORD);
|
||||
bool EconomyCanDelete(DWORD);
|
||||
bool CubePlayerWritable(DWORD);
|
||||
bool CubeAccountLoadable(DWORD,DWORD);
|
||||
bool CubeItemWritable(DWORD);
|
||||
bool CubePeerMayWriteItem(CPeer*,DWORD);
|
||||
DWORD CubeDrainArm(CPeer*,DWORD,uint64_t,const PortCube::Batch&);
|
||||
bool CubeDrainSubmit(CPeer*,DWORD,uint64_t,DWORD);
|
||||
void CubeMainFence(DWORD,unsigned,bool);
|
||||
void CubeDrainTick();
|
||||
bool CubeMemoryLoadable(DWORD,DWORD);
|
||||
bool CubePeerMaySave(CPeer*,DWORD);
|
||||
void CubePeerGone(DWORD);
|
||||
void CubeAccountLogout(CPeer*,const char*,DWORD);
|
||||
void CubeAccountGone(DWORD,DWORD);
|
||||
void CubeHandshakeRequest(CPeer*,DWORD,const char*,DWORD);
|
||||
void CubeHandshakeRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeLiveResumeCheckRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
bool CubeRecoveryClaim(CPeer*,DWORD,DWORD,DWORD,uint64_t,PortCube::OwnerGrant&);
|
||||
void CubeRecoveryRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeRecoveryImageRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeCraftRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeLiveImageRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeLiveImageAckRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
void CubeLiveReleaseRoute(CPeer*,DWORD,const PortCube::Handshake&);
|
||||
typedef std::list<CPeer *> TPeerList;
|
||||
typedef std::unordered_map<DWORD, CPlayerTableCache *> TPlayerTableCacheMap;
|
||||
typedef std::unordered_map<DWORD, CItemCache *> TItemCacheMap;
|
||||
@@ -40,10 +84,10 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
typedef std::unordered_map<short, BYTE> TChannelStatusMap;
|
||||
|
||||
// MYSHOP_PRICE_LIST
|
||||
/// 아이템 가격정보 리스트 요청 정보
|
||||
/// 아이템 가격정보 리스트 요청 정보
|
||||
/**
|
||||
* first: Peer handle
|
||||
* second: 요청한 플레이어의 ID
|
||||
* second: 요청한 플레이어의 ID
|
||||
*/
|
||||
typedef std::pair< DWORD, DWORD > TItemPricelistReqInfo;
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
@@ -69,7 +113,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
pAccountTable = NULL;
|
||||
player_id = dwPID;
|
||||
};
|
||||
//독일선물기능용 생성자
|
||||
//독일선물기능용 생성자
|
||||
ClientHandleInfo(DWORD argHandle, DWORD dwPID, DWORD accountId)
|
||||
{
|
||||
dwHandle = argHandle;
|
||||
@@ -108,7 +152,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
void SetChinaEventServer(bool flag) { m_bChinaEventServer = flag; }
|
||||
bool IsChinaEventServer() { return m_bChinaEventServer; }
|
||||
|
||||
DWORD GetUserCount(); // 접속된 사용자 수를 리턴 한다.
|
||||
DWORD GetUserCount(); // 접속된 사용자 수를 리턴 한다.
|
||||
|
||||
void SendAllGuildSkillRechargePacket();
|
||||
void SendTime();
|
||||
@@ -122,29 +166,30 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
|
||||
CItemCache * GetItemCache(DWORD id);
|
||||
void PutItemCache(TPlayerItem * pNew, bool bSkipQuery = false);
|
||||
bool ValidateLoadedExtra(const TPlayerItem& item,const char* hex) const;
|
||||
bool DeleteItemCache(DWORD id);
|
||||
|
||||
void UpdatePlayerCache();
|
||||
void UpdateItemCache();
|
||||
|
||||
// MYSHOP_PRICE_LIST
|
||||
/// 가격정보 리스트 캐시를 가져온다.
|
||||
/// 가격정보 리스트 캐시를 가져온다.
|
||||
/**
|
||||
* @param [in] dwID 가격정보 리스트의 소유자.(플레이어 ID)
|
||||
* @return 가격정보 리스트 캐시의 포인터
|
||||
* @param [in] dwID 가격정보 리스트의 소유자.(플레이어 ID)
|
||||
* @return 가격정보 리스트 캐시의 포인터
|
||||
*/
|
||||
CItemPriceListTableCache* GetItemPriceListCache(DWORD dwID);
|
||||
|
||||
/// 가격정보 리스트 캐시를 넣는다.
|
||||
/// 가격정보 리스트 캐시를 넣는다.
|
||||
/**
|
||||
* @param [in] pItemPriceList 캐시에 넣을 아이템 가격정보 리스트
|
||||
* @param [in] pItemPriceList 캐시에 넣을 아이템 가격정보 리스트
|
||||
*
|
||||
* 캐시가 이미 있으면 Update 가 아닌 replace 한다.
|
||||
* 캐시가 이미 있으면 Update 가 아닌 replace 한다.
|
||||
*/
|
||||
void PutItemPriceListCache(const TItemPriceListTable* pItemPriceList);
|
||||
|
||||
|
||||
/// Flush 시간이 만료된 아이템 가격정보 리스트 캐시를 Flush 해주고 캐시에서 삭제한다.
|
||||
/// Flush 시간이 만료된 아이템 가격정보 리스트 캐시를 Flush 해주고 캐시에서 삭제한다.
|
||||
void UpdateItemPriceListCache(void);
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
|
||||
@@ -162,8 +207,8 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
|
||||
void SendNotice(const char * c_pszFormat, ...);
|
||||
|
||||
char* GetCommand(char* str); //독일선물기능에서 명령어 얻는 함수
|
||||
void ItemAward(CPeer * peer, char* login); //독일 선물 기능
|
||||
char* GetCommand(char* str); //독일선물기능에서 명령어 얻는 함수
|
||||
void ItemAward(CPeer * peer, char* login); //독일 선물 기능
|
||||
|
||||
protected:
|
||||
void Destroy();
|
||||
@@ -184,9 +229,9 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
bool InitializeObjectTable();
|
||||
bool InitializeMonarch();
|
||||
|
||||
// mob_proto.txt, item_proto.txt에서 읽은 mob_proto, item_proto를 real db에 반영.
|
||||
// item_proto, mob_proto를 db에 반영하지 않아도, 게임 돌아가는데는 문제가 없지만,
|
||||
// 운영툴 등에서 db의 item_proto, mob_proto를 읽어 쓰기 때문에 문제가 발생한다.
|
||||
// mob_proto.txt, item_proto.txt에서 읽은 mob_proto, item_proto를 real db에 반영.
|
||||
// item_proto, mob_proto를 db에 반영하지 않아도, 게임 돌아가는데는 문제가 없지만,
|
||||
// 운영툴 등에서 db의 item_proto, mob_proto를 읽어 쓰기 때문에 문제가 발생한다.
|
||||
bool MirrorMobTableIntoDB();
|
||||
bool MirrorItemTableIntoDB();
|
||||
|
||||
@@ -200,6 +245,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
int Process();
|
||||
|
||||
void ProcessPackets(CPeer * peer);
|
||||
void Ava2ItemShop(CPeer* peer, DWORD handle, const char* data, DWORD length);
|
||||
|
||||
CLoginData * GetLoginData(DWORD dwKey);
|
||||
CLoginData * GetLoginDataByLogin(const char * c_pszLogin);
|
||||
@@ -251,20 +297,20 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
// END_PLAYER_INDEX_CREATE_BUG_FIX
|
||||
|
||||
// MYSHOP_PRICE_LIST
|
||||
/// 가격정보 로드 쿼리에 대한 Result 처리
|
||||
/// 가격정보 로드 쿼리에 대한 Result 처리
|
||||
/**
|
||||
* @param peer 가격정보를 요청한 Game server 의 peer 객체 포인터
|
||||
* @param pMsg 쿼리의 Result 로 받은 객체의 포인터
|
||||
* @param peer 가격정보를 요청한 Game server 의 peer 객체 포인터
|
||||
* @param pMsg 쿼리의 Result 로 받은 객체의 포인터
|
||||
*
|
||||
* 로드된 가격정보 리스트를 캐시에 저장하고 peer 에게 리스트를 보내준다.
|
||||
* 로드된 가격정보 리스트를 캐시에 저장하고 peer 에게 리스트를 보내준다.
|
||||
*/
|
||||
void RESULT_PRICELIST_LOAD(CPeer* peer, SQLMsg* pMsg);
|
||||
|
||||
/// 가격정보 업데이트를 위한 로드 쿼리에 대한 Result 처리
|
||||
/// 가격정보 업데이트를 위한 로드 쿼리에 대한 Result 처리
|
||||
/**
|
||||
* @param pMsg 쿼리의 Result 로 받은 객체의 포인터
|
||||
* @param pMsg 쿼리의 Result 로 받은 객체의 포인터
|
||||
*
|
||||
* 로드된 정보로 가격정보 리스트 캐시를 만들고 업데이트 받은 가격정보로 업데이트 한다.
|
||||
* 로드된 정보로 가격정보 리스트 캐시를 만들고 업데이트 받은 가격정보로 업데이트 한다.
|
||||
*/
|
||||
void RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg* pMsg);
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
@@ -344,7 +390,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
void SendAllLoginToBilling();
|
||||
void SendLoginToBilling(CLoginData * pkLD, bool bLogin);
|
||||
|
||||
// 결혼
|
||||
// 결혼
|
||||
void MarriageAdd(TPacketMarriageAdd * p);
|
||||
void MarriageUpdate(TPacketMarriageUpdate * p);
|
||||
void MarriageRemove(TPacketMarriageRemove * p);
|
||||
@@ -354,20 +400,20 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
void WeddingEnd(TPacketWeddingEnd * p);
|
||||
|
||||
// MYSHOP_PRICE_LIST
|
||||
// 개인상점 가격정보
|
||||
// 개인상점 가격정보
|
||||
|
||||
/// 아이템 가격정보 리스트 업데이트 패킷(HEADER_GD_MYSHOP_PRICELIST_UPDATE) 처리함수
|
||||
/// 아이템 가격정보 리스트 업데이트 패킷(HEADER_GD_MYSHOP_PRICELIST_UPDATE) 처리함수
|
||||
/**
|
||||
* @param [in] pPacket 패킷 데이터의 포인터
|
||||
* @param [in] pPacket 패킷 데이터의 포인터
|
||||
*/
|
||||
// void MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* pPacket);
|
||||
void MyshopPricelistUpdate(const TItemPriceListTable* pPacket);
|
||||
|
||||
/// 아이템 가격정보 리스트 요청 패킷(HEADER_GD_MYSHOP_PRICELIST_REQ) 처리함수
|
||||
/// 아이템 가격정보 리스트 요청 패킷(HEADER_GD_MYSHOP_PRICELIST_REQ) 처리함수
|
||||
/**
|
||||
* @param peer 패킷을 보낸 Game server 의 peer 객체의 포인터
|
||||
* @param [in] dwHandle 가격정보를 요청한 peer 의 핸들
|
||||
* @param [in] dwPlayerID 가격정보 리스트를 요청한 플레이어의 ID
|
||||
* @param peer 패킷을 보낸 Game server 의 peer 객체의 포인터
|
||||
* @param [in] dwHandle 가격정보를 요청한 peer 의 핸들
|
||||
* @param [in] dwPlayerID 가격정보 리스트를 요청한 플레이어의 ID
|
||||
*/
|
||||
void MyshopPricelistRequest(CPeer* peer, DWORD dwHandle, DWORD dwPlayerID);
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
@@ -387,7 +433,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
|
||||
private:
|
||||
int m_looping;
|
||||
socket_t m_fdAccept; // 접속 받는 소켓
|
||||
socket_t m_fdAccept; // 접속 받는 소켓
|
||||
TPeerList m_peerList;
|
||||
|
||||
CPeer * m_pkAuthPeer;
|
||||
@@ -404,7 +450,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
typedef std::unordered_map<DWORD, CLoginData *> TLoginDataByAID;
|
||||
TLoginDataByAID m_map_pkLoginDataByAID;
|
||||
|
||||
// Login LoginData pair (실제 로그인 되어있는 계정)
|
||||
// Login LoginData pair (실제 로그인 되어있는 계정)
|
||||
typedef std::unordered_map<std::string, CLoginData *> TLogonAccountMap;
|
||||
TLogonAccountMap m_map_kLogonAccount;
|
||||
|
||||
@@ -436,14 +482,14 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
|
||||
bool m_bShutdowned;
|
||||
|
||||
TPlayerTableCacheMap m_map_playerCache; // 플레이어 id가 key
|
||||
TPlayerTableCacheMap m_map_playerCache; // 플레이어 id가 key
|
||||
|
||||
TItemCacheMap m_map_itemCache; // 아이템 id가 key
|
||||
TItemCacheSetPtrMap m_map_pkItemCacheSetPtr; // 플레이어 id가 key, 이 플레이어가 어떤 아이템 캐쉬를 가지고 있나?
|
||||
TItemCacheMap m_map_itemCache; // 아이템 id가 key
|
||||
TItemCacheSetPtrMap m_map_pkItemCacheSetPtr; // 플레이어 id가 key, 이 플레이어가 어떤 아이템 캐쉬를 가지고 있나?
|
||||
|
||||
// MYSHOP_PRICE_LIST
|
||||
/// 플레이어별 아이템 가격정보 리스트 map. key: 플레이어 ID, value: 가격정보 리스트 캐시
|
||||
TItemPriceListCacheMap m_mapItemPriceListCache; ///< 플레이어별 아이템 가격정보 리스트
|
||||
/// 플레이어별 아이템 가격정보 리스트 map. key: 플레이어 ID, value: 가격정보 리스트 캐시
|
||||
TItemPriceListCacheMap m_mapItemPriceListCache; ///< 플레이어별 아이템 가격정보 리스트
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
|
||||
TChannelStatusMap m_mChannelStatus;
|
||||
@@ -481,7 +527,7 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
|
||||
//BOOT_LOCALIZATION
|
||||
public:
|
||||
/* 로컬 정보 초기화
|
||||
/* 로컬 정보 초기화
|
||||
**/
|
||||
bool InitializeLocalization();
|
||||
|
||||
@@ -548,6 +594,25 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
|
||||
void DeleteAwardId(TPacketDeleteAwardID* data);
|
||||
void UpdateChannelStatus(TChannelStatus* pData);
|
||||
void RequestChannelStatus(CPeer* peer, DWORD dwHandle);
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
std::map<DWORD, TOfflineShop*> m_Offlineshop;
|
||||
void OfflineShopAssert(TOfflineShop* p);
|
||||
void CreateOfflineShop(TOfflineShop* p);
|
||||
void DeleteOfflineShop(DWORD ownerid);
|
||||
void RemoveItem(OFFLINE_SHOP_ITEM* item);
|
||||
void AddItem(OFFLINE_SHOP_ITEM* item);
|
||||
void BuyItem(TOfflineShopBuy* item);
|
||||
void WithdrawMoney(DWORD ch);
|
||||
void ClearLog(DWORD ch);
|
||||
void ChangeDecoration(TShopDecoration* ch);
|
||||
void ChangeTitle(TOfflineShopChangeTitle* p);
|
||||
void OpenSlot(TOfflineShopOpenSlot* p);
|
||||
void TimeDone(DWORD ch);
|
||||
void GetBackItem(DWORD p);
|
||||
void AddTime(DWORD p);
|
||||
void RecvPackets(const char* data);
|
||||
bool InitializeOfflineShop();
|
||||
#endif
|
||||
#ifdef __AUCTION__
|
||||
void EnrollInAuction (CPeer * peer, DWORD owner_id, AuctionEnrollProductInfo* data);
|
||||
void EnrollInSale (CPeer * peer, DWORD owner_id, AuctionEnrollSaleInfo* data);
|
||||
|
||||
@@ -97,6 +97,13 @@ bool CClientManager::InitializeTables()
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
if (!InitializeOfflineShop())
|
||||
{
|
||||
sys_err("InitializeOfflineShop FAILED");
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -111,6 +118,7 @@ bool CClientManager::InitializeRefineTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes->uiNumRows)
|
||||
return true;
|
||||
@@ -122,7 +130,7 @@ bool CClientManager::InitializeRefineTable()
|
||||
m_pRefineTable = NULL;
|
||||
}
|
||||
|
||||
m_iRefineTableSize = pRes->uiNumRows;
|
||||
m_iRefineTableSize = static_cast<int>(pRes->uiNumRows);
|
||||
|
||||
m_pRefineTable = new TRefineTable[m_iRefineTableSize];
|
||||
memset(m_pRefineTable, 0, sizeof(TRefineTable) * m_iRefineTableSize);
|
||||
@@ -171,42 +179,42 @@ class FCompareVnum
|
||||
|
||||
bool CClientManager::InitializeMobTable()
|
||||
{
|
||||
//================== 함수 설명 ==================//
|
||||
//1. 요약 : 'mob_proto.txt', 'mob_proto_test.txt', 'mob_names.txt' 파일을 읽고,
|
||||
// (!)[mob_table] 테이블 오브젝트를 생성한다. (타입 : TMobTable)
|
||||
//2. 순서
|
||||
// 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
// 2) 'mob_proto_test.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다.
|
||||
// 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[mob_table] 테이블을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_mobTableByVnum]의 것을 사용한다.
|
||||
// 4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다.
|
||||
//3. 테스트
|
||||
// 1)'mob_proto.txt' 정보가 mob_table에 잘 들어갔는지. -> 완료
|
||||
// 2)'mob_names.txt' 정보가 mob_table에 잘 들어갔는지.
|
||||
// 3)'mob_proto_test.txt' 에서 [겹치는] 정보가 mob_table 에 잘 들어갔는지.
|
||||
// 4)'mob_proto_test.txt' 에서 [새로운] 정보가 mob_table 에 잘 들어갔는지.
|
||||
// 5) (최종) 게임 클라이언트에서 제대로 작동 하는지.
|
||||
//================== 함수 설명 ==================//
|
||||
//1. 요약 : 'mob_proto.txt', 'mob_proto_test.txt', 'mob_names.txt' 파일을 읽고,
|
||||
// (!)[mob_table] 테이블 오브젝트를 생성한다. (타입 : TMobTable)
|
||||
//2. 순서
|
||||
// 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
// 2) 'mob_proto_test.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다.
|
||||
// 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[mob_table] 테이블을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_mobTableByVnum]의 것을 사용한다.
|
||||
// 4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다.
|
||||
//3. 테스트
|
||||
// 1)'mob_proto.txt' 정보가 mob_table에 잘 들어갔는지. -> 완료
|
||||
// 2)'mob_names.txt' 정보가 mob_table에 잘 들어갔는지.
|
||||
// 3)'mob_proto_test.txt' 에서 [겹치는] 정보가 mob_table 에 잘 들어갔는지.
|
||||
// 4)'mob_proto_test.txt' 에서 [새로운] 정보가 mob_table 에 잘 들어갔는지.
|
||||
// 5) (최종) 게임 클라이언트에서 제대로 작동 하는지.
|
||||
//_______________________________________________//
|
||||
|
||||
|
||||
//===============================================//
|
||||
// 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap] 맵을 만든다.
|
||||
//<(a)localMap 맵 생성>
|
||||
// 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap] 맵을 만든다.
|
||||
//<(a)localMap 맵 생성>
|
||||
map<int,const char*> localMap;
|
||||
bool isNameFile = true;
|
||||
//<파일 읽기>
|
||||
//<파일 읽기>
|
||||
cCsvTable nameData;
|
||||
if(!nameData.Load("mob_names.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "mob_names.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "mob_names.txt 파일을 읽어오지 못했습니다\n");
|
||||
isNameFile = false;
|
||||
} else {
|
||||
nameData.Next(); //설명row 생략.
|
||||
nameData.Next(); //설명row 생략.
|
||||
while(nameData.Next()) {
|
||||
localMap[atoi(nameData.AsStringByIndex(0))] = nameData.AsStringByIndex(1);
|
||||
}
|
||||
@@ -215,35 +223,35 @@ bool CClientManager::InitializeMobTable()
|
||||
|
||||
|
||||
//===============================================//
|
||||
// 2) 'mob_proto_test.txt'파일과 (a)localMap 맵으로
|
||||
// (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다.
|
||||
// 2) 'mob_proto_test.txt'파일과 (a)localMap 맵으로
|
||||
// (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다.
|
||||
//0.
|
||||
set<int> vnumSet; //테스트용 파일 데이터중, 신규여부 확인에 사용.
|
||||
//1. 파일 읽어오기
|
||||
set<int> vnumSet; //테스트용 파일 데이터중, 신규여부 확인에 사용.
|
||||
//1. 파일 읽어오기
|
||||
bool isTestFile = true;
|
||||
cCsvTable test_data;
|
||||
if(!test_data.Load("mob_proto_test.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "테스트 파일이 없습니다. 그대로 진행합니다.\n");
|
||||
fprintf(stderr, "테스트 파일이 없습니다. 그대로 진행합니다.\n");
|
||||
isTestFile = false;
|
||||
}
|
||||
//2. (c)[test_map_mobTableByVnum](vnum:TMobTable) 맵 생성.
|
||||
//2. (c)[test_map_mobTableByVnum](vnum:TMobTable) 맵 생성.
|
||||
map<DWORD, TMobTable *> test_map_mobTableByVnum;
|
||||
if (isTestFile) {
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
|
||||
//ㄱ. 테스트 몬스터 테이블 생성.
|
||||
//ㄱ. 테스트 몬스터 테이블 생성.
|
||||
TMobTable * test_mob_table = NULL;
|
||||
int test_MobTableSize = test_data.m_File.GetRowCount()-1;
|
||||
test_mob_table = new TMobTable[test_MobTableSize];
|
||||
memset(test_mob_table, 0, sizeof(TMobTable) * test_MobTableSize);
|
||||
|
||||
//ㄴ. 테스트 몬스터 테이블에 값을 넣고, 맵에까지 넣기.
|
||||
//ㄴ. 테스트 몬스터 테이블에 값을 넣고, 맵에까지 넣기.
|
||||
while(test_data.Next()) {
|
||||
|
||||
if (!Set_Proto_Mob_Table(test_mob_table, test_data, localMap))
|
||||
{
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
test_map_mobTableByVnum.insert(std::map<DWORD, TMobTable *>::value_type(test_mob_table->dwVnum, test_mob_table));
|
||||
@@ -254,22 +262,22 @@ bool CClientManager::InitializeMobTable()
|
||||
|
||||
}
|
||||
|
||||
// 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[mob_table] 테이블을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_mobTableByVnum]의 것을 사용한다.
|
||||
// 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[mob_table] 테이블을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_mobTableByVnum]의 것을 사용한다.
|
||||
|
||||
//1. 파일 읽기.
|
||||
//1. 파일 읽기.
|
||||
cCsvTable data;
|
||||
if(!data.Load("mob_proto.txt",'\t')) {
|
||||
fprintf(stderr, "mob_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "mob_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
return false;
|
||||
}
|
||||
data.Next(); //설명 row 넘어가기
|
||||
//2. (!)[mob_table] 생성하기
|
||||
//2.1 새로 추가되는 갯수를 파악
|
||||
data.Next(); //설명 row 넘어가기
|
||||
//2. (!)[mob_table] 생성하기
|
||||
//2.1 새로 추가되는 갯수를 파악
|
||||
int addNumber = 0;
|
||||
while(data.Next()) {
|
||||
int vnum = atoi(data.AsStringByIndex(0));
|
||||
@@ -279,15 +287,15 @@ bool CClientManager::InitializeMobTable()
|
||||
addNumber++;
|
||||
}
|
||||
}
|
||||
//data를 다시 첫줄로 옮긴다.(다시 읽어온다;;)
|
||||
//data를 다시 첫줄로 옮긴다.(다시 읽어온다;;)
|
||||
data.Destroy();
|
||||
if(!data.Load("mob_proto.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "mob_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "mob_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
return false;
|
||||
}
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
//2.2 크기에 맞게 mob_table 생성
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
//2.2 크기에 맞게 mob_table 생성
|
||||
if (!m_vec_mobTable.empty())
|
||||
{
|
||||
sys_log(0, "RELOAD: mob_proto");
|
||||
@@ -296,18 +304,18 @@ bool CClientManager::InitializeMobTable()
|
||||
m_vec_mobTable.resize(data.m_File.GetRowCount()-1 + addNumber);
|
||||
memset(&m_vec_mobTable[0], 0, sizeof(TMobTable) * m_vec_mobTable.size());
|
||||
TMobTable * mob_table = &m_vec_mobTable[0];
|
||||
//2.3 데이터 채우기
|
||||
//2.3 데이터 채우기
|
||||
while (data.Next())
|
||||
{
|
||||
int col = 0;
|
||||
//(b)[test_map_mobTableByVnum]에 같은 row가 있는지 조사.
|
||||
//(b)[test_map_mobTableByVnum]에 같은 row가 있는지 조사.
|
||||
bool isSameRow = true;
|
||||
std::map<DWORD, TMobTable *>::iterator it_map_mobTable;
|
||||
it_map_mobTable = test_map_mobTableByVnum.find(atoi(data.AsStringByIndex(col)));
|
||||
if(it_map_mobTable == test_map_mobTableByVnum.end()) {
|
||||
isSameRow = false;
|
||||
}
|
||||
//같은 row 가 있으면 (b)에서 읽어온다.
|
||||
//같은 row 가 있으면 (b)에서 읽어온다.
|
||||
if(isSameRow) {
|
||||
TMobTable *tempTable = it_map_mobTable->second;
|
||||
|
||||
@@ -378,13 +386,13 @@ bool CClientManager::InitializeMobTable()
|
||||
|
||||
if (!Set_Proto_Mob_Table(mob_table, data, localMap))
|
||||
{
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
//셋에 vnum 추가
|
||||
//셋에 vnum 추가
|
||||
vnumSet.insert(mob_table->dwVnum);
|
||||
|
||||
|
||||
@@ -395,22 +403,22 @@ bool CClientManager::InitializeMobTable()
|
||||
//_____________________________________________________//
|
||||
|
||||
|
||||
// 4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다.
|
||||
//파일 다시 읽어오기.
|
||||
// 4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다.
|
||||
//파일 다시 읽어오기.
|
||||
test_data.Destroy();
|
||||
isTestFile = true;
|
||||
test_data;
|
||||
if(!test_data.Load("mob_proto_test.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "테스트 파일이 없습니다. 그대로 진행합니다.\n");
|
||||
fprintf(stderr, "테스트 파일이 없습니다. 그대로 진행합니다.\n");
|
||||
isTestFile = false;
|
||||
}
|
||||
if(isTestFile) {
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
|
||||
while (test_data.Next()) //테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다.
|
||||
while (test_data.Next()) //테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다.
|
||||
{
|
||||
//중복되는 부분이면 넘어간다.
|
||||
//중복되는 부분이면 넘어간다.
|
||||
set<int>::iterator itVnum;
|
||||
itVnum=vnumSet.find(atoi(test_data.AsStringByIndex(0)));
|
||||
if (itVnum != vnumSet.end()) {
|
||||
@@ -419,7 +427,7 @@ bool CClientManager::InitializeMobTable()
|
||||
|
||||
if (!Set_Proto_Mob_Table(mob_table, test_data, localMap))
|
||||
{
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "몹 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
sys_log(0, "MOB #%-5d %-24s %-24s level: %-3u rank: %u empire: %d", mob_table->dwVnum, mob_table->szName, mob_table->szLocaleName, mob_table->bLevel, mob_table->bRank, mob_table->bEmpire);
|
||||
@@ -447,9 +455,10 @@ bool CClientManager::InitializeShopTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg2(CDBManager::instance().DirectQuery(s_szQuery));
|
||||
|
||||
// shop의 vnum은 있는데 shop_item 이 없을경우... 실패로 처리되니 주의 요망.
|
||||
// 고처야할부분
|
||||
// shop의 vnum은 있는데 shop_item 이 없을경우... 실패로 처리되니 주의 요망.
|
||||
// 고처야할부분
|
||||
SQLResult * pRes2 = pkMsg2->Get();
|
||||
if (pkMsg2->uiSQLErrno || !pRes2 || pRes2->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes2->uiNumRows)
|
||||
{
|
||||
@@ -487,7 +496,7 @@ bool CClientManager::InitializeShopTable()
|
||||
|
||||
str_to_number(shop_table->dwNPCVnum, data[col++]);
|
||||
|
||||
if (!data[col]) // 아이템이 하나도 없으면 NULL이 리턴 되므로..
|
||||
if (!data[col]) // 아이템이 하나도 없으면 NULL이 리턴 되므로..
|
||||
continue;
|
||||
|
||||
TShopItemTable * pItem = &shop_table->items[shop_table->byItemCount];
|
||||
@@ -526,6 +535,7 @@ bool CClientManager::InitializeQuestItemTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes->uiNumRows)
|
||||
{
|
||||
@@ -560,7 +570,7 @@ bool CClientManager::InitializeQuestItemTable()
|
||||
continue;
|
||||
}
|
||||
|
||||
tbl.bType = ITEM_QUEST; // quest_item_proto 테이블에 있는 것들은 모두 ITEM_QUEST 유형
|
||||
tbl.bType = ITEM_QUEST; // quest_item_proto 테이블에 있는 것들은 모두 ITEM_QUEST 유형
|
||||
tbl.bSize = 1;
|
||||
|
||||
m_vec_itemTable.push_back(tbl);
|
||||
@@ -571,39 +581,39 @@ bool CClientManager::InitializeQuestItemTable()
|
||||
|
||||
bool CClientManager::InitializeItemTable()
|
||||
{
|
||||
//================== 함수 설명 ==================//
|
||||
//1. 요약 : 'item_proto.txt', 'item_proto_test.txt', 'item_names.txt' 파일을 읽고,
|
||||
// <item_table>(TItemTable), <m_map_itemTableByVnum> 오브젝트를 생성한다.
|
||||
//2. 순서
|
||||
// 1) 'item_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
// 2) 'item_proto_text.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_itemTableByVnum](vnum:TItemTable) 맵을 생성한다.
|
||||
// 3) 'item_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[item_table], <m_map_itemTableByVnum>을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_itemTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_itemTableByVnum]의 것을 사용한다.
|
||||
// 4) (b)[test_map_itemTableByVnum]의 row중, (!)[item_table]에 없는 것을 추가한다.
|
||||
//3. 테스트
|
||||
// 1)'item_proto.txt' 정보가 item_table에 잘 들어갔는지. -> 완료
|
||||
// 2)'item_names.txt' 정보가 item_table에 잘 들어갔는지.
|
||||
// 3)'item_proto_test.txt' 에서 [겹치는] 정보가 item_table 에 잘 들어갔는지.
|
||||
// 4)'item_proto_test.txt' 에서 [새로운] 정보가 item_table 에 잘 들어갔는지.
|
||||
// 5) (최종) 게임 클라이언트에서 제대로 작동 하는지.
|
||||
//================== 함수 설명 ==================//
|
||||
//1. 요약 : 'item_proto.txt', 'item_proto_test.txt', 'item_names.txt' 파일을 읽고,
|
||||
// <item_table>(TItemTable), <m_map_itemTableByVnum> 오브젝트를 생성한다.
|
||||
//2. 순서
|
||||
// 1) 'item_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
// 2) 'item_proto_text.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_itemTableByVnum](vnum:TItemTable) 맵을 생성한다.
|
||||
// 3) 'item_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[item_table], <m_map_itemTableByVnum>을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_itemTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_itemTableByVnum]의 것을 사용한다.
|
||||
// 4) (b)[test_map_itemTableByVnum]의 row중, (!)[item_table]에 없는 것을 추가한다.
|
||||
//3. 테스트
|
||||
// 1)'item_proto.txt' 정보가 item_table에 잘 들어갔는지. -> 완료
|
||||
// 2)'item_names.txt' 정보가 item_table에 잘 들어갔는지.
|
||||
// 3)'item_proto_test.txt' 에서 [겹치는] 정보가 item_table 에 잘 들어갔는지.
|
||||
// 4)'item_proto_test.txt' 에서 [새로운] 정보가 item_table 에 잘 들어갔는지.
|
||||
// 5) (최종) 게임 클라이언트에서 제대로 작동 하는지.
|
||||
//_______________________________________________//
|
||||
|
||||
|
||||
|
||||
//=================================================================================//
|
||||
// 1) 'item_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
// 1) 'item_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다.
|
||||
//=================================================================================//
|
||||
bool isNameFile = true;
|
||||
map<int,const char*> localMap;
|
||||
cCsvTable nameData;
|
||||
if(!nameData.Load("item_names.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "item_names.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "item_names.txt 파일을 읽어오지 못했습니다\n");
|
||||
isNameFile = false;
|
||||
} else {
|
||||
nameData.Next();
|
||||
@@ -614,32 +624,32 @@ bool CClientManager::InitializeItemTable()
|
||||
//_________________________________________________________________//
|
||||
|
||||
//=================================================================//
|
||||
// 2) 'item_proto_text.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_itemTableByVnum](vnum:TItemTable) 맵을 생성한다.
|
||||
// 2) 'item_proto_text.txt'파일과 (a)[localMap] 맵으로
|
||||
// (b)[test_map_itemTableByVnum](vnum:TItemTable) 맵을 생성한다.
|
||||
//=================================================================//
|
||||
map<DWORD, TItemTable *> test_map_itemTableByVnum;
|
||||
//1. 파일 읽어오기.
|
||||
//1. 파일 읽어오기.
|
||||
cCsvTable test_data;
|
||||
if(!test_data.Load("item_proto_test.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "item_proto_test.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "item_proto_test.txt 파일을 읽어오지 못했습니다\n");
|
||||
//return false;
|
||||
} else {
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
|
||||
//2. 테스트 아이템 테이블 생성.
|
||||
//2. 테스트 아이템 테이블 생성.
|
||||
TItemTable * test_item_table = NULL;
|
||||
int test_itemTableSize = test_data.m_File.GetRowCount()-1;
|
||||
test_item_table = new TItemTable[test_itemTableSize];
|
||||
memset(test_item_table, 0, sizeof(TItemTable) * test_itemTableSize);
|
||||
|
||||
//3. 테스트 아이템 테이블에 값을 넣고, 맵에까지 넣기.
|
||||
//3. 테스트 아이템 테이블에 값을 넣고, 맵에까지 넣기.
|
||||
while(test_data.Next()) {
|
||||
|
||||
|
||||
if (!Set_Proto_Item_Table(test_item_table, test_data, localMap))
|
||||
{
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
test_map_itemTableByVnum.insert(std::map<DWORD, TItemTable *>::value_type(test_item_table->dwVnum, test_item_table));
|
||||
@@ -651,25 +661,25 @@ bool CClientManager::InitializeItemTable()
|
||||
|
||||
|
||||
//========================================================================//
|
||||
// 3) 'item_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[item_table], <m_map_itemTableByVnum>을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_itemTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_itemTableByVnum]의 것을 사용한다.
|
||||
// 3) 'item_proto.txt' 파일과 (a)[localMap] 맵으로
|
||||
// (!)[item_table], <m_map_itemTableByVnum>을 만든다.
|
||||
// <참고>
|
||||
// 각 row 들 중,
|
||||
// (b)[test_map_itemTableByVnum],(!)[mob_table] 모두에 있는 row는
|
||||
// (b)[test_map_itemTableByVnum]의 것을 사용한다.
|
||||
//========================================================================//
|
||||
|
||||
//vnum들을 저장할 셋. 새로운 테스트 아이템을 판별할때 사용된다.
|
||||
//vnum들을 저장할 셋. 새로운 테스트 아이템을 판별할때 사용된다.
|
||||
set<int> vnumSet;
|
||||
|
||||
//파일 읽어오기.
|
||||
//파일 읽어오기.
|
||||
cCsvTable data;
|
||||
if(!data.Load("item_proto.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "item_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "item_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
return false;
|
||||
}
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
|
||||
if (!m_vec_itemTable.empty())
|
||||
{
|
||||
@@ -678,8 +688,8 @@ bool CClientManager::InitializeItemTable()
|
||||
m_map_itemTableByVnum.clear();
|
||||
}
|
||||
|
||||
//===== 아이템 테이블 생성 =====//
|
||||
//새로 추가되는 갯수를 파악한다.
|
||||
//===== 아이템 테이블 생성 =====//
|
||||
//새로 추가되는 갯수를 파악한다.
|
||||
int addNumber = 0;
|
||||
while(data.Next()) {
|
||||
int vnum = atoi(data.AsStringByIndex(0));
|
||||
@@ -689,14 +699,14 @@ bool CClientManager::InitializeItemTable()
|
||||
addNumber++;
|
||||
}
|
||||
}
|
||||
//data를 다시 첫줄로 옮긴다.(다시 읽어온다;;)
|
||||
//data를 다시 첫줄로 옮긴다.(다시 읽어온다;;)
|
||||
data.Destroy();
|
||||
if(!data.Load("item_proto.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "item_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "item_proto.txt 파일을 읽어오지 못했습니다\n");
|
||||
return false;
|
||||
}
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분)
|
||||
|
||||
m_vec_itemTable.resize(data.m_File.GetRowCount() - 1 + addNumber);
|
||||
memset(&m_vec_itemTable[0], 0, sizeof(TItemTable) * m_vec_itemTable.size());
|
||||
@@ -711,16 +721,16 @@ bool CClientManager::InitializeItemTable()
|
||||
std::map<DWORD, TItemTable *>::iterator it_map_itemTable;
|
||||
it_map_itemTable = test_map_itemTableByVnum.find(atoi(data.AsStringByIndex(col)));
|
||||
if(it_map_itemTable == test_map_itemTableByVnum.end()) {
|
||||
//각 칼럼 데이터 저장
|
||||
//각 칼럼 데이터 저장
|
||||
|
||||
if (!Set_Proto_Item_Table(item_table, data, localMap))
|
||||
{
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
} else { //$$$$$$$$$$$$$$$$$$$$$$$ 테스트 아이템 정보가 있다!
|
||||
} else { //$$$$$$$$$$$$$$$$$$$$$$$ 테스트 아이템 정보가 있다!
|
||||
TItemTable *tempTable = it_map_itemTable->second;
|
||||
|
||||
item_table->dwVnum = tempTable->dwVnum;
|
||||
@@ -777,19 +787,19 @@ bool CClientManager::InitializeItemTable()
|
||||
//_______________________________________________________________________//
|
||||
|
||||
//========================================================================//
|
||||
// 4) (b)[test_map_itemTableByVnum]의 row중, (!)[item_table]에 없는 것을 추가한다.
|
||||
// 4) (b)[test_map_itemTableByVnum]의 row중, (!)[item_table]에 없는 것을 추가한다.
|
||||
//========================================================================//
|
||||
test_data.Destroy();
|
||||
if(!test_data.Load("item_proto_test.txt",'\t'))
|
||||
{
|
||||
fprintf(stderr, "item_proto_test.txt 파일을 읽어오지 못했습니다\n");
|
||||
fprintf(stderr, "item_proto_test.txt 파일을 읽어오지 못했습니다\n");
|
||||
//return false;
|
||||
} else {
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
test_data.Next(); //설명 로우 넘어가기.
|
||||
|
||||
while (test_data.Next()) //테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다.
|
||||
while (test_data.Next()) //테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다.
|
||||
{
|
||||
//중복되는 부분이면 넘어간다.
|
||||
//중복되는 부분이면 넘어간다.
|
||||
set<int>::iterator itVnum;
|
||||
itVnum=vnumSet.find(atoi(test_data.AsStringByIndex(0)));
|
||||
if (itVnum != vnumSet.end()) {
|
||||
@@ -798,7 +808,7 @@ bool CClientManager::InitializeItemTable()
|
||||
|
||||
if (!Set_Proto_Item_Table(item_table, test_data, localMap))
|
||||
{
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
fprintf(stderr, "아이템 프로토 테이블 셋팅 실패.\n");
|
||||
}
|
||||
|
||||
|
||||
@@ -815,6 +825,8 @@ bool CClientManager::InitializeItemTable()
|
||||
// InitializeQuestItemTable();
|
||||
// END_OF_QUEST_ITEM_PROTO_DISABLE
|
||||
|
||||
// Build pointers only after sorting; otherwise each key can point to another prototype.
|
||||
sort(m_vec_itemTable.begin(), m_vec_itemTable.end(), FCompareVnum());
|
||||
m_map_itemTableByVnum.clear();
|
||||
|
||||
itertype(m_vec_itemTable) it = m_vec_itemTable.begin();
|
||||
@@ -842,7 +854,6 @@ bool CClientManager::InitializeItemTable()
|
||||
|
||||
m_map_itemTableByVnum.insert(std::map<DWORD, TItemTable *>::value_type(item_table->dwVnum, item_table));
|
||||
}
|
||||
sort(m_vec_itemTable.begin(), m_vec_itemTable.end(), FCompareVnum());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -862,6 +873,7 @@ bool CClientManager::InitializeSkillTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes->uiNumRows)
|
||||
{
|
||||
@@ -875,7 +887,7 @@ bool CClientManager::InitializeSkillTable()
|
||||
m_vec_skillTable.clear();
|
||||
}
|
||||
|
||||
m_vec_skillTable.reserve(pRes->uiNumRows);
|
||||
m_vec_skillTable.reserve(static_cast<size_t>(pRes->uiNumRows));
|
||||
|
||||
MYSQL_ROW data;
|
||||
int col;
|
||||
@@ -944,6 +956,7 @@ bool CClientManager::InitializeBanwordTable()
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery("SELECT word FROM banword"));
|
||||
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (pRes->uiNumRows == 0)
|
||||
return true;
|
||||
@@ -974,6 +987,7 @@ bool CClientManager::InitializeItemAttrTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes->uiNumRows)
|
||||
{
|
||||
@@ -987,7 +1001,7 @@ bool CClientManager::InitializeItemAttrTable()
|
||||
m_vec_itemAttrTable.clear();
|
||||
}
|
||||
|
||||
m_vec_itemAttrTable.reserve(pRes->uiNumRows);
|
||||
m_vec_itemAttrTable.reserve(static_cast<size_t>(pRes->uiNumRows));
|
||||
|
||||
MYSQL_ROW data;
|
||||
|
||||
@@ -1048,6 +1062,7 @@ bool CClientManager::InitializeItemRareTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!pRes->uiNumRows)
|
||||
{
|
||||
@@ -1061,7 +1076,7 @@ bool CClientManager::InitializeItemRareTable()
|
||||
m_vec_itemRareTable.clear();
|
||||
}
|
||||
|
||||
m_vec_itemRareTable.reserve(pRes->uiNumRows);
|
||||
m_vec_itemRareTable.reserve(static_cast<size_t>(pRes->uiNumRows));
|
||||
|
||||
MYSQL_ROW data;
|
||||
|
||||
@@ -1126,6 +1141,7 @@ bool CClientManager::InitializeLandTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!m_vec_kLandTable.empty())
|
||||
{
|
||||
@@ -1133,7 +1149,7 @@ bool CClientManager::InitializeLandTable()
|
||||
m_vec_kLandTable.clear();
|
||||
}
|
||||
|
||||
m_vec_kLandTable.reserve(pRes->uiNumRows);
|
||||
m_vec_kLandTable.reserve(static_cast<size_t>(pRes->uiNumRows));
|
||||
|
||||
MYSQL_ROW data;
|
||||
|
||||
@@ -1229,6 +1245,7 @@ bool CClientManager::InitializeObjectProto()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!m_vec_kObjectProto.empty())
|
||||
{
|
||||
@@ -1236,7 +1253,7 @@ bool CClientManager::InitializeObjectProto()
|
||||
m_vec_kObjectProto.clear();
|
||||
}
|
||||
|
||||
m_vec_kObjectProto.reserve(MAX(0, pRes->uiNumRows));
|
||||
m_vec_kObjectProto.reserve(static_cast<size_t>(pRes->uiNumRows));
|
||||
|
||||
MYSQL_ROW data;
|
||||
|
||||
@@ -1298,6 +1315,7 @@ bool CClientManager::InitializeObjectTable()
|
||||
|
||||
std::unique_ptr<SQLMsg> pkMsg(CDBManager::instance().DirectQuery(query));
|
||||
SQLResult * pRes = pkMsg->Get();
|
||||
if (pkMsg->uiSQLErrno || !pRes || pRes->uiNumRows > UINT16_MAX) { sys_err("boot table query failed or exceeds 16-bit wire count"); return false; }
|
||||
|
||||
if (!m_map_pkObjectTable.empty())
|
||||
{
|
||||
|
||||
@@ -157,7 +157,11 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG
|
||||
|
||||
sys_log(0, "LOGIN_BY_KEY success %s %lu %s", r.login, p->dwLoginKey, info->ip);
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
#ifdef ENABLE_PLAYER_PER_ACCOUNT5
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, pid5, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), r.id);
|
||||
#else
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), r.id);
|
||||
#endif
|
||||
CDBManager::instance().ReturnQuery(szQuery, QID_LOGIN_BY_KEY, pkPeer->GetHandle(), info);
|
||||
}
|
||||
|
||||
@@ -179,7 +183,11 @@ void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg)
|
||||
{
|
||||
DWORD account_id = info->pAccountTable->id;
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
#ifdef ENABLE_PLAYER_PER_ACCOUNT5
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, pid5, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), account_id);
|
||||
#else
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), account_id);
|
||||
#endif
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER));
|
||||
|
||||
sys_log(0, "RESULT_LOGIN_BY_KEY FAIL player_index's NULL : ID:%d", account_id);
|
||||
@@ -211,13 +219,13 @@ void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg)
|
||||
if (g_stLocale == "gb2312")
|
||||
{
|
||||
snprintf(szQuery, sizeof(szQuery),
|
||||
"SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u",
|
||||
"SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name, conquerorlevel, sungma_str, sungma_hp, sungma_move, sungma_inmune FROM player%s WHERE account_id=%u",
|
||||
GetTablePostfix(), info->pAccountTable->id);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(szQuery, sizeof(szQuery),
|
||||
"SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u",
|
||||
"SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name, conquerorlevel, sungma_str, sungma_hp, sungma_move, sungma_inmune FROM player%s WHERE account_id=%u",
|
||||
GetTablePostfix(), info->pAccountTable->id);
|
||||
}
|
||||
|
||||
@@ -231,7 +239,11 @@ void CClientManager::RESULT_PLAYER_INDEX_CREATE(CPeer * pkPeer, SQLMsg * msg)
|
||||
ClientHandleInfo * info = (ClientHandleInfo *) qi->pvData;
|
||||
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
#ifdef ENABLE_PLAYER_PER_ACCOUNT5
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, pid5, empire FROM player_index%s WHERE id=%u", GetTablePostfix(),
|
||||
#else
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(),
|
||||
#endif
|
||||
info->pAccountTable->id);
|
||||
CDBManager::instance().ReturnQuery(szQuery, QID_LOGIN_BY_KEY, pkPeer->GetHandle(), info);
|
||||
}
|
||||
@@ -313,6 +325,11 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab)
|
||||
pkTab->players[j].y = pt->y;
|
||||
pkTab->players[j].skill_group = pt->skill_group;
|
||||
pkTab->players[j].bChangeName = 0;
|
||||
pkTab->players[j].byConquerorLevel = pt->conquerorlevel;
|
||||
pkTab->players[j].bySungmaST = pt->sungma_str;
|
||||
pkTab->players[j].bySungmaHP = pt->sungma_hp;
|
||||
pkTab->players[j].bySungmaMove = pt->sungma_move;
|
||||
pkTab->players[j].bySungmaInmune = pt->sungma_inmune;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -334,6 +351,11 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab)
|
||||
pkTab->players[j].y = 0;
|
||||
pkTab->players[j].skill_group = 0;
|
||||
pkTab->players[j].bChangeName = 0;
|
||||
pkTab->players[j].byConquerorLevel = 0;
|
||||
pkTab->players[j].bySungmaST = 0;
|
||||
pkTab->players[j].bySungmaHP = 0;
|
||||
pkTab->players[j].bySungmaMove = 0;
|
||||
pkTab->players[j].bySungmaInmune = 0;
|
||||
|
||||
str_to_number(pkTab->players[j].byJob, row[col++]);
|
||||
str_to_number(pkTab->players[j].byLevel, row[col++]);
|
||||
@@ -348,6 +370,11 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab)
|
||||
str_to_number(pkTab->players[j].y, row[col++]);
|
||||
str_to_number(pkTab->players[j].skill_group, row[col++]);
|
||||
str_to_number(pkTab->players[j].bChangeName, row[col++]);
|
||||
str_to_number(pkTab->players[j].byConquerorLevel, row[col++]);
|
||||
str_to_number(pkTab->players[j].bySungmaST, row[col++]);
|
||||
str_to_number(pkTab->players[j].bySungmaHP, row[col++]);
|
||||
str_to_number(pkTab->players[j].bySungmaMove, row[col++]);
|
||||
str_to_number(pkTab->players[j].bySungmaInmune, row[col++]);
|
||||
}
|
||||
|
||||
sys_log(0, "%s %lu %lu hair %u",
|
||||
@@ -399,13 +426,13 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg)
|
||||
if (g_stLocale == "gb2312")
|
||||
{
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u",
|
||||
"SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name, conquerorlevel, sungma_str, sungma_hp, sungma_move, sungma_inmune FROM player%s WHERE account_id=%u",
|
||||
GetTablePostfix(), info->pAccountTable->id);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u",
|
||||
"SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name, conquerorlevel, sungma_str, sungma_hp, sungma_move, sungma_inmune FROM player%s WHERE account_id=%u",
|
||||
GetTablePostfix(), info->pAccountTable->id);
|
||||
}
|
||||
|
||||
@@ -435,7 +462,7 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg)
|
||||
}
|
||||
else
|
||||
{
|
||||
sys_log(0, "RESULT_LOGIN: login success %s rows: %lu", info->pAccountTable->login, msg->Get()->uiNumRows);
|
||||
sys_log(0, "RESULT_LOGIN: login success %s rows: %llu", info->pAccountTable->login, static_cast<unsigned long long>(msg->Get()->uiNumRows));
|
||||
|
||||
if (msg->Get()->uiNumRows > 0)
|
||||
CreateAccountPlayerDataFromRes(msg->Get()->pSQLResult, info->pAccountTable);
|
||||
|
||||
@@ -0,0 +1,757 @@
|
||||
#include "stdafx.h"
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
#include "ClientManager.h"
|
||||
#include "../../common/offline_shop_safety.h"
|
||||
|
||||
void InsertImportLog(const char* logReason, TOfflineShop* p, DWORD targetPID, const char* targetName, const OFFLINE_SHOP_ITEM* item)
|
||||
{
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
snprintf(szQuery, sizeof(szQuery), "INSERT INTO offline_shop_log_important(reason, owner_id, owner, target_id, target, itemid, itemvnum, itemcount, price, date) VALUES('%s', %u, '%s', %u, '%s', %u, %u, %d, %lld, NOW())",
|
||||
logReason, p ? p->owner_id : 0, p ? p->owner_name : "Noname", targetPID, targetName, item? item->id : 0,item ? item->vnum : 0, item ? item->count : 0, item ? item->price : 0);
|
||||
std::unique_ptr<SQLMsg> pMsgPrice(CDBManager::instance().DirectQuery(szQuery));
|
||||
}
|
||||
|
||||
void CClientManager::OfflineShopAssert(TOfflineShop* p){}
|
||||
|
||||
bool CClientManager::InitializeOfflineShop()
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return true; // Do not run legacy expiry/delete cleanup on stored custody.
|
||||
MYSQL_ROW row;
|
||||
//for (size_t j = 1; j <= channelcount; j++)
|
||||
{
|
||||
MYSQL_ROW row_item;
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery("SELECT * FROM offline_shop_npc"));
|
||||
if (pMsg && pMsg->Get()->uiNumRows != 0)
|
||||
{
|
||||
while (NULL != (row = mysql_fetch_row(pMsg->Get()->pSQLResult)))
|
||||
{
|
||||
TOfflineShop* offlineshop = new TOfflineShop;
|
||||
|
||||
memset(offlineshop, 0, sizeof(TOfflineShop));
|
||||
memset(&offlineshop->items, 0, sizeof(OFFLINE_SHOP_ITEM)*OFFLINE_SHOP_HOST_ITEM_MAX_NUM);
|
||||
memset(&offlineshop->log, 0, sizeof(ShopLog)*OFFLINE_SHOP_HOST_ITEM_MAX_NUM);
|
||||
|
||||
str_to_number(offlineshop->owner_id, row[0]);
|
||||
strlcpy(offlineshop->owner_name, row[1], sizeof(offlineshop->owner_name));
|
||||
strlcpy(offlineshop->sign, row[2], sizeof(offlineshop->sign));
|
||||
str_to_number(offlineshop->x, row[3]);
|
||||
str_to_number(offlineshop->y, row[4]);
|
||||
str_to_number(offlineshop->z, row[5]);
|
||||
str_to_number(offlineshop->mapindex, row[6]);
|
||||
str_to_number(offlineshop->type, row[7]);
|
||||
str_to_number(offlineshop->channel, row[8]);
|
||||
str_to_number(offlineshop->slotflag, row[9]);
|
||||
str_to_number(offlineshop->time, row[10]);
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT shop_money FROM player WHERE id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsgPrice(CDBManager::instance().DirectQuery(szQuery));
|
||||
if (pMsgPrice->Get()->uiNumRows != 0)
|
||||
{
|
||||
MYSQL_ROW price = mysql_fetch_row(pMsgPrice->Get()->pSQLResult);
|
||||
str_to_number(offlineshop->price, price[0]);
|
||||
}
|
||||
else
|
||||
offlineshop->price = 0;
|
||||
|
||||
int iLen = snprintf(szQuery, sizeof(szQuery), "SELECT id,owner_id,pos,count,vnum");
|
||||
for (int j = 0; j < ITEM_SOCKET_MAX_NUM; j++)
|
||||
iLen+=snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ",socket%d",j);
|
||||
for (int j = 0; j < ITEM_ATTRIBUTE_MAX_NUM; j++)
|
||||
iLen+=snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ",attrtype%d,attrvalue%d",j,j);
|
||||
iLen+=snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ",price,status,ownername,buyername,HEX(port_extra)");
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
iLen+=snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ",transmutation");
|
||||
#endif
|
||||
iLen+=snprintf(szQuery+iLen, sizeof(szQuery)-iLen, " FROM offline_shop_item WHERE owner_id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
int cur = 0;
|
||||
BYTE pos = 0;
|
||||
if (pMsg2 && pMsg2->Get()->uiNumRows != 0)
|
||||
{
|
||||
while (NULL != (row_item = mysql_fetch_row(pMsg2->Get()->pSQLResult)))
|
||||
{
|
||||
cur = 0;
|
||||
str_to_number(pos, row_item[2]);
|
||||
if (pos >= OFFLINE_SHOP_HOST_ITEM_MAX_NUM)
|
||||
continue;
|
||||
OFFLINE_SHOP_ITEM& item = offlineshop->items[pos];
|
||||
str_to_number(item.id, row_item[cur++]);
|
||||
str_to_number(item.owner_id, row_item[cur++]);
|
||||
str_to_number(item.pos, row_item[cur++]);
|
||||
str_to_number(item.count, row_item[cur++]);
|
||||
str_to_number(item.vnum, row_item[cur++]);
|
||||
for (int j = 0; j < ITEM_SOCKET_MAX_NUM; j++)
|
||||
str_to_number(item.alSockets[j], row_item[cur++]);
|
||||
for (int j = 0; j < ITEM_ATTRIBUTE_MAX_NUM; j++)
|
||||
{
|
||||
str_to_number(item.aAttr[j].bType, row_item[cur++]);
|
||||
str_to_number(item.aAttr[j].sValue, row_item[cur++]);
|
||||
}
|
||||
str_to_number(item.price, row_item[cur++]);
|
||||
str_to_number(item.status, row_item[cur++]);
|
||||
strlcpy(item.szOwnerName, row_item[cur++], sizeof(item.szOwnerName));
|
||||
strlcpy(item.szBuyerName, row_item[cur++], sizeof(item.szBuyerName));
|
||||
if(!PortItemExtraRead(row_item[cur++],item.extra)){sys_err("OFFLINE_EXTRA_QUARANTINE id=%u",item.id);return false;}
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
str_to_number(item.transmutation, row_item[cur++]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool status = false;
|
||||
for (DWORD i = 0; i < OFFLINE_SHOP_HOST_ITEM_MAX_NUM; ++i)
|
||||
{
|
||||
if (offlineshop->items[i].vnum != 0 && offlineshop->items[i].status == 0)
|
||||
{
|
||||
status = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!status)
|
||||
{
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_npc WHERE owner_id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_item WHERE owner_id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg1(CDBManager::instance().DirectQuery(szQuery));
|
||||
delete offlineshop;
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
int i = 0;
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT target, time, itemvnum, itemcount, price FROM offline_shop_log WHERE owner_id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg5(CDBManager::instance().DirectQuery(szQuery));
|
||||
if (pMsg5 && pMsg5->Get()->uiNumRows != 0)
|
||||
{
|
||||
MYSQL_ROW log_row = NULL;
|
||||
while ((log_row = mysql_fetch_row(pMsg5->Get()->pSQLResult)))
|
||||
{
|
||||
strlcpy(offlineshop->log[i].name, log_row[0], sizeof(offlineshop->log[i].name));
|
||||
strlcpy(offlineshop->log[i].date, log_row[1], sizeof(offlineshop->log[i].date));
|
||||
str_to_number(offlineshop->log[i].itemVnum, log_row[2]);
|
||||
str_to_number(offlineshop->log[i].itemCount, log_row[3]);
|
||||
str_to_number(offlineshop->log[i].price, log_row[4]);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
sys_log(0, "shop insert: owner_id: %u, owner_name: %s, sign: %s,x: %ld,y: %ld,mapIndex: %u, channel: %d",
|
||||
offlineshop->owner_id, offlineshop->owner_name, offlineshop->sign, offlineshop->x, offlineshop->y, offlineshop->mapindex, offlineshop->channel);
|
||||
|
||||
m_Offlineshop.insert(std::make_pair(offlineshop->owner_id, offlineshop));
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void CClientManager::CreateOfflineShop(TOfflineShop* p)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
if (!p)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(p->owner_id);
|
||||
if (it != m_Offlineshop.end())
|
||||
{
|
||||
sys_err("wtf, this guy have offlineshop???????????? owner id %d name %s", p->owner_id, p->owner_name);
|
||||
OfflineShopAssert(p);// save player items...
|
||||
return;
|
||||
}
|
||||
|
||||
int iLen = 0, iUpdateLen = 0;
|
||||
char szQuery[QUERY_MAX_LEN], szColumns[QUERY_MAX_LEN], szValues[QUERY_MAX_LEN];
|
||||
TOfflineShop* offlineshop = new TOfflineShop;
|
||||
thecore_memcpy(offlineshop, p, sizeof(TOfflineShop));
|
||||
m_Offlineshop.insert(std::make_pair(offlineshop->owner_id, offlineshop));
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT shop_money FROM player WHERE id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsgPrice(CDBManager::instance().DirectQuery(szQuery));
|
||||
if (pMsgPrice->Get()->uiNumRows != 0)
|
||||
{
|
||||
MYSQL_ROW price = mysql_fetch_row(pMsgPrice->Get()->pSQLResult);
|
||||
str_to_number(offlineshop->price, price[0]);
|
||||
}
|
||||
else
|
||||
offlineshop->price = 0;
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "INSERT INTO offline_shop_npc(owner_id, owner_name, sign, x, y, z, mapindex, type, channel, slotflag, time) VALUES(%u, '%s', '%s', %ld, %ld, %ld, %u, %d, %d, %lld, %d)",
|
||||
offlineshop->owner_id, offlineshop->owner_name, offlineshop->sign, offlineshop->x, offlineshop->y, offlineshop->z, offlineshop->mapindex, offlineshop->type, offlineshop->channel, offlineshop->slotflag, offlineshop->time);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::Instance().DirectQuery(szQuery));
|
||||
for (DWORD i = 0; i < OFFLINE_SHOP_HOST_ITEM_MAX_NUM; ++i)
|
||||
{
|
||||
if (p->items[i].vnum == 0)
|
||||
continue;
|
||||
|
||||
iLen = snprintf(szColumns, sizeof(szColumns), "id,owner_id,pos,count,price,vnum");
|
||||
iUpdateLen = snprintf(szValues, sizeof(szValues), "%u,%u,%d,%d,%lld,%u", offlineshop->items[i].id, offlineshop->items[i].owner_id, offlineshop->items[i].pos, offlineshop->items[i].count, offlineshop->items[i].price, offlineshop->items[i].vnum);
|
||||
|
||||
for(BYTE j=0;j<ITEM_SOCKET_MAX_NUM;++j)
|
||||
{
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",socket%d",j);
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%ld", offlineshop->items[i].alSockets[j]);
|
||||
}
|
||||
|
||||
for(BYTE j=0;j<ITEM_ATTRIBUTE_MAX_NUM;++j)
|
||||
{
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ", attrtype%d, attrvalue%d",j,j);
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%d,%d",offlineshop->items[i].aAttr[j].bType, offlineshop->items[i].aAttr[j].sValue);
|
||||
}
|
||||
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",transmutation");
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%d", offlineshop->items[i].transmutation);
|
||||
#endif
|
||||
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",ownername,port_extra");
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",'%s',UNHEX('%s')", offlineshop->items[i].szOwnerName,PortItemExtraHex(offlineshop->items[i].extra).c_str());
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "INSERT INTO offline_shop_item (%s) VALUES (%s)", szColumns, szValues);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
}
|
||||
|
||||
memset(&offlineshop->log, 0, sizeof(ShopLog) * OFFLINE_SHOP_HOST_ITEM_MAX_NUM);
|
||||
int i = 0;
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT target, time, itemvnum, itemcount, price FROM offline_shop_log WHERE owner_id = %u", offlineshop->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg5(CDBManager::instance().DirectQuery(szQuery));
|
||||
if (pMsg5->Get()->uiNumRows != 0)
|
||||
{
|
||||
MYSQL_ROW log_row = NULL;
|
||||
while ((log_row = mysql_fetch_row(pMsg5->Get()->pSQLResult)))
|
||||
{
|
||||
strlcpy(offlineshop->log[i].name, log_row[0], sizeof(offlineshop->log[i].name));
|
||||
strlcpy(offlineshop->log[i].date, log_row[1], sizeof(offlineshop->log[i].date));
|
||||
str_to_number(offlineshop->log[i].itemVnum, log_row[2]);
|
||||
str_to_number(offlineshop->log[i].itemCount, log_row[3]);
|
||||
str_to_number(offlineshop->log[i].price, log_row[4]);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
sys_log(0, "shop insert: owner_id: %u, owner_name: %s, sign: %s,x: %ld,y: %ld,mapIndex: %u, channel: %d",
|
||||
offlineshop->owner_id, offlineshop->owner_name, offlineshop->sign, offlineshop->x, offlineshop->y, offlineshop->mapindex, offlineshop->channel);
|
||||
|
||||
// and open this comment for 12h
|
||||
/*
|
||||
int firstOffshopTime = time(0)+(60*60*12);
|
||||
if(offlineshop->time < firstOffshopTime)
|
||||
{
|
||||
offlineshop->time = firstOffshopTime;
|
||||
sys_err("shop insert: negative offshop time.... pid: %d name: %s ",offlineshop->owner_id, offlineshop->owner_name);
|
||||
}
|
||||
*/
|
||||
|
||||
shop_create n;
|
||||
n.subheader = CREATE_OFFLINESHOP;
|
||||
thecore_memcpy(&n.offlineshop, offlineshop, sizeof(n.offlineshop));
|
||||
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_create));//, 0, peer);
|
||||
}
|
||||
|
||||
void CClientManager::DeleteOfflineShop(DWORD ownerid)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
auto it = m_Offlineshop.find(ownerid);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_npc WHERE owner_id = %u", ownerid);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_item WHERE owner_id = %u and status = 1", ownerid);
|
||||
std::unique_ptr<SQLMsg> pMsg1(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
delete it->second;
|
||||
it->second = NULL;
|
||||
m_Offlineshop.erase(it);
|
||||
|
||||
sys_log(0, "DeleteOfflineShop %d ",ownerid);
|
||||
|
||||
shop_owner n;
|
||||
n.subheader = DESTROY_OFFLINESHOP;
|
||||
n.owner_id = ownerid;
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_owner));
|
||||
}
|
||||
|
||||
void CClientManager::RemoveItem(OFFLINE_SHOP_ITEM* item)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
if(!item || item->pos>=OFFLINE_SHOP_HOST_ITEM_MAX_NUM)return;
|
||||
if (!item)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(item->owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
{
|
||||
InsertImportLog("TRY_REMOVE_BUT_NOT_EXIST_SHOP", NULL, item->owner_id, item->szOwnerName, item);
|
||||
// todo player removes items...
|
||||
return;
|
||||
}
|
||||
if (it->second->items[item->pos].vnum == 0)
|
||||
{
|
||||
InsertImportLog("TRY_REMOVE_BUT_NOT_EXIST_ITEM", it->second, item->owner_id, item->szOwnerName, item);
|
||||
return;
|
||||
}
|
||||
|
||||
shop_item n;
|
||||
n.subheader = REMOVE_ITEM;
|
||||
//thecore_memcpy(&n.item, item, sizeof(n.item));
|
||||
thecore_memcpy(&n.item, &it->second->items[item->pos], sizeof(n.item));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_item));
|
||||
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_item WHERE id = %u", item->id);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
memset(&it->second->items[item->pos], 0, sizeof(OFFLINE_SHOP_ITEM));
|
||||
sys_log(0, "RemoveItem %d -> vnum %d count %d pos %d price %lld status %d buyername %s ", item->owner_id, item->vnum, item->count, item->pos, item->price, item->status, item->szBuyerName);
|
||||
InsertImportLog("REMOVE_SUCCESFULLY", it->second, item->owner_id, item->szOwnerName, item);
|
||||
}
|
||||
|
||||
|
||||
void CClientManager::AddItem(OFFLINE_SHOP_ITEM* item)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
if(!item || item->pos>=OFFLINE_SHOP_HOST_ITEM_MAX_NUM)return;
|
||||
if (!item)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(item->owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
{
|
||||
InsertImportLog("TRY_ADD_BUT_SHOP_NOT_EXIST", NULL, item->owner_id, item->szOwnerName, item);
|
||||
// todo player removes items...
|
||||
return;
|
||||
}
|
||||
InsertImportLog("ADD_SUCCESFULLY", it->second, item->owner_id, item->szOwnerName, item);
|
||||
thecore_memcpy(&it->second->items[item->pos], item, sizeof(OFFLINE_SHOP_ITEM));
|
||||
OFFLINE_SHOP_ITEM& newitem = it->second->items[item->pos];
|
||||
int iLen = 0, iUpdateLen = 0;
|
||||
char szQuery[QUERY_MAX_LEN], szColumns[QUERY_MAX_LEN], szValues[QUERY_MAX_LEN];
|
||||
|
||||
iLen = snprintf(szColumns, sizeof(szColumns), "id,owner_id,pos,count,price,vnum");
|
||||
iUpdateLen = snprintf(szValues, sizeof(szValues), "%u,%u,%d,%d,%lld,%u", newitem.id, newitem.owner_id, newitem.pos, newitem.count, newitem.price, newitem.vnum);
|
||||
|
||||
for(BYTE j=0;j<ITEM_SOCKET_MAX_NUM;++j)
|
||||
{
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",socket%d",j);
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%ld", newitem.alSockets[j]);
|
||||
}
|
||||
|
||||
for(BYTE j=0;j<ITEM_ATTRIBUTE_MAX_NUM;++j)
|
||||
{
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ", attrtype%d, attrvalue%d",j,j);
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%d,%d",newitem.aAttr[j].bType, newitem.aAttr[j].sValue);
|
||||
}
|
||||
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",transmutation");
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",%d", newitem.transmutation);
|
||||
#endif
|
||||
iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ",ownername,port_extra");
|
||||
iUpdateLen += snprintf(szValues + iUpdateLen, sizeof(szValues) - iUpdateLen, ",'%s',UNHEX('%s')", newitem.szOwnerName,PortItemExtraHex(newitem.extra).c_str());
|
||||
snprintf(szQuery, sizeof(szQuery), "INSERT INTO offline_shop_item (%s) VALUES (%s)", szColumns, szValues);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
sys_log(0, "AddItem %d -> vnum %d count %d pos %d price %lld ", newitem.owner_id, newitem.vnum, newitem.count, newitem.pos, newitem.price);
|
||||
|
||||
shop_item n;
|
||||
n.subheader = ADD_ITEM;
|
||||
thecore_memcpy(&n.item, item, sizeof(n.item));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_item));
|
||||
|
||||
}
|
||||
|
||||
void CClientManager::BuyItem(TOfflineShopBuy* buyItem)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
if(!buyItem || buyItem->item.pos>=OFFLINE_SHOP_HOST_ITEM_MAX_NUM)return;
|
||||
if (!buyItem)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(buyItem->item.owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
{
|
||||
InsertImportLog("TRY_BUY_BUT_NOT_EXIST_SHOP", NULL, buyItem->customer_id, buyItem->customer_name, NULL);
|
||||
// todo player removes price...
|
||||
return;
|
||||
}
|
||||
|
||||
OFFLINE_SHOP_ITEM& item = it->second->items[buyItem->item.pos];
|
||||
|
||||
if (item.vnum == 0 || item.status != 0)
|
||||
{
|
||||
InsertImportLog("TRY_BUY_BUT_ALREADY_SELLED", it->second, buyItem->customer_id, buyItem->customer_name, &item);
|
||||
return;
|
||||
}
|
||||
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE player SET shop_money = shop_money + %lld WHERE id = %u", buyItem->item.price, buyItem->item.owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg1(CDBManager::instance().DirectQuery(szQuery));
|
||||
it->second->price += buyItem->item.price;
|
||||
item.status = 1;
|
||||
strlcpy(item.szBuyerName, buyItem->customer_name, sizeof(item.szBuyerName));
|
||||
|
||||
memset(&buyItem->log, 0, sizeof(buyItem->log));
|
||||
buyItem->log_index = -1;
|
||||
InsertImportLog("BUY_SUCCESFULLY", it->second, buyItem->customer_id, buyItem->customer_name, &item);
|
||||
|
||||
for (DWORD i = 0; i < OFFLINE_SHOP_HOST_ITEM_MAX_NUM; i++)
|
||||
{
|
||||
ShopLog& log = it->second->log[i];
|
||||
if (log.price != 0)
|
||||
continue;
|
||||
|
||||
time_t now = time(0);
|
||||
struct tm tstruct;
|
||||
char buf[80];
|
||||
tstruct = *localtime(&now);
|
||||
strftime(buf, sizeof(buf), "%X-%d.%m.%Y", &tstruct);
|
||||
|
||||
strlcpy(log.date, buf, sizeof(log.date));
|
||||
log.itemCount = item.count;
|
||||
log.itemVnum = item.vnum;
|
||||
strlcpy(log.name, buyItem->customer_name, sizeof(log.name));
|
||||
log.price = item.price;
|
||||
|
||||
buyItem->log_index = i;
|
||||
thecore_memcpy(&buyItem->log,&log, sizeof(buyItem->log));
|
||||
|
||||
int iLen = snprintf(szQuery, sizeof(szQuery), "INSERT INTO offline_shop_log ("
|
||||
"owner_id, target, time, itemvnum, itemcount, price"
|
||||
",item_id, pos"
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
",transmutation"
|
||||
#endif
|
||||
);
|
||||
|
||||
for(BYTE j=0;j<ITEM_SOCKET_MAX_NUM;++j)
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ", socket%d",j);
|
||||
|
||||
for(BYTE j=0;j<ITEM_ATTRIBUTE_MAX_NUM;++j)
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ", attrtype%d, attrvalue%d",j,j);
|
||||
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ") VALUES("
|
||||
"%u, '%s', '%s', %d, %d, %lld"
|
||||
",%u, %d"
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
",%d"
|
||||
#endif
|
||||
,item.owner_id, buyItem->customer_name, buf, item.vnum, item.count, item.price,
|
||||
item.id, item.pos
|
||||
#ifdef ENABLE_CHANGELOOK_SYSTEM
|
||||
,item.transmutation
|
||||
#endif
|
||||
);
|
||||
for(BYTE j=0;j<ITEM_SOCKET_MAX_NUM;++j)
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ", %ld",item.alSockets[j]);
|
||||
for(BYTE j=0;j<ITEM_ATTRIBUTE_MAX_NUM;++j)
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ", %d, %d",item.aAttr[j].bType, item.aAttr[j].sValue);
|
||||
iLen += snprintf(szQuery+iLen, sizeof(szQuery)-iLen, ")");
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
break;
|
||||
}
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE offline_shop_item SET status = 1, buyername = '%s' WHERE id = %u and owner_id = %u", buyItem->customer_name,buyItem->item.id, buyItem->item.owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
thecore_memcpy(&buyItem->item, &item, sizeof(buyItem->item));
|
||||
sys_log(0, "BuyItem %d -> buyer name %s vnum %d count %d pos %d price %lld ", buyItem->item.owner_id, buyItem->customer_name, buyItem->item.vnum, buyItem->item.count, buyItem->item.pos, buyItem->item.price);
|
||||
|
||||
shop_buy n;
|
||||
n.subheader = BUY_ITEM;
|
||||
thecore_memcpy(&n.buyItem, buyItem, sizeof(n.buyItem));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_buy));
|
||||
}
|
||||
|
||||
void CClientManager::WithdrawMoney(DWORD ch)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
auto it = m_Offlineshop.find(ch);
|
||||
if (it == m_Offlineshop.end())
|
||||
// todo player removes price...
|
||||
return;
|
||||
if (it->second->price == 0)
|
||||
return;
|
||||
char szQuery[QUERY_MAX_LEN];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE player SET shop_money = 0 WHERE id = '%u'",ch);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
sys_log(0, "WithdrawMoney %d -> %lld ", ch, it->second->price);
|
||||
it->second->price = 0;
|
||||
|
||||
shop_owner n;
|
||||
n.subheader = WITHDRAW_MONEY;
|
||||
n.owner_id = ch;
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_owner));
|
||||
}
|
||||
|
||||
void CClientManager::ChangeTitle(TOfflineShopChangeTitle* p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(p->owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
// todo player removes price...
|
||||
return;
|
||||
strlcpy(it->second->sign, p->sign, sizeof(it->second->sign));
|
||||
char szQuery[1024 + 1];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE offline_shop_npc SET sign = '%s' WHERE owner_id = '%d'", p->sign, p->owner_id);
|
||||
std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
sys_log(0, "ChangeTitle %d -> %s ", p->owner_id, p->sign);
|
||||
|
||||
|
||||
shop_title n;
|
||||
n.subheader = CHANGE_TITLE;
|
||||
thecore_memcpy(&n.title, p, sizeof(n.title));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP,&n, sizeof(shop_title));
|
||||
}
|
||||
|
||||
void CClientManager::ClearLog(DWORD ch)
|
||||
{
|
||||
auto it = m_Offlineshop.find(ch);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
memset(&it->second->log, 0, sizeof(it->second->log));
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_log WHERE owner_id = %u", it->second->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
sys_log(0, "ClearLog %d ", ch);
|
||||
|
||||
shop_owner n;
|
||||
n.subheader = CLEAR_LOG;
|
||||
n.owner_id = ch;
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_owner));
|
||||
}
|
||||
|
||||
void CClientManager::ChangeDecoration(TShopDecoration* ch)
|
||||
{
|
||||
if (!ch)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(ch->owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
it->second->type = 30000 + ch->vnum;
|
||||
strlcpy(it->second->sign, ch->sign, sizeof(it->second->sign));
|
||||
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE offline_shop_npc SET type = %d, sign = '%s' WHERE owner_id = %u", it->second->type, it->second->sign,it->first);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
sys_log(0, "ChangeDecoration %d -> %d %s ", ch->owner_id, 30000 + ch->vnum, ch->sign);
|
||||
|
||||
shop_decoration n;
|
||||
n.subheader = CHANGE_DECORATION;
|
||||
thecore_memcpy(&n.decoration, ch, sizeof(n.decoration));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_decoration));
|
||||
}
|
||||
|
||||
void CClientManager::OpenSlot(TOfflineShopOpenSlot* ch)
|
||||
{
|
||||
if (!ch)
|
||||
return;
|
||||
auto it = m_Offlineshop.find(ch->owner_id);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
it->second->slotflag = ch->flag;
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE offline_shop_npc SET slotflag = %lld WHERE owner_id = %u", ch->flag,ch->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
sys_log(0, "OpenSlot %d -> %lld ", ch->owner_id, ch->flag);
|
||||
|
||||
shop_slot n;
|
||||
n.subheader = CHANGE_OPEN_SLOT;
|
||||
thecore_memcpy(&n.ch, ch, sizeof(n.ch));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_slot));
|
||||
|
||||
}
|
||||
|
||||
void CClientManager::TimeDone(DWORD ch)
|
||||
{
|
||||
auto it = m_Offlineshop.find(ch);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
sys_log(0, "TimeDone %d ", ch);
|
||||
|
||||
bool status = true;
|
||||
for (DWORD i = 0; i < OFFLINE_SHOP_HOST_ITEM_MAX_NUM; ++i)
|
||||
{
|
||||
if (it->second->items[i].vnum != 0 && it->second->items[i].status == 0) {
|
||||
status = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (status)
|
||||
{
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_npc WHERE owner_id = %u", ch);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_item WHERE owner_id = %u", ch);
|
||||
std::unique_ptr<SQLMsg> pMsg1(CDBManager::instance().DirectQuery(szQuery));
|
||||
delete it->second;
|
||||
it->second = NULL;
|
||||
m_Offlineshop.erase(it);
|
||||
|
||||
sys_log(0, "TimeDone: %d shop closed. 0 item.", ch);
|
||||
}
|
||||
else
|
||||
sys_log(0, "TimeDone: %d ", ch);
|
||||
|
||||
shop_owner n;
|
||||
n.subheader = TIME_DONE;
|
||||
n.owner_id = ch;
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_owner));
|
||||
}
|
||||
|
||||
void CClientManager::GetBackItem(DWORD ch)
|
||||
{
|
||||
auto it = m_Offlineshop.find(ch);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_npc WHERE owner_id = %u", ch);
|
||||
std::unique_ptr<SQLMsg> pMsg2(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "DELETE FROM offline_shop_item WHERE owner_id = %u", ch);
|
||||
std::unique_ptr<SQLMsg> pMsg1(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
shop_back n;
|
||||
n.subheader = GET_BACK_ITEM;
|
||||
n.back.owner_id = ch;
|
||||
thecore_memcpy(&n.back.items, &it->second->items, sizeof(n.back.items));
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_back));
|
||||
|
||||
delete it->second;
|
||||
it->second = NULL;
|
||||
m_Offlineshop.erase(it);
|
||||
sys_log(0, "GetBackItem %d ", ch);
|
||||
}
|
||||
|
||||
void CClientManager::AddTime(DWORD ch)
|
||||
{
|
||||
auto it = m_Offlineshop.find(ch);
|
||||
if (it == m_Offlineshop.end())
|
||||
return;
|
||||
int oldtime = it->second->time-time(0);
|
||||
int addtime = (60 * 60 * 12);
|
||||
//int newTime = MIN((60*60*24*3) - oldtime, addtime);
|
||||
it->second->time = time(0) + (oldtime+ addtime);
|
||||
sys_log(0, "AddTime %d ", ch);
|
||||
|
||||
char szQuery[1024];
|
||||
snprintf(szQuery, sizeof(szQuery), "UPDATE offline_shop_npc SET time = %d WHERE owner_id = %u", it->second->time, it->second->owner_id);
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
shop_owner n;
|
||||
n.subheader = ADD_TIME;
|
||||
n.owner_id = ch;
|
||||
ForwardPacket(HEADER_DG_OFFLINESHOP, &n, sizeof(shop_owner));
|
||||
}
|
||||
|
||||
void CClientManager::RecvPackets(const char* data)
|
||||
{
|
||||
if(!PortOfflineShopEconomyReady())return;
|
||||
BYTE sub_header = (BYTE)*data;
|
||||
switch (sub_header)
|
||||
{
|
||||
case CREATE_OFFLINESHOP:
|
||||
{
|
||||
shop_create* p = (shop_create*)data;
|
||||
if (p)
|
||||
CreateOfflineShop(&p->offlineshop);
|
||||
}
|
||||
break;
|
||||
case DESTROY_OFFLINESHOP:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
DeleteOfflineShop(p->owner_id);
|
||||
}
|
||||
break;
|
||||
case ADD_ITEM:
|
||||
{
|
||||
shop_item* p = (shop_item*)data;
|
||||
if (p)
|
||||
AddItem(&p->item);
|
||||
}
|
||||
break;
|
||||
case REMOVE_ITEM:
|
||||
{
|
||||
shop_item* p = (shop_item*)data;
|
||||
if (p)
|
||||
RemoveItem(&p->item);
|
||||
}
|
||||
break;
|
||||
case BUY_ITEM:
|
||||
{
|
||||
shop_buy* p = (shop_buy*)data;
|
||||
if (p)
|
||||
BuyItem(&p->buyItem);
|
||||
}
|
||||
break;
|
||||
case CHANGE_TITLE:
|
||||
{
|
||||
shop_title* p = (shop_title*)data;
|
||||
if (p)
|
||||
ChangeTitle(&p->title);
|
||||
}
|
||||
break;
|
||||
|
||||
case WITHDRAW_MONEY:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
WithdrawMoney(p->owner_id);
|
||||
}
|
||||
break;
|
||||
|
||||
case CLEAR_LOG:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
ClearLog(p->owner_id);
|
||||
}
|
||||
break;
|
||||
|
||||
case CHANGE_DECORATION:
|
||||
{
|
||||
shop_decoration* p = (shop_decoration*)data;
|
||||
if (p)
|
||||
ChangeDecoration(&p->decoration);
|
||||
}
|
||||
break;
|
||||
|
||||
case CHANGE_OPEN_SLOT:
|
||||
{
|
||||
shop_slot* p = (shop_slot*)data;
|
||||
if (p)
|
||||
OpenSlot(&p->ch);
|
||||
}
|
||||
break;
|
||||
|
||||
case TIME_DONE:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
TimeDone(p->owner_id);
|
||||
}
|
||||
break;
|
||||
|
||||
case GET_BACK_ITEM:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
GetBackItem(p->owner_id);
|
||||
}
|
||||
break;
|
||||
|
||||
case ADD_TIME:
|
||||
{
|
||||
shop_owner* p = (shop_owner*)data;
|
||||
if (p)
|
||||
AddTime(p->owner_id);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
sys_err("unkown offlineshop subheader %d", sub_header);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -22,6 +22,22 @@ extern int g_log;
|
||||
//
|
||||
// Check all SELECT syntax on item table before change this function!!!
|
||||
//
|
||||
bool CClientManager::ValidateLoadedExtra(const TPlayerItem& item,const char* hex) const {
|
||||
auto found=m_map_itemTableByVnum.find(item.vnum);
|
||||
if(found==m_map_itemTableByVnum.end())return false;
|
||||
const auto* proto=found->second;
|
||||
if(proto->bType!=ITEM_PET || proto->bSubType!=PET_LEVELABLE)return true;
|
||||
if(!hex || strlen(hex)!=138 || item.alSockets[1]<1 || item.alSockets[1]>120 || item.alSockets[2]<0 ||
|
||||
item.extra.sockets[0]<0 || item.extra.sockets[0]>3 || item.extra.sockets[1]<0 || item.extra.sockets[1]>15)return false;
|
||||
for(unsigned i=2;i<5;++i)if(item.extra.sockets[i]<0 || item.extra.sockets[i]>20)return false;
|
||||
for(unsigned i=0;i<15;++i){
|
||||
const unsigned type=i<7?item.aAttr[i].bType:item.extra.types[i-7];
|
||||
const int value=i<7?item.aAttr[i].sValue:item.extra.values[i-7];
|
||||
if((type>29 && type!=99) || value<0 || value>20 || ((type==0||type==99)&&value!=0))return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CreateItemTableFromRes(MYSQL_RES * res, std::vector<TPlayerItem> * pVec, DWORD dwPID)
|
||||
{
|
||||
if (!res)
|
||||
@@ -32,7 +48,7 @@ bool CreateItemTableFromRes(MYSQL_RES * res, std::vector<TPlayerItem> * pVec, DW
|
||||
|
||||
int rows;
|
||||
|
||||
if ((rows = mysql_num_rows(res)) <= 0) // 데이터 없음
|
||||
if ((rows = mysql_num_rows(res)) <= 0) // 데이터 없음
|
||||
{
|
||||
pVec->clear();
|
||||
return true;
|
||||
@@ -65,6 +81,12 @@ bool CreateItemTableFromRes(MYSQL_RES * res, std::vector<TPlayerItem> * pVec, DW
|
||||
str_to_number(item.aAttr[j].sValue, row[cur++]);
|
||||
}
|
||||
|
||||
if (!PortItemExtraRead(mysql_num_fields(res)>unsigned(cur)?row[cur]:NULL,item.extra) ||
|
||||
!CClientManager::instance().ValidateLoadedExtra(item,mysql_num_fields(res)>unsigned(cur)?row[cur]:NULL)) {
|
||||
// Original bytes stay in SQL. Do not create caches or return partial inventory.
|
||||
sys_err("ITEM_EXTRA_QUARANTINE owner=%u item=%u window=%u: invalid port_extra", dwPID,item.id,item.window);
|
||||
pVec->clear();return false;
|
||||
}
|
||||
item.owner = dwPID;
|
||||
}
|
||||
|
||||
@@ -99,7 +121,7 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
|
||||
"ht = %d, "
|
||||
"dx = %d, "
|
||||
"iq = %d, "
|
||||
"gold = %d, "
|
||||
"gold = %lld, "
|
||||
"exp = %u, "
|
||||
"stat_point = %d, "
|
||||
"skill_point = %d, "
|
||||
@@ -111,12 +133,26 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
|
||||
"last_play = NOW(), "
|
||||
"skill_group = %d, "
|
||||
"alignment = %ld, "
|
||||
"conquerorlevel = %d, "
|
||||
"conqueror_level_step = %d, "
|
||||
"sungma_str = %d, "
|
||||
"sungma_hp = %d, "
|
||||
"sungma_move = %d, "
|
||||
"sungma_inmune = %d, "
|
||||
"conqueror_exp = %u, "
|
||||
"conqueror_point = %d, "
|
||||
"horse_level = %d, "
|
||||
"horse_riding = %d, "
|
||||
"horse_hp = %d, "
|
||||
"horse_hp_droptime = %u, "
|
||||
"horse_stamina = %d, "
|
||||
"horse_skill_point = %d, "
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
"inventory_0 = %u, inventory_1 = %u, inventory_2 = %u, inventory_3 = %u, inventory_4 = %u, inventory_5 = %u, "
|
||||
#endif
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
"shopFlag = %llu, "
|
||||
#endif
|
||||
,
|
||||
GetTablePostfix(),
|
||||
pkTab->job,
|
||||
@@ -141,7 +177,7 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
|
||||
pkTab->ht,
|
||||
pkTab->dx,
|
||||
pkTab->iq,
|
||||
pkTab->gold,
|
||||
(long long) pkTab->gold,
|
||||
pkTab->exp,
|
||||
pkTab->stat_point,
|
||||
pkTab->skill_point,
|
||||
@@ -152,14 +188,34 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
|
||||
pkTab->parts[PART_HAIR],
|
||||
pkTab->skill_group,
|
||||
pkTab->lAlignment,
|
||||
pkTab->conquerorlevel,
|
||||
pkTab->conqueror_level_step,
|
||||
pkTab->sungma_str,
|
||||
pkTab->sungma_hp,
|
||||
pkTab->sungma_move,
|
||||
pkTab->sungma_inmune,
|
||||
pkTab->conqueror_exp,
|
||||
pkTab->conqueror_point,
|
||||
pkTab->horse.bLevel,
|
||||
pkTab->horse.bRiding,
|
||||
pkTab->horse.sHealth,
|
||||
pkTab->horse.dwHorseHealthDropTime,
|
||||
pkTab->horse.sStamina,
|
||||
pkTab->horse_skill_point);
|
||||
pkTab->horse_skill_point
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
, pkTab->inventory_unlock[0]
|
||||
, pkTab->inventory_unlock[1]
|
||||
, pkTab->inventory_unlock[2]
|
||||
, pkTab->inventory_unlock[3]
|
||||
, pkTab->inventory_unlock[4]
|
||||
, pkTab->inventory_unlock[5]
|
||||
#endif
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
, pkTab->shopFlag
|
||||
#endif
|
||||
);
|
||||
|
||||
// Binary 로 바꾸기 위한 임시 공간
|
||||
// Binary 로 바꾸기 위한 임시 공간
|
||||
static char text[8192 + 1];
|
||||
|
||||
CDBManager::instance().EscapeString(text, pkTab->skills, sizeof(pkTab->skills));
|
||||
@@ -207,11 +263,12 @@ void CClientManager::PutPlayerCache(TPlayerTable * pNew)
|
||||
*/
|
||||
void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoadPacket * packet)
|
||||
{
|
||||
if(!EconomyBeforeLoad(peer,dwHandle,packet)){if(!m_economyFences.count(packet->player_id))peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED,dwHandle,0);return;}
|
||||
CPlayerTableCache * c;
|
||||
TPlayerTable * pTab;
|
||||
|
||||
//
|
||||
// 한 계정에 속한 모든 캐릭터들 캐쉬처리
|
||||
// 한 계정에 속한 모든 캐릭터들 캐쉬처리
|
||||
//
|
||||
CLoginData * pLoginData = GetLoginDataByAID(packet->account_id);
|
||||
|
||||
@@ -223,12 +280,12 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// 1. 유저정보가 DBCache 에 존재 : DBCache에서
|
||||
// 2. 유저정보가 DBCache 에 없음 : DB에서
|
||||
// 1. 유저정보가 DBCache 에 존재 : DBCache에서
|
||||
// 2. 유저정보가 DBCache 에 없음 : DB에서
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
//----------------------------------
|
||||
// 1. 유저정보가 DBCache 에 존재 : DBCache에서
|
||||
// 1. 유저정보가 DBCache 에 존재 : DBCache에서
|
||||
//----------------------------------
|
||||
if ((c = GetPlayerCache(packet->player_id)))
|
||||
{
|
||||
@@ -265,16 +322,16 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
|
||||
TItemCacheSet * pSet = GetItemCacheSet(pTab->id);
|
||||
|
||||
sys_log(0, "[PLAYER_LOAD] ID %s pid %d gold %d ", pTab->name, pTab->id, pTab->gold);
|
||||
sys_log(0, "[PLAYER_LOAD] ID %s pid %d gold %lld ", pTab->name, pTab->id, (long long) pTab->gold);
|
||||
|
||||
//--------------------------------------------
|
||||
// 아이템 & AFFECT & QUEST 로딩 :
|
||||
// 아이템 & AFFECT & QUEST 로딩 :
|
||||
//--------------------------------------------
|
||||
// 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴
|
||||
// 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴
|
||||
// 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴
|
||||
// 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴
|
||||
|
||||
/////////////////////////////////////////////
|
||||
// 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴
|
||||
// 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴
|
||||
/////////////////////////////////////////////
|
||||
if (pSet)
|
||||
{
|
||||
@@ -289,7 +346,7 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
CItemCache * c = *it++;
|
||||
TPlayerItem * p = c->Get();
|
||||
|
||||
if (p->vnum) // vnum이 없으면 삭제된 아이템이다.
|
||||
if (p->vnum) // vnum이 없으면 삭제된 아이템이다.
|
||||
thecore_memcpy(&s_items[dwCount++], p, sizeof(TPlayerItem));
|
||||
}
|
||||
|
||||
@@ -316,14 +373,22 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
CDBManager::instance().ReturnQuery(szQuery, QID_AFFECT, peer->GetHandle(), new ClientHandleInfo(dwHandle));
|
||||
}
|
||||
/////////////////////////////////////////////
|
||||
// 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴
|
||||
// 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴
|
||||
/////////////////////////////////////////////
|
||||
else
|
||||
{
|
||||
snprintf(szQuery, sizeof(szQuery),
|
||||
"SELECT id,window+0,pos,count,vnum,socket0,socket1,socket2,attrtype0,attrvalue0,attrtype1,attrvalue1,attrtype2,attrvalue2,attrtype3,attrvalue3,attrtype4,attrvalue4,attrtype5,attrvalue5,attrtype6,attrvalue6 "
|
||||
"FROM item%s WHERE owner_id=%d AND (window < %d or window = %d)",
|
||||
GetTablePostfix(), pTab->id, SAFEBOX, DRAGON_SOUL_INVENTORY);
|
||||
"SELECT id,window+0,pos,count,vnum,socket0,socket1,socket2,attrtype0,attrvalue0,attrtype1,attrvalue1,attrtype2,attrvalue2,attrtype3,attrvalue3,attrtype4,attrvalue4,attrtype5,attrvalue5,attrtype6,attrvalue6,HEX(port_extra) "
|
||||
"FROM item%s WHERE owner_id=%d AND (window < %d or window = %d or window = %d"
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
" or (window >= %d and window <= %d)"
|
||||
#endif
|
||||
")",
|
||||
GetTablePostfix(), pTab->id, SAFEBOX, DRAGON_SOUL_INVENTORY, SWITCHBOT
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
, UPGRADE_INVENTORY, COSTUME_INVENTORY
|
||||
#endif
|
||||
);
|
||||
|
||||
CDBManager::instance().ReturnQuery(szQuery,
|
||||
QID_ITEM,
|
||||
@@ -350,7 +415,7 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
//return;
|
||||
}
|
||||
//----------------------------------
|
||||
// 2. 유저정보가 DBCache 에 없음 : DB에서
|
||||
// 2. 유저정보가 DBCache 에 없음 : DB에서
|
||||
//----------------------------------
|
||||
else
|
||||
{
|
||||
@@ -359,15 +424,22 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
char queryStr[QUERY_MAX_LEN];
|
||||
|
||||
//--------------------------------------------------------------
|
||||
// 캐릭터 정보 얻어오기 : 무조건 DB에서
|
||||
// 캐릭터 정보 얻어오기 : 무조건 DB에서
|
||||
//--------------------------------------------------------------
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT "
|
||||
"id,name,job,voice,dir,x,y,z,map_index,exit_x,exit_y,exit_map_index,hp,mp,stamina,random_hp,random_sp,playtime,"
|
||||
"gold,level,level_step,st,ht,dx,iq,exp,"
|
||||
"stat_point,skill_point,sub_skill_point,stat_reset_count,part_base,part_hair,"
|
||||
"skill_level,quickslot,skill_group,alignment,mobile,horse_level,horse_riding,horse_hp,horse_hp_droptime,horse_stamina,"
|
||||
"UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(last_play),horse_skill_point FROM player%s WHERE id=%d",
|
||||
"skill_level,quickslot,skill_group,alignment,conquerorlevel,conqueror_level_step,sungma_str,sungma_hp,sungma_move,sungma_inmune,conqueror_exp,conqueror_point,mobile,horse_level,horse_riding,horse_hp,horse_hp_droptime,horse_stamina,"
|
||||
"UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(last_play),horse_skill_point"
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
",inventory_0,inventory_1,inventory_2,inventory_3,inventory_4,inventory_5"
|
||||
#endif
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
",shopFlag"
|
||||
#endif
|
||||
" FROM player%s WHERE id=%d",
|
||||
GetTablePostfix(), packet->player_id);
|
||||
|
||||
ClientHandleInfo * pkInfo = new ClientHandleInfo(dwHandle, packet->player_id);
|
||||
@@ -375,24 +447,32 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
|
||||
CDBManager::instance().ReturnQuery(queryStr, QID_PLAYER, peer->GetHandle(), pkInfo);
|
||||
|
||||
//--------------------------------------------------------------
|
||||
// 아이템 가져오기
|
||||
// 아이템 가져오기
|
||||
//--------------------------------------------------------------
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT id,window+0,pos,count,vnum,socket0,socket1,socket2,attrtype0,attrvalue0,attrtype1,attrvalue1,attrtype2,attrvalue2,attrtype3,attrvalue3,attrtype4,attrvalue4,attrtype5,attrvalue5,attrtype6,attrvalue6 "
|
||||
"FROM item%s WHERE owner_id=%d AND (window < %d or window = %d)",
|
||||
GetTablePostfix(), packet->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY);
|
||||
"SELECT id,window+0,pos,count,vnum,socket0,socket1,socket2,attrtype0,attrvalue0,attrtype1,attrvalue1,attrtype2,attrvalue2,attrtype3,attrvalue3,attrtype4,attrvalue4,attrtype5,attrvalue5,attrtype6,attrvalue6,HEX(port_extra) "
|
||||
"FROM item%s WHERE owner_id=%d AND (window < %d or window = %d or window = %d"
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
" or (window >= %d and window <= %d)"
|
||||
#endif
|
||||
")",
|
||||
GetTablePostfix(), packet->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY, SWITCHBOT
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
, UPGRADE_INVENTORY, COSTUME_INVENTORY
|
||||
#endif
|
||||
);
|
||||
CDBManager::instance().ReturnQuery(queryStr, QID_ITEM, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id));
|
||||
|
||||
//--------------------------------------------------------------
|
||||
// QUEST 가져오기
|
||||
// QUEST 가져오기
|
||||
//--------------------------------------------------------------
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT dwPID,szName,szState,lValue FROM quest%s WHERE dwPID=%d",
|
||||
GetTablePostfix(), packet->player_id);
|
||||
CDBManager::instance().ReturnQuery(queryStr, QID_QUEST, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id,packet->account_id));
|
||||
//독일 선물 기능에서 item_award테이블에서 login 정보를 얻기위해 account id도 넘겨준다
|
||||
//독일 선물 기능에서 item_award테이블에서 login 정보를 얻기위해 account id도 넘겨준다
|
||||
//--------------------------------------------------------------
|
||||
// AFFECT 가져오기
|
||||
// AFFECT 가져오기
|
||||
//--------------------------------------------------------------
|
||||
snprintf(queryStr, sizeof(queryStr),
|
||||
"SELECT dwPID,bType,bApplyOn,lApplyValue,dwFlag,lDuration,lSPCost FROM affect%s WHERE dwPID=%d",
|
||||
@@ -409,21 +489,21 @@ void CClientManager::ItemAward(CPeer * peer,char* login)
|
||||
std::set<TItemAward *> * pSet = ItemAwardManager::instance().GetByLogin(login_t);
|
||||
if(pSet == NULL)
|
||||
return;
|
||||
__typeof(pSet->begin()) it = pSet->begin(); //taken_time이 NULL인것들 읽어옴
|
||||
__typeof(pSet->begin()) it = pSet->begin(); //taken_time이 NULL인것들 읽어옴
|
||||
while(it != pSet->end() )
|
||||
{
|
||||
TItemAward * pItemAward = *(it++);
|
||||
char* whyStr = pItemAward->szWhy; //why 콜룸 읽기
|
||||
char cmdStr[100] = ""; //why콜룸에서 읽은 값을 임시 문자열에 복사해둠
|
||||
strcpy(cmdStr,whyStr); //명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문
|
||||
char* whyStr = pItemAward->szWhy; //why 콜룸 읽기
|
||||
char cmdStr[100] = ""; //why콜룸에서 읽은 값을 임시 문자열에 복사해둠
|
||||
strcpy(cmdStr,whyStr); //명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문
|
||||
char command[20] = "";
|
||||
strcpy(command,GetCommand(cmdStr)); // command 얻기
|
||||
if( !(strcmp(command,"GIFT") )) // command 가 GIFT이면
|
||||
strcpy(command,GetCommand(cmdStr)); // command 얻기
|
||||
if( !(strcmp(command,"GIFT") )) // command 가 GIFT이면
|
||||
{
|
||||
TPacketItemAwardInfromer giftData;
|
||||
strcpy(giftData.login, pItemAward->szLogin); //로그인 아이디 복사
|
||||
strcpy(giftData.command, command); //명령어 복사
|
||||
giftData.vnum = pItemAward->dwVnum; //아이템 vnum도 복사
|
||||
strcpy(giftData.login, pItemAward->szLogin); //로그인 아이디 복사
|
||||
strcpy(giftData.command, command); //명령어 복사
|
||||
giftData.vnum = pItemAward->dwVnum; //아이템 vnum도 복사
|
||||
ForwardPacket(HEADER_DG_ITEMAWARD_INFORMER,&giftData,sizeof(TPacketItemAwardInfromer));
|
||||
}
|
||||
}
|
||||
@@ -444,7 +524,7 @@ char* CClientManager::GetCommand(char* str)
|
||||
|
||||
bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab)
|
||||
{
|
||||
if (mysql_num_rows(res) == 0) // 데이터 없음
|
||||
if (mysql_num_rows(res) == 0) // 데이터 없음
|
||||
return false;
|
||||
|
||||
memset(pkTab, 0, sizeof(TPlayerTable));
|
||||
@@ -506,6 +586,14 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab)
|
||||
|
||||
str_to_number(pkTab->skill_group, row[col++]);
|
||||
str_to_number(pkTab->lAlignment, row[col++]);
|
||||
str_to_number(pkTab->conquerorlevel, row[col++]);
|
||||
str_to_number(pkTab->conqueror_level_step, row[col++]);
|
||||
str_to_number(pkTab->sungma_str, row[col++]);
|
||||
str_to_number(pkTab->sungma_hp, row[col++]);
|
||||
str_to_number(pkTab->sungma_move, row[col++]);
|
||||
str_to_number(pkTab->sungma_inmune, row[col++]);
|
||||
str_to_number(pkTab->conqueror_exp, row[col++]);
|
||||
str_to_number(pkTab->conqueror_point, row[col++]);
|
||||
|
||||
if (row[col])
|
||||
{
|
||||
@@ -521,6 +609,13 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab)
|
||||
str_to_number(pkTab->horse.sStamina, row[col++]);
|
||||
str_to_number(pkTab->logoff_interval, row[col++]);
|
||||
str_to_number(pkTab->horse_skill_point, row[col++]);
|
||||
#ifdef UNLOCK_INVENTORY_WORLDARD
|
||||
for (int i = 0; i < UNLOCK_INVENTORY_MAX; ++i)
|
||||
str_to_number(pkTab->inventory_unlock[i], row[col++]);
|
||||
#endif
|
||||
#ifdef ENABLE_OFFLINESHOP_SYSTEM
|
||||
str_to_number(pkTab->shopFlag, row[col++]);
|
||||
#endif
|
||||
|
||||
// reset sub_skill_point
|
||||
{
|
||||
@@ -531,11 +626,11 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab)
|
||||
int max_point = pkTab->level - 9;
|
||||
|
||||
int skill_point =
|
||||
MIN(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP 통솔력
|
||||
MIN(20, pkTab->skills[124].bLevel) + // SKILL_MINING 채광
|
||||
MIN(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON 말소환
|
||||
MIN(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP보강
|
||||
MIN(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE 관통저항
|
||||
MIN(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP 통솔력
|
||||
MIN(20, pkTab->skills[124].bLevel) + // SKILL_MINING 채광
|
||||
MIN(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON 말소환
|
||||
MIN(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP보강
|
||||
MIN(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE 관통저항
|
||||
|
||||
pkTab->sub_skill_point = max_point - skill_point;
|
||||
}
|
||||
@@ -575,13 +670,13 @@ void CClientManager::RESULT_COMPOSITE_PLAYER(CPeer * peer, SQLMsg * pMsg, DWORD
|
||||
{
|
||||
sys_log(0, "QID_QUEST %u", info->dwHandle);
|
||||
RESULT_QUEST_LOAD(peer, pSQLResult, info->dwHandle, info->player_id);
|
||||
//aid얻기
|
||||
//aid얻기
|
||||
ClientHandleInfo* temp1 = info.get();
|
||||
if (temp1 == NULL)
|
||||
break;
|
||||
|
||||
CLoginData* pLoginData1 = GetLoginDataByAID(temp1->account_id); //
|
||||
//독일 선물 기능
|
||||
//독일 선물 기능
|
||||
if( pLoginData1->GetAccountRef().login == NULL)
|
||||
break;
|
||||
if( pLoginData1 == NULL )
|
||||
@@ -672,14 +767,17 @@ void CClientManager::RESULT_PLAYER_LOAD(CPeer * peer, MYSQL_RES * pRes, ClientHa
|
||||
void CClientManager::RESULT_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID)
|
||||
{
|
||||
static std::vector<TPlayerItem> s_items;
|
||||
//DB에서 아이템 정보를 읽어온다.
|
||||
CreateItemTableFromRes(pRes, &s_items, dwPID);
|
||||
//DB에서 아이템 정보를 읽어온다.
|
||||
if (!CreateItemTableFromRes(pRes, &s_items, dwPID)) {
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, dwHandle, 0);
|
||||
return;
|
||||
}
|
||||
DWORD dwCount = s_items.size();
|
||||
|
||||
peer->EncodeHeader(HEADER_DG_ITEM_LOAD, dwHandle, sizeof(DWORD) + sizeof(TPlayerItem) * dwCount);
|
||||
peer->EncodeDWORD(dwCount);
|
||||
|
||||
//CacheSet을 만든다
|
||||
//CacheSet을 만든다
|
||||
CreateItemCacheSet(dwPID);
|
||||
|
||||
// ITEM_LOAD_LOG_ATTACH_PID
|
||||
@@ -691,7 +789,7 @@ void CClientManager::RESULT_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHa
|
||||
peer->Encode(&s_items[0], sizeof(TPlayerItem) * dwCount);
|
||||
|
||||
for (DWORD i = 0; i < dwCount; ++i)
|
||||
PutItemCache(&s_items[i], true); // 로드한 것은 따로 저장할 필요 없으므로, 인자 bSkipQuery에 true를 넣는다.
|
||||
PutItemCache(&s_items[i], true); // 로드한 것은 따로 저장할 필요 없으므로, 인자 bSkipQuery에 true를 넣는다.
|
||||
}
|
||||
}
|
||||
|
||||
@@ -699,7 +797,7 @@ void CClientManager::RESULT_AFFECT_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dw
|
||||
{
|
||||
int iNumRows;
|
||||
|
||||
if ((iNumRows = mysql_num_rows(pRes)) == 0) // 데이터 없음
|
||||
if ((iNumRows = mysql_num_rows(pRes)) == 0) // 데이터 없음
|
||||
return;
|
||||
|
||||
static std::vector<TPacketAffectElement> s_elements;
|
||||
@@ -778,6 +876,7 @@ void CClientManager::RESULT_QUEST_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwH
|
||||
*/
|
||||
void CClientManager::QUERY_PLAYER_SAVE(CPeer * peer, DWORD dwHandle, TPlayerTable * pkTab)
|
||||
{
|
||||
if(!EconomySaveAllowed(peer,pkTab->id))return;
|
||||
if (g_test_server)
|
||||
sys_log(0, "PLAYER_SAVE: %s", pkTab->name);
|
||||
|
||||
@@ -794,9 +893,9 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC
|
||||
{
|
||||
char queryStr[QUERY_MAX_LEN];
|
||||
int queryLen;
|
||||
int player_id;
|
||||
DWORD player_id = 0;
|
||||
|
||||
// 한 계정에 X초 내로 캐릭터 생성을 할 수 없다.
|
||||
// 한 계정에 X초 내로 캐릭터 생성을 할 수 없다.
|
||||
time_by_id_map_t::iterator it = s_createTimeByAccountID.find(packet->account_id);
|
||||
|
||||
if (it != s_createTimeByAccountID.end())
|
||||
@@ -880,17 +979,17 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC
|
||||
"skill_level, quickslot) "
|
||||
"VALUES(0, %u, '%s', %d, %d, %d, %d, %d, "
|
||||
"%d, %d, %d, %d, %d, %d, %d, "
|
||||
"%d, %d, %d, %d, %d, %d, %d, 0, %d, 0, ",
|
||||
"%d, %d, %d, %d, %d, %d, %d, 0, %lld, 0, ",
|
||||
GetTablePostfix(),
|
||||
packet->account_id, packet->player_table.name, packet->player_table.level, packet->player_table.st, packet->player_table.ht, packet->player_table.dx, packet->player_table.iq,
|
||||
packet->player_table.job, packet->player_table.voice, packet->player_table.dir, packet->player_table.x, packet->player_table.y, packet->player_table.z,
|
||||
packet->player_table.hp, packet->player_table.sp, packet->player_table.sRandomHP, packet->player_table.sRandomSP, packet->player_table.stat_point, packet->player_table.stamina, packet->player_table.part_base, packet->player_table.part_base, packet->player_table.gold);
|
||||
packet->player_table.hp, packet->player_table.sp, packet->player_table.sRandomHP, packet->player_table.sRandomSP, packet->player_table.stat_point, packet->player_table.stamina, packet->player_table.part_base, packet->player_table.part_base, (long long) packet->player_table.gold);
|
||||
|
||||
sys_log(0, "PlayerCreate accountid %d name %s level %d gold %d, st %d ht %d job %d",
|
||||
sys_log(0, "PlayerCreate accountid %d name %s level %d gold %lld, st %d ht %d job %d",
|
||||
packet->account_id,
|
||||
packet->player_table.name,
|
||||
packet->player_table.level,
|
||||
packet->player_table.gold,
|
||||
(long long) packet->player_table.gold,
|
||||
packet->player_table.st,
|
||||
packet->player_table.ht,
|
||||
packet->player_table.job);
|
||||
@@ -909,24 +1008,23 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC
|
||||
if (g_test_server)
|
||||
sys_log(0, "Create_Player queryLen[%d] TEXT[%s]", queryLen, text);
|
||||
|
||||
if (pMsg2->Get()->uiAffectedRows <= 0)
|
||||
if (!pMsg2->Get()->HasAffectedRows() || !pMsg2->Get()->GetInsertID32(player_id))
|
||||
{
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_ALREADY, dwHandle, 0);
|
||||
sys_log(0, "ALREADY EXIST3 query: %s AffectedRows %lu", queryStr, pMsg2->Get()->uiAffectedRows);
|
||||
sys_log(0, "ALREADY EXIST3 query: %s AffectedRows %llu", queryStr, static_cast<unsigned long long>(pMsg2->Get()->uiAffectedRows));
|
||||
return;
|
||||
}
|
||||
|
||||
player_id = pMsg2->Get()->uiInsertID;
|
||||
|
||||
snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%d=%d WHERE id=%d",
|
||||
snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%d=%u WHERE id=%u",
|
||||
GetTablePostfix(), packet->account_index + 1, player_id, packet->account_id);
|
||||
std::unique_ptr<SQLMsg> pMsg3(CDBManager::instance().DirectQuery(queryStr));
|
||||
|
||||
if (pMsg3->Get()->uiAffectedRows <= 0)
|
||||
if (!pMsg3->Get()->HasAffectedRows())
|
||||
{
|
||||
sys_err("QUERY_ERROR: %s", queryStr);
|
||||
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM player%s WHERE id=%d", GetTablePostfix(), player_id);
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM player%s WHERE id=%u", GetTablePostfix(), player_id);
|
||||
CDBManager::instance().DirectQuery(queryStr);
|
||||
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_FAILED, dwHandle, 0);
|
||||
@@ -1027,7 +1125,7 @@ void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerD
|
||||
}
|
||||
|
||||
//
|
||||
// @version 05/06/10 Bang2ni - 플레이어 삭제시 가격정보 리스트 삭제 추가.
|
||||
// @version 05/06/10 Bang2ni - 플레이어 삭제시 가격정보 리스트 삭제 추가.
|
||||
//
|
||||
void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
{
|
||||
@@ -1063,13 +1161,18 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
return;
|
||||
}
|
||||
|
||||
if(!EconomyCanDelete(dwPID)) {
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_DELETE_FAILED,pi->dwHandle,1);
|
||||
peer->EncodeBYTE(pi->account_index);
|
||||
delete pi;return;
|
||||
}
|
||||
char queryStr[QUERY_MAX_LEN];
|
||||
|
||||
snprintf(queryStr, sizeof(queryStr), "INSERT INTO player%s_deleted SELECT * FROM player%s WHERE id=%d",
|
||||
GetTablePostfix(), GetTablePostfix(), pi->player_id);
|
||||
std::unique_ptr<SQLMsg> pIns(CDBManager::instance().DirectQuery(queryStr));
|
||||
|
||||
if (pIns->Get()->uiAffectedRows == 0 || pIns->Get()->uiAffectedRows == (uint32_t)-1)
|
||||
if (pIns->Get()->uiAffectedRows == 0 || pIns->Get()->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_log(0, "PLAYER_DELETE FAILED %u CANNOT INSERT TO player%s_deleted", dwPID, GetTablePostfix());
|
||||
|
||||
@@ -1078,14 +1181,14 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
return;
|
||||
}
|
||||
|
||||
// 삭제 성공
|
||||
// 삭제 성공
|
||||
sys_log(0, "PLAYER_DELETE SUCCESS %u", dwPID);
|
||||
|
||||
char account_index_string[16];
|
||||
|
||||
snprintf(account_index_string, sizeof(account_index_string), "player_id%d", m_iPlayerIDStart + pi->account_index);
|
||||
|
||||
// 플레이어 테이블을 캐쉬에서 삭제한다.
|
||||
// 플레이어 테이블을 캐쉬에서 삭제한다.
|
||||
CPlayerTableCache * pkPlayerCache = GetPlayerCache(pi->player_id);
|
||||
|
||||
if (pkPlayerCache)
|
||||
@@ -1094,7 +1197,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
delete pkPlayerCache;
|
||||
}
|
||||
|
||||
// 아이템들을 캐쉬에서 삭제한다.
|
||||
// 아이템들을 캐쉬에서 삭제한다.
|
||||
TItemCacheSet * pSet = GetItemCacheSet(pi->player_id);
|
||||
|
||||
if (pSet)
|
||||
@@ -1121,7 +1224,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
|
||||
std::unique_ptr<SQLMsg> pMsg(CDBManager::instance().DirectQuery(queryStr));
|
||||
|
||||
if (pMsg->Get()->uiAffectedRows == 0 || pMsg->Get()->uiAffectedRows == (uint32_t)-1)
|
||||
if (pMsg->Get()->uiAffectedRows == 0 || pMsg->Get()->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_log(0, "PLAYER_DELETE FAIL WHEN UPDATE account table");
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_DELETE_FAILED, pi->dwHandle, 1);
|
||||
@@ -1132,7 +1235,15 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM player%s WHERE id=%d", GetTablePostfix(), pi->player_id);
|
||||
delete CDBManager::instance().DirectQuery(queryStr);
|
||||
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM item%s WHERE owner_id=%d AND (window < %d or window = %d)", GetTablePostfix(), pi->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY);
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM item%s WHERE owner_id=%d AND (window < %d or window = %d or window = %d"
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
" or (window >= %d and window <= %d)"
|
||||
#endif
|
||||
")", GetTablePostfix(), pi->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY, SWITCHBOT
|
||||
#ifdef ENABLE_SPECIAL_STORAGE
|
||||
, UPGRADE_INVENTORY, COSTUME_INVENTORY
|
||||
#endif
|
||||
);
|
||||
delete CDBManager::instance().DirectQuery(queryStr);
|
||||
|
||||
snprintf(queryStr, sizeof(queryStr), "DELETE FROM quest%s WHERE dwPID=%d", GetTablePostfix(), pi->player_id);
|
||||
@@ -1157,7 +1268,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg)
|
||||
}
|
||||
else
|
||||
{
|
||||
// 삭제 실패
|
||||
// 삭제 실패
|
||||
sys_log(0, "PLAYER_DELETE FAIL NO ROW");
|
||||
peer->EncodeHeader(HEADER_DG_PLAYER_DELETE_FAILED, pi->dwHandle, 1);
|
||||
peer->EncodeBYTE(pi->account_index);
|
||||
@@ -1242,7 +1353,7 @@ void CClientManager::RESULT_HIGHSCORE_REGISTER(CPeer * pkPeer, SQLMsg * msg)
|
||||
|
||||
if (res->uiNumRows == 0)
|
||||
{
|
||||
// 새로운 하이스코어를 삽입
|
||||
// 새로운 하이스코어를 삽입
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "INSERT INTO highscore%s VALUES('%s', %u, %d)", GetTablePostfix(), szBoard, pi->player_id, value);
|
||||
CDBManager::instance().AsyncQuery(buf);
|
||||
@@ -1277,7 +1388,7 @@ void CClientManager::RESULT_HIGHSCORE_REGISTER(CPeer * pkPeer, SQLMsg * msg)
|
||||
CDBManager::instance().AsyncQuery(buf);
|
||||
}
|
||||
}
|
||||
// TODO: 이곳에서 하이스코어가 업데이트 되었는지 체크하여 공지를 뿌려야한다.
|
||||
// TODO: 이곳에서 하이스코어가 업데이트 되었는지 체크하여 공지를 뿌려야한다.
|
||||
delete pi;
|
||||
}
|
||||
|
||||
@@ -1285,10 +1396,10 @@ void CClientManager::InsertLogoutPlayer(DWORD pid)
|
||||
{
|
||||
TLogoutPlayerMap::iterator it = m_map_logout.find(pid);
|
||||
|
||||
// 존재하지 않을경우 추가
|
||||
// 존재하지 않을경우 추가
|
||||
if (it != m_map_logout.end())
|
||||
{
|
||||
// 존재할경우 시간만 갱신
|
||||
// 존재할경우 시간만 갱신
|
||||
if (g_log)
|
||||
sys_log(0, "LOGOUT: Update player time pid(%d)", pid);
|
||||
|
||||
|
||||
@@ -26,72 +26,48 @@ void CConfig::NextLine(FILE *fp)
|
||||
}
|
||||
}
|
||||
|
||||
bool CConfig::GetWord(FILE *fp, char *tar)
|
||||
bool CConfig::GetWord(FILE *fp, char *dest, size_t size)
|
||||
{
|
||||
int i = 0;
|
||||
int c;
|
||||
|
||||
int semicolon_mode = 0;
|
||||
|
||||
while ((c = fgetc(fp)) != EOF)
|
||||
{
|
||||
if (c == 13)
|
||||
continue;
|
||||
|
||||
if (semicolon_mode)
|
||||
{
|
||||
if (c == '"')
|
||||
{
|
||||
tar[i] = '\0';
|
||||
return true;
|
||||
}
|
||||
|
||||
tar[i++] = c;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (i == 0)
|
||||
{
|
||||
if (c == '"')
|
||||
{
|
||||
semicolon_mode = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c == ' ' || c == '\t' || c == '\n')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if ((c == ' ' || c == '\t' || c == '\n'))
|
||||
{
|
||||
// ÅÜ.
|
||||
tar[i] = '\0';
|
||||
return true;
|
||||
}
|
||||
|
||||
tar[i] = c;
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
return (i != 0);
|
||||
if (!fp || !dest || !size) { m_readError = true; return false; }
|
||||
size_t used = 0;
|
||||
bool quoted = false, started = false;
|
||||
dest[0] = 0;
|
||||
int c;
|
||||
while ((c = fgetc(fp)) != EOF)
|
||||
{
|
||||
if (c == 0) { m_readError = true; return false; }
|
||||
if (c == '\r') continue;
|
||||
if (!started)
|
||||
{
|
||||
if (c == ' ' || c == '\t' || c == '\n') continue;
|
||||
started = true;
|
||||
if (c == '"') { quoted = true; continue; }
|
||||
}
|
||||
if ((quoted && c == '"') || (!quoted && (c == ' ' || c == '\t' || c == '\n')))
|
||||
return true;
|
||||
if (used + 1 >= size) { m_readError = true; return false; }
|
||||
dest[used++] = static_cast<char>(c); // fgetc returned a byte, not EOF.
|
||||
dest[used] = 0;
|
||||
}
|
||||
if (ferror(fp) || quoted) m_readError = true;
|
||||
return started && !m_readError;
|
||||
}
|
||||
|
||||
bool CConfig::GetLine(FILE* fp, char*dest)
|
||||
bool CConfig::GetLine(FILE *fp, char *dest, size_t size)
|
||||
{
|
||||
int c;
|
||||
int i = 0;
|
||||
while ((c = fgetc(fp)) != EOF)
|
||||
{
|
||||
if (c == '\n')
|
||||
return true;
|
||||
dest[i] = c;
|
||||
++i;
|
||||
}
|
||||
return true;
|
||||
if (!fp || !dest || !size) { m_readError = true; return false; }
|
||||
size_t used = 0;
|
||||
dest[0] = 0;
|
||||
int c;
|
||||
while ((c = fgetc(fp)) != EOF)
|
||||
{
|
||||
if (c == '\n') return true;
|
||||
if (c == 0 || used + 1 >= size) { m_readError = true; return false; }
|
||||
dest[used++] = static_cast<char>(c);
|
||||
dest[used] = 0;
|
||||
}
|
||||
if (ferror(fp)) m_readError = true;
|
||||
return !m_readError;
|
||||
}
|
||||
|
||||
bool CConfig::LoadFile(const char* filename)
|
||||
@@ -105,8 +81,10 @@ bool CConfig::LoadFile(const char* filename)
|
||||
return false;
|
||||
|
||||
int mode = 0;
|
||||
m_readError = false;
|
||||
TValueMap staged = m_valueMap;
|
||||
|
||||
while (GetWord(fp, szTmp))
|
||||
while (GetWord(fp, szTmp, sizeof(szTmp)))
|
||||
{
|
||||
if (strcmp(szTmp, "//") == 0)
|
||||
{
|
||||
@@ -128,15 +106,15 @@ bool CConfig::LoadFile(const char* filename)
|
||||
|
||||
case 2:
|
||||
mode = 0;
|
||||
m_valueMap.insert(TValueMap::value_type(comment, szTmp));
|
||||
staged.insert(TValueMap::value_type(comment, szTmp));
|
||||
break;
|
||||
}
|
||||
|
||||
// ITEM_ID_RANGE
|
||||
if (mode == 2 && strcmp(comment, "ITEM_ID_RANGE") == 0)
|
||||
{
|
||||
GetLine(fp, szTmp);
|
||||
m_valueMap.insert(TValueMap::value_type(comment, szTmp));
|
||||
if (!GetLine(fp, szTmp, sizeof(szTmp))) break;
|
||||
staged.insert(TValueMap::value_type(comment, szTmp));
|
||||
mode = 0;
|
||||
|
||||
}
|
||||
@@ -145,8 +123,10 @@ bool CConfig::LoadFile(const char* filename)
|
||||
|
||||
|
||||
// ÆÄÀÏ ´Ý´Â ºÎºÐ.
|
||||
const bool valid = !m_readError && !ferror(fp) && mode == 0;
|
||||
fclose(fp);
|
||||
return true;
|
||||
if (valid) m_valueMap.swap(staged);
|
||||
return valid;
|
||||
}
|
||||
|
||||
std::string * CConfig::Search(const char* key)
|
||||
@@ -165,11 +145,14 @@ bool CConfig::GetParam(const char*key, int index, DWORD *Param)
|
||||
if (!pstStr)
|
||||
return false;
|
||||
|
||||
char szParam[5][32];
|
||||
if (!Param || index < 0 || index >= 5) return false;
|
||||
char szParam[5][32] = {};
|
||||
|
||||
sscanf(pstStr->c_str(), "%s %s %s %s %s", szParam[0],szParam[1],szParam[2],szParam[3],szParam[4]);
|
||||
if (sscanf(pstStr->c_str(), "%31s %31s %31s %31s %31s", szParam[0],szParam[1],szParam[2],szParam[3],szParam[4]) <= index) return false;
|
||||
|
||||
str_to_number(*Param, szParam[index]);
|
||||
unsigned long long value = 0;
|
||||
if (!str_to_number(value, szParam[index]) || value > UINT32_MAX) return false;
|
||||
*Param = static_cast<DWORD>(value);
|
||||
|
||||
sys_log(0, "GetParam %d", *Param);
|
||||
return true;
|
||||
@@ -239,12 +222,15 @@ bool CConfig::GetValue(const char * key, char *dest, size_t destSize)
|
||||
|
||||
bool CConfig::GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2)
|
||||
{
|
||||
if (!GetParam(key, 0, dest1))
|
||||
DWORD first=0, second=0;
|
||||
if (!dest1 || !dest2) return false;
|
||||
if (!GetParam(key, 0, &first))
|
||||
return false;
|
||||
|
||||
if (!GetParam(key, 1, dest2))
|
||||
if (!GetParam(key, 1, &second))
|
||||
return false;
|
||||
|
||||
*dest1=first; *dest2=second;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ class CConfig : public singleton<CConfig>
|
||||
bool GetValue(const char* key, DWORD* dest);
|
||||
bool GetValue(const char* key, BYTE* dest);
|
||||
bool GetValue(const char* key, char* dest, size_t destSize);
|
||||
bool GetWord(FILE* fp, char* dest);
|
||||
bool GetLine(FILE* fp, char* dest);
|
||||
bool GetWord(FILE* fp, char* dest, size_t size);
|
||||
bool GetLine(FILE* fp, char* dest, size_t size);
|
||||
bool GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2);
|
||||
void NextLine(FILE* fp);
|
||||
|
||||
@@ -29,6 +29,7 @@ class CConfig : public singleton<CConfig>
|
||||
|
||||
private:
|
||||
TValueMap m_valueMap;
|
||||
bool m_readError = false;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
#include "stdafx.h"
|
||||
#include "ClientManager.h"
|
||||
#include "Cache.h"
|
||||
#include "Main.h"
|
||||
#include <memory>
|
||||
|
||||
namespace {
|
||||
using CubeQuery=std::unique_ptr<SQLMsg>;
|
||||
CubeQuery cubeQuery(const std::string& sql){return CubeQuery(CDBManager::instance().DirectQuery(sql.c_str()));}
|
||||
bool cubeValid(const CubeQuery& q){return q&&!q->uiSQLErrno&&q->Get();}
|
||||
// No table installation at runtime. Cache only a completely absent schema;
|
||||
// migrations require coordinated restart. Partial/failed discovery fails closed.
|
||||
int cubeSchema() {
|
||||
static int state=-1;if(state>=0)return state;
|
||||
auto q=cubeQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('port_cube_version','port_cube_fences','port_cube_item_fences')");
|
||||
if(!cubeValid(q)||q->Get()->uiNumRows!=1)return -1;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);if(!row||!row[0])return -1;
|
||||
const std::string count=row[0];
|
||||
if(count=="0")return state=0;
|
||||
if(count=="3") {
|
||||
auto version=cubeQuery("SELECT version FROM port_cube_version WHERE id=1");
|
||||
if(!cubeValid(version)||version->Get()->uiNumRows!=1)return -1;
|
||||
MYSQL_ROW value=mysql_fetch_row(version->Get()->pSQLResult);
|
||||
if(value&&value[0]&&std::string(value[0])=="2")return state=1;
|
||||
}
|
||||
return -1; // includes the older two-table v1 candidate: do not ignore fences
|
||||
}
|
||||
bool cubeClear(const std::string& predicate) {
|
||||
const int installed=cubeSchema();if(installed==0)return true;if(installed<0)return false;
|
||||
auto q=cubeQuery("SELECT pid FROM port_cube_fences WHERE phase<>'RELEASED' AND ("+predicate+") LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
// Modern terminal release is not a completed resume. Keep the SQL quarantine
|
||||
// across DB restart, when m_cubeDrains no longer carries its memory hold.
|
||||
// No resume activation receipt exists yet; do not infer one from RELEASED.
|
||||
int cubeTerminalSchema() {
|
||||
static int installed=-1;if(installed>=0)return installed;
|
||||
const std::string names="('port_cube_release_version','port_cube_releases')";
|
||||
auto scalar=[](const std::string& sql,const std::string& expected)->bool{auto q=cubeQuery(sql);if(!cubeValid(q)||q->Get()->uiNumRows!=1)return false;MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);return row&&row[0]&&std::string(row[0])==expected;};
|
||||
auto q=cubeQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names);
|
||||
if(!cubeValid(q)||q->Get()->uiNumRows!=1)return -1;MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);if(!row||!row[0])return -1;
|
||||
const std::string count=row[0];if(count=="0")return installed=0;
|
||||
if(count!="2"||!scalar("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names,"2")||!scalar("SELECT version FROM port_cube_release_version WHERE id=1","1"))return -1;
|
||||
return installed=1;
|
||||
}
|
||||
bool cubeTerminalClear(const std::string& predicate) {
|
||||
const int schema=cubeTerminalSchema();if(schema==0)return true;if(schema<0)return false;
|
||||
auto q=cubeQuery("SELECT pid FROM port_cube_fences WHERE phase='RELEASED' AND request IN (SELECT request FROM port_cube_releases) AND ("+predicate+") LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
bool cubeGoldClear(const std::string& predicate) {
|
||||
// Coordinated restart on installation/removal, as with the base Cube gate.
|
||||
static int installed=-1;
|
||||
if(installed<0) {
|
||||
auto q=cubeQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('port_cube_gold_version','port_cube_gold_intents','port_cube_gold_sources')");
|
||||
if(!cubeValid(q)||q->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);if(!row||!row[0])return false;
|
||||
if(std::string(row[0])=="0")installed=0;
|
||||
else if(std::string(row[0])=="3") {
|
||||
auto engine=cubeQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN ('port_cube_gold_version','port_cube_gold_intents','port_cube_gold_sources')");
|
||||
if(!cubeValid(engine)||engine->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW e=mysql_fetch_row(engine->Get()->pSQLResult);if(!e||!e[0]||std::string(e[0])!="3")return false;
|
||||
auto version=cubeQuery("SELECT version FROM port_cube_gold_version WHERE id=1");
|
||||
if(!cubeValid(version)||version->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW v=mysql_fetch_row(version->Get()->pSQLResult);if(!v||!v[0]||std::string(v[0])!="2")return false;
|
||||
installed=1;
|
||||
} else return false;
|
||||
}
|
||||
if(!installed)return true;
|
||||
auto q=cubeQuery("SELECT pid FROM port_cube_gold_intents WHERE state='QUEUED' AND ("+predicate+") LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
bool cubeOwnerClear(const std::string& predicate) {
|
||||
static int installed=-1;
|
||||
const std::string names="('port_cube_owner_version','port_cube_owner_broker','port_cube_owner_leases')";
|
||||
auto scalar=[](const std::string& sql,const std::string& expected)->bool {
|
||||
auto q=cubeQuery(sql);if(!cubeValid(q)||q->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);return row&&row[0]&&std::string(row[0])==expected;
|
||||
};
|
||||
if(installed<0) {
|
||||
auto q=cubeQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN "+names);
|
||||
if(!cubeValid(q)||q->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);if(!row||!row[0])return false;
|
||||
if(std::string(row[0])=="0")installed=0;
|
||||
else if(std::string(row[0])=="3"&&scalar("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND ENGINE='InnoDB' AND TABLE_NAME IN "+names,"3")&&
|
||||
scalar("SELECT version FROM port_cube_owner_version WHERE id=1","1"))installed=1;
|
||||
else return false;
|
||||
}
|
||||
if(!installed)return true;
|
||||
// Includes REVOKED and ADOPTED. Neither is a normal-load/thaw receipt.
|
||||
auto q=cubeQuery("SELECT pid FROM port_cube_owner_leases WHERE "+predicate+" LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
}
|
||||
|
||||
bool CClientManager::CubePeerMayWriteItem(CPeer* peer,DWORD id) {
|
||||
if(*GetTablePostfix())return true;
|
||||
if(!id)return false;
|
||||
bool protectedActor=false;
|
||||
auto allowed=[&](DWORD pid)->bool {
|
||||
for(const auto& entry:m_cubeDrains)if(!entry.second.cancelled&&entry.second.batch.player==pid)
|
||||
return CubePeerMaySave(peer,pid);
|
||||
return true;
|
||||
};
|
||||
for(const auto& entry:m_cubeDrains) {
|
||||
const auto& c=entry.second;if(c.cancelled)continue;protectedActor=true;
|
||||
// Includes consumed inputs and not-yet-created reserved rewards. Never
|
||||
// trust a packet's claimed owner or lack of a current SQL item row.
|
||||
for(const auto& item:c.batch.inventory)if(item.value.id==id&&!allowed(c.batch.player))return false;
|
||||
for(const auto& reward:c.batch.rewards)if(reward.id==id&&!allowed(c.batch.player))return false;
|
||||
}
|
||||
if(!protectedActor)return true; // no extra SQL or cache access on baseline
|
||||
if(auto* cache=GetItemCache(id)) {
|
||||
const auto* item=cache->Get(false);
|
||||
if(!item||item->id!=id)return false;
|
||||
if(item->window!=SAFEBOX&&item->window!=MALL&&!allowed(item->owner))return false;
|
||||
}
|
||||
// Check BOTH cached and persisted ownership. A stale cache or a forged
|
||||
// SAFEBOX/MALL destination cannot conceal a protected ordinary SQL owner.
|
||||
auto owner=cubeQuery("SELECT owner_id FROM item WHERE id="+std::to_string(id)+" AND window NOT IN ('MALL','SAFEBOX')");
|
||||
if(!cubeValid(owner)||owner->Get()->uiNumRows>1)return false;
|
||||
if(owner->Get()->uiNumRows){MYSQL_ROW row=mysql_fetch_row(owner->Get()->pSQLResult);uint64_t pid=0;if(!row||!row[0]||!PortEconomy::Number(row[0],pid,UINT32_MAX)||!pid||!allowed(DWORD(pid)))return false;}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CClientManager::CubePlayerWritable(DWORD pid) {
|
||||
if(*GetTablePostfix())return true;
|
||||
if(!cubeTerminalClear("pid="+std::to_string(pid)))return false;
|
||||
if(!pid||!cubeOwnerClear("pid="+std::to_string(pid)))return false;
|
||||
if(!pid||!cubeGoldClear("pid="+std::to_string(pid)))return false;
|
||||
if(!pid||!cubeClear("pid="+std::to_string(pid)))return false;
|
||||
if(cubeSchema()==0)return true;
|
||||
auto q=cubeQuery("SELECT pid FROM port_cube_item_fences WHERE pid="+std::to_string(pid)+" LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
bool CClientManager::CubeAccountLoadable(DWORD account,DWORD pid) {
|
||||
if(*GetTablePostfix())return true;
|
||||
if(!cubeTerminalClear("account="+std::to_string(account)+" OR pid="+std::to_string(pid)))return false;
|
||||
if(!account||!pid||!cubeOwnerClear("account="+std::to_string(account)+" OR pid="+std::to_string(pid)))return false;
|
||||
if(!account||!pid||!cubeGoldClear("account="+std::to_string(account)+" OR pid="+std::to_string(pid)))return false;
|
||||
// Also stop selecting another character on an account with a held owner.
|
||||
if(!account||!pid||!cubeClear("account="+std::to_string(account)+" OR pid="+std::to_string(pid)))return false;
|
||||
if(cubeSchema()==0)return true;
|
||||
auto q=cubeQuery("SELECT f.pid FROM port_cube_item_fences f LEFT JOIN player p ON p.id=f.pid WHERE f.pid="+std::to_string(pid)+" OR p.account_id="+std::to_string(account)+" LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
bool CClientManager::CubeItemWritable(DWORD id) {
|
||||
if(*GetTablePostfix())return true;
|
||||
const int installed=cubeSchema();if(installed==0)return true;if(installed<0||!id)return false;
|
||||
const int terminal=cubeTerminalSchema();if(terminal<0)return false;
|
||||
if(terminal) {
|
||||
auto reservation=cubeQuery("SELECT f.pid FROM port_cube_fences f JOIN port_cube_releases r ON r.request=f.request JOIN port_economy_item_reservations i ON i.request=f.request WHERE f.phase='RELEASED' AND i.id="+std::to_string(id)+" LIMIT 1");
|
||||
if(!cubeValid(reservation)||reservation->Get()->uiNumRows)return false;
|
||||
auto owner=cubeQuery("SELECT owner_id FROM item WHERE id="+std::to_string(id)+" AND window NOT IN ('MALL','SAFEBOX')");
|
||||
if(!cubeValid(owner)||owner->Get()->uiNumRows>1)return false;
|
||||
if(owner->Get()->uiNumRows){MYSQL_ROW row=mysql_fetch_row(owner->Get()->pSQLResult);uint64_t pid=0;if(!row||!row[0]||!PortEconomy::Number(row[0],pid,UINT32_MAX)||!pid||!cubeTerminalClear("pid="+std::to_string(pid)))return false;}
|
||||
}
|
||||
// SQL RELEASED is not the save/resume handoff. ID-only legacy destroy and
|
||||
// flush packets cannot bypass a still-held playing context after SQL locks
|
||||
// retire. Batch IDs include consumed inputs and unissued reserved rewards.
|
||||
bool held=false;
|
||||
for(const auto& entry:m_cubeDrains) {
|
||||
const auto& c=entry.second;if(!c.began||c.cancelled)continue;held=true;
|
||||
for(const auto& item:c.batch.inventory)if(item.value.id==id)return false;
|
||||
for(const auto& reward:c.batch.rewards)if(reward.id==id)return false;
|
||||
}
|
||||
if(held) {
|
||||
auto owner=cubeQuery("SELECT owner_id FROM item WHERE id="+std::to_string(id)+" AND window NOT IN ('MALL','SAFEBOX')");
|
||||
if(!cubeValid(owner)||owner->Get()->uiNumRows>1)return false;
|
||||
if(owner->Get()->uiNumRows) {
|
||||
MYSQL_ROW row=mysql_fetch_row(owner->Get()->pSQLResult);uint64_t pid=0;
|
||||
if(!row||!row[0]||!PortEconomy::Number(row[0],pid,UINT32_MAX)||!pid)return false;
|
||||
for(const auto& entry:m_cubeDrains)if(entry.second.began&&!entry.second.cancelled&&entry.second.batch.player==pid)return false;
|
||||
}
|
||||
}
|
||||
// No JOIN against item: consumed input IDs no longer have an item row, and
|
||||
// owner-less legacy destroy packets must still be denied until resync ACK.
|
||||
auto q=cubeQuery("SELECT id FROM port_cube_item_fences WHERE id="+std::to_string(id)+" LIMIT 1");
|
||||
return cubeValid(q)&&q->Get()->uiNumRows==0;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "../../common/economy_mysql.h"
|
||||
#include "../../common/cube_gold_store.h"
|
||||
// Compile the complete candidate against the real pinned MySQL adapter. No
|
||||
// runtime caller or producer registration is installed by this instantiation.
|
||||
template class PortCube::GoldIntentStore<PortEconomy::Mysql>;
|
||||
@@ -0,0 +1,536 @@
|
||||
#include "stdafx.h"
|
||||
#include "ClientManager.h"
|
||||
#include "Cache.h"
|
||||
#include "Main.h"
|
||||
#include "../../common/cube_fence.h"
|
||||
#include "../../common/cube_gold_store.h"
|
||||
#include "../../common/cube_owner.h"
|
||||
#include "../../common/cube_image_ack.h"
|
||||
#include "../../common/cube_release.h"
|
||||
#include "../../common/cube_random.h"
|
||||
#include "../../common/economy_mysql.h"
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
|
||||
bool CClientManager::CubeDrainOwner(const PortCube::RuntimeDrain& context,bool lifecycleOnly) {
|
||||
auto* peer=GetPeer(context.peer);
|
||||
auto* login=GetLoginDataByAID(context.batch.account);
|
||||
if((context.ownerLost&&!lifecycleOnly)||!peer||!peer->GetChannel()||!login||login->IsPlay()==context.recovery||login->GetConnectedPeerHandle()!=context.peer)return false;
|
||||
for(const auto& player:login->GetAccountRef().players)if(player.dwID==context.batch.player)return true;
|
||||
return false;
|
||||
}
|
||||
bool CClientManager::CubeAuthorityCheck(const PortCube::RuntimeDrain& c,bool lease) {
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
PortCube::OwnerStore<PortEconomy::Mysql> owner(mysql,[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
return lease?owner.Check(c.batch,c.ownership):owner.Current(c.ownership.leader);
|
||||
}
|
||||
void CClientManager::CubeAuthorityRevoke(PortCube::RuntimeDrain& c,unsigned reason) {
|
||||
if(!c.began||c.revocationDone)return;auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortCube::OwnerStore<PortEconomy::Mysql> owner(mysql,lookup);
|
||||
PortCube::OwnerGrant receipt;const auto result=owner.Revoke(c.batch,c.ownership.leader,reason,&c.ownership,receipt);
|
||||
c.revocationDone=result==PortCube::OwnerStore<PortEconomy::Mysql>::Revoked;
|
||||
if(!c.revocationDone&&!c.recovery&&result==PortCube::OwnerStore<PortEconomy::Mysql>::Refused) {
|
||||
// Release COMMIT can precede peer loss and its reply. Only exact durable
|
||||
// terminal proof retires revocation work; token/empty lease is not proof.
|
||||
PortCube::Batch saved;std::string phase,image;PortCube::FenceStore<PortEconomy::Mysql> fence(mysql,lookup);
|
||||
PortCube::ReleaseStore<PortEconomy::Mysql> release(mysql,lookup);
|
||||
if(fence.Recover(c.batch.account,c.batch.player,saved,phase,image)==PortCube::FenceStore<PortEconomy::Mysql>::Done&&
|
||||
phase=="RELEASED"&&PortCube::Encode(saved)==PortCube::Encode(c.batch)&&release.ReleaseLive(c.batch,c.ownership,image)==PortCube::ReleaseStore<PortEconomy::Mysql>::Released) {
|
||||
c.phase="RELEASED";c.revocationDone=true; // memory save/load hold remains
|
||||
}
|
||||
}
|
||||
if(!c.revocationDone&&c.recovery&&result==PortCube::OwnerStore<PortEconomy::Mysql>::Refused) {
|
||||
// A Retry may have occurred before adoption committed. Retire only
|
||||
// after reading durable proof that this proposed grant is NOT current.
|
||||
std::string phase;uint64_t revoked=0;
|
||||
if(owner.Inspect(c.batch,c.ownership.leader,receipt,phase,revoked)&&!PortCube::SameOwnerGrant(receipt,c.ownership)&&
|
||||
(receipt.revision>=c.ownership.revision||(phase=="REVOKED"&&receipt.revision!=UINT64_MAX&&receipt.revision+1==c.ownership.revision)))c.revocationDone=true;
|
||||
}
|
||||
if(!c.revocationDone)c.nextRevocation=time(nullptr)+5;
|
||||
}
|
||||
|
||||
// Recovery preparation only. The gated internal game/DB route may call this;
|
||||
// no normal player load, currency write, image ACK or thaw is authorized here.
|
||||
bool CClientManager::CubeRecoveryClaim(CPeer* peer,DWORD handle,DWORD account,DWORD pid,uint64_t session,PortCube::OwnerGrant& grant) {
|
||||
using namespace PortCube;grant={};
|
||||
if(*GetTablePostfix()||!peer||!peer->GetChannel()||!handle||!account||!pid||!session)return false;
|
||||
auto* login=GetLoginDataByAID(account);
|
||||
if(!login||login->IsPlay()||login->GetConnectedPeerHandle()!=peer->GetHandle()||GetPeer(peer->GetHandle())!=peer)return false;
|
||||
bool member=false;for(const auto& player:login->GetAccountRef().players)if(player.dwID==pid)member=true;
|
||||
if(!member)return false;
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());OwnerStore<PortEconomy::Mysql> owner(mysql,lookup);
|
||||
if(m_cubeOwnerBoot.empty())m_cubeOwnerBoot=OwnerBootNonce();
|
||||
OwnerLeader leader;if(owner.Acquire(m_cubeOwnerBoot,leader)!=OwnerStore<PortEconomy::Mysql>::Acquired)return false;
|
||||
Batch batch;std::string phase,image;FenceStore<PortEconomy::Mysql> fence(mysql,lookup);
|
||||
if(fence.Recover(account,pid,batch,phase,image)!=FenceStore<PortEconomy::Mysql>::Done)return false;
|
||||
OwnerGrant active;uint64_t revoked=0;
|
||||
if(!owner.Inspect(batch,leader,active,phase,revoked))return false;
|
||||
auto remember=[&](const OwnerGrant& held)->bool {
|
||||
auto found=m_cubeDrains.find(held.binding.cookie);
|
||||
if(found!=m_cubeDrains.end())return found->second.recovery&&!found->second.ownerLost&&!found->second.revocationReason&&PortCube::SameOwnerGrant(found->second.ownership,held)&&PortCube::Encode(found->second.batch)==PortCube::Encode(batch);
|
||||
if(m_cubeDrains.size()>=128)return false;
|
||||
RuntimeDrain c;c.batch=batch;c.ownership=held;c.peer=held.peer;c.handle=held.binding.handle;c.session=held.binding.session;
|
||||
c.began=c.queued=c.finished=c.recovery=true;c.phase="ADOPTED";c.created=time(nullptr);
|
||||
m_cubeDrains.emplace(held.binding.cookie,std::move(c));m_cubeCookie=std::max(m_cubeCookie,held.binding.cookie);return true;
|
||||
};
|
||||
// Lost adoption ACK: return the exact persisted grant, never a fresh cookie.
|
||||
if(phase=="ADOPTED"&&active.leader.boot==leader.boot&&active.leader.generation==leader.generation&&active.leader.connection==leader.connection&&
|
||||
active.peer==peer->GetHandle()&&active.binding.handle==handle&&active.binding.session==session){if(!remember(active))return false;grant=active;return true;}
|
||||
if(active.leader.generation<leader.generation) {
|
||||
OwnerGrant receipt;if(owner.Revoke(batch,leader,3,nullptr,receipt)!=OwnerStore<PortEconomy::Mysql>::Revoked)return false;
|
||||
active=receipt;phase="REVOKED";revoked=leader.generation;
|
||||
}
|
||||
if(phase!="REVOKED"||revoked!=leader.generation||active.revision==UINT64_MAX||session==active.binding.session)return false;
|
||||
OwnerGrant proposal;
|
||||
for(const auto& entry:m_cubeDrains) {
|
||||
const auto& c=entry.second;
|
||||
if(c.recovery&&c.batch.token==batch.token&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==session&&c.ownership.revision==active.revision+1&&
|
||||
c.ownership.leader.boot==leader.boot&&c.ownership.leader.generation==leader.generation&&c.ownership.leader.connection==leader.connection) {
|
||||
if(c.ownerLost||c.revocationReason)return false;proposal=c.ownership;break;
|
||||
}
|
||||
}
|
||||
if(!Valid(proposal)) {
|
||||
if(m_cubeDrains.size()>=128||m_cubeCookie==UINT32_MAX)return false;
|
||||
proposal={leader,GoldSourceFor(batch,session,++m_cubeCookie,handle),peer->GetHandle(),active.revision+1};
|
||||
}
|
||||
const auto result=owner.Adopt(batch,leader,active.revision,peer->GetHandle(),proposal.binding,grant);
|
||||
if(result==OwnerStore<PortEconomy::Mysql>::Refused)return false;
|
||||
// Also retain a Retry proposal: COMMIT may have succeeded before its ACK
|
||||
// was lost. A peer close must be able to revoke it before a client retry.
|
||||
if(!remember(proposal)){grant={};return false;}
|
||||
return result==OwnerStore<PortEconomy::Mysql>::Adopted;
|
||||
}
|
||||
|
||||
DWORD CClientManager::CubeDrainArm(CPeer* peer,DWORD handle,uint64_t session,const PortCube::Batch& batch) {
|
||||
if(*GetTablePostfix()||!peer||!handle||!session||!PortCube::Validate(batch)||m_cubeDrains.size()>=128||m_cubeCookie==UINT32_MAX)return 0;
|
||||
PortCube::RuntimeDrain context;context.batch=batch;context.peer=peer->GetHandle();context.handle=handle;context.session=session;
|
||||
if(!CubeDrainOwner(context)||!CubeMemoryLoadable(batch.account,batch.player)||!CubePlayerWritable(batch.player)||m_economyFences.count(batch.player)||m_economyClosed.count(batch.player))return 0;
|
||||
auto& db=CDBManager::instance();
|
||||
PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
// A modern live owner may produce deferred gold. Do not Arm a source whose
|
||||
// durable enqueue/closure schema is missing, even if the base store exists.
|
||||
PortCube::OwnerStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(!store.Ready())return 0;
|
||||
if(m_cubeOwnerBoot.empty())m_cubeOwnerBoot=PortCube::OwnerBootNonce();
|
||||
PortCube::OwnerLeader leader;if(store.Acquire(m_cubeOwnerBoot,leader)!=PortCube::OwnerStore<PortEconomy::Mysql>::Acquired)return 0;
|
||||
// Capture BEFORE the final-save handoff, not after eviction or first barrier.
|
||||
context.main=db.EconomyFailures(false);context.async=db.EconomyFailures(true);context.router=db.SQLFenceFailures();context.created=time(nullptr);
|
||||
const DWORD cookie=++m_cubeCookie;context.ownership={leader,PortCube::GoldSourceFor(batch,session,cookie,handle),peer->GetHandle(),1};
|
||||
m_cubeDrains.emplace(cookie,std::move(context));return cookie;
|
||||
}
|
||||
|
||||
bool CClientManager::CubeMemoryLoadable(DWORD account,DWORD pid) {
|
||||
for(const auto& entry:m_cubeDrains)if(!entry.second.cancelled&&(entry.second.batch.account==account||entry.second.batch.player==pid))return false;
|
||||
return true;
|
||||
}
|
||||
bool CClientManager::CubePeerMaySave(CPeer* peer,DWORD pid) {
|
||||
for(const auto& entry:m_cubeDrains)if(!entry.second.cancelled&&entry.second.batch.player==pid)
|
||||
return !entry.second.began&&peer&&GetPeer(peer->GetHandle())==peer&&peer->GetHandle()==entry.second.peer&&CubeDrainOwner(entry.second);
|
||||
return true;
|
||||
}
|
||||
void CClientManager::CubePeerGone(DWORD peer) {
|
||||
for(auto& entry:m_cubeDrains)if(entry.second.peer==peer){entry.second.ownerLost=true;entry.second.revocationReason=1;}
|
||||
}
|
||||
void CClientManager::CubeAccountGone(DWORD account,DWORD peer) {
|
||||
if(!account||!peer)return;
|
||||
for(auto& entry:m_cubeDrains)if(entry.second.peer==peer&&entry.second.batch.account==account){entry.second.ownerLost=true;entry.second.revocationReason=2;}
|
||||
}
|
||||
void CClientManager::CubeAccountLogout(CPeer* peer,const char* data,DWORD length) {
|
||||
if(!peer||!data||length!=sizeof(TLogoutPacket))return;
|
||||
TLogoutPacket packet;std::memcpy(&packet,data,sizeof(packet));
|
||||
if(!packet.login[0]||!std::memchr(packet.login,0,sizeof(packet.login)))return;
|
||||
auto* login=GetLoginDataByLogin(packet.login);
|
||||
if(!login||login->GetConnectedPeerHandle()!=peer->GetHandle())return;
|
||||
CubeAccountGone(login->GetAccountRef().id,peer->GetHandle());
|
||||
}
|
||||
|
||||
bool CClientManager::CubeDrainSubmit(CPeer* peer,DWORD handle,uint64_t session,DWORD cookie) {
|
||||
auto it=m_cubeDrains.find(cookie);if(it==m_cubeDrains.end())return false;auto& c=it->second;
|
||||
if(!peer||peer->GetHandle()!=c.peer||handle!=c.handle||session!=c.session||!CubeDrainOwner(c)||c.finished||c.cancelled)return false;
|
||||
if(!CubeAuthorityCheck(c,c.queued))return false;
|
||||
if(c.queued)return true;
|
||||
auto* player=GetPlayerCache(c.batch.player);auto* items=GetItemCacheSet(c.batch.player);
|
||||
if(!player||!items||player->Get(false)->gold!=c.batch.gold)return false;
|
||||
std::vector<uint32_t> ids;std::vector<PortCube::Item> snapshot;
|
||||
for(auto* cache:*items) {
|
||||
const auto* item=cache->Get(false);
|
||||
if(!item->id||item->owner!=c.batch.player||ids.size()>=4096)return false;
|
||||
ids.push_back(item->id); // include gear and dirty tombstones before eviction
|
||||
if(!item->vnum||item->window!=INVENTORY||item->pos>=225)continue;
|
||||
PortCube::Item image;image.usable=false;image.cell=item->pos;image.value.id=item->id;image.value.vnum=item->vnum;image.value.count=item->count;
|
||||
for(unsigned j=0;j<3;++j){if(item->alSockets[j]<INT32_MIN||item->alSockets[j]>INT32_MAX)return false;image.value.sockets[j]=int32_t(item->alSockets[j]);}
|
||||
for(unsigned j=0;j<7;++j){image.value.types[j]=item->aAttr[j].bType;image.value.values[j]=item->aAttr[j].sValue;}
|
||||
static_assert(sizeof(item->extra)==69,"Cube requires the exact extra-item image");
|
||||
std::memcpy(image.value.extra,&item->extra,69);snapshot.push_back(image);
|
||||
}
|
||||
std::sort(ids.begin(),ids.end());if(std::adjacent_find(ids.begin(),ids.end())!=ids.end())return false;
|
||||
std::sort(snapshot.begin(),snapshot.end(),[](const PortCube::Item& a,const PortCube::Item& b){return a.cell<b.cell;});
|
||||
auto expected=c.batch.inventory;
|
||||
// usable describes runtime event/lock ownership, not a SQL column. Game must
|
||||
// validate it while frozen; equality here validates only the persisted image.
|
||||
for(auto& image:expected)image.usable=false;
|
||||
PortCube::Writer actual,wanted;actual.items(snapshot);wanted.items(expected);
|
||||
if(actual.data!=wanted.data)return false;
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
PortCube::FenceStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
// A lost commit ACK may already have installed the fence. Never expire or
|
||||
// accept ordinary saves again after entering Begin, including Retry/Refused.
|
||||
c.began=true;
|
||||
PortCube::OwnerStore<PortEconomy::Mysql> owner(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(store.Begin(c.batch,ids,[&](bool replay){return owner.BindWithin(c.batch,c.ownership,replay);})!=PortCube::FenceStore<PortEconomy::Mysql>::Done)return false;
|
||||
PortCube::Batch recovered;std::string phase,image;
|
||||
if(store.Recover(c.batch.account,c.batch.player,recovered,phase,image)!=PortCube::FenceStore<PortEconomy::Mysql>::Done||PortCube::Encode(recovered)!=PortCube::Encode(c.batch)||phase!="DRAINING")return false;
|
||||
if(!c.proof.Start(c.batch,c.session,c.main,c.async))return false;
|
||||
// Flush directly, not via peer QUERY_ITEM_FLUSH, whose ingress is now gated.
|
||||
FlushItemCacheSet(c.batch.player);FlushPlayerCacheSet(c.batch.player);DeleteLogoutPlayer(c.batch.player);
|
||||
c.queued=true;c.phase="DRAINING";
|
||||
db.ReturnQuery("SELECT 1",PortCube::MainFirst,cookie,nullptr);return true;
|
||||
}
|
||||
|
||||
void CClientManager::CubeMainFence(DWORD cookie,unsigned pass,bool failed) {
|
||||
auto it=m_cubeDrains.find(cookie);if(it==m_cubeDrains.end()||!it->second.queued||it->second.finished)return;auto& c=it->second;
|
||||
if(c.proof.Main(c.batch,c.session,pass,failed)==1) {
|
||||
c.phase="FIRST";
|
||||
auto& db=CDBManager::instance();db.ReturnQuery("SELECT 1",PortCube::MainSecond,cookie,nullptr);
|
||||
c.asyncQueued=db.CubeAsyncFence(cookie);
|
||||
}
|
||||
}
|
||||
|
||||
void CClientManager::CubeDrainTick() {
|
||||
auto& db=CDBManager::instance();
|
||||
while(SQLMsg* raw=db.PopCubeAsyncFence()) {
|
||||
std::unique_ptr<SQLMsg> msg(raw);const auto cookie=uint32_t(reinterpret_cast<uintptr_t>(msg->pvUserData));
|
||||
auto it=m_cubeDrains.find(cookie);if(it!=m_cubeDrains.end()&&it->second.queued&&!it->second.finished) {
|
||||
auto& c=it->second;c.proof.Async(c.batch,c.session,msg->uiSQLErrno!=0);
|
||||
}
|
||||
}
|
||||
// One joint queue: a persistent failing revoke must not starve a different
|
||||
// actor's drain (or vice versa). Keys also distinguish two jobs on one hold.
|
||||
struct Work {uint64_t key;DWORD cookie;bool revoke;};std::vector<Work> work;
|
||||
const auto now=time(nullptr);
|
||||
for(auto it=m_cubeDrains.begin();it!=m_cubeDrains.end();) {
|
||||
const auto cookie=it->first;auto& c=it->second;
|
||||
if(!CubeDrainOwner(c,true)){c.ownerLost=true;if(!c.revocationReason)c.revocationReason=2;}
|
||||
if(!c.began&&(c.ownerLost||now-c.created>=60)){it=m_cubeDrains.erase(it);continue;}++it;
|
||||
if(c.began&&c.revocationReason&&!c.revocationDone&&c.nextRevocation<=now)work.push_back({uint64_t(cookie)*2,cookie,true});
|
||||
if(!c.queued||c.finished||c.nextAttempt>now)continue;
|
||||
if(c.phase=="FIRST"&&!c.asyncQueued)c.asyncQueued=db.CubeAsyncFence(cookie);
|
||||
if(c.proof.Complete())work.push_back({uint64_t(cookie)*2+1,cookie,false});
|
||||
}
|
||||
const auto start=std::upper_bound(work.begin(),work.end(),m_cubeWorkCursor,[](uint64_t key,const Work& item){return key<item.key;});
|
||||
const size_t offset=size_t(start-work.begin());
|
||||
for(size_t n=0;n<work.size()&&n<2;++n) {
|
||||
const auto& item=work[(offset+n)%work.size()];auto& c=m_cubeDrains.find(item.cookie)->second;m_cubeWorkCursor=item.key;
|
||||
if(item.revoke)CubeAuthorityRevoke(c,c.revocationReason);else CubeDrainFinalize(c);
|
||||
}
|
||||
for(auto it=m_cubeDrains.begin();it!=m_cubeDrains.end();) {
|
||||
if(it->second.recovery&&it->second.revocationDone)it=m_cubeDrains.erase(it);else ++it;
|
||||
} // only obsolete in-memory recovery slots retire; SQL holds survive
|
||||
}
|
||||
void CClientManager::CubeDrainFinalize(PortCube::RuntimeDrain& c) {
|
||||
auto& db=CDBManager::instance();
|
||||
// An old DB connection/generation may still have queued callbacks.
|
||||
// Do not let it finalize a drain after authority has moved elsewhere.
|
||||
PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
PortCube::OwnerStore<PortEconomy::Mysql> authority(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(!(c.ownerLost?authority.Current(c.ownership.leader):authority.Check(c.batch,c.ownership))){c.nextAttempt=time(nullptr)+5;return;}
|
||||
PortCube::FenceStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?PortCube::Proto{}:PortCube::Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
const bool owner=!c.ownerLost&&db.SQLFenceFailures()==c.router;
|
||||
auto result=store.FinishDrain(c.batch,c.proof,c.session,db.EconomyFailures(false),db.EconomyFailures(true),owner);
|
||||
if(result==PortCube::FenceStore<PortEconomy::Mysql>::Done) {
|
||||
c.finished=true;c.phase=owner&&c.proof.Clean(db.EconomyFailures(false),db.EconomyFailures(true))?"FROZEN":"ABORTED";
|
||||
} else {
|
||||
// FinishDrain may have committed despite a lost COMMIT ACK. Read
|
||||
// its original durable outcome, never infer a downgrade or unlock.
|
||||
PortCube::Batch recovered;std::string phase,image;
|
||||
if(store.Recover(c.batch.account,c.batch.player,recovered,phase,image)==PortCube::FenceStore<PortEconomy::Mysql>::Done&&
|
||||
PortCube::Encode(recovered)==PortCube::Encode(c.batch)&&(phase=="FROZEN"||phase=="ABORTED")) {
|
||||
c.finished=true;c.phase=phase;
|
||||
} else c.nextAttempt=time(nullptr)+5;
|
||||
}
|
||||
// Deliberately retain both FROZEN and ABORTED holds. Settlement/image
|
||||
// application and exact resync ACK must be wired before any release.
|
||||
}
|
||||
|
||||
void CClientManager::CubeHandshakeRequest(CPeer* peer,DWORD handle,const char* data,DWORD length) {
|
||||
PortCube::Handshake f;
|
||||
if(!peer||!peer->GetChannel()||!handle||!PortCube::DecodeHandshake(data,length,f)||PortCube::IsDbHandshakeReply(f.message))return;
|
||||
if(f.message==PortCube::Message::LiveResumeCheckRequest) {
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){CubeLiveResumeCheckRoute(peer,handle,f);return;}
|
||||
f.message=PortCube::Message::LiveResumeCheckAnswer;f.status=PortCube::Status::Held;f.body.clear();
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==PortCube::Message::LiveReleaseRequest) {
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){CubeLiveReleaseRoute(peer,handle,f);return;}
|
||||
f.message=PortCube::Message::LiveReleaseAnswer;f.status=PortCube::Status::Held;f.body.clear();
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==PortCube::Message::LiveImageAck) {
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){CubeLiveImageAckRoute(peer,handle,f);return;}
|
||||
f.message=PortCube::Message::LiveImageAckAnswer;f.status=PortCube::Status::Held;f.body.clear();
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==PortCube::Message::LiveImageRequest) {
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){CubeLiveImageRoute(peer,handle,f);return;}
|
||||
f.message=PortCube::Message::LiveImageAnswer;f.status=PortCube::Status::Held;
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==PortCube::Message::Prepare||f.message==PortCube::Message::Execute) {
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){CubeCraftRoute(peer,handle,f);return;}
|
||||
f.message=PortCube::Message::CraftAnswer;f.status=PortCube::Status::Held;
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==PortCube::Message::RecoveryClaim||f.message==PortCube::Message::RecoveryImageRequest) {
|
||||
const bool image=f.message==PortCube::Message::RecoveryImageRequest;
|
||||
if(PortCube::HandshakeEnabled&&PortCube::ActorMutationAuditComplete){if(image)CubeRecoveryImageRoute(peer,handle,f);else CubeRecoveryRoute(peer,handle,f);return;}
|
||||
f.message=image?PortCube::Message::RecoveryImageAnswer:PortCube::Message::RecoveryAnswer;f.status=PortCube::Status::Held;
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
// Closed at the actual ingress, not merely at a UI button. In particular,
|
||||
// receiving a syntactically valid Arm does not prove the actor was frozen.
|
||||
if(!PortCube::HandshakeEnabled) {
|
||||
f.message=PortCube::Message::Answer;f.status=PortCube::Status::Held;f.body.clear();
|
||||
const auto bytes=PortCube::EncodeHandshake(f);peer->EncodeHeader(PortCube::HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
CubeHandshakeRoute(peer,handle,f);
|
||||
}
|
||||
void CClientManager::CubeRecoveryRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;if(!peer||!handle||!peer->GetChannel()||!ValidHandshake(request)||request.message!=Message::RecoveryClaim)return;
|
||||
auto reply=request;reply.message=Message::RecoveryAnswer;reply.status=Status::Held;
|
||||
auto* login=GetLoginDataByAID(request.account);bool member=false;
|
||||
if(login&&!login->IsPlay()&&GetPeer(peer->GetHandle())==peer&&login->GetConnectedPeerHandle()==peer->GetHandle())
|
||||
for(const auto& player:login->GetAccountRef().players)if(player.dwID==request.player)member=true;
|
||||
if(member&&!*GetTablePostfix()) {
|
||||
if(CubeMemoryLoadable(request.account,request.player)&&CubeAccountLoadable(request.account,request.player))reply.status=Status::RecoveryClear;
|
||||
else {
|
||||
OwnerGrant grant;
|
||||
if(CubeRecoveryClaim(peer,handle,request.account,request.player,request.session,grant)) {
|
||||
reply.status=Status::RecoveryGranted;reply.cookie=grant.binding.cookie;reply.epoch=grant.binding.epoch;reply.owner=grant.binding.owner;reply.token=grant.binding.request;reply.body=EncodeOwnerGrant(grant);
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;
|
||||
peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeRecoveryImageRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||request.message!=Message::RecoveryImageRequest)return;
|
||||
auto reply=request;reply.message=Message::RecoveryImageAnswer;reply.status=Status::Held;
|
||||
OwnerGrant grant;DecodeOwnerGrant(request.body,grant);auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
const auto& c=found->second;
|
||||
if(c.recovery&&c.peer==peer->GetHandle()&&c.handle==handle&&grant.binding.handle==handle&&SameOwnerGrant(c.ownership,grant)&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());OwnerStore<PortEconomy::Mysql> owner(mysql,lookup);FenceStore<PortEconomy::Mysql> fence(mysql,lookup);std::string image;
|
||||
if(fence.Resync(c.batch,image,[&](const std::string& current){return owner.ImageWithin(c.batch,grant,current);})==FenceStore<PortEconomy::Mysql>::Done) {
|
||||
const auto body=EncodeRecoveryImage(grant,image);
|
||||
if(!body.empty()){reply.body=body;reply.status=Status::RecoveryImageReady;}
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeCraftRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||(request.message!=Message::Prepare&&request.message!=Message::Execute))return;
|
||||
auto reply=request;reply.message=Message::CraftAnswer;reply.status=Status::Held;
|
||||
auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
const auto& c=found->second;
|
||||
if(!c.recovery&&c.queued&&c.finished&&c.phase=="FROZEN"&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==request.session&&
|
||||
c.batch.account==request.account&&c.batch.player==request.player&&c.batch.epoch==request.epoch&&c.batch.owner==request.owner&&c.batch.token==request.token&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());OwnerStore<PortEconomy::Mysql> owner(mysql,lookup);BatchStore<PortEconomy::Mysql> store(mysql,lookup);
|
||||
if(request.message==Message::Prepare) {
|
||||
CraftEntropy entropy;
|
||||
if(store.Prepare(c.batch,[&](){return entropy.Draw();},[&](){return owner.CraftWithin(c.batch,c.ownership);})==BatchStore<PortEconomy::Mysql>::Prepared)reply.status=Status::Prepared;
|
||||
} else {
|
||||
BatchStore<PortEconomy::Mysql>::Receipt result;
|
||||
if(store.Execute(c.batch.token,c.batch.account,c.batch.player,result,[&](const Batch& saved){return Encode(saved)==Encode(c.batch)&&owner.CraftWithin(saved,c.ownership);})==BatchStore<PortEconomy::Mysql>::Complete) {
|
||||
CraftReceipt receipt{result.result,result.successes,result.fee,result.awards};reply.body=EncodeCraftReceipt(receipt);if(!reply.body.empty())reply.status=Status::Complete;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeLiveImageRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||request.message!=Message::LiveImageRequest)return;
|
||||
auto reply=request;reply.message=Message::LiveImageAnswer;reply.status=Status::Held;
|
||||
auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
auto& c=found->second;
|
||||
if(!c.recovery&&c.queued&&c.finished&&(c.phase=="FROZEN"||c.phase=="RESYNC")&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==request.session&&
|
||||
c.batch.account==request.account&&c.batch.player==request.player&&c.batch.epoch==request.epoch&&c.batch.owner==request.owner&&c.batch.token==request.token&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());OwnerStore<PortEconomy::Mysql> owner(mysql,lookup);FenceStore<PortEconomy::Mysql> fence(mysql,lookup);GoldIntentStore<PortEconomy::Mysql> gold(mysql,lookup);
|
||||
std::vector<GoldIntent> pending;bool credited=gold.Pending(c.batch,pending)==GoldIntentStore<PortEconomy::Mysql>::Stored;
|
||||
for(size_t n=0;credited&&n<std::min(size_t(2),pending.size());++n) {
|
||||
typename GoldIntentStore<PortEconomy::Mysql>::Receipt receipt;
|
||||
credited=gold.Apply(pending[n].event,c.batch.account,c.batch.player,receipt,[&](const GoldIntent& intent){return Matches(intent,c.batch)&&owner.CraftWithin(c.batch,c.ownership);})==GoldIntentStore<PortEconomy::Mysql>::Applied;
|
||||
}
|
||||
std::string image;
|
||||
if(credited&&pending.size()<=2&&fence.Resync(c.batch,image,[&](const std::string& current){return owner.LiveImageWithin(c.batch,c.ownership,current);})==FenceStore<PortEconomy::Mysql>::Done) {
|
||||
reply.body=std::move(image);reply.status=Status::LiveImageReady;c.phase="RESYNC";
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeLiveImageAckRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||request.message!=Message::LiveImageAck)return;
|
||||
auto reply=request;reply.message=Message::LiveImageAckAnswer;reply.status=Status::Held;reply.body.clear();
|
||||
const auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
const auto& c=found->second;
|
||||
if(!c.recovery&&c.queued&&c.finished&&c.phase=="RESYNC"&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==request.session&&
|
||||
c.batch.account==request.account&&c.batch.player==request.player&&c.batch.epoch==request.epoch&&c.batch.owner==request.owner&&c.batch.token==request.token&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());ImageAckStore<PortEconomy::Mysql> ack(mysql,lookup);
|
||||
if(ack.AcknowledgeLive(c.batch,c.ownership,request.body)==ImageAckStore<PortEconomy::Mysql>::Stored) {
|
||||
reply.status=Status::LiveImageAcknowledged;reply.body=request.body;
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeLiveReleaseRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||request.message!=Message::LiveReleaseRequest)return;
|
||||
auto reply=request;reply.message=Message::LiveReleaseAnswer;reply.status=Status::Held;reply.body.clear();
|
||||
const auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
auto& c=found->second;
|
||||
if(!c.recovery&&c.queued&&c.finished&&(c.phase=="RESYNC"||c.phase=="RELEASED")&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==request.session&&
|
||||
c.batch.account==request.account&&c.batch.player==request.player&&c.batch.epoch==request.epoch&&c.batch.owner==request.owner&&c.batch.token==request.token&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());ReleaseStore<PortEconomy::Mysql> release(mysql,lookup);
|
||||
if(release.ReleaseLive(c.batch,c.ownership,request.body)==ReleaseStore<PortEconomy::Mysql>::Released) {
|
||||
c.phase="RELEASED";c.revocationDone=true;reply.status=Status::LiveReleased;reply.body=request.body;
|
||||
}
|
||||
}
|
||||
}
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeLiveResumeCheckRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& request) {
|
||||
using namespace PortCube;
|
||||
if(!peer||!peer->GetChannel()||!handle||!ValidHandshake(request)||request.message!=Message::LiveResumeCheckRequest)return;
|
||||
auto reply=request;reply.message=Message::LiveResumeCheckAnswer;reply.status=Status::Held;reply.body.clear();
|
||||
const auto found=m_cubeDrains.find(request.cookie);
|
||||
if(!*GetTablePostfix()&&found!=m_cubeDrains.end()&&GetPeer(peer->GetHandle())==peer) {
|
||||
const auto& c=found->second;
|
||||
if(!c.recovery&&c.queued&&c.finished&&c.phase=="RELEASED"&&c.revocationDone&&c.peer==peer->GetHandle()&&c.handle==handle&&c.session==request.session&&
|
||||
c.batch.account==request.account&&c.batch.player==request.player&&c.batch.epoch==request.epoch&&c.batch.owner==request.owner&&c.batch.token==request.token&&CubeDrainOwner(c)) {
|
||||
auto lookup=[&](uint32_t v){auto it=m_map_itemTableByVnum.find(v);return it==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(it->second->bSize),bool(it->second->dwFlags&ITEM_FLAG_STACKABLE)};};
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());ReleaseStore<PortEconomy::Mysql> release(mysql,lookup);
|
||||
if(release.CheckResumeLive(c.batch,c.ownership,request.body)==ReleaseStore<PortEconomy::Mysql>::Checked){reply.status=Status::LiveResumeChecked;reply.body=request.body;}
|
||||
}
|
||||
}
|
||||
// Read-only preflight: no context erasure, save/load grant or actor thaw.
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
}
|
||||
|
||||
void CClientManager::CubeHandshakeRoute(CPeer* peer,DWORD handle,const PortCube::Handshake& f) {
|
||||
using namespace PortCube;
|
||||
if(f.message==Message::LiveResumeCheckRequest){CubeLiveResumeCheckRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::LiveReleaseRequest){CubeLiveReleaseRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::LiveImageAck){CubeLiveImageAckRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::LiveImageRequest){CubeLiveImageRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::Prepare||f.message==Message::Execute){CubeCraftRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::RecoveryClaim){CubeRecoveryRoute(peer,handle,f);return;}
|
||||
if(f.message==Message::RecoveryImageRequest){CubeRecoveryImageRoute(peer,handle,f);return;}
|
||||
if(!peer||!handle||!peer->GetChannel()||!ValidHandshake(f)||IsDbHandshakeReply(f.message))return;
|
||||
RuntimeDrain binding;binding.batch.account=f.account;binding.batch.player=f.player;binding.peer=peer->GetHandle();
|
||||
if(!CubeDrainOwner(binding))return; // authenticated core AND current account ownership
|
||||
auto send=[&](Status status,DWORD cookie) {
|
||||
Handshake reply=f;reply.message=Message::Answer;reply.status=status;reply.cookie=cookie;reply.body.clear();
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;
|
||||
peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());
|
||||
};
|
||||
auto matches=[&](const RuntimeDrain& c) {
|
||||
return c.peer==peer->GetHandle()&&c.handle==handle&&c.session==f.session&&c.batch.account==f.account&&c.batch.player==f.player&&
|
||||
c.batch.epoch==f.epoch&&c.batch.owner==f.owner&&c.batch.token==f.token;
|
||||
};
|
||||
auto status=[&](const RuntimeDrain& c) {
|
||||
if(c.cancelled)return Status::Cancelled;
|
||||
if(!CubeDrainOwner(c))return Status::Held;
|
||||
if(c.finished)return c.phase=="FROZEN"?Status::Frozen:c.phase=="ABORTED"?Status::Aborted:Status::Held;
|
||||
if(c.queued)return Status::Draining;
|
||||
return c.began?Status::Held:Status::Armed;
|
||||
};
|
||||
if(f.message==Message::Arm) {
|
||||
for(const auto& entry:m_cubeDrains)if(matches(entry.second)) {
|
||||
// Exact retry returns the original cookie; changed body is not a
|
||||
// second Arm and must not release or replace the first hold.
|
||||
send(Encode(entry.second.batch)==f.body&&CubeAuthorityCheck(entry.second,entry.second.queued)?status(entry.second):Status::Held,entry.first);return;
|
||||
}
|
||||
Batch b;if(!Decode(f.body,b))return;
|
||||
const auto cookie=CubeDrainArm(peer,handle,f.session,b);
|
||||
send(cookie?Status::Armed:Status::Held,cookie);return;
|
||||
}
|
||||
auto it=m_cubeDrains.find(f.cookie);
|
||||
if(it==m_cubeDrains.end()||!matches(it->second)){send(Status::Held,f.cookie);return;}
|
||||
auto& c=it->second;
|
||||
if(c.cancelled){send(Status::Cancelled,f.cookie);return;}
|
||||
if(!CubeAuthorityCheck(c,c.queued)){c.ownerLost=true;send(Status::Held,f.cookie);return;}
|
||||
if(f.message==Message::GoldClose) {
|
||||
if(!c.began||!CubeDrainOwner(c)){send(Status::Held,f.cookie);return;}
|
||||
GoldSourceSeal seal;static_cast<GoldSourceBinding&>(seal)=GoldSourceFor(c.batch,f.session,f.cookie,handle);
|
||||
if(!DecodeGoldManifest(f.body,seal.events))return;
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
OwnerStore<PortEconomy::Mysql> authority(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(!authority.Check(c.batch,c.ownership)){send(Status::Held,f.cookie);return;}
|
||||
GoldIntentStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(store.CloseSource(c.batch,seal)!=GoldIntentStore<PortEconomy::Mysql>::Stored){send(Status::Held,f.cookie);return;}
|
||||
auto reply=f;reply.message=Message::GoldCloseAck;reply.status=Status::GoldClosed;const auto bytes=EncodeHandshake(reply);
|
||||
if(bytes.empty())return;peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==Message::GoldEnqueue) {
|
||||
// Original authenticated peer/login/handle/session/cookie AND immutable
|
||||
// batch, not a client-provided amount on an unowned player. DB restart
|
||||
// loses this binding: keep the source outbox pending, never adopt it.
|
||||
GoldIntent i;
|
||||
if(!c.began||!CubeDrainOwner(c)||!DecodeGoldIntent(f.body,i)||!Matches(i,c.batch)){send(Status::Held,f.cookie);return;}
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
OwnerStore<PortEconomy::Mysql> authority(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
if(!authority.Check(c.batch,c.ownership)){send(Status::Held,f.cookie);return;}
|
||||
GoldIntentStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
const auto result=store.Enqueue(c.batch,i);
|
||||
if(result!=GoldIntentStore<PortEconomy::Mysql>::Stored&&result!=GoldIntentStore<PortEconomy::Mysql>::Applied){send(Status::Held,f.cookie);return;}
|
||||
auto reply=f;reply.message=Message::GoldAck;reply.status=result==GoldIntentStore<PortEconomy::Mysql>::Stored?Status::GoldStored:Status::GoldApplied;
|
||||
const auto bytes=EncodeHandshake(reply);if(bytes.empty())return;
|
||||
peer->EncodeHeader(HandshakeHeader,handle,bytes.size());peer->Encode(bytes.data(),bytes.size());return;
|
||||
}
|
||||
if(f.message==Message::Invalidate) {
|
||||
// Sticky poison. Never turn an invalidated actor snapshot into a clean
|
||||
// FROZEN proof, even if its ordinary values later return to the same bytes.
|
||||
c.ownerLost=true;
|
||||
if(c.began) {
|
||||
auto& db=CDBManager::instance();PortEconomy::Mysql mysql(db.DirectHandle());
|
||||
FenceStore<PortEconomy::Mysql> store(mysql,[&](uint32_t v){auto p=m_map_itemTableByVnum.find(v);return p==m_map_itemTableByVnum.end()?Proto{}:Proto{unsigned(p->second->bSize),bool(p->second->dwFlags&ITEM_FLAG_STACKABLE)};});
|
||||
// The store refuses to abort an already accepted/ambiguous Prepare.
|
||||
// Retain that hold for receipt recovery instead of inventing refunds.
|
||||
if(store.AbortUnprepared(c.batch)==FenceStore<PortEconomy::Mysql>::Done)c.phase="ABORTED";
|
||||
}
|
||||
send(Status::Held,f.cookie);return;
|
||||
}
|
||||
if(f.message==Message::Cancel) {
|
||||
// No SQL Begin attempt: no accepted/ambiguous durable ownership exists.
|
||||
// Keep a short tombstone so lost cancellation ACK can be replayed.
|
||||
if(!c.began&&!c.ownerLost){c.cancelled=true;c.created=time(nullptr);send(Status::Cancelled,f.cookie);}
|
||||
else send(Status::Held,f.cookie);
|
||||
return;
|
||||
}
|
||||
if(f.message==Message::Submit&&!c.finished&&!c.queued)CubeDrainSubmit(peer,handle,f.session,f.cookie);
|
||||
send(status(c),f.cookie); // Submit refusal is a hold, never an unlock ACK
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
#pragma once
|
||||
#include "../../common/cube_drain.h"
|
||||
#include "../../common/cube_handshake.h"
|
||||
#include "../../common/cube_owner_types.h"
|
||||
#include <ctime>
|
||||
|
||||
namespace PortCube {
|
||||
// Internal DB adapter. Header78 dispatch is compiled but ingress is hard-gated
|
||||
// off in cube_handshake.h. A game coordinator MUST quiesce the actor before Arm,
|
||||
// send final saves after Arm ACK, and submit on the same peer FIFO. These APIs
|
||||
// and the game preparation state machine do not themselves stop asset events.
|
||||
constexpr int MainFirst=101,MainSecond=102;
|
||||
struct RuntimeDrain {
|
||||
Batch batch;Drain proof;
|
||||
uint64_t session=0,main=0,async=0,router=0;
|
||||
uint32_t peer=0,handle=0;
|
||||
bool began=false,queued=false,asyncQueued=false,ownerLost=false,finished=false,cancelled=false;
|
||||
std::time_t created=0,nextAttempt=0;
|
||||
std::string phase;
|
||||
OwnerGrant ownership;
|
||||
bool revocationDone=false;
|
||||
unsigned revocationReason=0; // trusted peer/account lifecycle, not Invalidate
|
||||
bool recovery=false; // held pre-load adoption, not a playing actor
|
||||
std::time_t nextRevocation=0;
|
||||
};
|
||||
}
|
||||
@@ -52,6 +52,7 @@ void CDBManager::Clear()
|
||||
}
|
||||
}
|
||||
|
||||
PortSQLFence::PlayerRouter().Clear();
|
||||
Initialize();
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <mysql/mysql.h>
|
||||
|
||||
#include "../../libsql/AsyncSQL.h"
|
||||
#include "SQLFences.h"
|
||||
|
||||
#define SQL_SAFE_LENGTH(size) (size * 2 + 1)
|
||||
#define QUERY_SAFE_LENGTH(size) (1024 + SQL_SAFE_LENGTH(size))
|
||||
@@ -46,6 +47,13 @@ class CDBManager : public singleton<CDBManager>
|
||||
|
||||
void ReturnQuery(const char * c_pszQuery, int iType, DWORD dwIdent, void * pvData, int iSlot = SQL_PLAYER);
|
||||
void AsyncQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);
|
||||
bool EconomyAsyncFence(DWORD pid) { return PortSQLFence::Queue(m_asyncSQL[SQL_PLAYER],PortSQLFence::Economy,pid); }
|
||||
SQLMsg* PopEconomyAsyncFence() { return PortSQLFence::Pop(m_asyncSQL[SQL_PLAYER],PortSQLFence::Economy); }
|
||||
bool CubeAsyncFence(DWORD cookie) { return PortSQLFence::Queue(m_asyncSQL[SQL_PLAYER],PortSQLFence::Cube,cookie); }
|
||||
SQLMsg* PopCubeAsyncFence() { return PortSQLFence::Pop(m_asyncSQL[SQL_PLAYER],PortSQLFence::Cube); }
|
||||
uint64_t SQLFenceFailures() { return PortSQLFence::PlayerRouter().Failures(); }
|
||||
uint64_t EconomyFailures(bool async) { return (async?m_asyncSQL[SQL_PLAYER]:m_mainSQL[SQL_PLAYER])->FailureEpoch(); }
|
||||
MYSQL* DirectHandle(int slot=SQL_PLAYER) { return m_directSQL[slot]->GetSQLHandle(); }
|
||||
SQLMsg * DirectQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);
|
||||
|
||||
SQLMsg * PopResult();
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
#include "stdafx.h"
|
||||
#include "ClientManager.h"
|
||||
#include "Cache.h"
|
||||
#include "QID.h"
|
||||
#include "Main.h"
|
||||
#include "../../common/economy_mysql.h"
|
||||
#include <memory>
|
||||
#include "../../common/economy_view.h"
|
||||
|
||||
namespace {
|
||||
using namespace PortEconomy;
|
||||
using Query=std::unique_ptr<SQLMsg>;
|
||||
Query query(const std::string& sql){return Query(CDBManager::instance().DirectQuery(sql.c_str()));}
|
||||
bool valid(const Query& q){return q&&!q->uiSQLErrno&&q->Get();}
|
||||
// Schema installation/removal requires a coordinated restart. An absent schema
|
||||
// is detected once without issuing failing SQL for every ordinary item save.
|
||||
int schema() {
|
||||
static int state=-1;if(state>=0)return state;
|
||||
auto q=query("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='port_economy_version'");
|
||||
if(!valid(q)||q->Get()->uiNumRows!=1)return -1;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);if(!row||!row[0])return -1;
|
||||
state=std::string(row[0])=="1"?1:0;return state;
|
||||
}
|
||||
bool owns(CLoginData* login,CPeer* peer,DWORD pid,bool playing) {
|
||||
if(!login || login->GetConnectedPeerHandle()!=peer->GetHandle() || login->IsPlay()!=playing)return false;
|
||||
for(const auto& p:login->GetAccountRef().players)if(p.dwID==pid)return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void CClientManager::EconomyRequest(CPeer* peer,DWORD handle,const char* data,DWORD length) {
|
||||
if(length!=sizeof(PortEconomy::Request)||!peer->GetChannel())return;
|
||||
PortEconomy::Request r;memcpy(&r,data,sizeof(r));
|
||||
if(!PortEconomy::Valid(r)||!owns(GetLoginDataByAID(r.account),peer,r.player,true))return;
|
||||
PortEconomy::Reply reply={};reply.account=r.account;reply.player=r.player;
|
||||
auto send=[&](const std::string& text,bool success){reply.ok=success;const std::string message=r.operation==PortEconomy::UiStatus&&text.find("MTECON1 ")!=0?"MTECON1 error "+std::to_string(r.generation)+" storage":text;strlcpy(reply.message,message.c_str(),sizeof(reply.message));peer->EncodeHeader(PortEconomy::Header,handle,sizeof(reply));peer->Encode(&reply,sizeof(reply));};
|
||||
if(*GetTablePostfix()||schema()!=1){send("Economy transactions require the unsuffixed player schema.",false);return;}
|
||||
PortEconomy::Mysql mysql(CDBManager::instance().DirectHandle());
|
||||
PortEconomy::Store<PortEconomy::Mysql> store(mysql,[&](uint32_t vnum){auto it=m_map_itemTableByVnum.find(vnum);return it==m_map_itemTableByVnum.end()?0u:unsigned(it->second->bSize);});
|
||||
if(!store.Ready()){send("Economy storage is unavailable; no payment was made.",false);return;}
|
||||
if(r.operation==PortEconomy::UiStatus) {
|
||||
std::vector<std::string> frames;
|
||||
if(!PortEconomy::View(mysql,r,[&](uint32_t vnum){auto it=m_map_itemTableByVnum.find(vnum);return it==m_map_itemTableByVnum.end()?0u:unsigned(it->second->bSize);},frames)) {
|
||||
send("MTECON1 error "+std::to_string(r.generation)+" storage",false);return;
|
||||
}
|
||||
for(const auto& frame:frames)send(frame,true);
|
||||
return;
|
||||
}
|
||||
if(r.operation==PortEconomy::Status) {
|
||||
PortEconomy::Rows rows;
|
||||
if(!mysql.Query("SELECT token,result,reference FROM port_economy_requests WHERE pid="+std::to_string(r.player)+" ORDER BY created_at DESC,token DESC LIMIT 3",rows)){send("Economy storage is unavailable.",false);return;}
|
||||
std::string text="Recent transactions:";
|
||||
for(const auto& row:rows)text+=" "+row[1]+" #"+row[2];send(text,true);
|
||||
if(mysql.Query("SELECT l.id,l.price,l.state,COALESCE(c.vnum,0),COALESCE(c.count,0) FROM port_economy_listings l LEFT JOIN port_economy_custody c ON c.id=l.item WHERE l.state='OPEN' OR l.owner="+std::to_string(r.player)+" ORDER BY l.id DESC LIMIT 5 OFFSET "+std::to_string(r.reference*5),rows))for(const auto& row:rows)send("Listing #"+row[0]+" vnum="+row[3]+" count="+row[4]+" price="+row[1]+" "+row[2],true);
|
||||
if(mysql.Query("SELECT id,state FROM port_economy_orders WHERE buyer="+std::to_string(r.player)+" ORDER BY id DESC LIMIT 5 OFFSET "+std::to_string(r.reference*5),rows))for(const auto& row:rows)send("Order #"+row[0]+" "+row[1],true);
|
||||
if(mysql.Query("SELECT amount FROM port_economy_credit WHERE pid="+std::to_string(r.player),rows))send("Unclaimed proceeds: "+(rows.empty()?std::string("0"):rows[0][0]),true);
|
||||
return;
|
||||
}
|
||||
if(!CubeMemoryLoadable(r.account,r.player)||!CubePlayerWritable(r.player)){send("Character assets are awaiting Cube reconciliation.",false);return;}
|
||||
if(r.operation==PortEconomy::List) {
|
||||
auto it=m_map_itemTableByVnum.find(r.itemVnum);
|
||||
if(it==m_map_itemTableByVnum.end() || (it->second->dwAntiFlags&(ITEM_ANTIFLAG_GIVE|ITEM_ANTIFLAG_MYSHOP)) || it->second->bType==ITEM_QUEST) {send("This item cannot be listed.",false);return;}
|
||||
}
|
||||
// Materialized Gaya stacks are generated by game using the normal item
|
||||
// factory. Validate proto stack limits before accepting their durable IDs.
|
||||
for(unsigned i=0;i<r.rewardCount;++i) {
|
||||
const auto& reward=r.rewards[i];auto it=m_map_itemTableByVnum.find(reward.vnum);
|
||||
if(it==m_map_itemTableByVnum.end() || reward.count>2000 || (!(it->second->dwFlags&ITEM_FLAG_STACKABLE)&&reward.count!=1)){send("Invalid reward stack.",false);return;}
|
||||
}
|
||||
if(store.Enqueue(r)) {
|
||||
m_economyOwners[r.player]=r.account;
|
||||
m_economyEnqueueEpoch.emplace(r.player,std::make_pair(CDBManager::instance().EconomyFailures(false),CDBManager::instance().EconomyFailures(true)));
|
||||
send("Transaction queued. Reconnect and select the character to settle it; use /mt_economy status for the result.",true);
|
||||
} else send("Transaction was not accepted, or another request is pending. Reconnect to recover it.",false);
|
||||
}
|
||||
|
||||
bool CClientManager::EconomyBeforeLoad(CPeer* peer,DWORD handle,TPlayerLoadPacket* packet) {
|
||||
if(!CubeMemoryLoadable(packet->account_id,packet->player_id))return false;
|
||||
if(!CubeAccountLoadable(packet->account_id,packet->player_id))return false;
|
||||
if(*GetTablePostfix())return true;
|
||||
const int installed=schema();if(installed==0)return true;if(installed<0)return false;
|
||||
// Existing ownership checks must run before evicting or fencing any cache.
|
||||
auto* login=GetLoginDataByAID(packet->account_id);
|
||||
if(!owns(login,peer,packet->player_id,false))return false;
|
||||
for(const auto& running:m_economyFences)if(running.second.account==packet->account_id)return false;
|
||||
auto pending=query("SELECT token FROM port_economy_pending WHERE pid="+std::to_string(packet->player_id));
|
||||
if(!valid(pending))return false;
|
||||
if(!pending->Get()->uiNumRows){m_economyClosed.erase(packet->player_id);return true;}
|
||||
m_economyOwners[packet->player_id]=packet->account_id;
|
||||
m_economyClosed.insert(packet->player_id);
|
||||
EconomyFence fence;fence.account=packet->account_id;fence.peer=peer->GetHandle();fence.handle=handle;fence.load=*packet;
|
||||
auto& database=CDBManager::instance();
|
||||
auto epoch=m_economyEnqueueEpoch.find(packet->player_id);
|
||||
fence.mainFailures=epoch==m_economyEnqueueEpoch.end()?database.EconomyFailures(false):epoch->second.first;
|
||||
fence.asyncFailures=epoch==m_economyEnqueueEpoch.end()?database.EconomyFailures(true):epoch->second.second;
|
||||
fence.routerFailures=database.SQLFenceFailures();
|
||||
m_economyFences[packet->player_id]=fence;
|
||||
// Eviction sends every dirty snapshot before the two FIFO barriers. Never
|
||||
// settle on a cached player, including caches still awaiting logout timeout.
|
||||
FlushItemCacheSet(packet->player_id);FlushPlayerCacheSet(packet->player_id);
|
||||
DeleteLogoutPlayer(packet->player_id);
|
||||
database.ReturnQuery("SELECT 1",QID_ECONOMY_FENCE,packet->player_id,nullptr);
|
||||
return false;
|
||||
}
|
||||
|
||||
void CClientManager::EconomyMainFence(DWORD pid,bool failed) {
|
||||
auto it=m_economyFences.find(pid);if(it==m_economyFences.end())return;
|
||||
it->second.failed|=failed;
|
||||
if(!it->second.primed) {
|
||||
// Earlier load callbacks may themselves queue saves (e.g. mall awards).
|
||||
// A second main barrier and an async barrier follow those callbacks.
|
||||
it->second.primed=true;
|
||||
CDBManager::instance().ReturnQuery("SELECT 1",QID_ECONOMY_FENCE,pid,nullptr);
|
||||
it->second.asyncQueued=CDBManager::instance().EconomyAsyncFence(pid);
|
||||
} else it->second.mainDone=true;
|
||||
}
|
||||
void CClientManager::EconomyTick() {
|
||||
auto& database=CDBManager::instance();
|
||||
for(auto& entry:m_economyFences)if(entry.second.primed&&!entry.second.asyncQueued)
|
||||
entry.second.asyncQueued=database.EconomyAsyncFence(entry.first);
|
||||
while(SQLMsg* raw=database.PopEconomyAsyncFence()) {
|
||||
Query q(raw);DWORD pid=static_cast<DWORD>(reinterpret_cast<uintptr_t>(q->pvUserData));
|
||||
auto it=m_economyFences.find(pid);if(it!=m_economyFences.end()){it->second.asyncDone=true;it->second.failed|=q->uiSQLErrno!=0;}
|
||||
}
|
||||
for(auto it=m_economyFences.begin();it!=m_economyFences.end();) {
|
||||
auto& fence=it->second;
|
||||
if(fence.nextAttempt>time(nullptr)){++it;continue;}
|
||||
if(!fence.mainDone||!fence.asyncDone){++it;continue;}
|
||||
auto* login=GetLoginDataByAID(fence.account);
|
||||
if((login&&login->IsPlay())||!CubeMemoryLoadable(fence.account,it->first)||!CubePlayerWritable(it->first)){++it;continue;}
|
||||
PortEconomy::Mysql mysql(database.DirectHandle());
|
||||
PortEconomy::Store<PortEconomy::Mysql> store(mysql,[&](uint32_t vnum){auto p=m_map_itemTableByVnum.find(vnum);return p==m_map_itemTableByVnum.end()?0u:unsigned(p->second->bSize);});
|
||||
const bool failed=fence.failed||database.EconomyFailures(false)!=fence.mainFailures||database.EconomyFailures(true)!=fence.asyncFailures||database.SQLFenceFailures()!=fence.routerFailures;
|
||||
bool done=failed?store.Abort(it->first,fence.account):store.Settle(it->first,fence.account)!=PortEconomy::Store<PortEconomy::Mysql>::Retry;
|
||||
if(done) {
|
||||
m_economyEnqueueEpoch.erase(it->first);
|
||||
sys_log(0,"ECONOMY_SETTLE pid=%u outcome=%s ref=%llu",it->first,failed?"save_failed":store.Outcome().c_str(),static_cast<unsigned long long>(store.Reference()));
|
||||
EconomyFence completed=fence;it=m_economyFences.erase(it);
|
||||
if(CPeer* peer=GetPeer(completed.peer))QUERY_PLAYER_LOAD(peer,completed.handle,&completed.load);
|
||||
} else {fence.nextAttempt=time(nullptr)+5;++it;}
|
||||
}
|
||||
}
|
||||
|
||||
bool CClientManager::EconomySaveAllowed(CPeer* peer,DWORD pid) {
|
||||
if(!CubePeerMaySave(peer,pid))return false;
|
||||
if(!CubePlayerWritable(pid))return false;
|
||||
if(m_economyClosed.count(pid))return false;
|
||||
auto it=m_economyOwners.find(pid);if(it==m_economyOwners.end())return true;
|
||||
return owns(GetLoginDataByAID(it->second),peer,pid,true);
|
||||
}
|
||||
bool CClientManager::EconomyItemWritable(DWORD id) {
|
||||
if(!CubeItemWritable(id))return false;
|
||||
if(*GetTablePostfix())return true;
|
||||
const int installed=schema();if(installed==0)return true;if(installed<0)return false;
|
||||
auto q=query("SELECT id FROM port_economy_custody WHERE id="+std::to_string(id));
|
||||
if(!valid(q))return false;
|
||||
return q->Get()->uiNumRows==0;
|
||||
}
|
||||
|
||||
// Native character deletion must not strand escrow, pending refunds, proceeds
|
||||
// or a migrated catalogue outside the tables that legacy deletion cleans up.
|
||||
// Catalogue users need an explicit audited retirement, not an implicit reset.
|
||||
bool CClientManager::EconomyCanDelete(DWORD pid) {
|
||||
if(!CubeMemoryLoadable(0,pid))return false;
|
||||
if(!CubePlayerWritable(pid))return false;
|
||||
if(*GetTablePostfix())return true;
|
||||
const int installed=schema();if(installed==0)return true;if(installed<0)return false;
|
||||
if(m_economyFences.count(pid)||m_economyClosed.count(pid))return false;
|
||||
const std::string id=std::to_string(pid);
|
||||
auto q=query("SELECT (EXISTS(SELECT 1 FROM port_economy_pending WHERE pid="+id+"))+(EXISTS(SELECT 1 FROM port_economy_listings WHERE owner="+id+" AND state IN('OPEN','RESERVED')))+(EXISTS(SELECT 1 FROM port_economy_orders WHERE buyer="+id+" AND state='READY'))+(EXISTS(SELECT 1 FROM port_economy_credit WHERE pid="+id+" AND amount<>0))+(EXISTS(SELECT 1 FROM port_economy_gaya WHERE pid="+id+" AND generation<>"+std::to_string(PortEconomy::RetiredGeneration)+"))+(EXISTS(SELECT 1 FROM port_economy_gaya WHERE pid="+id+" AND generation="+std::to_string(PortEconomy::RetiredGeneration)+" AND EXISTS(SELECT 1 FROM quest WHERE dwPID="+id+" AND szName='gem' AND szState='points' AND lValue<>0)))");
|
||||
if(!valid(q)||q->Get()->uiNumRows!=1)return false;
|
||||
MYSQL_ROW row=mysql_fetch_row(q->Get()->pSQLResult);return row&&row[0]&&std::string(row[0])=="0";
|
||||
}
|
||||
@@ -765,9 +765,9 @@ void CGuildManager::UseSkill(DWORD GID, DWORD dwSkillVnum, DWORD dwCooltime)
|
||||
// END_OF_GUILD_SKILL_COOLTIME_BUG_FIX
|
||||
}
|
||||
|
||||
void CGuildManager::MoneyChange(DWORD dwGuild, DWORD dwGold)
|
||||
void CGuildManager::MoneyChange(DWORD dwGuild, int64_t dwGold)
|
||||
{
|
||||
sys_log(0, "GuildManager::MoneyChange %d %d", dwGuild, dwGold);
|
||||
sys_log(0, "GuildManager::MoneyChange %u %lld", dwGuild, (long long)dwGold);
|
||||
|
||||
TPacketDGGuildMoneyChange p;
|
||||
p.dwGuild = dwGuild;
|
||||
@@ -775,11 +775,11 @@ void CGuildManager::MoneyChange(DWORD dwGuild, DWORD dwGold)
|
||||
CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_MONEY_CHANGE, &p, sizeof(p));
|
||||
|
||||
char buf[1024];
|
||||
snprintf(buf, sizeof(buf), "UPDATE guild%s SET gold=%u WHERE id = %u", GetTablePostfix(), dwGold, dwGuild);
|
||||
snprintf(buf, sizeof(buf), "UPDATE guild%s SET gold=%lld WHERE id = %u", GetTablePostfix(), (long long)dwGold, dwGuild);
|
||||
CDBManager::instance().AsyncQuery(buf);
|
||||
}
|
||||
|
||||
void CGuildManager::DepositMoney(DWORD dwGuild, INT iGold)
|
||||
void CGuildManager::DepositMoney(DWORD dwGuild, int64_t iGold)
|
||||
{
|
||||
if (iGold <= 0)
|
||||
return;
|
||||
@@ -793,12 +793,12 @@ void CGuildManager::DepositMoney(DWORD dwGuild, INT iGold)
|
||||
}
|
||||
|
||||
it->second.gold += iGold;
|
||||
sys_log(0, "GUILD: %u Deposit %u Total %d", dwGuild, iGold, it->second.gold);
|
||||
sys_log(0, "GUILD: %u Deposit %lld Total %lld", dwGuild, (long long)iGold, (long long)it->second.gold);
|
||||
|
||||
MoneyChange(dwGuild, it->second.gold);
|
||||
}
|
||||
|
||||
void CGuildManager::WithdrawMoney(CPeer* peer, DWORD dwGuild, INT iGold)
|
||||
void CGuildManager::WithdrawMoney(CPeer* peer, DWORD dwGuild, int64_t iGold)
|
||||
{
|
||||
itertype(m_map_kGuild) it = m_map_kGuild.find(dwGuild);
|
||||
|
||||
@@ -812,7 +812,7 @@ void CGuildManager::WithdrawMoney(CPeer* peer, DWORD dwGuild, INT iGold)
|
||||
if (it->second.gold >= iGold)
|
||||
{
|
||||
it->second.gold -= iGold;
|
||||
sys_log(0, "GUILD: %u Withdraw %d Total %d", dwGuild, iGold, it->second.gold);
|
||||
sys_log(0, "GUILD: %u Withdraw %lld Total %lld", dwGuild, (long long)iGold, (long long)it->second.gold);
|
||||
|
||||
TPacketDGGuildMoneyWithdraw p;
|
||||
p.dwGuild = dwGuild;
|
||||
@@ -823,14 +823,14 @@ void CGuildManager::WithdrawMoney(CPeer* peer, DWORD dwGuild, INT iGold)
|
||||
}
|
||||
}
|
||||
|
||||
void CGuildManager::WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, INT iGold)
|
||||
void CGuildManager::WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, int64_t iGold)
|
||||
{
|
||||
itertype(m_map_kGuild) it = m_map_kGuild.find(dwGuild);
|
||||
|
||||
if (it == m_map_kGuild.end())
|
||||
return;
|
||||
|
||||
sys_log(0, "GuildManager::WithdrawMoneyReply : guild %u success %d gold %d", dwGuild, bGiveSuccess, iGold);
|
||||
sys_log(0, "GuildManager::WithdrawMoneyReply : guild %u success %d gold %lld", dwGuild, bGiveSuccess, (long long)iGold);
|
||||
|
||||
if (!bGiveSuccess)
|
||||
it->second.gold += iGold;
|
||||
@@ -1067,13 +1067,12 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
|
||||
|
||||
std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
if (pmsg->Get()->uiAffectedRows == 0 || pmsg->Get()->uiInsertID == 0 || pmsg->Get()->uiAffectedRows == (uint32_t)-1)
|
||||
if (pmsg->Get()->uiAffectedRows == 0 || !pmsg->Get()->GetInsertID32(t.dwID) || pmsg->Get()->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_err("GuildWar: Cannot insert row");
|
||||
return false;
|
||||
}
|
||||
|
||||
t.dwID = pmsg->Get()->uiInsertID;
|
||||
|
||||
m_map_kWarReserve.insert(std::make_pair(t.dwID, new CGuildWarReserve(t)));
|
||||
|
||||
@@ -1293,7 +1292,7 @@ bool CGuildWarReserve::Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild)
|
||||
|
||||
std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
if (pmsg->Get()->uiAffectedRows == 0 || pmsg->Get()->uiAffectedRows == (uint32_t)-1)
|
||||
if (pmsg->Get()->uiAffectedRows == 0 || pmsg->Get()->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_log(0, "GuildWarReserve::Bet: failed. cannot insert row to guild_war_bet table");
|
||||
return false;
|
||||
|
||||
@@ -114,7 +114,7 @@ typedef struct SGuild
|
||||
int win;
|
||||
int draw;
|
||||
int loss;
|
||||
int gold;
|
||||
int64_t gold;
|
||||
int level;
|
||||
} TGuild;
|
||||
|
||||
@@ -191,12 +191,12 @@ class CGuildManager : public singleton<CGuildManager>
|
||||
|
||||
void UseSkill(DWORD dwGuild, DWORD dwSkillVnum, DWORD dwCooltime);
|
||||
|
||||
INT GetGuildGold(DWORD dwGuild);
|
||||
void DepositMoney(DWORD dwGuild, INT lGold);
|
||||
void WithdrawMoney(CPeer* peer, DWORD dwGuild, INT lGold);
|
||||
void WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, INT lGold);
|
||||
int64_t GetGuildGold(DWORD dwGuild);
|
||||
void DepositMoney(DWORD dwGuild, int64_t lGold);
|
||||
void WithdrawMoney(CPeer* peer, DWORD dwGuild, int64_t lGold);
|
||||
void WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, int64_t lGold);
|
||||
|
||||
void MoneyChange(DWORD dwGuild, DWORD dwGold);
|
||||
void MoneyChange(DWORD dwGuild, int64_t dwGold);
|
||||
|
||||
void QueryRanking();
|
||||
void ResultRanking(MYSQL_RES * pRes);
|
||||
|
||||
@@ -28,7 +28,7 @@ void ItemAwardManager::Load(SQLMsg * pMsg)
|
||||
{
|
||||
MYSQL_RES * pRes = pMsg->Get()->pSQLResult;
|
||||
|
||||
for (uint i = 0; i < pMsg->Get()->uiNumRows; ++i)
|
||||
for (uint64_t i = 0; i < pMsg->Get()->uiNumRows; ++i)
|
||||
{
|
||||
MYSQL_ROW row = mysql_fetch_row(pRes);
|
||||
int col = 0;
|
||||
|
||||
@@ -93,20 +93,54 @@ bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable
|
||||
|
||||
snprintf(szQuery, sizeof(szQuery), "SELECT MAX(id) FROM item%s WHERE id >= %u and id <= %u", GetTablePostfix(), dwMin, dwMax);
|
||||
|
||||
if(!*GetTablePostfix()) {
|
||||
// Legacy escrow remains reserved until explicit reconciliation. Closing
|
||||
// its UI must not make those original IDs available after a DB restart.
|
||||
auto* legacy=CDBManager::instance().DirectQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='offline_shop_item'");
|
||||
if(!legacy || legacy->uiSQLErrno || !legacy->Get() || legacy->Get()->uiNumRows!=1 || !legacy->Get()->pSQLResult){delete legacy;return false;}
|
||||
row=mysql_fetch_row(legacy->Get()->pSQLResult);
|
||||
const bool hasLegacy=row && row[0] && !strcmp(row[0],"1");
|
||||
const bool noLegacy=row && row[0] && !strcmp(row[0],"0");
|
||||
delete legacy;if(!hasLegacy && !noLegacy)return false;
|
||||
SQLMsg* version=CDBManager::instance().DirectQuery("SELECT version FROM port_economy_version WHERE id=1");
|
||||
if(!version)return false;
|
||||
const bool absent=version->uiSQLErrno==ER_NO_SUCH_TABLE;
|
||||
const bool valid=!version->uiSQLErrno && version->Get() && version->Get()->uiNumRows==1;
|
||||
delete version;
|
||||
if(!absent && !valid)return false;
|
||||
const std::string bounds=" WHERE id BETWEEN "+std::to_string(dwMin)+" AND "+std::to_string(dwMax);
|
||||
std::string sources="SELECT id FROM item"+bounds;
|
||||
if(hasLegacy)sources+=" UNION ALL SELECT id FROM offline_shop_item"+bounds;
|
||||
if(valid)sources+=" UNION ALL SELECT id FROM port_economy_custody"+bounds+" UNION ALL SELECT id FROM port_economy_item_reservations"+bounds;
|
||||
// PORT: a durable Cube drain may hold dirty cached IDs that are not in
|
||||
// item yet. They must not be reissued while that owner awaits resync.
|
||||
auto* cube=CDBManager::instance().DirectQuery("SELECT COUNT(*) FROM information_schema.tables WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='port_cube_item_fences'");
|
||||
if(!cube||cube->uiSQLErrno||!cube->Get()||cube->Get()->uiNumRows!=1||!cube->Get()->pSQLResult){delete cube;return false;}
|
||||
row=mysql_fetch_row(cube->Get()->pSQLResult);
|
||||
const bool hasCube=row&&row[0]&&!strcmp(row[0],"1"),noCube=row&&row[0]&&!strcmp(row[0],"0");
|
||||
delete cube;if(!hasCube&&!noCube)return false;
|
||||
if(hasCube)sources+=" UNION ALL SELECT id FROM port_cube_item_fences"+bounds;
|
||||
const int length=snprintf(szQuery,sizeof(szQuery),"SELECT MAX(id) FROM (%s) AS allocated_ids",sources.c_str());
|
||||
if(length<0||size_t(length)>=sizeof(szQuery))return false;
|
||||
}
|
||||
pMsg = CDBManager::instance().DirectQuery(szQuery);
|
||||
if(!pMsg || pMsg->uiSQLErrno || !pMsg->Get() || pMsg->Get()->uiNumRows!=1 || !pMsg->Get()->pSQLResult){delete pMsg;return false;}
|
||||
|
||||
if (pMsg != NULL)
|
||||
{
|
||||
if (pMsg->Get()->uiNumRows > 0)
|
||||
if (pMsg->Get()->uiNumRows == 1 && pMsg->Get()->pSQLResult)
|
||||
{
|
||||
row = mysql_fetch_row(pMsg->Get()->pSQLResult);
|
||||
str_to_number(dwItemMaxID, row[0]);
|
||||
unsigned long long maximum=0;
|
||||
if(!row || (row[0] && (!str_to_number(maximum,row[0]) || maximum>UINT32_MAX))){delete pMsg;return false;}
|
||||
dwItemMaxID=static_cast<DWORD>(maximum);
|
||||
}
|
||||
delete pMsg;
|
||||
}
|
||||
|
||||
if (dwItemMaxID == 0)
|
||||
dwItemMaxID = dwMin;
|
||||
else if(dwItemMaxID>=dwMax)return false;
|
||||
else
|
||||
dwItemMaxID++;
|
||||
|
||||
@@ -126,28 +160,14 @@ bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable
|
||||
|
||||
pMsg = CDBManager::instance().DirectQuery(szQuery);
|
||||
|
||||
if (pMsg != NULL)
|
||||
{
|
||||
if (pMsg->Get()->uiNumRows > 0)
|
||||
{
|
||||
DWORD count = 0;
|
||||
row = mysql_fetch_row(pMsg->Get()->pSQLResult);
|
||||
str_to_number(count, row[0]);
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
sys_err("ItemIDRange: Build: %u ~ %u\thave a item", range.dwUsableItemIDMin, range.dwMax);
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
sys_log(0, "ItemIDRange: Build: %u ~ %u start:%u", range.dwMin, range.dwMax, range.dwUsableItemIDMin);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
delete pMsg;
|
||||
}
|
||||
if(!pMsg || pMsg->uiSQLErrno || !pMsg->Get() || pMsg->Get()->uiNumRows!=1 || !pMsg->Get()->pSQLResult){delete pMsg;return false;}
|
||||
row=mysql_fetch_row(pMsg->Get()->pSQLResult);
|
||||
unsigned long long count=0;
|
||||
const bool empty=row && row[0] && str_to_number(count,row[0]) && count==0;
|
||||
delete pMsg;
|
||||
if(!empty)return false;
|
||||
sys_log(0,"ItemIDRange: Build: %u ~ %u start:%u",range.dwMin,range.dwMax,range.dwUsableItemIDMin);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
+36
-16
@@ -1,28 +1,29 @@
|
||||
MAKE = gmake
|
||||
CC = clang++-devel
|
||||
MAKE = make
|
||||
CC ?= clang++-devel
|
||||
|
||||
INCDIR =
|
||||
LIBDIR =
|
||||
BINDIR = ..
|
||||
OBJDIR = .obj
|
||||
DBDIR = /usr/metin2/server/share/bin
|
||||
DBDIR ?= ../../share/bin
|
||||
|
||||
GCC_VERSION = $(shell $(CC) --version 2>&1 | grep "(GCC)" | cut -d' ' -f3 | cut -d'.' -f1)
|
||||
BSD_VERSION = $(shell uname -v 2>&1 | cut -d' ' -f2 | cut -d'.' -f1)
|
||||
UNAME_S := $(shell uname -s)
|
||||
SVN_VERSION = 40142
|
||||
$(shell if [ ! -d $(OBJDIR) ]; then mkdir $(OBJDIR); fi)
|
||||
|
||||
# TARGET = $(BINDIR)/db_r$(SVN_VERSION)
|
||||
TARGET = $(BINDIR)/db
|
||||
|
||||
CFLAGS = -g -Wall -w -O2 -pipe -fno-rtti -std=c++2b -fno-exceptions -pthread -D_THREAD_SAFE
|
||||
CFLAGS += -mtune=i686
|
||||
|
||||
ifeq ($(UNAME_S), Linux)
|
||||
CFLAGS ?= -g -Wall -w -O2 -pipe -fno-rtti -std=c++2b -fno-exceptions -pthread -D_THREAD_SAFE
|
||||
LIBS += -lmariadb -lz -lssl -lcrypto -ldl
|
||||
INCDIR += -I/usr/include/mariadb -I/usr/include/mysql
|
||||
else
|
||||
CFLAGS ?= -g -Wall -w -O2 -pipe -fno-rtti -std=c++2b -fno-exceptions -pthread -D_THREAD_SAFE -mtune=i686
|
||||
# MySQL
|
||||
LIBS += /usr/local/lib/mysql/libmysqlclient.a /usr/lib/libz.a
|
||||
|
||||
# OpenSSL
|
||||
LIBS += /usr/lib/libssl.a /usr/lib/libcrypto.a
|
||||
endif
|
||||
|
||||
# Miscellaneous external libraries
|
||||
INCDIR += -I../../../extern/include
|
||||
@@ -38,8 +39,8 @@ SRCS = Config.cpp NetBase.cpp Peer.cpp PeerBase.cpp Main.cpp Lock.cpp DBManager.
|
||||
Cache.cpp LoginData.cpp ClientManager.cpp ClientManagerPlayer.cpp ClientManagerLogin.cpp \
|
||||
ClientManagerBoot.cpp ClientManagerParty.cpp ClientManagerGuild.cpp GuildManager.cpp HB.cpp \
|
||||
PrivManager.cpp MoneyLog.cpp ItemAwardManager.cpp ClientManagerEventFlag.cpp Marriage.cpp \
|
||||
Monarch.cpp BlockCountry.cpp ItemIDRangeManager.cpp ClientManagerHorseName.cpp version.cpp \
|
||||
AuctionManager.cpp ProtoReader.cpp CsvReader.cpp
|
||||
Monarch.cpp BlockCountry.cpp ItemIDRangeManager.cpp ClientManagerHorseName.cpp ClientManagerOfflineshop.cpp version.cpp \
|
||||
AuctionManager.cpp ProtoReader.cpp CsvReader.cpp Ava2ItemShop.cpp Economy.cpp Cube.cpp CubeRuntime.cpp CubeGold.cpp
|
||||
|
||||
OBJS = $(SRCS:%.cpp=$(OBJDIR)/%.o)
|
||||
|
||||
@@ -47,11 +48,10 @@ default: $(TARGET)
|
||||
|
||||
$(TARGET): $(OBJS)
|
||||
@echo linking $(TARGET)....
|
||||
@$(CC) $(CFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $(TARGET)
|
||||
$(CC) $(CFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $(TARGET)
|
||||
@touch version.cpp
|
||||
@echo "Moving $(TARGET) to $(DBDIR)"
|
||||
@mv $(TARGET) $(DBDIR)
|
||||
@echo "All done! Your db file moved to your server directory."
|
||||
@if [ -d "$(DBDIR)" ]; then cp $(TARGET) $(DBDIR)/; echo "Copied $(TARGET) to $(DBDIR)"; fi
|
||||
@echo "All done!"
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
@echo compile $<
|
||||
@@ -72,3 +72,23 @@ dep:
|
||||
makedepend -fDepend $(INCDIR) -I/usr/include/c++/3.3 -I/usr/include/c++/4.2 -p$(OBJDIR)/ $(SRCS) 2> /dev/null
|
||||
|
||||
sinclude Depend
|
||||
|
||||
# PORT: handwritten economy headers are not present in the legacy Depend file.
|
||||
$(OBJDIR)/Economy.o: ../../common/economy.h ../../common/economy_store.h ../../common/economy_mysql.h ../../common/economy_view.h
|
||||
|
||||
# ClientManager layout and DB result ownership affect every DB translation unit.
|
||||
$(OBJS): ClientManager.h DBManager.h SQLFences.h CubeRuntime.h ../../common/sql_fence_router.h ../../common/cube_batch.h ../../common/cube_recipe.h ../../common/cube_drain.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_fence.h ../../common/cube_store.h ../../common/economy_mysql.h
|
||||
$(OBJS): ../../common/cube_handshake.h
|
||||
$(OBJS): ../../common/cube_mutation.h
|
||||
$(OBJDIR)/CubeGold.o: ../../common/cube_gold_store.h ../../common/cube_gold_intent.h ../../common/cube_store.h ../../common/economy_mysql.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_gold_intent.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_gold_store.h
|
||||
$(OBJS): ../../common/cube_gold_source.h
|
||||
$(OBJS): ../../common/cube_owner_types.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_owner.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_image_ack.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_release.h
|
||||
$(OBJS): ../../common/cube_image.h
|
||||
$(OBJS): ../../common/cube_receipt.h
|
||||
$(OBJDIR)/CubeRuntime.o: ../../common/cube_random.h
|
||||
|
||||
@@ -44,11 +44,11 @@ namespace marriage
|
||||
unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
SQLResult * pRes = pmsg->Get();
|
||||
sys_log(0, "MarriageList(size=%lu)", pRes->uiNumRows);
|
||||
sys_log(0, "MarriageList(size=%llu)", static_cast<unsigned long long>(pRes->uiNumRows));
|
||||
|
||||
if (pRes->uiNumRows > 0)
|
||||
{
|
||||
for (uint uiRow = 0; uiRow != pRes->uiNumRows; ++uiRow)
|
||||
for (uint64_t uiRow = 0; uiRow != pRes->uiNumRows; ++uiRow)
|
||||
{
|
||||
MYSQL_ROW row = mysql_fetch_row(pRes->pSQLResult);
|
||||
|
||||
@@ -104,7 +104,7 @@ namespace marriage
|
||||
unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
SQLResult* res = pmsg->Get();
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_err("cannot insert marriage");
|
||||
return;
|
||||
@@ -144,7 +144,7 @@ namespace marriage
|
||||
unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
SQLResult* res = pmsg->Get();
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_err("cannot update marriage : PID:%u %u", dwPID1, dwPID2);
|
||||
return;
|
||||
@@ -190,7 +190,7 @@ namespace marriage
|
||||
unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
SQLResult* res = pmsg->Get();
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_err("cannot delete marriage : PID:%u %u", dwPID1, dwPID2);
|
||||
return;
|
||||
@@ -234,7 +234,7 @@ namespace marriage
|
||||
unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
|
||||
|
||||
SQLResult* res = pmsg->Get();
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
|
||||
if (res->uiAffectedRows == 0 || res->uiAffectedRows == UINT64_MAX)
|
||||
{
|
||||
sys_err("cannot change engage to marriage : PID:%u %u", dwPID1, dwPID2);
|
||||
return;
|
||||
|
||||
@@ -51,7 +51,7 @@ void CMoneyLog::Save()
|
||||
*/
|
||||
}
|
||||
|
||||
void CMoneyLog::AddLog(BYTE bType, DWORD dwVnum, int iGold)
|
||||
void CMoneyLog::AddLog(BYTE bType, DWORD dwVnum, int64_t iGold)
|
||||
{
|
||||
m_MoneyLogContainer[bType][dwVnum] += iGold;
|
||||
}
|
||||
|
||||
@@ -11,10 +11,10 @@ class CMoneyLog : public singleton<CMoneyLog>
|
||||
virtual ~CMoneyLog();
|
||||
|
||||
void Save();
|
||||
void AddLog(BYTE bType, DWORD dwVnum, int iGold);
|
||||
void AddLog(BYTE bType, DWORD dwVnum, int64_t iGold);
|
||||
|
||||
private:
|
||||
std::map<DWORD, int> m_MoneyLogContainer[MONEY_LOG_TYPE_MAX_NUM];
|
||||
std::map<DWORD, int64_t> m_MoneyLogContainer[MONEY_LOG_TYPE_MAX_NUM];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -79,6 +79,7 @@ int get_Item_Type_Value(string inputString)
|
||||
|
||||
"ITEM_RING",
|
||||
"ITEM_BELT", //35개 (EItemTypes 값으로 치면 34)
|
||||
"ITEM_SHINING", "ITEM_NEW_RINGS", "ITEM_PET", // AVA2 35 (not ported), 36 new rings
|
||||
};
|
||||
|
||||
|
||||
@@ -101,9 +102,9 @@ int get_Item_Type_Value(string inputString)
|
||||
int get_Item_SubType_Value(int type_value, string inputString)
|
||||
{
|
||||
static string arSub1[] = { "WEAPON_SWORD", "WEAPON_DAGGER", "WEAPON_BOW", "WEAPON_TWO_HANDED",
|
||||
"WEAPON_BELL", "WEAPON_FAN", "WEAPON_ARROW", "WEAPON_MOUNT_SPEAR"};
|
||||
"WEAPON_BELL", "WEAPON_FAN", "WEAPON_ARROW", "WEAPON_MOUNT_SPEAR", "WEAPON_CLAW", "WEAPON_QUIVER"};
|
||||
static string arSub2[] = { "ARMOR_BODY", "ARMOR_HEAD", "ARMOR_SHIELD", "ARMOR_WRIST", "ARMOR_FOOTS",
|
||||
"ARMOR_NECK", "ARMOR_EAR", "ARMOR_NUM_TYPES"};
|
||||
"ARMOR_NECK", "ARMOR_EAR", "ARMOR_PENDANT", "ARMOR_NUM_TYPES"};
|
||||
static string arSub3[] = { "USE_POTION", "USE_TALISMAN", "USE_TUNING", "USE_MOVE", "USE_TREASURE_BOX", "USE_MONEYBAG", "USE_BAIT",
|
||||
"USE_ABILITY_UP", "USE_AFFECT", "USE_CREATE_STONE", "USE_SPECIAL", "USE_POTION_NODELAY", "USE_CLEAR",
|
||||
"USE_INVISIBILITY", "USE_DETACHMENT", "USE_BUCKET", "USE_POTION_CONTINUE", "USE_CLEAN_SOCKET",
|
||||
@@ -122,8 +123,10 @@ int get_Item_SubType_Value(int type_value, string inputString)
|
||||
"RESOURCE_STONE", "RESOURCE_METIN", "RESOURCE_ORE" };
|
||||
static string arSub16[] = { "UNIQUE_NONE", "UNIQUE_BOOK", "UNIQUE_SPECIAL_RIDE", "UNIQUE_3", "UNIQUE_4", "UNIQUE_5",
|
||||
"UNIQUE_6", "UNIQUE_7", "UNIQUE_8", "UNIQUE_9", "USE_SPECIAL"};
|
||||
static string arSub28[] = { "COSTUME_BODY", "COSTUME_HAIR" };
|
||||
static string arSub28[] = { "COSTUME_BODY", "COSTUME_HAIR", "COSTUME_MOUNT", "COSTUME_SASH", "COSTUME_MOUNT_SKIN", "COSTUME_WEAPON", "COSTUME_NEW_SASH", "COSTUME_PET" };
|
||||
static string arSub29[] = { "DS_SLOT1", "DS_SLOT2", "DS_SLOT3", "DS_SLOT4", "DS_SLOT5", "DS_SLOT6" };
|
||||
static string arSub35[] = { "SHINING_WEAPON", "SHINING_ARMOR", "SHINING_SPECIAL" };
|
||||
static string arSub37[] = { "PET_LEVELABLE", "PET_EGG", "PET_TRANSPORTBOX", "PET_PROTEIN", "PET_CHANGE_NAME_ITEM", "PET_DEW", "PET_SKILL", "PET_PRIMIUM_FEEDSTUFF", "PET_ATTR_CHANGE", "PET_ATTR_DETERMINE", "PET_EXPFOOD_PER", "PET_SKILL_DEL_BOOK", "PET_SKILL_ALL_DEL_BOOK", "PET_EXPFOOD", "PET_FEEDSTUFF" };
|
||||
static string arSub31[] = { "EXTRACT_DRAGON_SOUL", "EXTRACT_DRAGON_HEART" };
|
||||
|
||||
static string* arSubType[] = {0, //0
|
||||
@@ -161,6 +164,9 @@ int get_Item_SubType_Value(int type_value, string inputString)
|
||||
0, //32
|
||||
0, //33 반지
|
||||
0, //34 벨트
|
||||
arSub35, //35 ITEM_SHINING
|
||||
0, //36 ITEM_NEW_RINGS
|
||||
arSub37, //37 ITEM_PET
|
||||
};
|
||||
static int arNumberOfSubtype[_countof(arSubType)] = {
|
||||
0,
|
||||
@@ -198,6 +204,9 @@ int get_Item_SubType_Value(int type_value, string inputString)
|
||||
0, // 32
|
||||
0, // 33 반지
|
||||
0, // 34 벨트
|
||||
sizeof(arSub35)/sizeof(arSub35[0]), // 35
|
||||
0, // 36
|
||||
sizeof(arSub37)/sizeof(arSub37[0]), // 37
|
||||
};
|
||||
|
||||
|
||||
@@ -242,7 +251,7 @@ int get_Item_AntiFlag_Value(string inputString)
|
||||
|
||||
string arAntiFlag[] = {"ANTI_FEMALE", "ANTI_MALE", "ANTI_MUSA", "ANTI_ASSASSIN", "ANTI_SURA", "ANTI_MUDANG",
|
||||
"ANTI_GET", "ANTI_DROP", "ANTI_SELL", "ANTI_EMPIRE_A", "ANTI_EMPIRE_B", "ANTI_EMPIRE_C",
|
||||
"ANTI_SAVE", "ANTI_GIVE", "ANTI_PKDROP", "ANTI_STACK", "ANTI_MYSHOP", "ANTI_SAFEBOX"};
|
||||
"ANTI_SAVE", "ANTI_GIVE", "ANTI_PKDROP", "ANTI_STACK", "ANTI_MYSHOP", "ANTI_SAFEBOX", "ANTI_WOLFMAN"};
|
||||
|
||||
|
||||
int retValue = 0;
|
||||
@@ -393,6 +402,14 @@ int get_Item_ApplyType_Value(string inputString)
|
||||
"APPLY_EXTRACT_HP_PCT", "APPLY_RESIST_WARRIOR", "APPLY_RESIST_ASSASSIN", "APPLY_RESIST_SURA", "APPLY_RESIST_SHAMAN",
|
||||
"APPLY_ENERGY", "APPLY_DEF_GRADE", "APPLY_COSTUME_ATTR_BONUS", "APPLY_MAGIC_ATTBONUS_PER", "APPLY_MELEE_MAGIC_ATTBONUS_PER",
|
||||
"APPLY_RESIST_ICE", "APPLY_RESIST_EARTH", "APPLY_RESIST_DARK", "APPLY_ANTI_CRITICAL_PCT", "APPLY_ANTI_PENETRATE_PCT",
|
||||
// PORT AVA2 numbering: 92-96/138 = Wolfman, the rest not ported yet (common/length.h)
|
||||
"APPLY_BLEEDING_REDUCE", "APPLY_BLEEDING_PCT", "APPLY_ATTBONUS_WOLFMAN", "APPLY_RESIST_WOLFMAN", "APPLY_RESIST_CLAW", "APPLY_RESERVED_97", "APPLY_RESIST_MAGIC_REDUCTION", "APPLY_RESIST_HUMAN",
|
||||
"APPLY_RESERVED_100", "APPLY_RESERVED_101", "APPLY_RESERVED_102", "APPLY_RESERVED_103", "APPLY_RESERVED_104", "APPLY_RESERVED_105", "APPLY_RESERVED_106", "APPLY_RESERVED_107",
|
||||
"APPLY_RESERVED_108", "APPLY_RESERVED_109", "APPLY_RESERVED_110", "APPLY_RESERVED_111", "APPLY_RESERVED_112", "APPLY_RESERVED_113", "APPLY_RESERVED_114", "APPLY_RESERVED_115",
|
||||
"APPLY_RESERVED_116", "APPLY_RESERVED_117", "APPLY_RESERVED_118", "APPLY_RESERVED_119", "APPLY_RESERVED_120", "APPLY_RESERVED_121", "APPLY_RESERVED_122", "APPLY_ENCHANT_ELECT",
|
||||
"APPLY_ENCHANT_FIRE", "APPLY_ENCHANT_ICE", "APPLY_ENCHANT_WIND", "APPLY_ENCHANT_EARTH", "APPLY_ENCHANT_DARK", "APPLY_RESERVED_129", "APPLY_RESERVED_130", "APPLY_RESERVED_131",
|
||||
"APPLY_RESERVED_132", "APPLY_RESERVED_133", "APPLY_RESERVED_134", "APPLY_RESERVED_135", "APPLY_RESERVED_136", "APPLY_RESERVED_137", "APPLY_ATTBONUS_CLAW",
|
||||
"APPLY_ATTBONUS_STONE", "APPLY_ATTBONUS_BOSS",
|
||||
};
|
||||
|
||||
int retInt = -1;
|
||||
|
||||
@@ -32,7 +32,8 @@ enum QID
|
||||
QID_ITEMPRICE_SAVE, ///< 21, 아이템 가격정보 저장 쿼리
|
||||
QID_ITEMPRICE_DESTROY, ///< 22, 아이템 가격정보 삭제 쿼리
|
||||
QID_ITEMPRICE_LOAD_FOR_UPDATE, ///< 23, 가격정보 업데이트를 위한 아이템 가격정보 로드 쿼리
|
||||
QID_ITEMPRICE_LOAD, ///< 24, 아이템 가격정보 로드 쿼리
|
||||
QID_ECONOMY_FENCE = 100,
|
||||
QID_ITEMPRICE_LOAD = 24, ///< 24, 아이템 가격정보 로드 쿼리
|
||||
// END_OF_MYSHOP_PRICE_LIST
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
#pragma once
|
||||
#include "../../common/sql_fence_router.h"
|
||||
|
||||
// Include after libsql/AsyncSQL.h. Every return-query on the PLAYER async queue
|
||||
// must register here; regular fire-and-forget AsyncQuery has no result message.
|
||||
namespace PortSQLFence {
|
||||
// Process-lifetime registry avoids static-destruction order against the DB
|
||||
// singleton. CDBManager::Clear drains ownership explicitly after SQL shutdown.
|
||||
inline Router<SQLMsg>& PlayerRouter(){static auto* router=new Router<SQLMsg>;return *router;}
|
||||
inline bool Queue(CAsyncSQL* sql,Kind kind,uint32_t logical) {
|
||||
if(!sql)return false;const auto ticket=PlayerRouter().Reserve(kind,logical);if(!ticket)return false;
|
||||
sql->ReturnQuery("SELECT 1",reinterpret_cast<void*>(uintptr_t(ticket)));return true;
|
||||
}
|
||||
inline SQLMsg* Pop(CAsyncSQL* sql,Kind kind) {
|
||||
if(sql){SQLMsg* message=nullptr;unsigned budget=1024;while(budget--&&sql->PopResult(&message))PlayerRouter().Complete(message);}
|
||||
return PlayerRouter().Pop(kind);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
#define __INC_METiN_II_DBSERV_STDAFX_H__
|
||||
|
||||
#include "../../libthecore/include/stdafx.h"
|
||||
#include <memory>
|
||||
|
||||
#ifndef __WIN32__
|
||||
#include <semaphore.h>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user