From 4570202be42668f8d89602484de3706acd61fc3d Mon Sep 17 00:00:00 2001
From: pennyrigate <pennyrigate@cybergal.com>
Date: Sun, 15 Oct 2023 00:27:05 -0400
Subject: [PATCH] ms. x lore

---
 maps/station.tscn             | 20 ++++++++++++++++++--
 objects/lore/station/msx.tscn | 27 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 objects/lore/station/msx.tscn

diff --git a/maps/station.tscn b/maps/station.tscn
index c1303ab..9ed5127 100644
--- a/maps/station.tscn
+++ b/maps/station.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=2]
+[gd_scene load_steps=27 format=2]
 
 [ext_resource path="res://maps/station.gd" type="Script" id=1]
 [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2]
@@ -23,6 +23,8 @@
 [ext_resource path="res://objects/environment/barrier/jail_bars.tscn" type="PackedScene" id=21]
 [ext_resource path="res://objects/npc/msx.tscn" type="PackedScene" id=22]
 [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=23]
+[ext_resource path="res://audio/sounds/die.wav" type="AudioStream" id=24]
+[ext_resource path="res://objects/lore/station/msx.tscn" type="PackedScene" id=25]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 4, 120 )
@@ -31,6 +33,7 @@ extents = Vector2( 4, 120 )
 pause_mode = 1
 script = ExtResource( 1 )
 music = ExtResource( 9 )
+lore_entries = [ ExtResource( 25 ) ]
 
 [node name="Camera2D" parent="." instance=ExtResource( 6 )]
 
@@ -74,13 +77,14 @@ tile_data = PoolIntArray( 393226, 536870912, 196609, 458762, 536870912, 196609,
 
 [node name="Exit" parent="." instance=ExtResource( 5 )]
 position = Vector2( 8, 164 )
-z_index = 0
 cost = 25
 
 [node name="Enemies" type="Node2D" parent="."]
 
 [node name="Cop" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 88, 112 )
+blood = true
+death_sound = ExtResource( 24 )
 left_boundary = 3.0
 right_boundary = 6.0
 turn_time = 1.0
@@ -88,28 +92,40 @@ turn_time = 1.0
 [node name="Cop2" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 136, 160 )
 scale = Vector2( -1, 1 )
+blood = true
+death_sound = ExtResource( 24 )
 turn_time = inf
 
 [node name="Cop3" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 200, 112 )
+blood = true
+death_sound = ExtResource( 24 )
 turn_time = inf
 
 [node name="Cop9" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 400, 160 )
+blood = true
+death_sound = ExtResource( 24 )
 left_boundary = 5.0
 
 [node name="Cop10" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 680, 160 )
 scale = Vector2( -1, 1 )
+blood = true
+death_sound = ExtResource( 24 )
 walk_speed = 0.0
 
 [node name="Cop6" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 184, 56 )
+blood = true
+death_sound = ExtResource( 24 )
 left_boundary = 4.0
 right_boundary = 4.0
 
 [node name="Cop7" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 352, 19 )
+blood = true
+death_sound = ExtResource( 24 )
 left_boundary = 10.0
 
 [node name="LaserWall" parent="Enemies" instance=ExtResource( 15 )]
diff --git a/objects/lore/station/msx.tscn b/objects/lore/station/msx.tscn
new file mode 100644
index 0000000..14d1153
--- /dev/null
+++ b/objects/lore/station/msx.tscn
@@ -0,0 +1,27 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1]
+[ext_resource path="res://objects/lore/lore.tscn" type="PackedScene" id=2]
+[ext_resource path="res://graphics/npc/msx_idle.png" type="Texture" id=3]
+
+[sub_resource type="ShaderMaterial" id=1]
+shader = ExtResource( 1 )
+shader_param/border_color = Color( 0, 0, 0, 1 )
+shader_param/border_corners = true
+
+[node name="Lore" instance=ExtResource( 2 )]
+
+[node name="TextureRect" parent="Panel" index="0"]
+material = SubResource( 1 )
+texture = ExtResource( 3 )
+
+[node name="Control" parent="." index="1"]
+margin_top = 42.0
+margin_bottom = 149.0
+
+[node name="Label" parent="Control" index="0"]
+margin_top = 3.0
+margin_bottom = 104.0
+text = "Name: Ms. X (Marisa Xevious)
+Birthday: October 21, 2062
+A young trans woman locked away for such frivolous crimes as shoplifting and marijuana possession. her reliance on weed causes a lot of issues in her life."