稻谷bug修复 提示删除
This commit is contained in:
1 parent
344fad19ac
commit
bd2ebfb154
43 files changed
+700
-846
No files matched your search
@@ -60,12 +60,12 @@ SUSHI_GROUPS = [
|
||||
"nigiri3": "rtdd:nigirisushicod_3",
|
||||
"pile2": "rtdd:sushipile_2",
|
||||
"pile3": "rtdd:sushipile_3",
|
||||
"addTip": "§a加上鳕鱼",
|
||||
"addTip": None,
|
||||
"rollTip": None,
|
||||
"cutTip": "§a切出了鳕鱼寿司块(三个)",
|
||||
"nigiriTip": "§a捏成手握鳕鱼寿司",
|
||||
"pileTip": "§a堆成寿司堆",
|
||||
"takeTip": "§a取走一个",
|
||||
"cutTip": None,
|
||||
"nigiriTip": None,
|
||||
"pileTip": None,
|
||||
"takeTip": None,
|
||||
},
|
||||
{
|
||||
"key": "salmon",
|
||||
@@ -78,12 +78,12 @@ SUSHI_GROUPS = [
|
||||
"nigiri3": "rtdd:nigirisushisalnom_3",
|
||||
"pile2": "rtdd:sushipile_4",
|
||||
"pile3": "rtdd:sushipile_5",
|
||||
"addTip": "§a加上鲑鱼",
|
||||
"addTip": None,
|
||||
"rollTip": None,
|
||||
"cutTip": "§a切出了鲑鱼寿司块(三个)",
|
||||
"nigiriTip": "§a捏成手握鲑鱼寿司",
|
||||
"pileTip": "§a堆成寿司堆",
|
||||
"takeTip": "§a取走一个",
|
||||
"cutTip": None,
|
||||
"nigiriTip": None,
|
||||
"pileTip": None,
|
||||
"takeTip": None,
|
||||
},
|
||||
{
|
||||
"key": "fish",
|
||||
@@ -96,12 +96,12 @@ SUSHI_GROUPS = [
|
||||
"nigiri3": "rtdd:nigirisushifish_3",
|
||||
"pile2": "rtdd:sushipile_0",
|
||||
"pile3": "rtdd:sushipile_1",
|
||||
"addTip": "§a加上热带鱼",
|
||||
"addTip": None,
|
||||
"rollTip": None,
|
||||
"cutTip": "§a切出了热带鱼寿司块(三个)",
|
||||
"nigiriTip": "§a捏成手握热带鱼寿司",
|
||||
"pileTip": "§a堆成寿司堆",
|
||||
"takeTip": "§a取走一个",
|
||||
"cutTip": None,
|
||||
"nigiriTip": None,
|
||||
"pileTip": None,
|
||||
"takeTip": None,
|
||||
},
|
||||
{
|
||||
"key": "squid",
|
||||
@@ -111,7 +111,7 @@ SUSHI_GROUPS = [
|
||||
"nigiri2": "rtdd:squidsushi_2",
|
||||
"nigiri3": "rtdd:squidsushi_3",
|
||||
"addTip": None, "rollTip": None, "cutTip": None,
|
||||
"nigiriTip": "§a捏成手握鱿鱼寿司",
|
||||
"nigiriTip": None,
|
||||
"pileTip": None, "takeTip": None,
|
||||
},
|
||||
]
|
||||
|
||||
+3
-10
@@ -60,7 +60,7 @@ class ShousiService(BlueFoxServerSystem):
|
||||
# 1) 基础组: 干海带 + 手持饭团右键 -> 干海带(加饭团), 消耗4个饭团
|
||||
self.recipes[(NORI_0, RICE_BALL)] = {
|
||||
"target": NORI_1, "consume": NORI_RICE_CONSUME,
|
||||
"tip": "§a海苔上铺好了饭团",
|
||||
"tip": None,
|
||||
}
|
||||
self.featureBlocks.add(NORI_0)
|
||||
|
||||
@@ -121,11 +121,11 @@ class ShousiService(BlueFoxServerSystem):
|
||||
# 手握堆叠: 手持 手握X寿司(一个) 右键 -> (两个) -> (三个), 每级消耗1个
|
||||
self.recipes[(g["nigiri1"], g["nigiri1"])] = {
|
||||
"target": g["nigiri2"], "consume": STACK_CONSUME,
|
||||
"tip": "§a堆叠成两个",
|
||||
"tip": None,
|
||||
}
|
||||
self.recipes[(g["nigiri2"], g["nigiri1"])] = {
|
||||
"target": g["nigiri3"], "consume": STACK_CONSUME,
|
||||
"tip": "§a堆叠成三个",
|
||||
"tip": None,
|
||||
}
|
||||
self.featureBlocks.add(g["nigiri1"])
|
||||
self.featureBlocks.add(g["nigiri2"])
|
||||
@@ -242,7 +242,6 @@ class ShousiService(BlueFoxServerSystem):
|
||||
return False
|
||||
self.consumeItem(playerId, itemDict, 1)
|
||||
self.replaceBlock(targetPos, dim, NIGIRI_BASE, playerId)
|
||||
comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a摆成手握普通寿司")
|
||||
return True
|
||||
|
||||
# ============================================================================
|
||||
@@ -272,9 +271,6 @@ class ShousiService(BlueFoxServerSystem):
|
||||
# 递减取走: 以掉落物形式返还卷寿司
|
||||
if recipe.get("drop"):
|
||||
self.dropItem(dim, pos, recipe["drop"])
|
||||
# 提示
|
||||
if recipe.get("tip"):
|
||||
comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
|
||||
|
||||
# ============================================================================
|
||||
# 四、切块(手持菜刀右键卷寿司两次 -> 寿司块(三个))
|
||||
@@ -288,11 +284,8 @@ class ShousiService(BlueFoxServerSystem):
|
||||
if n >= CUT_COUNT:
|
||||
self.cutCounter.pop(key, None)
|
||||
self.replaceBlock(pos, dim, g["cubes"], playerId)
|
||||
msg = g.get("cutTip") or "§a切好了"
|
||||
else:
|
||||
self.cutCounter[key] = n
|
||||
msg = "§a切寿司中…(%d/%d)" % (n, CUT_COUNT)
|
||||
comp.CreateMsg(playerId).NotifyOneMessage(playerId, msg)
|
||||
return True
|
||||
|
||||
# ============================================================================
|
||||
|
||||
Reference in new issue
Block a user