Merge remote-tracking branch 'origin/main'

This commit is contained in:
2025-10-05 02:02:14 +02:00
8 changed files with 32 additions and 13 deletions

View File

@@ -1,8 +1,8 @@
extends Node
@export var CursorBullet: PackedScene = preload("res://CardInjects/CursorGun/cursor_bullet.tscn")
@export var max_ammo = 10
var ammo = 10
@export var max_ammo = 30
var ammo = max_ammo
func activate(world, activator):
var target: Vector2 = activator.get_target_pos()
@@ -18,8 +18,6 @@ func activate(world, activator):
bullet.set_collision_layer_value(2, false)
else:
assert(false, "who are you, activator?")
ammo -= 1
# TODO: handle ammo for player and virus
func discard(world, activator):
pass

View File

@@ -3,6 +3,8 @@ extends Node
@export var FireWall: PackedScene
@export var max_range = 10
@export var min_range = 5
@export var max_ammo = 5
var ammo = max_ammo
func activate(world, activator):
var firewall = FireWall.instantiate()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 139 KiB

View File

@@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cbf1y1t8dbvd0"
uid="uid://fp2p3qmysqx6"
path="res://.godot/imported/BG_tilemap.png-dc96b1551e977ce000bd71e567bf3d53.ctex"
metadata={
"vram_texture": false

View File

@@ -1,6 +1,12 @@
[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://c20bl25rqyf68"]
[gd_resource type="TileSet" load_steps=5 format=3 uid="uid://c20bl25rqyf68"]
[ext_resource type="Texture2D" uid="uid://cbf1y1t8dbvd0" path="res://assets/tiles/BG_tilemap.png" id="1_j670q"]
[ext_resource type="Texture2D" uid="uid://fp2p3qmysqx6" path="res://assets/tiles/BG_tilemap.png" id="1_j670q"]
[sub_resource type="TileMapPattern" id="TileMapPattern_j670q"]
tile_data = PackedInt32Array(0, 65538, 0, 65536, 65538, 1342177280, 131072, 65538, 1879048192, 196608, 65538, 1342177280, 1, 65538, 1610612736, 65537, 65538, 1073741824, 131073, 65538, 268435456, 196609, 65538, 0, 2, 65538, 805306368, 65538, 65538, 536870912, 131074, 65538, 805306368, 196610, 65538, 1610612736, 3, 65538, 1073741824, 65539, 65538, 536870912, 131075, 65538, 1879048192, 196611, 65538, 268435456)
[sub_resource type="TileMapPattern" id="TileMapPattern_xxvok"]
tile_data = PackedInt32Array(0, 65538, 0, 65536, 65538, 536870912, 131072, 131074, 0, 196608, 131074, 536870912, 1, 65538, 268435456, 65537, 65538, 805306368, 131073, 131074, 268435456, 196609, 131074, 805306368, 2, 2, 0, 65538, 2, 536870912, 131074, 196610, 805306368, 196610, 196610, 268435456, 3, 2, 268435456, 65539, 2, 805306368, 131075, 196610, 536870912, 196611, 196610, 0)
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_xxvok"]
texture = ExtResource("1_j670q")
@@ -8,7 +14,10 @@ texture_region_size = Vector2i(800, 800)
0:0/0 = 0
1:0/0 = 0
2:0/0 = 0
3:0/0 = 0
[resource]
tile_size = Vector2i(800, 800)
sources/2 = SubResource("TileSetAtlasSource_xxvok")
pattern_0 = SubResource("TileMapPattern_j670q")
pattern_1 = SubResource("TileMapPattern_xxvok")

File diff suppressed because one or more lines are too long

View File

@@ -53,7 +53,7 @@ func update_target_coords():
func update_camera_position():
if not camera:
return;
var camera_target = (target - screen_size / 2) / 4
var camera_target = (target - screen_size / 2) / 2
camera.position = camera.position.lerp(camera_target, 0.1)
func charge():

View File

@@ -15,6 +15,11 @@ run/main_scene="uid://c5qbqj52kr0aw"
config/features=PackedStringArray("4.5", "GL Compatibility")
config/icon="res://icon.svg"
[display]
window/size/viewport_width=1600
window/size/viewport_height=900
[input]
move_left={