chtwrs/chirpnest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
shoopea 2020-01-26 17:01:32 +08:00
parent cf493c1eaa
commit 81825f4c00
2 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
data/obj_item.json
View File

@ -135,11 +135,11 @@
"mana": 15, "mana": 15,
"items": [ "items": [
{ {
"item": "01", "code": "01",
"quantity": 7 "quantity": 7
}, },
{ {
"item": "19", "code": "19",
"quantity": 1 "quantity": 1
} }
] ]
@ -634,15 +634,15 @@
"mana": 10, "mana": 10,
"items": [ "items": [
{ {
"item": "51", "code": "51",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "39", "code": "39",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "48", "code": "48",
"quantity": 1 "quantity": 1
} }
] ]
@ -672,11 +672,11 @@
"mana": 10, "mana": 10,
"items": [ "items": [
{ {
"item": "44", "code": "44",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "53", "code": "53",
"quantity": 1 "quantity": 1
} }
] ]
@ -3516,11 +3516,11 @@
"mana": 10, "mana": 10,
"items": [ "items": [
{ {
"item": "55", "code": "55",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "48", "code": "48",
"quantity": 1 "quantity": 1
} }
] ]
@ -3540,15 +3540,15 @@
"mana": 15, "mana": 15,
"items": [ "items": [
{ {
"item": "63", "code": "63",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "48", "code": "48",
"quantity": 2 "quantity": 2
}, },
{ {
"item": "59", "code": "59",
"quantity": 1 "quantity": 1
} }
] ]
@ -3568,19 +3568,19 @@
"mana": 30, "mana": 30,
"items": [ "items": [
{ {
"item": "63", "code": "63",
"quantity": 2 "quantity": 2
}, },
{ {
"item": "43", "code": "43",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "59", "code": "59",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "52", "code": "52",
"quantity": 1 "quantity": 1
} }
] ]
@ -3600,11 +3600,11 @@
"mana": 10, "mana": 10,
"items": [ "items": [
{ {
"item": "39", "code": "39",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "49", "code": "49",
"quantity": 1 "quantity": 1
} }
] ]
@ -3624,15 +3624,15 @@
"mana": 15, "mana": 15,
"items": [ "items": [
{ {
"item": "49", "code": "49",
"quantity": 2 "quantity": 2
}, },
{ {
"item": "60", "code": "60",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "62", "code": "62",
"quantity": 1 "quantity": 1
} }
] ]
@ -3652,19 +3652,19 @@
"mana": 30, "mana": 30,
"items": [ "items": [
{ {
"item": "62", "code": "62",
"quantity": 2 "quantity": 2
}, },
{ {
"item": "57", "code": "57",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "60", "code": "60",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "52", "code": "52",
"quantity": 1 "quantity": 1
} }
] ]
@ -3684,11 +3684,11 @@
"mana": 10, "mana": 10,
"items": [ "items": [
{ {
"item": "46", "code": "46",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "50", "code": "50",
"quantity": 1 "quantity": 1
} }
] ]
@ -3708,11 +3708,11 @@
"mana": 15, "mana": 15,
"items": [ "items": [
{ {
"item": "61", "code": "61",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "64", "code": "64",
"quantity": 1 "quantity": 1
} }
] ]
@ -3732,19 +3732,19 @@
"mana": 30, "mana": 30,
"items": [ "items": [
{ {
"item": "64", "code": "64",
"quantity": 2 "quantity": 2
}, },
{ {
"item": "42", "code": "42",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "52", "code": "52",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "61", "code": "61",
"quantity": 1 "quantity": 1
} }
] ]
@ -5476,43 +5476,43 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r93", "code": "r93",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k93", "code": "k93",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "23", "code": "23",
"quantity": 119 "quantity": 119
}, },
{ {
"item": "33", "code": "33",
"quantity": 79 "quantity": 79
}, },
{ {
"item": "27", "code": "27",
"quantity": 17 "quantity": 17
}, },
{ {
"item": "32", "code": "32",
"quantity": 10 "quantity": 10
}, },
{ {
"item": "18", "code": "18",
"quantity": 9 "quantity": 9
}, },
{ {
"item": "17", "code": "17",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "38" "code": "38"
,"quantity": 3 ,"quantity": 3
}, },
{ {
"item": "36", "code": "36",
"quantity": 3 "quantity": 3
} }
] ]
@ -5532,39 +5532,39 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r94", "code": "r94",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k98", "code": "k98",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "23", "code": "23",
"quantity": 111 "quantity": 111
}, },
{ {
"item": "14", "code": "14",
"quantity": 92 "quantity": 92
}, },
{ {
"item": "32", "code": "32",
"quantity": 19 "quantity": 19
}, },
{ {
"item": "18", "code": "18",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "38", "code": "38",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "17", "code": "17",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "36", "code": "36",
"quantity": 3 "quantity": 3
} }
] ]
@ -5584,43 +5584,43 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r95", "code": "r95",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k95", "code": "k95",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "23", "code": "23",
"quantity": 111 "quantity": 111
}, },
{ {
"item": "14", "code": "14",
"quantity": 92 "quantity": 92
}, },
{ {
"item": "27", "code": "27",
"quantity": 39 "quantity": 39
}, },
{ {
"item": "18", "code": "18",
"quantity": 9 "quantity": 9
}, },
{ {
"item": "32", "code": "32",
"quantity": 7 "quantity": 7
}, },
{ {
"item": "36", "code": "36",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "38", "code": "38",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "15" "code": "15"
,"quantity": 3 ,"quantity": 3
} }
] ]
@ -5640,39 +5640,39 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r96", "code": "r96",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k96", "code": "k96",
"quantity": 5 "quantity": 5
}, },
{ {
"item": "23", "code": "23",
"quantity": 103 "quantity": 103
}, },
{ {
"item": "14", "code": "14",
"quantity": 97 "quantity": 97
}, },
{ {
"item": "32", "code": "32",
"quantity": 21 "quantity": 21
}, },
{ {
"item": "18", "code": "18",
"quantity": 7 "quantity": 7
}, },
{ {
"item": "36", "code": "36",
"quantity": 5 "quantity": 5
}, },
{ {
"item": "17", "code": "17",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "38", "code": "38",
"quantity": 2 "quantity": 2
} }
] ]
@ -5692,39 +5692,39 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r97", "code": "r97",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k97", "code": "k97",
"quantity": 5 "quantity": 5
}, },
{ {
"item": "23", "code": "23",
"quantity": 103 "quantity": 103
}, },
{ {
"item": "14", "code": "14",
"quantity": 97 "quantity": 97
}, },
{ {
"item": "27", "code": "27",
"quantity": 91 "quantity": 91
}, },
{ {
"item": "18", "code": "18",
"quantity": 7 "quantity": 7
}, },
{ {
"item": "36", "code": "36",
"quantity": 5 "quantity": 5
}, },
{ {
"item": "15", "code": "15",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "38", "code": "38",
"quantity": 2 "quantity": 2
} }
] ]
@ -5744,39 +5744,39 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r98", "code": "r98",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k98", "code": "k98",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "23", "code": "23",
"quantity": 107 "quantity": 107
}, },
{ {
"item": "33", "code": "33",
"quantity": 79 "quantity": 79
}, },
{ {
"item": "32", "code": "32",
"quantity": 17 "quantity": 17
}, },
{ {
"item": "18", "code": "18",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "38", "code": "38",
"quantity": 4 "quantity": 4
}, },
{ {
"item": "17", "code": "17",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "36", "code": "36",
"quantity": 3 "quantity": 3
} }
] ]
@ -5796,43 +5796,43 @@
"mana": 800, "mana": 800,
"items": [ "items": [
{ {
"item": "r99", "code": "r99",
"quantity": 1 "quantity": 1
}, },
{ {
"item": "k99", "code": "k99",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "23", "code": "23",
"quantity": 107 "quantity": 107
}, },
{ {
"item": "33", "code": "33",
"quantity": 79 "quantity": 79
}, },
{ {
"item": "27", "code": "27",
"quantity": 39 "quantity": 39
}, },
{ {
"item": "32", "code": "32",
"quantity": 7 "quantity": 7
}, },
{ {
"item": "18", "code": "18",
"quantity": 6 "quantity": 6
}, },
{ {
"item": "38", "code": "38",
"quantity": 4 "quantity": 4
}, },
{ {
"item": "15", "code": "15",
"quantity": 3 "quantity": 3
}, },
{ {
"item": "36", "code": "36",
"quantity": 1 "quantity": 1
} }
] ]

3
item.go
View File

@ -354,7 +354,8 @@ func loadObjItem() error {
setObjItemCraft(objItems[i].ObjID64, objItems[i].Craft.Command, objItems[i].Craft.Mana) setObjItemCraft(objItems[i].ObjID64, objItems[i].Craft.Command, objItems[i].Craft.Mana)
emptyObjItemCraftItem(objItems[i].ObjID64) emptyObjItemCraftItem(objItems[i].ObjID64)
for k, o := range objItems[i].Craft.Items { for k, o := range objItems[i].Craft.Items {
objItems[i].Craft.Items[k].ItemID64 = getObjItemID(o.Code, ``) log.Printf("loadObjItem : %s : adding %s (%d) to the recipe.\n")
objItems[i].Craft.Items[k].ItemID64 = getSilentObjItemID(o.Code, ``)
} }
for _, o := range objItems[i].Craft.Items { for _, o := range objItems[i].Craft.Items {
addObjItemCraftItem(objItems[i].ObjID64, o.ItemID64, o.Quantity) addObjItemCraftItem(objItems[i].ObjID64, o.ItemID64, o.Quantity)