diff --git a/growth/CardInjects/Firewall/FirewallCardInject.tscn b/growth/CardInjects/Firewall/FirewallCardInject.tscn index 45caa5e..567e0e1 100644 --- a/growth/CardInjects/Firewall/FirewallCardInject.tscn +++ b/growth/CardInjects/Firewall/FirewallCardInject.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://otxia3v8iw07"] [ext_resource type="Script" uid="uid://dpyarqogod6d3" path="res://CardInjects/Firewall/firewall_card_inject.gd" id="1_fd08f"] -[ext_resource type="PackedScene" uid="uid://33rplipuwv2k" path="res://CardInjects/Firewall/firewall.tscn" id="2_sbju6"] +[ext_resource type="PackedScene" uid="uid://ddvrvdq4406l4" path="res://CardInjects/Firewall/firewall.tscn" id="2_sbju6"] [node name="FirewallCardInject" type="Node"] script = ExtResource("1_fd08f") diff --git a/growth/CardInjects/Firewall/firewall.tscn b/growth/CardInjects/Firewall/firewall.tscn index 46b0e20..da30717 100644 --- a/growth/CardInjects/Firewall/firewall.tscn +++ b/growth/CardInjects/Firewall/firewall.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://ddvrvdq4406l4"] +[gd_scene load_steps=5 format=3 uid="uid://ddvrvdq4406l4"] [ext_resource type="Script" uid="uid://bmt6oqrixatxt" path="res://CardInjects/Firewall/firewall.gd" id="1_qwxdp"] [ext_resource type="SpriteFrames" uid="uid://bliai1y7g52o0" path="res://assets/animations/Firewalls/firewall.tres" id="2_nlcc7"] @@ -6,10 +6,32 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_4b7oj"] size = Vector2(111.33856, 61) +[sub_resource type="Shader" id="Shader_4b7oj"] +code = "shader_type canvas_item; + +void vertex() { + // Called for every vertex the material is visible on. +} + +void fragment() { + COLOR.g = 1.0; +} + +//void light() { +// // Called for every pixel for every light affecting the CanvasItem. +// // Uncomment to replace the default light processing function with this one. +//} +" + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1k8bc"] +shader = SubResource("Shader_4b7oj") + [node name="Firewall" type="Node2D"] +scale = Vector2(2, 2) script = ExtResource("1_qwxdp") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +material = SubResource("ShaderMaterial_1k8bc") sprite_frames = ExtResource("2_nlcc7") animation = &"angled_idle" frame_progress = 0.5135349 diff --git a/growth/CardInjects/Firewall/firewall_card_inject.gd b/growth/CardInjects/Firewall/firewall_card_inject.gd index b1298bd..b253b98 100644 --- a/growth/CardInjects/Firewall/firewall_card_inject.gd +++ b/growth/CardInjects/Firewall/firewall_card_inject.gd @@ -1,8 +1,8 @@ extends Node @export var FireWall: PackedScene -@export var max_range = 70 -@export var min_range = 50 +@export var max_range = 100 +@export var min_range = 75 @export var max_ammo = 5 @export var cast_time = 0.1 @export var cooldown_time = 0.3 diff --git a/growth/CardInjects/Mine/mine.tscn b/growth/CardInjects/Mine/mine.tscn index c7a8b90..ddd9b99 100644 --- a/growth/CardInjects/Mine/mine.tscn +++ b/growth/CardInjects/Mine/mine.tscn @@ -1,12 +1,33 @@ -[gd_scene load_steps=3 format=3 uid="uid://umv7m1lf4x6b"] +[gd_scene load_steps=5 format=3 uid="uid://umv7m1lf4x6b"] [ext_resource type="Script" uid="uid://b3jims0gq4tg5" path="res://CardInjects/Mine/mine.gd" id="1_mj2xh"] [ext_resource type="Texture2D" uid="uid://dmq8shsoq55dx" path="res://assets/icons/Mine_symbol.png" id="2_80s1i"] +[sub_resource type="Shader" id="Shader_80s1i"] +code = "shader_type canvas_item; + +void vertex() { + // Called for every vertex the material is visible on. +} + +void fragment() { + COLOR.y = 1.0; +} + +//void light() { +// // Called for every pixel for every light affecting the CanvasItem. +// // Uncomment to replace the default light processing function with this one. +//} +" + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_56tnn"] +shader = SubResource("Shader_80s1i") + [node name="Mine" type="Node2D"] script = ExtResource("1_mj2xh") [node name="Sprite2D" type="Sprite2D" parent="."] +material = SubResource("ShaderMaterial_56tnn") texture = ExtResource("2_80s1i") [node name="Area2D" type="Area2D" parent="."]