This commit is contained in:
Jacob 2026-09-27 17:24:58 -06:00
parent fb6b9ae016
commit 1f3c09ad33
6 changed files with 41 additions and 6 deletions

View file

@ -5,6 +5,7 @@ extends Camera2D
func _ready() -> void:
pass
# Called every frame. 'delta' is the elapsed time since the previous frame.
@ -48,3 +49,19 @@ func _unhandled_input(event: InputEvent):
node.position = loc
self.add_child(node)
UserContext.select_point(node)
func _on_enemy_gates_body_entered(body: Node2D) -> void:
if (body.get_class()== "CharacterBody2D"):
if body.get_node("MemberSprite").get_allegiance() == "You":
var event = preload("res://random events/invaded_win.tres")
event.probability = 1.0
# Replace with function body.
func _on_player_gates_body_entered(body: Node2D) -> void:
if (body.get_class()== "CharacterBody2D"):
if body.get_node("MemberSprite").get_allegiance() == "Rivaldom":
var event = preload("res://random events/invaded_loss.tres")
event.probability = 1.0

View file

@ -2,6 +2,7 @@
[ext_resource type="Texture2D" uid="uid://bntb4uxiugjq3" path="res://Map/EHAP_map.png" id="1_c7s6e"]
[ext_resource type="Script" uid="uid://ws5ruc64db3v" path="res://CameraMove.gd" id="2_wijl4"]
[ext_resource type="Script" uid="uid://cflu4y85bxg86" path="res://player_gates.gd" id="3_iw27f"]
[ext_resource type="Script" uid="uid://cafd3hd3kkkga" path="res://spawns_good.gd" id="9_0t07s"]
[ext_resource type="PackedScene" uid="uid://dmp1bqj8y0nvm" path="res://spawner.tscn" id="9_gqbix"]
[ext_resource type="Script" uid="uid://cqr8x6e2fjta1" path="res://spawns_bad.gd" id="11_6qsgm"]
@ -64,9 +65,11 @@ script = ExtResource("2_wijl4")
[node name="PlayerGates" type="Area2D" parent="." unique_id=1387700911]
unique_name_in_owner = true
position = Vector2(965, 1505)
script = ExtResource("3_iw27f")
[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerGates" unique_id=880212519]
position = Vector2(967, 1469)
position = Vector2(0, -35)
shape = SubResource("RectangleShape2D_bhunq")
[node name="EnemyGates" type="Area2D" parent="." unique_id=92129502]
@ -3622,3 +3625,6 @@ position = Vector2(1348, 858)
[node name="spawner576" parent="SpawnsBad" unique_id=1376681627 instance=ExtResource("9_gqbix")]
position = Vector2(1382, 808)
[connection signal="body_entered" from="PlayerGates" to="Camera2D" method="_on_player_gates_body_entered"]
[connection signal="body_entered" from="EnemyGates" to="Camera2D" method="_on_enemy_gates_body_entered"]

6
player_gates.gd Normal file
View file

@ -0,0 +1,6 @@
extends Area2D
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
UserContext.pgate = self

1
player_gates.gd.uid Normal file
View file

@ -0,0 +1 @@
uid://cflu4y85bxg86

View file

@ -4,12 +4,12 @@ extends CharacterBody2D
const SPEED = 700.0
const JUMP_VELOCITY = -400.0
@export var target : Node2D
@export var enemTarget : Node2D
func _ready() -> void:
UserContext. set_target_for . connect(set_target_for)
#enemTarget = %PlayerGates
func set_target_for(who: CurrencyMemberSprite, t: Node2D):
if %MemberSprite == who:
@ -21,7 +21,9 @@ func set_target_for(who: CurrencyMemberSprite, t: Node2D):
func removed_target():
target = null
func sprite() -> CurrencyMemberSprite:
return %MemberSprite
@ -50,9 +52,10 @@ func combat(target):
func _physics_process(delta: float) -> void:
if %MemberSprite.get_allegiance() == "Rivaldom" and %MemberSprite.get_combat() == true and target != enemTarget:
target = enemTarget
elif %MemberSprite.get_allegiance() == "You" and target == enemTarget:
if %MemberSprite.get_allegiance() == "Rivaldom" and %MemberSprite.get_combat() == true and target != UserContext.pgate:
if UserContext.pgate != null:
target = UserContext.pgate
elif %MemberSprite.get_allegiance() == "You" and target == UserContext.pgate:
removed_target()
if target != null:

View file

@ -3,6 +3,8 @@ extends Node
signal currency_inspect(c: Currency)
signal member_inspect(c: CurrencyMemberSprite)
var pgate: Area2D
@warning_ignore("unused_signal")
signal open_inbox
signal set_target_for(who: CurrencyMemberSprite, target: Node2D)