fill card table

2 files changed, 49 insertions, 4 deletions

diff --git a/csrc/cards_ui.c b/csrc/cards_ui.c
index cedcac2..6db0a06 100644
--- a/csrc/cards_ui.c
+++ b/csrc/cards_ui.c
@@ -17,13 +17,36 @@ typedef struct
 
 rich4_card cards_table[] = {
 	{ NULL, 0, 0, 0, 0 },
-	{ "\xa7\xa1\xb4I\xa5\x64", 1, 200, 2, 2 }, /* 均富卡 */
-	{ "\xa7\xa1\xb3h\xa5\x64", 2, 200, 2, 2 }, /* 均贫卡 */
+	{ "\xa7\xa1\xb4\x49\xa5\x64", 1, 200, 2, 2 }, /* 均富卡 */
+	{ "\xa7\xa1\xb3\x68\xa5\x64", 2, 200, 2, 2 }, /* 均贫卡 */
 	{ "\xc1\xca\xa6\x61\xa5\x64", 4, 35, 0, 1 }, /* 购地卡 */
 	{ "\xb4\xab\xa6\x61\xa5\x64", 4, 25, 0, 0 }, /* 换地卡 */
 	{ "\xb4\xab\xab\xce\xa5\x64", 4, 20, 0, 0 }, /* 换屋卡 */
-	{ "\xc2\xe0\xa6V\xa5\x64", 3, 20, 0, 0 }, /* 转向卡 */
-	/* TODO */
+	{ "\xc2\xe0\xa6\x56\xa5\x64", 3, 20, 0, 0 }, /* 转向卡 */
+	{ "\xa7\xef\xab\xd8\xa5\x64", 8, 15, 0, 0 }, /* 改建卡 */
+	{ "\xa9\xe7\xbd\xe6\xa5\x64", 3, 20, 0, 1 }, /* 拍卖卡 */
+	{ "\xa4\xd1\xa8\xcf\xa5\x64", 2, 160, 2, 0 }, /* 天使卡 */
+	{ "\xb4\x63\xc5\x5d\xa5\x64", 1, 180, 2, 2 }, /* 恶魔卡 */
+	{ "\xa9\xc7\xc3\x7e\xa5\x64", 2, 60, 0, 2 }, /* 怪兽卡 */
+	{ "\xa9\xee\xb0\xa3\xa5\x64", 5, 15, 0, 1 }, /* 拆除卡 */
+	{ "\xb7\x6d\xb9\xdc\xa5\x64", 4, 25, 0, 2 }, /* 抢夺卡 */
+	{ "\xb0\xb1\xaf\x64\xa5\x64", 4, 20, 0, 0 }, /* 停留卡 */
+	{ "\xa5\x56\xaf\x76\xa5\x64", 2, 100, 2, 2 }, /* 冬眠卡 */
+	{ "\xb9\xda\xb9\x43\xa5\x64", 4, 25, 0, 1 }, /* 梦游卡 */
+	{ "\xb3\xb4\xae\x60\xa5\x64", 4, 20, 0, 2 }, /* 陷害卡 */
+	{ "\xb4\x5f\xa4\xb3\xa5\x64", 4, 20, 0, 0 }, /* 复仇卡 */
+	{ "\xb6\xf9\xba\xd7\xa5\x64", 4, 40, 0, 0 }, /* 嫁祸卡 */
+	{ "\xa7\x4b\xb6\x4f\xa5\x64", 4, 25, 0, 0 }, /* 免费卡 */
+	{ "\xa7\x4b\xb8\x6f\xa5\x64", 4, 25, 0, 0 }, /* 免罪卡 */
+	{ "\xb0\x65\xaf\xab\xb2\xc5", 3, 10, 0, 0 }, /* 送神符 */
+	{ "\xbd\xd0\xaf\xab\xb2\xc5", 3, 20, 0, 0 }, /* 请神符 */
+	{ "\xac\xf5\xa5\x64", 3, 50, 0, 0 }, /* 红卡 */
+	{ "\xb6\xc2\xa5\x64", 3, 30, 0, 1 }, /* 黑卡 */
+	{ "\xac\x64\xb5\x7c\xa5\x64", 4, 35, 0, 1 }, /* 查税卡 */
+	{ "\xba\xa6\xbb\xf9\xa5\x64", 3, 35, 0, 0 }, /* 涨价卡 */
+	{ "\xac\x64\xab\xca\xa5\x64", 3, 35, 0, 1 }, /* 查封卡 */
+	{ "\xa6\x50\xb7\xf9\xa5\x64", 2, 40, 0, 0 }, /* 同盟卡 */
+	{ "\xaf\x51\xc0\x74\xa5\x64", 3, 70, 0, 0 }, /* 乌龟卡 */
 };
 
 int fcn_4018e7(wProc a1, int a2)
diff --git a/r2/print_cards_table.py b/r2/print_cards_table.py
new file mode 100644
index 0000000..83bcfa3
--- /dev/null
+++ b/r2/print_cards_table.py
@@ -0,0 +1,22 @@
+import r2pipe
+import opencc
+
+cc = opencc.OpenCC('t2s')
+r = r2pipe.open()
+data = r.cmdj("xj 240 @ 0x47fdf2")
+for i in range(0,30):
+    addr = data[i*8+0] + (data[i*8+1]<<8) + (data[i*8+2]<<16) + (data[i*8+3]<<24)
+    _4 = data[i*8+4]
+    _5 = data[i*8+5]
+    _6 = data[i*8+6]
+    _7 = data[i*8+7]
+    hexs = r.cmdj("xj 10 @ {}".format(addr))
+    hexstr = ""
+    cbytes = bytearray([])
+    for i in hexs:
+        if i == 0:
+            break
+        hexstr += f'\\x{i:02x}'
+        cbytes.append(i)
+    big5str = cc.convert(cbytes.decode(encoding='big5'))
+    print("{ " + f'"{hexstr}", {_4}, {_5}, {_6}, {_7}' + ' }, /* ' + big5str + ' */')