zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes, upgrade to 4.4.0-dev4

Browse Source
This commit is contained in:
Zenny
2024-11-20 20:36:58 -08:00
parent 8d4177f8b1
commit 8ddfe86750
31 changed files with 972 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/Game.cs
View File

@@ -261,10 +261,10 @@ public partial class Game : Node3D, IGame
}
}
public void HealHP(int amountToRaise)
public void HealHP(int amountToRestore)
{
GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value + amountToRaise);
var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}";
GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value + amountToRestore);
var raiseString = amountToRestore == 1000 ? "MAX" : $"{amountToRestore}";
EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}HP Restored.");
}
@@ -278,10 +278,10 @@ public partial class Game : Node3D, IGame
}
}
public void HealVT(int amountToRaise)
public void HealVT(int amountToRestore)
{
GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.CurrentVT.Value + amountToRaise);
var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}";
GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.CurrentVT.Value + amountToRestore);
var raiseString = amountToRestore == 1000 ? "MAX" : $"{amountToRestore}";
EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}VT Restored.");
}

55
src/game/Game.tscn
View File

@@ -1,14 +1,11 @@
[gd_scene load_steps=19 format=3 uid="uid://33ek675mfb5n"]
[gd_scene load_steps=13 format=3 uid="uid://33ek675mfb5n"]
[ext_resource type="Script" path="res://src/game/Game.cs" id="1_ytcii"]
[ext_resource type="Shader" path="res://src/app/App.gdshader" id="2_6ifxs"]
[ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"]
[ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"]
[ext_resource type="Script" path="res://src/items/throwable/ThrowableItem.cs" id="5_2h2uw"]
[ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
[ext_resource type="Texture2D" uid="uid://dhfn51smm818x" path="res://src/items/throwable/textures/spell sign - luck.PNG" id="6_3qv3u"]
[ext_resource type="PackedScene" uid="uid://b16ejcwanod72" path="res://src/audio/InGameAudio.tscn" id="6_qc71l"]
[ext_resource type="Script" path="res://src/items/throwable/ThrowableItemStats.cs" id="7_1lafu"]
[ext_resource type="Script" path="res://src/game/DialogueController.cs" id="10_58pbt"]
[ext_resource type="Script" path="res://src/ui/pause_menu/PauseMenu.cs" id="11_5ng8c"]
[ext_resource type="PackedScene" uid="uid://pu6gp8de3ck4" path="res://src/ui/floor_clear/FloorClearMenu.tscn" id="11_rya1n"]
@@ -24,24 +21,6 @@ shader_parameter/scale_resolution = false
shader_parameter/target_resolution_scale = 4
shader_parameter/enable_recolor = false
[sub_resource type="Resource" id="Resource_qjdoa"]
script = ExtResource("7_1lafu")
ThrowableItemTags = []
Name = "Test Item"
Description = ""
Texture = ExtResource("6_3qv3u")
SpawnRate = 0.5
ThrowSpeed = 12.0
HealHPAmount = 0
HealVTAmount = 0
ThrowDamage = 5
[sub_resource type="BoxShape3D" id="BoxShape3D_qkug6"]
size = Vector3(0.371643, 0.289612, 0.286743)
[sub_resource type="BoxShape3D" id="BoxShape3D_1clvs"]
size = Vector3(0.778381, 0.929947, 0.731567)
[node name="Game" type="Node3D"]
process_mode = 3
script = ExtResource("1_ytcii")
@@ -75,38 +54,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.74459, 1.22144)
unique_name_in_owner = true
process_mode = 1
[node name="ThrowableItem" type="Node3D" parent="SubViewportContainer/SubViewport/PauseContainer"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.52777, 3.48107, 3.48636)
script = ExtResource("5_2h2uw")
ThrowableItemInfo = SubResource("Resource_qjdoa")
[node name="Hitbox" type="RigidBody3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem"]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 17
[node name="Sprite" type="Sprite3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
unique_name_in_owner = true
pixel_size = 0.001
billboard = 1
shaded = true
double_sided = false
texture_filter = 0
render_priority = 100
texture = ExtResource("6_3qv3u")
[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
shape = SubResource("BoxShape3D_qkug6")
[node name="Pickup" type="Area3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox"]
unique_name_in_owner = true
collision_layer = 0
collision_mask = 4
[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/PauseContainer/ThrowableItem/Hitbox/Pickup"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0600509, 0.26725, 0.180481)
shape = SubResource("BoxShape3D_1clvs")
[node name="InGameUI" parent="." instance=ExtResource("5_lxtnp")]
unique_name_in_owner = true