2
0
Эх сурвалжийг харах

把 shop 搬到 item 命名空间

LTCatt 6 жил өмнө
parent
commit
048f968d7b

+ 1 - 1
data/ltw/functions/shop/buy_apple1.mcfunction → data/item/functions/shop/buy_apple1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 324
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_armor1.mcfunction → data/item/functions/shop/buy_armor1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 36
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_armor2.mcfunction → data/item/functions/shop/buy_armor2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 63
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_armor3.mcfunction → data/item/functions/shop/buy_armor3.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 162
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_arrow1.mcfunction → data/item/functions/shop/buy_arrow1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 9
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_arrow2.mcfunction → data/item/functions/shop/buy_arrow2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 45
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_potion1.mcfunction → data/item/functions/shop/buy_potion1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 81
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_weapon1.mcfunction → data/item/functions/shop/buy_weapon1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 18
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/shop/buy_weapon2.mcfunction → data/item/functions/shop/buy_weapon2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 54
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-execute as @s[tag=canbuy] run function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 0 - 0
data/ltw/functions/shop/refresh_equip.mcfunction → data/item/functions/shop/refresh_equip.mcfunction


+ 3 - 3
data/ltw/functions/shop/refresh_gold.mcfunction → data/item/functions/shop/refresh_gold.mcfunction

@@ -8,15 +8,15 @@ clear @s gold_nugget
 scoreboard players operation @s temp = @s gold
 scoreboard players operation @s temp /= #const_81 mem
 # 给予金锭
-execute if score @s temp matches 1.. at @s run function ltw:shop/summon_block
+execute if score @s temp matches 1.. at @s run function item:shop/summon_block
 # 获取金锭数,存于 temp
 scoreboard players operation @s temp = @s gold
 scoreboard players operation @s temp %= #const_81 mem
 scoreboard players operation @s temp /= #const_9 mem
 # 给予金锭
-execute if score @s temp matches 1.. at @s run function ltw:shop/summon_gold
+execute if score @s temp matches 1.. at @s run function item:shop/summon_gold
 # 获取金粒数,存于 temp
 scoreboard players operation @s temp = @s gold
 scoreboard players operation @s temp %= #const_9 mem
 # 给予金粒
-execute if score @s temp matches 1.. at @s run function ltw:shop/summon_nugget
+execute if score @s temp matches 1.. at @s run function item:shop/summon_nugget

+ 1 - 1
data/ltw/functions/shop/summon_block.mcfunction → data/item/functions/shop/summon_block.mcfunction

@@ -5,6 +5,6 @@ execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=sc
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
-execute if score @s temp matches 1.. run function ltw:shop/summon_block
+execute if score @s temp matches 1.. run function item:shop/summon_block
 
 

+ 1 - 1
data/ltw/functions/shop/summon_gold.mcfunction → data/item/functions/shop/summon_gold.mcfunction

@@ -5,6 +5,6 @@ execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=sc
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
-execute if score @s temp matches 1.. run function ltw:shop/summon_gold
+execute if score @s temp matches 1.. run function item:shop/summon_gold
 
 

+ 1 - 1
data/ltw/functions/shop/summon_nugget.mcfunction → data/item/functions/shop/summon_nugget.mcfunction

@@ -5,6 +5,6 @@ execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=sc
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
-execute if score @s temp matches 1.. run function ltw:shop/summon_nugget
+execute if score @s temp matches 1.. run function item:shop/summon_nugget
 
 

+ 1 - 1
data/ltw/functions/state/0/player_enter.mcfunction

@@ -25,4 +25,4 @@ tp @s[tag=!debug] 10 16 10
 
 # 刷新物品
 clear @s[tag=!debug]
-function ltw:shop/refresh_gold
+function item:shop/refresh_gold

+ 1 - 1
data/ltw/functions/state/0/start_gameparty.mcfunction

@@ -17,7 +17,7 @@ scoreboard players operation @a game_id = $ game_id
 
 # 重置物品
 clear @a[tag=!watcher,tag=!debug]
-execute as @a[tag=!watcher,tag=!debug] at @s run function ltw:shop/refresh_equip
+execute as @a[tag=!watcher,tag=!debug] at @s run function item:shop/refresh_equip
 
 # 开始小游戏
 function lib:sounds/music/stop

+ 1 - 1
data/mini/functions/slime/game/summon.mcfunction

@@ -1,4 +1,4 @@
 # 召唤史莱姆
-summon slime 1010.00 6.01 7008.98 {Size:2}
+summon slime 1010.00 6.01 7008.98 {Size:1}
 effect give @e[type=slime] resistance 1000000 5 true
 schedule function mini:slime/game/set_attack 1t