Skip to content

Commit

Permalink
Merge pull request #23 from Flubberschnub/indev
Browse files Browse the repository at this point in the history
upward physics
  • Loading branch information
Flubberschnub committed Oct 9, 2020
2 parents d4e196c + 1c6ddd9 commit 2c0392f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion data/lc/functions/load.mcfunction
Expand Up @@ -55,4 +55,4 @@ scoreboard players set 50 Constant 50
scoreboard players set 100 Constant 100

##message
tellraw @a ["",{"text":"Reloaded!","underlined":true,"color":"green"},{"text":" TRON Vehicles v1.2.3","bold":true,"italic":true,"color":"white"},{"text":" "},{"text":"by","color":"yellow"},{"text":" "},{"text":"F","color":"dark_aqua"},{"text":"lubberschnub","color":"dark_gray"}]
tellraw @a ["",{"text":"Reloaded!","underlined":true,"color":"green"},{"text":" TRON Vehicles v1.2.4","bold":true,"italic":true,"color":"white"},{"text":" "},{"text":"by","color":"yellow"},{"text":" "},{"text":"F","color":"dark_aqua"},{"text":"lubberschnub","color":"dark_gray"}]
2 changes: 1 addition & 1 deletion data/lc/functions/motion/drag.mcfunction
@@ -1,5 +1,5 @@
##drag
execute as @s[tag=ribboning] if score @s speed > ribboning topSpeed run scoreboard players operation @s speed = ribboning topSpeed
execute unless score @s speed matches ..0 unless entity @a[tag=matchedid,predicate=lc:lc/riding_cycle] run scoreboard players remove @s speed 15
execute unless score @s speed matches ..0 if entity @s[tag=inAir] run scoreboard players remove @s speed 15
execute unless score @s speed matches ..0 if entity @s[tag=inAir] run scoreboard players remove @s speed 10
execute if score @s speed matches ..0 run scoreboard players set @s speed 0
3 changes: 2 additions & 1 deletion data/lc/functions/move.mcfunction
Expand Up @@ -13,7 +13,8 @@ function aestd1:entity/set_motion_from_rotation
#execute as @s[tag=moveup] run function aestd1:entity/set_motion_magnitude
scoreboard players operation @s aestd.math.in = @s speed
function aestd1:entity/set_motion_magnitude
execute as @s[tag=moveup] run data modify entity @s Motion[1] set value 0.5d
#execute as @s[tag=moveup] run data modify entity @s Motion[1] set value 0.5d
execute as @s[tag=moveup] store result entity @s Motion[1] double 0.0004 run scoreboard players get @s speed
execute as @s run function lc:motion/tick
execute as @s run function lc:rotate/tick
kill @e[tag=aestd.context.position_cloud]
Expand Down
3 changes: 2 additions & 1 deletion data/lc/functions/rotate/tick.mcfunction
Expand Up @@ -12,7 +12,8 @@ execute as @a[predicate=lc:lc/riding_cycle,tag=matchedid] if entity @e[tag=cycle
#execute as @e[tag=cyclefacing,tag=matchedid,limit=1] at @s facing entity @e[tag=cyclestand,tag=matchedid] feet facing ^ ^ ^-1 run tp @s ~ ~ ~ ~-90 ~
#execute as @e[tag=cyclestand,tag=matchedid] run data modify entity @s Rotation[0] set from entity @e[tag=cyclefacing,tag=matchedid,limit=1] Rotation[0]
#execute as @e[tag=cyclefacing,tag=matchedid,limit=1] at @s run tp @s ~ ~ ~ ~90 ~
execute as @e[tag=cyclefacing,tag=matchedid] run data modify entity @s Motion[1] set from entity @e[tag=cyclestand,tag=matchedid,limit=1] Motion[1]
#execute as @e[tag=cyclefacing,tag=matchedid] run data modify entity @s Motion[1] set from entity @e[tag=cyclestand,tag=matchedid,limit=1] Motion[1]
execute as @e[tag=cyclefacing,tag=matchedid] store result entity @s Motion[1] double 0.001 run data get entity @e[tag=cyclestand,tag=matchedid,limit=1] Motion[1] 1000
execute at @e[tag=cyclestand,tag=matchedid] at @s facing entity @e[tag=cyclefacing,tag=matchedid,limit=1] feet rotated ~-90 ~ run tp @s ~ ~ ~ ~ ~
execute as @e[tag=cyclestand,tag=matchedid] run data modify entity @s Motion[1] set from entity @e[tag=cyclefacing,tag=matchedid,limit=1] Motion[1]
execute as @e[tag=cyclefacing,tag=matchedid] run data modify entity @s Motion[1] set value 0d
Expand Down

0 comments on commit 2c0392f

Please sign in to comment.