catch up to latest developments #10

Merged
kistaro merged 12 commits from pyrex/chameleonic:main into main 2022-12-21 06:50:14 +00:00
Showing only changes of commit 5831cdf4e8 - Show all commits

View File

@ -702,7 +702,6 @@ function player:update()
end
end
if (self.rope) self.rope:prevent_highlight(#self.todo>0)
_apply(self,self.todo)
if self.rope then
@ -927,7 +926,7 @@ end
function rope:draw(artificial_dx,artificial_dy)
local points,highlight=self:_tug(true)
if (self:busy() or self._prevent_highlight) highlight=nil
if (self:busy()) highlight=nil
if (self.state.name=="done") return
local perc_to_show=1.0
if (self.state.name=="destroy") perc_to_show=(1.0-self.state.frame/5)^2
@ -1439,15 +1438,6 @@ function rope:tug()
return rc
end
function rope:prevent_highlight(prevent)
if prevent then
local points,highlight=self:_tug(true)
if (self:busy() or highlight==nil) self._prevent_highlight=true
else
self._prevent_highlight=false
end
end
function rope:_tug(hypothetically)
local ancs=self:_anchors_simplified()
local touched={}