diff --git a/bindata.go b/bindata.go index 4aa43b6..51faad9 100644 --- a/bindata.go +++ b/bindata.go @@ -102,7 +102,7 @@ func dataCodeJson() (*asset, error) { return a, nil } -var _dataCode_obj_sub_typeJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x9a\x49\x73\xdb\xb8\x12\xc7\xcf\xf6\xa7\x40\xf9\x9c\x4f\xf0\x6e\x4a\x9c\x38\x79\xf5\x9c\xc5\xcb\xcb\x61\x6a\x8a\x05\x91\x2d\x0a\x09\x08\xd0\x58\x24\xab\xa6\xe6\xbb\x4f\x01\x5c\x05\x80\xb6\xd1\xac\xb9\x76\x53\x3f\xfc\xd1\x40\x63\x69\xe8\x8f\xcb\x8b\xbf\x2e\x2f\x2e\xae\x98\x30\xbc\x60\xd5\xd5\x7f\xc8\x95\xd5\xa0\xae\xde\x39\xa3\xa0\x0d\x38\xcb\xe3\x68\x91\xdb\x5f\x85\x39\xb5\x30\x7e\x77\x79\xf1\xf7\xbb\x18\x51\x5b\xc6\xab\x73\xc6\xcd\x64\x9a\x43\xba\x2f\xd3\x94\x46\xd7\x81\x0e\xf1\x5b\xc8\xa3\x88\x29\xee\xcb\x45\x46\x71\xa4\x41\x7f\x7e\x52\x45\x14\xb4\x52\x99\x5c\x94\x97\x1b\x03\x7d\xe7\x34\x39\xa2\xb9\xdd\xaf\x0a\x05\x4f\xe7\xe0\xef\x9c\x9e\x40\xcd\xc0\x44\xc1\x93\x05\x8d\x6d\x80\x96\xbf\x5f\x6b\x60\xfc\x24\x23\x2a\xaf\xe9\xaf\xc3\xf8\x60\xbb\xf1\x6a\x47\xe2\x96\x10\xfd\xf1\xd2\x0a\x05\xfa\xbc\x89\x1f\xce\x4c\x14\x68\xcb\xb3\x85\x57\x16\x78\xb1\x63\xf5\xde\x9c\x33\xaf\x2d\x70\xe2\xed\x48\xf0\x1e\x94\x8c\xe3\xfe\x19\x94\x24\xda\x36\x0d\x55\x27\x6c\xac\x3d\x39\x8a\xf3\x19\x19\x11\xdb\x06\x96\xd4\xee\xdd\x68\xad\xd4\xdc\xc0\x92\xe2\x33\x3a\x42\x37\x13\x87\x58\xf8\x17\x71\x00\x61\x24\x5e\xaf\xa3\x46\x82\x27\x2a\x42\x67\xcb\x38\xa7\x35\x14\x4c\x94\x41\x82\x74\x0e\xc2\x44\x29\x1b\x26\x6a\x2c\xb8\x96\x69\xee\x60\xcf\x27\x1a\xd6\x80\xb4\x26\x8d\x3d\x73\xe6\xb3\x8f\x4c\xa4\xb9\xa3\x23\x9f\xc9\xa5\xd6\x69\xe8\xe4\x79\x3b\xd5\x28\xb6\xb5\x26\x31\x60\x0f\x9d\x03\x3d\x60\x03\x38\x9a\x5f\x03\x98\x96\x6e\x3b\xe5\x50\xd5\x90\xd8\x99\x5f\x86\x53\x5b\x1a\x26\x45\x41\x85\x90\x56\x94\x70\xde\xc2\xa6\xf3\x92\x73\x6f\x3e\xdd\xb6\x55\x9c\x74\x03\xdc\xb6\x15\x35\x80\xcd\xbc\x79\x13\x51\x84\x82\x26\xa6\x40\x35\x20\xb2\x5b\x72\x33\x38\x31\x08\xac\x01\xb2\x59\x0f\x8e\xc2\xe3\xc1\x77\xc8\xed\x35\xc8\xed\x9b\xfc\x9c\xf6\xd3\x29\xdc\x9a\x27\x5b\x8e\x96\x71\x1f\x7e\x0a\x55\x11\xef\x71\xbd\xcc\xa5\xee\xa8\x36\xa9\x7d\x78\xa3\x40\x50\xe2\xbc\x64\xe6\xcd\x52\x4b\x1d\x22\x52\x3a\xb3\x66\x8c\xac\x6c\x83\x41\x1d\x0c\x39\x5b\xa1\xb0\xe7\x90\xdb\xd1\xf2\x76\xca\xd6\x9e\xe2\x01\xb8\x07\xce\x31\xc1\xd7\xc0\x79\x4c\x7b\x6f\x4f\x18\x98\x54\x15\xa8\xad\x94\xbf\x63\xe2\xb7\xc1\xb5\x8e\x4b\x4b\xbe\xc4\xdd\xe4\x6f\xcc\x47\x66\xf6\x95\xa2\xc7\x58\xee\xcf\xde\x83\x51\x3b\x52\x4b\x59\xc1\x02\xf6\xc3\xe8\xc2\xa8\x2d\x0f\x8b\x6a\x4b\x60\x87\xfc\xad\x43\x1b\x59\x26\x06\xed\xde\x99\x51\xb3\xca\xf3\xa2\x05\xb6\xe3\x21\x06\xaa\x61\xba\x8c\xe5\xdd\x32\x5d\x62\xd4\x79\x5a\x24\xce\xd3\x10\xda\xac\x70\x7b\x56\x74\xff\x7c\x74\xe6\x15\xd7\x4f\x63\x97\x2e\x70\x0f\x8a\x56\x40\x3a\xbe\xbb\x36\xdf\x75\x97\x2a\x44\x20\xc6\x36\x12\xe7\x91\x64\x1b\x88\xf0\x24\x4f\x92\x37\x20\x40\xb1\x12\x7b\x92\x1c\xf7\xa1\x48\xf7\x8d\x24\xdd\x95\x10\xa1\xb4\x56\x92\x83\x4e\xec\x6d\xee\xfe\x4a\xbc\x13\x13\xe4\x1e\x1b\x4b\x9d\x61\x31\x6a\x87\x9c\x4d\x29\x1e\x12\x17\x27\xb8\xcf\x5e\x5e\xee\x17\xd1\x1b\x5e\xee\x57\xb0\xd3\xf9\xdc\xb3\xb1\x69\x3d\x46\x64\x19\x7d\x07\x6b\xc8\x2d\x4d\xa5\x63\x8f\xfe\x4e\x71\x39\xd8\xb3\xa5\x49\x05\xdb\xfb\xc8\x37\xb3\x26\xd6\x54\x9c\x12\x93\xaf\x23\x6f\xc4\x69\xd5\xdc\x5b\x8a\x32\x5a\x6b\xa4\x13\xbd\x65\x6c\xad\x3e\x85\x87\x9a\xc1\x92\x53\xa3\xd3\x4b\x9b\xe3\x1d\x68\x69\x55\x09\x9a\xa0\x7b\xed\x53\x6c\x01\xef\x32\x0c\x9a\x13\x1e\xee\x73\x6c\x01\xee\x53\x0c\x4d\x86\x27\xcb\xda\x25\xf4\x47\xe7\x74\x57\x27\x3c\xbf\x54\x74\x67\xfe\x45\x7e\x47\x86\xa6\x35\xa7\xd4\xf9\xe4\xe3\xe4\xc8\x3e\xf1\xa4\x72\xed\x7e\x55\xaa\x15\x15\xb4\x52\xb3\xd4\xc2\x73\xdd\x79\x50\xf9\x36\x62\xe3\x94\x1b\xb0\x08\xb5\x25\xd5\x86\x43\x41\x8d\xa1\xa9\xb1\xfb\xe0\xdd\x64\xe3\xdd\xa8\x99\x71\xc6\x8f\xa4\x9f\xf3\xf1\xfa\x0d\x55\x35\x24\x22\xde\xf3\x1f\xbc\x7b\x85\xfe\x9e\xbf\xa4\xbf\xe7\xe3\xf5\x57\xb0\x5b\x14\x7f\x0d\x3b\x10\x1a\x56\xa8\x77\xf4\x25\xe9\x03\x1d\xb3\x60\x47\xcc\xf7\x88\x5a\x6b\xaf\x71\xa9\xf7\x2b\xe6\xdc\xd2\x64\xcb\xd7\x08\xcf\xe5\x9e\x8a\x3a\xa1\xf2\x63\xef\x41\xad\xca\x03\x35\x52\x3a\x52\x31\x5a\xfd\x5a\x9f\x5e\x85\xf1\x7b\x47\x2c\xd1\xf3\x50\xb7\xaf\x05\x85\x8f\x9d\x03\xa3\x71\x60\x46\x2a\x07\x26\x42\xa7\x90\x85\x36\xb4\x61\x61\x39\xea\xab\x24\xf7\x73\x3b\xa6\x28\xa2\x81\xaa\x72\xbf\x54\x17\x99\x7b\xf3\xdf\xdb\x82\xa8\xfe\xc0\x16\xf9\x16\xee\x6b\xe8\xcb\xda\x96\x1a\xc3\x21\x5c\x2f\x26\x5b\x66\x1c\x8b\x92\x8a\x12\x12\x95\x30\x1f\x47\xf2\xc1\x7b\xd1\xa5\xab\x81\x1e\x75\xff\x8c\x8e\x88\x42\x3f\xa5\xdc\x31\xd5\x48\x05\x55\x78\xf0\xf0\x5e\x77\x0f\x9c\x79\x11\x6f\xae\x05\x6d\xb6\x56\xef\x53\x43\xd7\xbd\x90\x92\x23\x33\x7b\xb2\x99\x7d\x95\xf3\xa6\x49\x79\x61\x83\xe2\xea\x67\xa0\x9c\x3c\x66\x17\x58\x7d\x65\xb7\xab\x25\x27\x5e\x10\x7c\x3d\xf9\x93\x7f\xd8\xc5\x9c\xc4\xfa\x72\x72\xb2\xe8\xd0\xb1\xd7\x94\x20\x45\x84\x1d\xab\x7a\x5f\x11\xdc\xe1\x61\xac\x82\x1d\xd0\x85\x77\xbc\xeb\x99\xef\xed\x64\x0e\x07\x70\x03\x16\xe7\xca\xff\x9c\x87\x3c\xa2\xd6\xdc\x91\x1a\x85\x61\xa4\x66\x46\xe1\x97\xdc\x0e\x51\x48\x77\xff\x97\xdc\xc6\x3c\x67\x5c\xe6\xf5\xef\x77\x61\xad\xac\x7b\xbb\x43\xf0\xea\x61\xf8\x83\x09\x35\x0c\x3d\xe5\x28\xaa\xbf\x8c\x24\x2f\xd2\x08\x9a\x02\x5d\x52\x51\x44\xff\xfc\xb9\xf3\x76\xd2\x80\xd6\xc8\x68\x6a\x30\x45\x25\x45\x10\xce\x7b\x30\x0e\x46\xa8\x26\xce\x89\x01\xfb\x63\x1b\x67\xe3\xfb\xdd\x84\x16\xd5\x28\xf8\xc0\x28\x99\x7f\x94\x87\x57\xb0\x53\x10\x2e\x89\x77\x9d\x71\x6c\x62\xa7\x64\x83\x6c\xc3\x9d\x86\x6d\x5b\xc0\xf3\x54\x3b\x9e\x8e\x73\xbe\x16\xfb\xde\x7f\x81\xe4\xb2\x26\xe6\x7e\x69\x56\x70\xeb\xfe\x3e\xb9\x70\x97\xc4\xcc\xe2\xe1\x86\xba\x3b\x86\xff\x5b\x1b\xa8\x9f\xa4\x3a\x52\x55\xa1\xe6\x1e\x3d\x40\xfc\x77\xa2\x7b\x7a\x00\xb7\xa5\xf5\x85\x1d\x04\xf7\x40\x2d\x37\x85\xd5\xa0\xdc\xe6\x6c\x6c\xd0\xc0\xff\x9d\x9b\x3c\x6a\x50\xee\xd8\x67\xec\x8a\x36\x98\x81\xe6\x85\x36\xbe\x18\x68\x56\xb4\xe1\x1f\x66\xc3\xc0\x0f\xf1\xbe\x5d\x99\xf3\xb0\x8b\x53\x7e\xb8\x39\xfe\x17\xa7\xb5\x82\xe0\x61\xf0\x56\xd7\xe4\x1a\x38\x86\xe7\xee\xe6\x7b\xda\x34\xa0\xfc\xeb\x45\x30\xf9\xc0\x90\xcf\xde\x49\xfc\xb3\x7e\x66\x0c\xfc\xa8\x45\xf3\x6e\xa8\x25\xc6\x24\xf7\xfd\x4b\x28\xca\xc3\x93\x7f\x5f\x38\xcc\x47\x35\x4c\x97\x71\x99\x10\x38\xa7\x02\xa4\x4d\xfc\x89\xe6\x35\xa0\x82\x92\xb5\x10\xf6\x74\xb2\xe5\xb0\x5a\x1a\x2e\x57\xdf\x69\xea\x51\xed\x35\x8e\x34\xfb\xf0\xaf\xb4\xdf\x26\x53\x0e\xc9\x0a\xf6\x64\x21\xbc\x20\x4e\xb6\x37\xb2\xba\xf2\x42\xaa\xb4\x10\x63\xfa\x6f\xd3\xa0\x1d\x65\x41\xc7\x3e\x8d\x96\x39\xc4\x7f\x97\x46\xf8\xa7\xcc\xa8\x47\x32\xf1\xaf\xac\xee\xcb\x34\xe5\xa5\x43\x52\x4c\x1a\xbe\x4e\xb3\x9e\xdb\x68\xef\x03\xc5\x20\xf9\xff\xa5\xe7\x76\x01\xd2\xdd\x63\x76\x52\x8d\x7f\xbf\x99\x2d\x68\xc9\xbf\xe4\x74\xff\xd4\x79\x89\xa6\x8f\xb4\x09\xb4\xdd\x4f\xa6\x3c\xd6\x81\x72\x0e\xa7\x70\x11\x9f\x6c\x6f\xa5\x99\xa8\x7f\x0f\xc9\xde\x99\x1e\x71\xf9\xe7\x3f\x01\x00\x00\xff\xff\x35\xfa\x1b\xfb\x6b\x2e\x00\x00") +var _dataCode_obj_sub_typeJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x9a\x5b\x73\x1b\xa9\x12\xc7\x9f\xed\x4f\x41\xf9\x39\x9f\xe0\xbc\x29\x71\xe2\xe4\xd4\x71\x2e\xbe\x9c\x3c\x6c\x6d\x4d\xa1\x99\x96\x44\xc2\xc0\x98\x8b\x64\xd5\xd6\x7e\xf7\x2d\x98\x3b\x30\xb6\xe9\xa9\x7d\xed\x1e\xfd\xf8\xd3\xd0\x5c\x1a\xfd\x71\x79\xf1\xd7\xe5\xc5\xc5\x15\x13\x86\x17\xac\xba\xfa\x0f\xb9\xb2\x1a\xd4\xd5\x3b\x67\x14\xb4\x06\x67\x79\x1c\x2c\x72\xfb\xab\x30\xe7\x06\x86\xef\x2e\x2f\xfe\x7e\x17\x23\xf6\x96\xf1\x6a\xce\xb8\x19\x4d\x53\x48\xfb\x65\x9a\x52\xeb\x7d\xa0\x43\xfc\x16\xf2\x24\x62\x8a\xfb\x72\x91\x51\x9c\x68\xd0\x9f\x9f\x54\x11\x05\x8d\x54\x26\x17\xe5\xe5\xc6\x40\xdf\x39\x4d\x4e\x68\x6e\xfb\xab\x42\xc1\xd3\x1c\xfc\x9d\xd3\x33\xa8\x09\x98\x28\x78\xb2\xa0\xb1\x0d\xd0\xf2\xf7\x6b\x0d\x0c\x9f\x64\x44\xe5\x35\xfd\xfb\x30\x3e\xd8\x6e\xbc\xda\x91\xb8\x25\x44\x7f\xbc\xb4\x42\x81\x9e\x37\xf1\xc3\x99\x89\x02\x6d\x79\xb6\xf0\xca\x02\x2f\x76\x6c\x7f\x30\x73\xe6\xb5\x05\x4e\xbc\x1d\x09\x3e\x80\x92\x71\xdc\x3f\x83\x92\x44\xdb\xba\xa6\xea\x8c\x8d\xb5\x27\x47\x71\x9e\x91\x11\xb1\xad\x61\x49\xed\xc1\x8d\xd6\x4a\xcd\x35\x2c\x29\x9e\xd1\x11\xba\x99\x38\xc6\xc2\xbf\x88\x23\x08\x23\xf1\x7a\x1d\x35\x12\x3c\x52\x11\x3a\x1b\xc6\x39\xdd\x43\xc1\x44\x19\x24\x48\xeb\x20\x4c\x94\xb2\x66\x62\x8f\x05\xef\x65\x9a\xdb\xdb\xf3\x89\x86\xd5\x20\xad\x49\x63\x67\xce\x7c\xf6\x89\x89\x34\x77\x70\xe4\x33\xb9\xd4\x3a\x0d\x1d\x3d\x6f\xa7\x1a\xc5\xb6\xd6\x24\x06\xec\xa1\x75\xa0\x07\xac\x07\x47\xf3\xab\x07\xd3\xd2\x6d\xa7\x1c\xaa\x3d\x24\x76\xe6\x97\xe1\xd4\x96\x86\x49\x51\x50\x21\xa4\x15\x25\xcc\x5b\xd8\xb4\x5e\x32\xf7\xe6\xd3\x6d\x53\xc5\x49\xd7\xc3\x6d\x53\x51\x03\xd8\xcc\x9b\x36\x11\x45\x28\x68\x62\x0c\x54\x0d\x22\xbb\x25\x37\x83\x13\x83\xc0\x6a\x20\x9b\xf5\xe0\x28\x3c\x1e\x7c\x87\xdc\x5e\x83\xdc\xbe\xc9\xcf\x69\x3f\x9d\xc2\xad\x79\xb4\xe5\x68\x19\xf6\xe1\xa7\x50\x15\xf1\x1e\xd7\xcb\x5c\xea\x8e\x6a\x93\xda\x87\x37\x0a\x04\x25\xce\x4b\x26\xde\x2c\xb5\xd4\x21\x22\xa5\x13\x6b\xc6\xc8\xca\x26\x31\xb0\xb2\xc9\xdf\x0e\x85\x9d\x43\x6e\x07\xcb\xdb\x29\x5b\x7b\x8e\xd5\xdc\x03\xe7\x98\x01\xd0\xc0\x79\x4c\x7b\x6f\xcf\x18\x98\x54\x15\xa8\xad\x94\xbf\x63\xe2\xb7\xde\xb5\x8e\x4b\x4b\xbe\xc4\xdd\xe4\x6f\xce\x27\x66\x0e\x95\xa2\xa7\x58\xee\xcf\xce\x83\x51\x3b\x50\x4b\x59\xc1\x02\xf6\xc3\xe0\xc2\xa8\x2d\x8f\x8b\x6a\x4b\x60\xc7\xfc\xed\x43\x1b\x59\x26\x06\xed\xde\x99\x51\xb3\xca\xf3\xa2\x45\xb6\xe5\x21\x06\xaa\x66\xba\x8c\xe5\xdd\x32\x5d\x62\xd4\x79\x5a\x24\xce\xd3\x10\xda\xac\x70\xfb\x56\x74\x07\x7d\x74\xe6\x15\x57\x50\x63\x97\x2e\x71\x0f\x8a\x56\x40\x5a\xbe\xbb\x3a\xdf\xb5\x17\x2b\x44\x20\x86\x36\x12\x67\x92\x64\x1b\x88\xf0\x24\x4f\x93\x37\x20\x40\xb1\x12\x7b\x9a\x1c\xf6\xa2\x48\xf7\x8d\x24\xed\xb5\x10\xa1\x74\xaf\x24\x07\x9d\xd8\xdf\xdc\x1d\x96\x78\x27\x26\xc8\x1d\x36\x96\x3a\xc1\x62\xd4\xf6\x39\x9b\x52\xdc\x27\x2e\x4e\x70\x97\xbd\xbc\x3c\x2c\xa2\x37\xbc\x3c\xac\x60\xa7\xf3\xb9\x63\x63\xd3\x7a\x88\xc8\x32\xfa\x0e\xd6\x90\x1b\x9a\x4a\xc7\x0e\xfd\x9d\xe2\x72\xb0\x63\x4b\x93\x0a\xb6\xf7\x91\x6f\x66\x4d\xac\xa9\x38\x27\x26\x5f\x4b\xde\x88\xf3\xaa\xb9\xb7\x14\x65\xb4\xd6\x48\x27\x7a\xcb\xd8\x5a\x7d\x0e\x0f\x35\xbd\x25\xa7\x4e\xa7\x97\x36\xc7\x3b\xd0\xd2\xaa\x12\x34\x41\xf7\xda\xa7\xd8\x02\xde\x65\x18\xd4\x67\x3c\xdc\xe7\xd8\x02\xdc\xa7\x18\x9a\x0c\x4f\x96\x35\x4b\xe8\x8f\xce\xe9\xae\x4f\x78\x7e\xa9\xe8\xce\xfc\x8b\xfc\x96\x0c\x75\x63\xce\xa9\xf3\xc9\xc7\xd1\x91\x7d\xe2\x49\xe5\xda\xfd\xaa\x54\x2b\x2a\x68\xa4\x66\xa9\x85\xe7\xba\xf5\xa0\xf2\x6d\xc0\xc6\x29\xd7\x63\x11\x6a\x4b\xaa\x0d\x87\x82\x1a\x43\x53\x63\xf7\xc1\xbb\xc9\xc6\xbb\x51\x33\x63\xc6\x8f\xa4\xcf\xf9\x78\xfd\x86\xaa\x3d\x24\x22\xde\xf1\x1f\xbc\x7b\x85\xfe\x8e\xbf\xa4\xbf\xe3\xe3\xf5\x57\xb0\x5b\x14\x7f\x0d\x3b\x10\x1a\x56\xa8\x77\xf4\x25\xe9\x3d\x1d\xb3\x60\x47\xcc\xf7\x88\x7a\x6b\xa7\x71\xa9\xf7\x2b\xe6\xdc\xd2\x64\xcb\xd7\x08\xcf\xe5\x81\x8a\x7d\x42\xe5\xc7\xce\x83\x5a\x95\x7b\x6a\xa4\x74\xa0\x62\xb4\xfa\xb5\x3e\xbd\x0a\xe3\xf7\x8e\x58\xa2\xe7\xa1\x6e\x5f\x0b\x0a\x1f\x5b\x07\x46\x63\xcf\x8c\x54\xf6\x4c\x84\x4e\x21\x0b\x6d\x68\xcd\xc2\x92\xd4\x57\x49\xee\xa7\x76\x4c\x51\x44\x03\x55\xe5\x61\xa9\x2e\x32\xf5\xe6\xbf\xb9\x05\x51\xfd\x81\x2d\xf4\x2d\xdc\xd7\xd0\x97\xb5\x2d\x35\x86\x43\xb8\x5e\x8c\xb6\xcc\x38\x16\x25\x15\x25\x24\x2a\x61\x3e\x8e\xe4\x83\xf7\xa2\x4b\x57\x3d\x3d\xea\xfe\x8c\x8e\x88\x42\x37\xa5\xdc\x31\xd5\x48\x05\x55\x78\xf0\xf0\x5e\x77\x0f\x9c\x78\x11\xef\xae\x05\xad\xb7\x56\x1f\x52\x43\xd7\xbe\x92\x92\x13\x33\x07\xb2\x99\x7c\x95\xf3\xae\x49\x79\x61\x9b\x39\xfc\x33\x50\x4e\x1e\xb3\x0b\xac\xbe\xba\xdb\xd6\x93\x13\xaf\x08\xbe\xa6\xfc\xc9\x3f\xee\x62\x4e\x62\x5d\x49\x39\x59\x74\x68\xd9\x6b\x4a\x90\x22\xc2\x0e\x55\xbd\xaf\x08\x6e\xff\x38\x56\xc1\x0e\xe8\xc2\x5b\xde\xf5\xc4\xf7\x76\x32\x87\x23\xb8\x01\x8b\x73\xe5\x7f\xce\x43\x1e\x51\x6b\xee\x40\x8d\xc2\x30\x50\x33\xa3\xf0\x4b\x6e\xfb\x28\xa4\xbb\xff\x4b\x6e\x63\x9e\x33\x2e\xf3\xba\x37\xbc\xb0\x56\xd6\xbe\xdf\x21\x78\xfb\x7e\xf8\x83\x09\xd5\x0f\x3d\xe5\x28\xaa\xbf\x8c\x24\x2f\xd2\x08\x9a\x02\x5d\x52\x51\x44\xff\xfe\xb9\xf3\x76\x52\x83\xd6\xc8\x68\x6a\x30\x45\x25\x45\x10\xce\x7b\x30\x0e\x46\xa8\x26\xce\x89\x01\xfb\x63\x1b\x67\xc3\x1b\xde\x88\x16\xd5\x20\xf8\xc8\x28\x99\x7e\x94\x87\x57\xb0\x53\x10\x2e\x89\x77\xad\x71\x68\x62\xa7\x64\x8d\x6c\xc3\x9d\x86\x6d\x53\xc0\xf3\x58\x3b\x1e\x8f\x73\xbe\x16\xfb\xde\x7f\x81\xe4\xb2\x3a\xe6\x7e\xa9\x57\x70\xf7\xdd\x7d\x72\xe1\x2e\x89\x99\xc5\xfd\x0d\x75\x77\x0a\xff\xbb\xd6\x53\x3f\x49\x75\xa2\xaa\x42\xcd\x3d\x7a\x84\xf8\x2f\x45\xf7\xf4\x08\x6e\x4b\xeb\x0a\x3b\x08\xee\x91\x5a\x6e\x0a\xab\x41\xb9\xcd\xd9\xd8\xa0\x81\xff\x3b\x37\x79\xd4\xa0\xdc\xb1\xcf\xd8\x15\x6d\x30\x03\xf5\x0b\x6d\x7c\x31\x50\xaf\x68\xc3\x3f\xce\x86\x81\xef\xe3\x7d\xbb\x32\xe7\x61\x17\xa7\x7c\x7f\x73\xfc\x2f\x4e\x6b\x05\xc1\xc3\xe0\xad\xde\x93\x6b\xe0\x18\x9e\xbb\x9b\x1f\x68\x5d\x83\xf2\xaf\x17\xc1\xe4\x03\x43\x3e\x7b\x27\xf1\x4f\xfb\x99\x31\xf0\xa3\x16\xcd\xbb\xbe\x96\x18\x93\xdc\xf7\x2f\xa1\x28\x0f\x4f\xfe\x5d\xe1\x30\x1f\x55\x33\x5d\xc6\x65\x42\xe0\x9c\x0a\x90\x36\xf1\x47\x9a\xd7\x80\x0a\x4a\xd6\x40\xd8\xd3\xd1\x96\xc3\x6a\x68\xb8\x5c\x7d\xa7\xa9\x47\xb5\xd7\x38\xd2\x1c\xc2\xbf\xd3\x7e\x1b\x4d\x39\x24\x2b\xd8\x93\x85\xf0\x82\x38\xda\xde\xc8\x6a\xcb\x0b\xa9\xd2\x42\x8c\xe9\xbe\x4d\x83\x76\x94\x05\x1d\xfb\x34\x58\xa6\x10\xff\x5d\x1a\xe1\x9f\x32\xa3\x1e\xc9\xc4\x3f\xb3\xda\x2f\xd3\x94\x97\x0e\x49\x31\xa9\xff\x3a\xcd\x7a\x6e\xa2\xbd\x0f\x14\x83\xe4\x7f\x98\x9e\x9b\x05\x48\x7b\x8f\xd9\x49\x35\xfc\x05\x67\xb2\xa0\x25\xff\x96\xd3\xfe\x5b\xe7\x25\x9a\x3e\xd1\x3a\xd0\x76\x3f\x9a\xf2\x58\x47\xca\x39\x9c\xc3\x45\x7c\xb4\xbd\x95\x66\xa2\xfe\x3d\x24\x7b\x67\x3a\xc4\xe5\x9f\xff\x04\x00\x00\xff\xff\xcd\x48\x00\x5c\x6f\x2e\x00\x00") func dataCode_obj_sub_typeJsonBytes() ([]byte, error) { return bindataRead( @@ -117,7 +117,7 @@ func dataCode_obj_sub_typeJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "data/code_obj_sub_type.json", size: 11883, mode: os.FileMode(420), modTime: time.Unix(1577967149, 0)} + info := bindataFileInfo{name: "data/code_obj_sub_type.json", size: 11887, mode: os.FileMode(420), modTime: time.Unix(1577978441, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/def.go b/def.go index e8de61b..3031ca9 100644 --- a/def.go +++ b/def.go @@ -441,20 +441,6 @@ const ( cmdParseModeMarkDown = 2 cmdParseModeHTML = 3 - objTypeUser = 1 - objTypeGuild = 2 - objTypeMessage = 3 - objTypeWar = 4 - objTypeWarReport = 5 - objTypeJob = 6 - objTypeItem = 7 - objTypeCastle = 8 - objTypeFair = 9 - objTypeUnion = 10 - objTypeTribute = 11 - objTypeExperience = 12 - objTypeQuest = 13 - castleDeer = 1 castleDragon = 2 castleHighnest = 3 @@ -463,152 +449,6 @@ const ( castleShark = 6 castleWolf = 7 - objSubTypeUser = 101 - objSubTypeGuild = 201 - /* - cacheObjSubType[`msg`] = 301 - cacheObjSubType[`msg_war`] = 302 // from Chat Wars Reports (not done) - objSubTypeMessageMiniWar = 303 // FIXME DELETE - cacheObjSubType[`msg_guild_war`] = 304 // from Chat Wars Reports (not done) - cacheObjSubType[`msg_report_req`] = 305 // /report (done) - cacheObjSubType[`msg_report_ack`] = 306 // result from /report (done) - cacheObjSubType[`msg_g_report_req`] = 307 // /g_report (done) - cacheObjSubType[`msg_g_report_ack`] = 308 // result from /g_report (not done) - cacheObjSubType[`msg_quest_res`] = 309 // result from going to quest (not done) - cacheObjSubType[`msg_duel_fight`] = 310 // result from going to duel fight (done) - cacheObjSubType[`msg_hero_req`] = 311 // /hero (done) - cacheObjSubType[`msg_hero_ack`] = 312 // result from /hero (not done) - cacheObjSubType[`msg_me_req`] = 313 // 🏅Me (done) - cacheObjSubType[`msg_me_ack`] = 314 // result from 🏅Me (done) - cacheObjSubType[`msg_inv_req`] = 315 // /inv (done) - cacheObjSubType[`msg_inv_ack`] = 316 // result from /inv (not done) - cacheObjSubType[`msg_pillage_inc`] = 317 // random incoming pillage (done) - cacheObjSubType[`msg_pillage_go`] = 318 // ack from /go (done) - cacheObjSubType[`msg_pillage_timeout`] = 319 // ack from lack of /go (done) - cacheObjSubType[`msg_pillage_win`] = 320 // pillage successfully intercepted (done) - cacheObjSubType[`msg_pillage_loss`] = 321 // pillage not intercepted (done) - cacheObjSubType[`msg_tribute_inc`] = 322 // request for a /pledge (not done) - cacheObjSubType[`msg_tribute_ack`] = 323 // pledge accepted (not done) - cacheObjSubType[`msg_auction_announce`] = 324 // from Boris and Co, Ltd (done) - cacheObjSubType[`msg_auction_upd_req`] = 325 // /l_123456 msg (not done) - cacheObjSubType[`msg_auction_upd_ack`] = 326 // result from /l_123456 (not done) - cacheObjSubType[`msg_time_ack`] = 327 // result from /time (done) - cacheObjSubType[`msg_time_req`] = 328 // /time (done) - cacheObjSubType[`msg_go`] = 329 // /go (done) - cacheObjSubType[`msg_pledge`] = 330 // /pledge (done) - cacheObjSubType[`msg_go_quest_req`] = 331 // 🌲Forest or 🍄Swamp or ⛰️Valley (not done) - cacheObjSubType[`msg_fast_fight`] = 332 // ▶️Fast fight (not done) - cacheObjSubType[`msg_go_arena`] = 333 // 📯Arena (not done) - cacheObjSubType[`msg_top`] = 334 // any /topXX (not done) - cacheObjSubType[`msg_menu`] = 335 // main menu (not done) - cacheObjSubType[`msg_buy_req`] = 336 // /wtb_xx (done) - cacheObjSubType[`msg_sell_req`] = 337 // /wts_xx (done) - cacheObjSubType[`msg_orderbook_req`] = 338 // /t_xx (done) - cacheObjSubType[`msg_orderbook_acl`] = 339 // orderbook summary (not done) - cacheObjSubType[`msg_withdraw_req`] = 340 // /g_withdraw (done) - cacheObjSubType[`msg_withdraw_code`] = 341 // code to receive (done) - cacheObjSubType[`msg_withdraw_rcv`] = 342 // Withdraw "received" msg (done) - cacheObjSubType[`msg_stock_req`] = 343 // /stock (done) - cacheObjSubType[`msg_stock_ack`] = 344 // result from /stock (not done) - cacheObjSubType[`msg_misc_req`] = 345 // /misc (done) - cacheObjSubType[`msg_misc_ack`] = 346 // result from /misc (not done) - cacheObjSubType[`msg_union_war`] = 347 // from Chat Wars Reports (not done) - cacheObjSubType[`msg_tureport_req`] = 348 // /tu_report (not done) - cacheObjSubType[`msg_tureport_ack`] = 349 // result from /tu_report (not done) - cacheObjSubType[`msg_timeout`] = 350 // generic timeout for action - cacheObjSubType[`msg_go_quest_ack`] = 351 // confirm quest destination/busyness (done) - cacheObjSubType[`msg_groles_req`] = 352 // /g_roles (done) - cacheObjSubType[`msg_groles_ack`] = 353 // result from /g_roles (done) - cacheObjSubType[`msg_gstock_res_req`] = 354 // /g_stock_res (done) - cacheObjSubType[`msg_gstock_alch_req`] = 355 // /g_stock_alch (done) - cacheObjSubType[`msg_gstock_misc_req`] = 356 // /g_stock_misc (done) - cacheObjSubType[`msg_gstock_rec_req`] = 357 // /g_stock_rec (done) - cacheObjSubType[`msg_gstock_part_req`] = 358 // /g_stock_parts (done) - cacheObjSubType[`msg_gstock_oth_req`] = 359 // /g_stock_other (done) - cacheObjSubType[`msg_gstock_any_ack`] = 360 // result from any /g_stock_xxx (done) - cacheObjSubType[`msg_gstock_req`] = 361 // /g_stock (done) - cacheObjSubType[`msg_gstock_ack`] = 362 // result from /g_stock (done) - cacheObjSubType[`msg_busy`] = 363 // too busy now - cacheObjSubType[`msg_res_stock_req`] = 364 // 📦Resources or /stock (done) - cacheObjSubType[`msg_alch_stock_req`] = 365 // ⚗️Alchemy (done) - cacheObjSubType[`msg_misc_stock_req`] = 366 // 🗃Misc or /misc (done) - cacheObjSubType[`msg_equip_stock_req`] = 367 // 🏷Equipment (done) - cacheObjSubType[`msg_craft_stock_req`] = 368 // ⚒Crafting (done) - cacheObjSubType[`msg_stock_empty`] = 369 // [empty] (done) - cacheObjSubType[`msg_stock_any_ack`] = 370 // list of stock (done) - cacheObjSubType[`msg_g_deposit_req`] = 371 // /g_deposit xx y (done) - cacheObjSubType[`msg_g_deposit_ack`] = 372 // Deposited successfully: xx (y) (done) - cacheObjSubType[`msg_castle_attack_req`] = 373 // Attack (done) - cacheObjSubType[`msg_castle_attack_ack`] = 374 // Read for attack, select target (done) - cacheObjSubType[`msg_castle_target_req`] = 375 // Castle selection (done) - cacheObjSubType[`msg_castle_target_ack`] = 376 // Castle confirmation (done) - cacheObjSubType[`msg_castle_def_req`] = 377 // Defend (done) - cacheObjSubType[`msg_castle_def_ack`] = 378 // Defend confirmation (done) - cacheObjSubType[`msg_back`] = 379 // Back (done) - cacheObjSubType[`msg_castle_req`] = 380 // Castle (done) - cacheObjSubType[`msg_castle_ack`] = 381 // Castle msg (not done) - cacheObjSubType[`msg_exchange_req`] = 382 // ⚖Exchange (done) - cacheObjSubType[`msg_exchange_ack`] = 383 // List of deals (done) - cacheObjSubType[`msg_equip_req`] = 384 // /on_item (done) - cacheObjSubType[`msg_equip_ack`] = 385 // Item equipped (done) - cacheObjSubType[`msg_unequip_req`] = 386 // /off_item (done) - cacheObjSubType[`msg_unequip_ack`] = 387 // Item unequipped (done) - cacheObjSubType[`msg_no_stamina`] = 388 // Not enough stamina. (done) - cacheObjSubType[`msg_orderbook_search`] = 389 // /t - cacheObjSubType[`msg_quest_req`] = 390 // quest - cacheObjSubType[`msg_quest_ack`] = 391 // forest/swamp/valley/arena - cacheObjSubType[`msg_battle`] = 392 // wind is howling - cacheObjSubType[`msg_order_cancel_req`] = 393 // /rm_xxx - cacheObjSubType[`msg_order_cancel_ack`] = 394 // Cancelling order - cacheObjSubType[`msg_stamina_restored`] = 395 // Stamina Restored - cacheObjSubType[`msg_top`]Req = 396 - cacheObjSubType[`msg_quest_res_ambush`] = 397 // result from going to quest with ambush (not done) - cacheObjSubType[`msg_heal_up`] = 398 // you should heal up first (done) - cacheObjSubType[`msg_arena_fight_ack`] = 399 // thirsty for blood ... (done) - cacheObjSubType[`msg_go_arena`]Ack = 400 // Welcome to Arena! (done) - cacheObjSubType[`msg_withdraw_nack`] = 401 // not enought items (done) - cacheObjSubType[`msg_pillage_defeat`] = 402 // You tried stopping (done) - cacheObjSubType[`msg_level_up_req`] = 403 // /level_up - cacheObjSubType[`msg_level_up_ack`] = 404 - - cacheObjSubType[`job_pillage`] = 601 - cacheObjSubType[`job_tribute`] = 602 - cacheObjSubType[`job_status`] = 603 - cacheObjSubType[`job_gwithdraw`] = 604 - cacheObjSubType[`job_gstock`] = 605 - cacheObjSubType[`job_rescan_msg`] = 606 - cacheObjSubType[`job_set_done`] = 607 - cacheObjSubType[`job_msg_client`] = 608 - cacheObjSubType[`job_msg_refresh`] = 609 - cacheObjSubType[`job_backup_export`] = 610 - cacheObjSubType[`job_backup_import`] = 611 - cacheObjSubType[`job_gdeposit`] = 612 - cacheObjSubType[`job_gdeposit_fwd`] = 613 - cacheObjSubType[`job_save_res`] = 614 - cacheObjSubType[`job_vault_user_status`] = 615 - cacheObjSubType[`job_vault_item_status`] = 616 - cacheObjSubType[`job_msg_fwd`] = 617 // rename to objSubTypeJobMsgFwd - cacheObjSubType[`job_set_def`] = 618 - cacheObjSubType[`job_msg_del`] = 619 - cacheObjSubType[`job_get_hammer_time`] = 620 - - cacheObjSubType[`item_res`] = 701 - cacheObjSubType[`item_alch`] = 702 - cacheObjSubType[`item_misc`] = 703 - cacheObjSubType[`item_recipe`] = 704 - cacheObjSubType[`item_part`] = 705 - cacheObjSubType[`item_other`] = 706 - - */ - objSubTypeCastle = 801 - objSubTypeFair = 901 - objSubTypeUnion = 1001 - objSubTypeTribute = 1101 - objSubTypeExperience = 1201 - objSubTypeQuestForest = 1301 - objSubTypeQuestSwamp = 1302 - objSubTypeQuestValley = 1303 - objJobStatusCallBack = -1 objJobStatusNew = 0 objJobStatusPillageGo = 1 diff --git a/obj.go b/obj.go index 009314a..6c7ea9c 100644 --- a/obj.go +++ b/obj.go @@ -647,7 +647,7 @@ func addObjXP(userID64 int64, expNow int64, expLvl int64, level int64, date time } res, err := tx.Exec(`INSERT INTO obj (obj_type_id, obj_sub_type_id) - VALUES (` + strconv.Itoa(objTypeExperience) + `,` + strconv.Itoa(objSubTypeExperience) + `);`) + VALUES (` + strconv.FormatInt(codeObjType[`xp`], 10) + `,` + strconv.FormatInt(codeObSubjType[`xp`], 10) + `);`) logOnError(err, "addObjXP : exec insert obj") if err != nil { err2 := tx.Rollback()