Make tag edition code not entirely override the tag sprite's draw function (#803)

Author: InvalidOS

lovely/cat.toml

@@ -130,56 +130,27 @@ end
 '''
 match_indent = true
 
-# tag_sprite draw
 [[patches]]
 [patches.pattern]
-target = "tag.lua"
-pattern = '''tag_sprite.stop_hover = function(_self) _self.hovering = false; Node.stop_hover(_self); _self.hover_tilt = 0 end'''
-position = "after"
+target = 'engine/sprite.lua'
+pattern = '''for k, v in pairs(self.children) do'''
+position = 'before'
+match_indent = true
 payload = '''
-tag_sprite.draw = function(_self)
-	if not _self.states.visible then return end
-
-	_self.tilt_var = self.tilt_var or {mx = 0, my = 0, dx = _self.tilt_var.dx or 0, dy = _self.tilt_var.dy or 0, amt = 0}
-	_self.tilt_var.mx, _self.tilt_var.my = G.CONTROLLER.cursor_position.x, G.CONTROLLER.cursor_position.y
-        _self.tilt_var.amt = math.abs(_self.hover_offset.y + _self.hover_offset.x - 10)*0.3
-
-        _self.ARGS.send_to_shader = _self.ARGS.send_to_shader or {}
-        _self.ARGS.send_to_shader[1] = math.min(_self.VT.r*3, 1) + G.TIMERS.REAL/(28) + (_self.juice and _self.juice.r*10 or 0) + _self.tilt_var.amt
-        _self.ARGS.send_to_shader[2] = G.TIMERS.REAL*2
-
-	_self.tilt_var = _self.tilt_var or {}
-	_self.tilt_var.mx, _self.tilt_var.my =G.CONTROLLER.cursor_position.x,G.CONTROLLER.cursor_position.y
-
-	_self.role.draw_major = _self
-	_self:draw_shader('dissolve', 0.1)
-	local ed = _self.config.tag.ability.edshader
+if Cryptid.safe_get(self, "config", "tag", "ability", "edshader") then
+	local ed = self.config.tag.ability.edshader
+	self.ARGS.send_to_shader = self.ARGS.send_to_shader or {}
+	self.ARGS.send_to_shader[1] = math.min(self.VT.r*3, 1) + G.TIMERS.REAL/28 + (self.juice and self.juice.r*10 or 0) + (Cryptid.safe_get(self, "tilt_var", "amt") or 0)
+	self.ARGS.send_to_shader[2] = G.TIMERS.REAL*2
+	
 	if ed then
-		if ed == 'foil' or ed == 'cry_noisy' then
-			_self:draw_shader('dissolve')
-		end
-		_self:draw_shader(ed, nil, _self.ARGS.send_to_shader)
+		self:draw_shader(ed, nil, self.ARGS.send_to_shader)
 		if ed == 'negative' or ed == 'cry_oversat' then
-			_self:draw_shader('negative_shine', nil, _self.ARGS.send_to_shader)
+			self:draw_shader('negative_shine', nil, self.ARGS.send_to_shader)
 		end
-	else
-		_self:draw_shader('dissolve')
 	end
-	add_to_drawhash(_self)
 end
 '''
-match_indent = true
-
-# init tilt_var
-[[patches]]
-[patches.pattern]
-target = "tag.lua"
-pattern = '''tag_sprite.T.scale = 1'''
-position = "before"
-payload = '''
-tag_sprite.tilt_var = {mx = 0, my = 0, dx = 0, dy = 0, amt = 0}
-'''
-match_indent = true
 
 # make the cat tag meow (can probably do this without injecting?)
 [[patches]]