Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 saderako
|
5636c0da67 | ||
 kziolkowski
|
4578a2cfda | ||
 Jonathan
|
9032272599 | ||
 jlink
|
a2ef3bfaf0 | ||
|
jlink
|
1ab1071246 | ||
|
Jonathan
|
e5b2b8b8ab | ||
|
Jonathan
|
2fa8aa9fbc | ||
|
Jonathan
|
6deb6e29fd | ||
|
Jonathan
|
edc133749f | ||
 jonathan
|
5f75bde317 | ||
|
jonathan
|
7310bfbf6e | ||
|
jonathan
|
fef8380a57 | ||
|
jonathan
|
f42c2c86b1 | ||
|
jlink
|
2ed9dbbc52 | ||
|
jlink
|
09f55d3aa7 | ||
|
jonathan
|
a736adaafb |
@@ -0,0 +1,8 @@
|
||||
[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=3 uid="uid://b8320gi2iry7e"]
|
||||
|
||||
[ext_resource type="SpineAtlasResource" uid="uid://bp5dm6ppdxyfy" path="res://art/animation/Cat/sk_cat.atlas" id="1_silct"]
|
||||
[ext_resource type="SpineSkeletonFileResource" uid="uid://dj4q5ov01nmar" path="res://art/animation/Cat/sk_cat.skel" id="2_bwfy5"]
|
||||
|
||||
[resource]
|
||||
atlas_res = ExtResource("1_silct")
|
||||
skeleton_file_res = ExtResource("2_bwfy5")
|
||||
@@ -0,0 +1,12 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://cdqhc3rpjiod2"]
|
||||
|
||||
[ext_resource type="SpineSkeletonDataResource" uid="uid://b8320gi2iry7e" path="res://art/animation/Cat/cat.tres" id="1_x424w"]
|
||||
|
||||
[node name="Cat" type="Node2D"]
|
||||
|
||||
[node name="SpineSprite" type="SpineSprite" parent="."]
|
||||
skeleton_data_res = ExtResource("1_x424w")
|
||||
preview_skin = "Default"
|
||||
preview_animation = "Idle"
|
||||
preview_frame = false
|
||||
preview_time = 0.0
|
||||
@@ -0,0 +1,29 @@
|
||||
sk_cat.png
|
||||
size:4930,1270
|
||||
filter:Linear,Linear
|
||||
pma:true
|
||||
cat_backleg_lower
|
||||
bounds:0,0,72,113
|
||||
cat_backleg_upper
|
||||
bounds:493,0,181,200
|
||||
offsets:0,1,181,201
|
||||
cat_body
|
||||
bounds:986,0,493,349
|
||||
cat_eyeball
|
||||
bounds:1479,0,302,155
|
||||
cat_eyelashes
|
||||
bounds:1972,0,331,160
|
||||
cat_frontleg_lower
|
||||
bounds:2465,0,84,115
|
||||
offsets:0,1,84,116
|
||||
cat_frontleg_upper
|
||||
bounds:2958,0,76,169
|
||||
cat_head
|
||||
bounds:3451,0,422,575
|
||||
offsets:0,2,422,577
|
||||
cat_leg
|
||||
bounds:3944,0,218,635
|
||||
cat_nose
|
||||
bounds:4437,0,294,93
|
||||
cat_pupil
|
||||
bounds:0,635,235,117
|
||||
@@ -0,0 +1,16 @@
|
||||
[remap]
|
||||
|
||||
importer="spine.atlas"
|
||||
type="SpineAtlasResource"
|
||||
uid="uid://bp5dm6ppdxyfy"
|
||||
path="res://.godot/imported/sk_cat.atlas-209e52708ae51512bd5a9c13ecef821d.spatlas"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/animation/Cat/sk_cat.atlas"
|
||||
dest_files=["res://.godot/imported/sk_cat.atlas-209e52708ae51512bd5a9c13ecef821d.spatlas"]
|
||||
|
||||
[params]
|
||||
|
||||
normal_map_prefix="n"
|
||||
specular_map_prefix="s"
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 515 KiB |
@@ -0,0 +1,40 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bxbae280ae8yv"
|
||||
path="res://.godot/imported/sk_cat.png-400ad3198e50487a16cece95aef9c056.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/animation/Cat/sk_cat.png"
|
||||
dest_files=["res://.godot/imported/sk_cat.png-400ad3198e50487a16cece95aef9c056.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
Binary file not shown.
@@ -0,0 +1,14 @@
|
||||
[remap]
|
||||
|
||||
importer="spine.skel"
|
||||
type="SpineSkeletonFileResource"
|
||||
uid="uid://dj4q5ov01nmar"
|
||||
path="res://.godot/imported/sk_cat.skel-040dd3b0902fe4467d3f597cd8205232.spskel"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/animation/Cat/sk_cat.skel"
|
||||
dest_files=["res://.godot/imported/sk_cat.skel-040dd3b0902fe4467d3f597cd8205232.spskel"]
|
||||
|
||||
[params]
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>libspine_godot.ios.template_debug</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>spine-godot</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.esotericsoftware.spine.spine-godot</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.2.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.2.0</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>12.0</string>
|
||||
<key>DTPlatformName</key>
|
||||
<string>iphoneos</string>
|
||||
</dict>
|
||||
</plist>
|
||||
Binary file not shown.
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>libspine_godot.ios.template_release</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>spine-godot</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.esotericsoftware.spine.spine-godot</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.2.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.2.0</string>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>12.0</string>
|
||||
<key>DTPlatformName</key>
|
||||
<string>iphoneos</string>
|
||||
</dict>
|
||||
</plist>
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>libspine_godot.macos.editor</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>spine-godot</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.esotericsoftware.spine.spine-godot</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.2.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.2.0</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.12</string>
|
||||
<key>CFBundleSupportedPlatforms</key>
|
||||
<array>
|
||||
<string>MacOSX</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
Binary file not shown.
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>libspine_godot.macos.template_debug</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>spine-godot</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.esotericsoftware.spine.spine-godot</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.2.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.2.0</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.12</string>
|
||||
<key>CFBundleSupportedPlatforms</key>
|
||||
<array>
|
||||
<string>MacOSX</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
BIN
Binary file not shown.
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>libspine_godot.macos.template_release</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>spine-godot</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.esotericsoftware.spine.spine-godot</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.2.0</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.2.0</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.12</string>
|
||||
<key>CFBundleSupportedPlatforms</key>
|
||||
<array>
|
||||
<string>MacOSX</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
BIN
Binary file not shown.
@@ -0,0 +1,40 @@
|
||||
[configuration]
|
||||
|
||||
entry_symbol = "spine_godot_library_init"
|
||||
compatibility_minimum = "4.1"
|
||||
|
||||
[libraries]
|
||||
|
||||
macos.editor = "macos/libspine_godot.macos.editor.framework"
|
||||
macos.debug = "macos/libspine_godot.macos.template_debug.framework"
|
||||
macos.release = "macos/libspine_godot.macos.template_release.framework"
|
||||
|
||||
ios.debug = "ios/libspine_godot.ios.template_debug.framework"
|
||||
ios.release = "ios/libspine_godot.ios.template_release.framework"
|
||||
|
||||
windows.editor.x86_64 = "windows/libspine_godot.windows.editor.x86_64.dll"
|
||||
windows.debug.x86_64 = "windows/libspine_godot.windows.template_debug.x86_64.dll"
|
||||
windows.release.x86_64 = "windows/libspine_godot.windows.template_release.x86_64.dll"
|
||||
|
||||
linux.editor.x86_64 = "linux/libspine_godot.linux.editor.x86_64.so"
|
||||
linux.debug.x86_64 = "linux/libspine_godot.linux.template_debug.x86_64.so"
|
||||
linux.release.x86_64 = "linux/libspine_godot.linux.template_release.x86_64.so"
|
||||
|
||||
linux.editor.arm64 = "linux/libspine_godot.linux.editor.arm64.so"
|
||||
linux.debug.arm64 = "linux/libspine_godot.linux.template_debug.arm64.so"
|
||||
linux.release.arm64 = "linux/libspine_godot.linux.template_release.arm64.so"
|
||||
|
||||
linux.editor.rv64 = "linux/libspine_godot.linux.editor.rv64.so"
|
||||
linux.debug.rv64 = "linux/libspine_godot.linux.template_debug.rv64.so"
|
||||
linux.release.rv64 = "linux/libspine_godot.linux.template_release.rv64.so"
|
||||
|
||||
android.debug.x86_64 = "android/libspine_godot.android.template_debug.x86_64.so"
|
||||
android.release.x86_64 = "android/libspine_godot.android.template_release.x86_64.so"
|
||||
|
||||
android.debug.arm64 = "android/libspine_godot.android.template_debug.arm64.so"
|
||||
android.release.arm64 = "android/libspine_godot.android.template_release.arm64.so"
|
||||
|
||||
web.debug.threads.wasm32 = "web/libspine_godot.web.template_debug.wasm32.wasm"
|
||||
web.release.threads.wasm32 = "web/libspine_godot.web.template_release.wasm32.wasm"
|
||||
web.debug.wasm32 = "web/libspine_godot.web.template_debug.wasm32.nothreads.wasm"
|
||||
web.release.wasm32 = "web/libspine_godot.web.template_release.wasm32.nothreads.wasm"
|
||||
@@ -0,0 +1 @@
|
||||
uid://cjp18u5g8vh2o
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,30 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://l1hdihubffeg"]
|
||||
[gd_scene load_steps=3 format=3 uid="uid://l1hdihubffeg"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b5i41b6502xam" path="res://scripts/CSharp/Common/Fight/FighterDamageIndicatorFlyingNumber.cs" id="1_m0ub6"]
|
||||
[ext_resource type="Texture2D" uid="uid://do0y56t1moi2" path="res://art/mockups/erdbeeren.png" id="2_ctnqp"]
|
||||
|
||||
[node name="DamageFlyingNuber" type="Node2D" node_paths=PackedStringArray("_label")]
|
||||
[node name="DamageFlyingNuber" type="Node2D" node_paths=PackedStringArray("_label", "_sprite")]
|
||||
script = ExtResource("1_m0ub6")
|
||||
_label = NodePath("Label")
|
||||
_sprite = NodePath("TextureRect")
|
||||
|
||||
[node name="TextureRect" type="TextureRect" parent="."]
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
offset_left = -61.0
|
||||
offset_top = -61.0
|
||||
offset_right = 61.0
|
||||
offset_bottom = 61.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 4
|
||||
texture = ExtResource("2_ctnqp")
|
||||
expand_mode = 1
|
||||
stretch_mode = 5
|
||||
|
||||
[node name="Label" type="Label" parent="."]
|
||||
custom_minimum_size = Vector2(200, 100)
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://n5cj71bxxjkk"]
|
||||
[gd_scene load_steps=4 format=3 uid="uid://n5cj71bxxjkk"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://dqe1i2qmpttwf" path="res://scripts/CSharp/Common/Fight/FightWorld.cs" id="1_tnyce"]
|
||||
[ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="2_lxs0o"]
|
||||
[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="3_008v8"]
|
||||
|
||||
[node name="FightWorldAutoload" type="Node2D"]
|
||||
script = ExtResource("1_tnyce")
|
||||
_itemToDropByEnemyGroup = ExtResource("2_lxs0o")
|
||||
itemBeetrootToEatForHealth = ExtResource("3_008v8")
|
||||
|
||||
@@ -14,5 +14,9 @@ position = Vector2(23, -96)
|
||||
scale = Vector2(0.547474, 0.547474)
|
||||
texture = SubResource("AtlasTexture_ane0o")
|
||||
|
||||
[node name="CollisionShape2D" parent="TargetSelection/Click" index="0"]
|
||||
position = Vector2(25.215, -195)
|
||||
scale = Vector2(0.72370636, 1)
|
||||
|
||||
[node name="Sprite2D" parent="TargetSelection/HoverIndicator" index="0"]
|
||||
position = Vector2(1, -126)
|
||||
position = Vector2(0.84, -126)
|
||||
|
||||
+3
-2
@@ -141,6 +141,7 @@ directories/tres_directory={
|
||||
"beet": "res://resources/items/beet.tres",
|
||||
"beetRoot": "res://resources/quests/beetRoot.tres",
|
||||
"beet_seed": "res://resources/items/beet_seed.tres",
|
||||
"cat": "res://art/animation/Cat/cat.tres",
|
||||
"choice_panel_focus": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_focus.tres",
|
||||
"choice_panel_hover": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_hover.tres",
|
||||
"choice_panel_normal": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_normal.tres",
|
||||
@@ -186,8 +187,8 @@ directories/tres_directory={
|
||||
|
||||
[display]
|
||||
|
||||
window/size/viewport_width=1980
|
||||
window/size/viewport_height=1020
|
||||
window/size/viewport_width=1920
|
||||
window/size/viewport_height=1080
|
||||
window/stretch/mode="viewport"
|
||||
window/stretch/aspect="keep_height"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=118 format=3 uid="uid://gigb28qk8t12"]
|
||||
[gd_scene load_steps=119 format=3 uid="uid://gigb28qk8t12"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="1_7wfwe"]
|
||||
[ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
|
||||
@@ -37,6 +37,7 @@
|
||||
[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="35_64mdn"]
|
||||
[ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"]
|
||||
[ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="36_fv1t2"]
|
||||
[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="36_q1g8e"]
|
||||
[ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="37_8ey8m"]
|
||||
[ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="37_di1ed"]
|
||||
[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="37_taxvr"]
|
||||
@@ -1043,6 +1044,24 @@ shape = SubResource("CircleShape2D_tm0yg")
|
||||
[node name="Icon" parent="YSorted/SeedPickup" index="4"]
|
||||
scale = Vector2(1, 1)
|
||||
|
||||
[node name="BeetPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
|
||||
position = Vector2(5787, 2269)
|
||||
_finiteSupply = 3
|
||||
metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"
|
||||
|
||||
[node name="SpawnWithItem" parent="YSorted/BeetPickup" index="0"]
|
||||
_blueprint = ExtResource("36_q1g8e")
|
||||
|
||||
[node name="PickupInteractionArea" parent="YSorted/BeetPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")]
|
||||
_spritesToOutline = [NodePath("../../SeedPickup/Icon")]
|
||||
metadata/SaveID = "ad152c51-3631-42c1-9aa4-4df896b35d8c"
|
||||
|
||||
[node name="CollisionShape3D" parent="YSorted/BeetPickup/PickupInteractionArea/Area2D" index="0"]
|
||||
shape = SubResource("CircleShape2D_tm0yg")
|
||||
|
||||
[node name="Icon" parent="YSorted/BeetPickup" index="4"]
|
||||
scale = Vector2(1, 1)
|
||||
|
||||
[node name="SeedPickup2" parent="YSorted" instance=ExtResource("25_hukxv")]
|
||||
position = Vector2(10705, 2257)
|
||||
_finiteSupply = 3
|
||||
@@ -2507,6 +2526,7 @@ script = ExtResource("80_w1kgo")
|
||||
[connection signal="SuccessfulPickUp" from="YSorted/CanGenericPickup" to="YSorted/Vesna" method="HandlePickUp"]
|
||||
[connection signal="SuccessfulPickUp" from="YSorted/RakeGenericPickup" to="YSorted/Vesna" method="HandlePickUp"]
|
||||
[connection signal="SuccessfulPickUp" from="YSorted/SeedPickup" to="YSorted/Vesna" method="HandlePickUp"]
|
||||
[connection signal="SuccessfulPickUp" from="YSorted/BeetPickup" to="YSorted/Vesna" method="HandlePickUp"]
|
||||
[connection signal="SuccessfulPickUp" from="YSorted/SeedPickup2" to="YSorted/Vesna" method="HandlePickUp"]
|
||||
[connection signal="InteractedTool" from="YSorted/Farm visuals/Static/EnterHouseInteraction" to="." method="LoadSceneAtIndex"]
|
||||
[connection signal="InteractedTool" from="YSorted/Blocker/InteractionArea" to="." method="LoadSceneAtIndex"]
|
||||
@@ -2531,6 +2551,8 @@ script = ExtResource("80_w1kgo")
|
||||
[editable path="YSorted/RakeGenericPickup/PickupInteractionArea"]
|
||||
[editable path="YSorted/SeedPickup"]
|
||||
[editable path="YSorted/SeedPickup/PickupInteractionArea"]
|
||||
[editable path="YSorted/BeetPickup"]
|
||||
[editable path="YSorted/BeetPickup/PickupInteractionArea"]
|
||||
[editable path="YSorted/SeedPickup2"]
|
||||
[editable path="YSorted/SeedPickup2/PickupInteractionArea"]
|
||||
[editable path="YSorted/Blocker/InteractionArea"]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=14 format=3 uid="uid://cjshlwk8ajpnp"]
|
||||
[gd_scene load_steps=20 format=3 uid="uid://cjshlwk8ajpnp"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cnhpnn8o0gybd" path="res://scripts/CSharp/Common/Fight/FightHappeningSceneSetup.cs" id="1_fiutj"]
|
||||
[ext_resource type="Script" uid="uid://c76mhhqyk4lgh" path="res://scripts/CSharp/Common/Fight/FightHappening.cs" id="1_gsk03"]
|
||||
@@ -6,6 +6,7 @@
|
||||
[ext_resource type="Script" uid="uid://dwsqst8fhhqlc" path="res://scripts/CSharp/Common/Fight/AllFightersVisual.cs" id="2_lu4y4"]
|
||||
[ext_resource type="PackedScene" uid="uid://bcld43daavmrn" path="res://prefabs/fight/fight_scene_switcher.tscn" id="2_phrlx"]
|
||||
[ext_resource type="PackedScene" uid="uid://7jsxokx67gpq" path="res://prefabs/fight/fighterVisuals/vesna_fighter_visual.tscn" id="4_qo0gi"]
|
||||
[ext_resource type="Script" uid="uid://cdrjvgm82pxoj" path="res://scripts/CSharp/Common/Fight/FightHappeningAnimationContext.cs" id="4_v5rv6"]
|
||||
[ext_resource type="PackedScene" uid="uid://0vm3jb1hnkkb" path="res://prefabs/fight/fighterVisuals/blob_fighter_visual.tscn" id="4_vp8s0"]
|
||||
[ext_resource type="Script" uid="uid://buiwuf7pjfq8" path="res://scripts/CSharp/Common/Fight/FightHappeningStateReaction.cs" id="4_ydj1i"]
|
||||
[ext_resource type="PackedScene" uid="uid://bydwj3pbvqrhb" path="res://prefabs/minigame/minigame.tscn" id="8_2b3cf"]
|
||||
@@ -13,20 +14,30 @@
|
||||
[ext_resource type="Script" uid="uid://bwm0nhvt1083k" path="res://scripts/CSharp/Common/Fight/FightMinigameHandler.cs" id="8_falfe"]
|
||||
[ext_resource type="Script" uid="uid://d2ugtb3dalrg3" path="res://scripts/CSharp/Common/Fight/FightHappeningStateDebugger.cs" id="8_tv7cl"]
|
||||
[ext_resource type="Script" uid="uid://2f7rqk50gtdg" path="res://scripts/CSharp/Common/Fight/SwitchSceneOnFightEnd.cs" id="10_qqd8u"]
|
||||
[ext_resource type="Script" uid="uid://6nniwfxye8ss" path="res://scripts/CSharp/Common/Fight/UsedItemIndicatorVisual.cs" id="14_b4ll5"]
|
||||
[ext_resource type="Script" uid="uid://71mdwp2m4rta" path="res://scripts/CSharp/Common/Fight/UI/HealButtonVisual.cs" id="14_oy2wu"]
|
||||
[ext_resource type="Resource" uid="uid://0mnsr4anoaiq" path="res://resources/items/beet.tres" id="15_k4fcr"]
|
||||
[ext_resource type="PackedScene" uid="uid://l1hdihubffeg" path="res://prefabs/fight/damage_flying_nuber.tscn" id="15_oy2wu"]
|
||||
[ext_resource type="Texture2D" uid="uid://djewfwrdt4iv3" path="res://art/ui/UI/icons/icon-fruit-beetroot.png" id="16_k4fcr"]
|
||||
|
||||
[node name="BabushkaSceneFightHappening" type="Node2D"]
|
||||
|
||||
[node name="FightHappening" type="Node" parent="."]
|
||||
script = ExtResource("1_gsk03")
|
||||
|
||||
[node name="ActionAnimationController" type="Node" parent="." node_paths=PackedStringArray("_allFightersVisual")]
|
||||
[node name="ActionAnimationController" type="Node" parent="." node_paths=PackedStringArray("_allFightersVisual", "_animationContext")]
|
||||
script = ExtResource("2_7kjgs")
|
||||
_allFightersVisual = NodePath("../FightVisuals")
|
||||
_animationContext = NodePath("AnimationContext")
|
||||
|
||||
[node name="StateReactionActionAnimation" type="Node" parent="ActionAnimationController"]
|
||||
script = ExtResource("4_ydj1i")
|
||||
_fightState = 10
|
||||
|
||||
[node name="AnimationContext" type="Node" parent="ActionAnimationController" node_paths=PackedStringArray("useHealItemIndicator")]
|
||||
script = ExtResource("4_v5rv6")
|
||||
useHealItemIndicator = NodePath("../../UseItemIndicator")
|
||||
|
||||
[node name="Camera2D" type="Camera2D" parent="."]
|
||||
|
||||
[node name="FightSetup" type="Node2D" parent="."]
|
||||
@@ -146,7 +157,12 @@ theme_override_constants/margin_bottom = 10
|
||||
[node name="Talk Button" type="Button" parent="ActionSelect/BottomPanel/VBoxContainer/MarginContainer/HBoxContainer/MarginContainer3"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 41
|
||||
text = "Talk"
|
||||
text = "x19 - Heal"
|
||||
icon = ExtResource("16_k4fcr")
|
||||
alignment = 0
|
||||
expand_icon = true
|
||||
script = ExtResource("14_oy2wu")
|
||||
_healItemBlueprint = ExtResource("15_k4fcr")
|
||||
|
||||
[node name="MarginContainer4" type="MarginContainer" parent="ActionSelect/BottomPanel/VBoxContainer/MarginContainer/HBoxContainer"]
|
||||
layout_mode = 2
|
||||
@@ -207,6 +223,12 @@ offset_right = 794.0
|
||||
offset_bottom = -472.0
|
||||
text = "Hello world"
|
||||
|
||||
[node name="UseItemIndicator" type="Node2D" parent="."]
|
||||
position = Vector2(214, 319)
|
||||
script = ExtResource("14_b4ll5")
|
||||
_flyingIndicatorPrefab = ExtResource("15_oy2wu")
|
||||
_itemTexture = ExtResource("16_k4fcr")
|
||||
|
||||
[connection signal="SignalTransitionState" from="FightHappening" to="ActionAnimationController/StateReactionActionAnimation" method="FightHappeningStateTransitioned"]
|
||||
[connection signal="SignalTransitionState" from="FightHappening" to="FightVisuals" method="FightHappeningStateChange"]
|
||||
[connection signal="SignalTransitionState" from="FightHappening" to="ActionSelect/StateReactionInputActionSelect" method="FightHappeningStateTransitioned"]
|
||||
@@ -221,4 +243,5 @@ text = "Hello world"
|
||||
[connection signal="pressed" from="ActionSelect/BottomPanel/VBoxContainer/MarginContainer/HBoxContainer/MarginContainer4/Flee Button" to="ActionSelect" method="SelectAction" binds= [4]]
|
||||
[connection signal="OnStateEntered" from="ActionSelect/StateReactionInputActionSelect" to="ActionSelect" method="show"]
|
||||
[connection signal="OnStateEntered" from="ActionSelect/StateReactionInputActionSelect" to="ActionSelect" method="StateEntered"]
|
||||
[connection signal="OnStateEntered" from="ActionSelect/StateReactionInputActionSelect" to="ActionSelect/BottomPanel/VBoxContainer/MarginContainer/HBoxContainer/MarginContainer3/Talk Button" method="UpdateText"]
|
||||
[connection signal="OnStateExited" from="ActionSelect/StateReactionInputActionSelect" to="ActionSelect" method="hide"]
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
[ext_resource type="Script" uid="uid://dbu8afaiohpdh" path="res://scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs" id="40_cvg1r"]
|
||||
[ext_resource type="PackedScene" uid="uid://bcld43daavmrn" path="res://prefabs/fight/fight_scene_switcher.tscn" id="40_elhbh"]
|
||||
[ext_resource type="PackedScene" uid="uid://qfdiudt3vpai" path="res://prefabs/fight/roaming_enemy_group.tscn" id="41_cvg1r"]
|
||||
[ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="41_x3yi1"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ruj2u"]
|
||||
shader = ExtResource("16_0fard")
|
||||
@@ -2175,6 +2176,7 @@ _sceneRoot = NodePath("..")
|
||||
script = ExtResource("40_cvg1r")
|
||||
_enemyGroupSpawns = [NodePath("../YSorted/EnemyGroupSpawns/Spawn1"), NodePath("../YSorted/EnemyGroupSpawns/Spawn2"), NodePath("../YSorted/EnemyGroupSpawns/Spawn3"), NodePath("../YSorted/EnemyGroupSpawns/Spawn4")]
|
||||
_roamingEnemyGroupPrefab = ExtResource("41_cvg1r")
|
||||
_itemOnGroundPrefab = ExtResource("41_x3yi1")
|
||||
_fightSceneSwitcher = NodePath("../FightSceneSwitcher")
|
||||
|
||||
[editable path="YSorted/Vesna"]
|
||||
|
||||
@@ -11,11 +11,11 @@ public partial class ActionAnimationController : Node
|
||||
#endregion
|
||||
|
||||
[Export] private AllFightersVisual _allFightersVisual = null!;
|
||||
|
||||
[Export] private FightHappeningAnimationContext _animationContext = null!;
|
||||
|
||||
public void StateEnter()
|
||||
{
|
||||
_ = HappeningData.actionStaging!.AnimateAction(_allFightersVisual);
|
||||
_ = HappeningData.actionStaging!.AnimateAction(_allFightersVisual,_animationContext);
|
||||
}
|
||||
|
||||
public void StateExit()
|
||||
|
||||
@@ -48,10 +48,11 @@ public class AllyAttackAction : FighterAction
|
||||
public override void ExecuteAction()
|
||||
{
|
||||
var totalDamage = minigameDetail.damageHits!.Sum(dh => dh);
|
||||
targetSelect.GetTarget().AddHealth(-totalDamage);
|
||||
targetSelect.GetTarget().ChangeHealth(-totalDamage);
|
||||
}
|
||||
|
||||
public override async Task AnimateAction(AllFightersVisual allFightersVisual)
|
||||
public override async Task AnimateAction(AllFightersVisual allFightersVisual,
|
||||
FightHappeningAnimationContext animationContext)
|
||||
{
|
||||
var currentFighter = HappeningData.fighterTurn.Current;
|
||||
var targetFighter = targetSelect.GetTarget();
|
||||
@@ -64,7 +65,7 @@ public class AllyAttackAction : FighterAction
|
||||
|
||||
foreach (var hit in minigameDetail.damageHits!)
|
||||
{
|
||||
targetFighterVisual.SpawnDamageIndicatorNumber(hit);
|
||||
targetFighterVisual.SpawnDamageIndicatorNumber($"-{hit}");
|
||||
}
|
||||
|
||||
await currentFighterVisual.AnimatePosToBase();
|
||||
|
||||
@@ -18,10 +18,11 @@ public class BlobAttackAction(int damage = 3) : FighterAction
|
||||
|
||||
public override void ExecuteAction()
|
||||
{
|
||||
FightWorld.Instance.allyFighters.vesnaFighter.AddHealth(-damage);
|
||||
FightWorld.Instance.allyFighters.vesnaFighter.ChangeHealth(-damage);
|
||||
}
|
||||
|
||||
public override async Task AnimateAction(AllFightersVisual allFightersVisual)
|
||||
public override async Task AnimateAction(AllFightersVisual allFightersVisual,
|
||||
FightHappeningAnimationContext animationContext)
|
||||
{
|
||||
var currentFighter = HappeningData.fighterTurn.Current;
|
||||
var targetFighter = FightWorld.Instance.allyFighters.vesnaFighter;
|
||||
@@ -31,7 +32,7 @@ public class BlobAttackAction(int damage = 3) : FighterAction
|
||||
|
||||
await currentFighterVisual.AnimatePosToTarget(targetFighterVisual);
|
||||
_ = targetFighterVisual.AnimateHit();
|
||||
targetFighterVisual.SpawnDamageIndicatorNumber(damage);
|
||||
targetFighterVisual.SpawnDamageIndicatorNumber($"-{damage}");
|
||||
await currentFighterVisual.AnimatePosToBase();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Threading.Tasks;
|
||||
using Babushka.scripts.CSharp.Common.Inventory;
|
||||
using Babushka.scripts.CSharp.Common.Util;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight.Actions;
|
||||
|
||||
public class EatBeetrootAction : FighterAction
|
||||
{
|
||||
public override Variant<float, Func<bool>> GetAnimationEnd() => 1;
|
||||
public override bool NextDetail() => false;
|
||||
|
||||
private const int HealAmount = 20;
|
||||
|
||||
public override bool ShouldAbort()
|
||||
{
|
||||
Debug.Assert(FightWorld.Instance.itemBeetrootToEatForHealth != null,
|
||||
"Item to eat for health has not been set in the FightWorld autoload");
|
||||
return !InventoryManager.Instance.playerInventory!.HasItems(new ItemInstance
|
||||
{ blueprint = FightWorld.Instance.itemBeetrootToEatForHealth });
|
||||
}
|
||||
|
||||
public override async Task AnimateAction(AllFightersVisual allFightersVisual,
|
||||
FightHappeningAnimationContext animationContext)
|
||||
{
|
||||
var fighter = HappeningData.fighterTurn.Current;
|
||||
var fighterVisual = allFightersVisual.GetVisualForFighter(fighter);
|
||||
fighterVisual.SpawnDamageIndicatorNumber($"+{HealAmount}");
|
||||
animationContext.useHealItemIndicator.SpawnIndicator();
|
||||
await fighterVisual.AnimateHeal();
|
||||
}
|
||||
|
||||
public override void ExecuteAction()
|
||||
{
|
||||
var fighter = HappeningData.fighterTurn.Current;
|
||||
|
||||
var result = InventoryManager.Instance.playerInventory!.TryRemoveAllItems(
|
||||
new ItemInstance { blueprint = FightWorld.Instance.itemBeetrootToEatForHealth! });
|
||||
|
||||
if (result != InventoryActionResult.Success)
|
||||
throw new Exception("No Beetroot in inventory. This case should have been handled earlier");
|
||||
|
||||
fighter.ChangeHealth(HealAmount);
|
||||
}
|
||||
|
||||
public override AllyActionButton BindToActionButton() => AllyActionButton.Talk; // Temporarily bound to talk button
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://b2463q1waqvdu
|
||||
@@ -10,7 +10,8 @@ public class AllyFighters
|
||||
maxHealth = 60,
|
||||
availableActions =
|
||||
[
|
||||
new AllyAttackAction()
|
||||
new AllyAttackAction(),
|
||||
new EatBeetrootAction()
|
||||
]
|
||||
};
|
||||
public FightWorld.Fighter chuhaFighter = new()
|
||||
|
||||
@@ -222,9 +222,9 @@ public partial class FightHappening : Node
|
||||
case FightState.ActionCheckDetails:
|
||||
RequireNotNull(HappeningData.actionStaging);
|
||||
|
||||
if (ActionAbort())
|
||||
if (ShouldActionAbort())
|
||||
ChangeState(FightState.InputActionSelect);
|
||||
else if (ActionNeededDetail())
|
||||
else if (DoesActionNeededDetail())
|
||||
ChangeState(FightState.InputActionDetail);
|
||||
else
|
||||
ChangeState(FightState.ActionExecute);
|
||||
@@ -307,6 +307,11 @@ public partial class FightHappening : Node
|
||||
HappeningData.enemyFighterFormation.SetFighterAtPosition(emptySlotIndex, fighter);
|
||||
HappeningData.fighterTurn.AddAsLast(fighter);
|
||||
}
|
||||
|
||||
if (GD.RandRange(0, 2) != 0) // 2/3 chance for vesna to start
|
||||
{
|
||||
HappeningData.fighterTurn.SpinBack();
|
||||
}
|
||||
}
|
||||
|
||||
private void ExecuteNextFighter()
|
||||
@@ -328,13 +333,13 @@ public partial class FightHappening : Node
|
||||
return HappeningData.actionStaging.GetAnimationEnd();
|
||||
}
|
||||
|
||||
private bool ActionAbort()
|
||||
private bool ShouldActionAbort()
|
||||
{
|
||||
Debug.Assert(HappeningData.actionStaging != null);
|
||||
return HappeningData.actionStaging.MarkedForAbort();
|
||||
return HappeningData.actionStaging.ShouldAbort();
|
||||
}
|
||||
|
||||
private bool ActionNeededDetail()
|
||||
private bool DoesActionNeededDetail()
|
||||
{
|
||||
Debug.Assert(HappeningData.actionStaging != null);
|
||||
return HappeningData.actionStaging.NextDetail();
|
||||
@@ -344,7 +349,7 @@ public partial class FightHappening : Node
|
||||
private void ReviveVesna()
|
||||
{
|
||||
var vesnaFighter = FightWorld.Instance.allyFighters.vesnaFighter;
|
||||
vesnaFighter.health = vesnaFighter.maxHealth;
|
||||
vesnaFighter.Health = vesnaFighter.maxHealth;
|
||||
GD.Print("Vesna has been revived. This is for the current prototype only");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight;
|
||||
|
||||
public partial class FightHappeningAnimationContext : Node
|
||||
{
|
||||
[Export] public UsedItemIndicatorVisual useHealItemIndicator = null!;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://cdrjvgm82pxoj
|
||||
@@ -1,15 +1,16 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Babushka.scripts.CSharp.Common.Util;
|
||||
using Babushka.scripts.CSharp.Common.Inventory;
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight;
|
||||
|
||||
public partial class FightRoomSceneSetup : Node
|
||||
{
|
||||
[Export(PropertyHint.ArrayType)] private Node2D[] _enemyGroupSpawns;
|
||||
[Export] private PackedScene _roamingEnemyGroupPrefab;
|
||||
[Export] private FightSceneSwitcher _fightSceneSwitcher;
|
||||
[Export(PropertyHint.ArrayType)] private Node2D[] _enemyGroupSpawns = null!;
|
||||
[Export] private PackedScene _roamingEnemyGroupPrefab = null!;
|
||||
[Export] private PackedScene _itemOnGroundPrefab = null!;
|
||||
[Export] private FightSceneSwitcher _fightSceneSwitcher = null!;
|
||||
|
||||
|
||||
public override void _Ready()
|
||||
@@ -19,11 +20,30 @@ public partial class FightRoomSceneSetup : Node
|
||||
foreach (var (parent, group) in _enemyGroupSpawns.Zip(room.enemyGroups))
|
||||
{
|
||||
if (group.AreAllDead())
|
||||
continue;
|
||||
|
||||
var roamingEnemyGroup = _roamingEnemyGroupPrefab.Instantiate<RoamingEnemyGroup>();
|
||||
roamingEnemyGroup.Initialize(group, _fightSceneSwitcher);
|
||||
parent.AddChild(roamingEnemyGroup);
|
||||
{
|
||||
SpawnLoot(group, parent);
|
||||
}
|
||||
else
|
||||
{
|
||||
SpawnEnemies(group, parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SpawnEnemies(FightWorld.FighterGroup group, Node2D parent)
|
||||
{
|
||||
var roamingEnemyGroup = _roamingEnemyGroupPrefab.Instantiate<RoamingEnemyGroup>();
|
||||
roamingEnemyGroup.Initialize(group, _fightSceneSwitcher);
|
||||
parent.AddChild(roamingEnemyGroup);
|
||||
}
|
||||
|
||||
private void SpawnLoot(FightWorld.FighterGroup group, Node2D parent)
|
||||
{
|
||||
if (group.lootToDrop == null)
|
||||
return;
|
||||
|
||||
var onGroundInstance = _itemOnGroundPrefab.Instantiate<ItemOnGround2D>();
|
||||
onGroundInstance.itemInstance = group.lootToDrop;
|
||||
parent.AddChild(onGroundInstance);
|
||||
}
|
||||
}
|
||||
@@ -10,15 +10,16 @@ public static class FightUtils
|
||||
{
|
||||
return self.Where(e => e.IsAlive());
|
||||
}
|
||||
|
||||
public static IEnumerable<FightWorld.Fighter> WhereIsNotInFormation(this IEnumerable<FightWorld.Fighter> self, FighterFormation formation)
|
||||
|
||||
public static IEnumerable<FightWorld.Fighter> WhereIsNotInFormation(this IEnumerable<FightWorld.Fighter> self,
|
||||
FighterFormation formation)
|
||||
{
|
||||
return self.Where(e => !e.IsInFormation(formation));
|
||||
}
|
||||
|
||||
public static bool IsAlive(this FightWorld.Fighter self)
|
||||
{
|
||||
return self.GetHealth() > 0;
|
||||
return self.Health > 0;
|
||||
}
|
||||
|
||||
public static bool IsDead(this FightWorld.Fighter self)
|
||||
@@ -26,16 +27,16 @@ public static class FightUtils
|
||||
return !self.IsAlive();
|
||||
}
|
||||
|
||||
public static int GetHealth(this FightWorld.Fighter self)
|
||||
/// <summary>
|
||||
/// Changes the health of a fighter
|
||||
/// </summary>
|
||||
/// <param name="self">The fighter itself</param>
|
||||
/// <param name="amount">The amount of health to add. Make negative to remove health</param>
|
||||
public static void ChangeHealth(this FightWorld.Fighter self, int amount)
|
||||
{
|
||||
return Math.Max(self.health ?? self.maxHealth, 0);
|
||||
self.Health += amount;
|
||||
}
|
||||
|
||||
public static void AddHealth(this FightWorld.Fighter self, int addHealth)
|
||||
{
|
||||
self.health = self.GetHealth() + addHealth;
|
||||
}
|
||||
|
||||
public static bool IsInFormation(this FightWorld.Fighter self, FighterFormation formation)
|
||||
{
|
||||
return formation.ContainsFighter(self);
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Babushka.scripts.CSharp.Common.Fight.Actions;
|
||||
using Babushka.scripts.CSharp.Common.Inventory;
|
||||
using Babushka.scripts.CSharp.Common.Util;
|
||||
using Godot;
|
||||
|
||||
@@ -19,6 +21,7 @@ public partial class FightWorld : Node
|
||||
None,
|
||||
EndOfNight
|
||||
}
|
||||
|
||||
public required Dictionary<int, Room> paths;
|
||||
public required List<FighterGroup> enemyGroups;
|
||||
public Special specialRoom = Special.None;
|
||||
@@ -27,6 +30,7 @@ public partial class FightWorld : Node
|
||||
public class FighterGroup
|
||||
{
|
||||
public required List<Fighter> fighters;
|
||||
public ItemInstance? lootToDrop = null;
|
||||
}
|
||||
|
||||
public class FightHappeningData
|
||||
@@ -56,9 +60,17 @@ public partial class FightWorld : Node
|
||||
public required int maxHealth;
|
||||
public required List<FighterAction> availableActions;
|
||||
public const int MaxActionPoints = 1;
|
||||
public int? health = null; // null => initialize to full health on spawn
|
||||
public int actionPointsLeft;
|
||||
|
||||
private int? _healthBacking = null;
|
||||
|
||||
public int Health
|
||||
{
|
||||
get => _healthBacking ?? maxHealth;
|
||||
set => _healthBacking = Math.Clamp(value, 0, maxHealth);
|
||||
}
|
||||
|
||||
|
||||
public FighterAction AutoSelectAction()
|
||||
{
|
||||
return availableActions.Random() ?? new FighterAction.Skip();
|
||||
@@ -81,6 +93,10 @@ public partial class FightWorld : Node
|
||||
public FightHappeningData? fightHappeningData = null;
|
||||
public AllyFighters allyFighters = new();
|
||||
|
||||
// settings
|
||||
[Export] private ItemResource? _itemToDropByEnemyGroup;
|
||||
[Export] public ItemResource? itemBeetrootToEatForHealth;
|
||||
|
||||
public void ResetFightWorld()
|
||||
{
|
||||
Generate();
|
||||
@@ -89,10 +105,10 @@ public partial class FightWorld : Node
|
||||
|
||||
public void Generate()
|
||||
{
|
||||
world = new Generator().GenerateWorld();
|
||||
world = new Generator(this).GenerateWorld();
|
||||
}
|
||||
|
||||
private class Generator
|
||||
private class Generator(FightWorld fightWorld)
|
||||
{
|
||||
public World GenerateWorld()
|
||||
{
|
||||
@@ -113,7 +129,7 @@ public partial class FightWorld : Node
|
||||
{
|
||||
rooms.Add(GenerateDisconnectedRoom());
|
||||
}
|
||||
|
||||
|
||||
rooms.Add(new Room
|
||||
{
|
||||
paths = [],
|
||||
@@ -162,6 +178,11 @@ public partial class FightWorld : Node
|
||||
fighters = []
|
||||
};
|
||||
|
||||
if (fightWorld._itemToDropByEnemyGroup != null)
|
||||
{
|
||||
enemyGroup.lootToDrop = new ItemInstance { blueprint = fightWorld._itemToDropByEnemyGroup };
|
||||
}
|
||||
|
||||
var enemyCount = GD.RandRange(2, 3);
|
||||
|
||||
for (var i = 0; i < enemyCount; i++)
|
||||
@@ -189,7 +210,6 @@ public partial class FightWorld : Node
|
||||
var enemy = new Fighter
|
||||
{
|
||||
type = type,
|
||||
health = null,
|
||||
maxHealth = GD.RandRange(8, 20),
|
||||
availableActions =
|
||||
[
|
||||
|
||||
@@ -30,8 +30,6 @@ public abstract class FighterAction
|
||||
public abstract bool DetailComplete();
|
||||
}
|
||||
|
||||
private bool _abort = false;
|
||||
|
||||
#region Shortcuts
|
||||
|
||||
protected static FightWorld.FightHappeningData HappeningData =>
|
||||
@@ -61,19 +59,13 @@ public abstract class FighterAction
|
||||
/// Animates the action.
|
||||
/// </summary>
|
||||
/// <param name="allFightersVisual"></param>
|
||||
public virtual async Task AnimateAction(AllFightersVisual allFightersVisual)
|
||||
/// <param name="animationContext"></param>
|
||||
public virtual async Task AnimateAction(AllFightersVisual allFightersVisual,
|
||||
FightHappeningAnimationContext animationContext)
|
||||
{
|
||||
}
|
||||
|
||||
public void MarkAbort()
|
||||
{
|
||||
_abort = true;
|
||||
}
|
||||
|
||||
public bool MarkedForAbort()
|
||||
{
|
||||
return _abort;
|
||||
}
|
||||
public virtual bool ShouldAbort() => false;
|
||||
|
||||
/// <summary>
|
||||
/// Returns the FighterActionDetail, that is currently handled.
|
||||
|
||||
@@ -4,13 +4,13 @@ namespace Babushka.scripts.CSharp.Common.Fight;
|
||||
|
||||
public partial class FighterDamageIndicatorVisual : Node2D
|
||||
{
|
||||
[Export] private PackedScene _flyingNumberPrefab;
|
||||
[Export] private PackedScene _flyingNumberPrefab = null!;
|
||||
|
||||
|
||||
public void SpawnFlyingNumber(int number)
|
||||
public void SpawnFlyingNumber(string text)
|
||||
{
|
||||
var flyingNumberInstance = _flyingNumberPrefab.Instantiate<FighterDamageIndicatorFlyingNumber>();
|
||||
var flyingNumberInstance = _flyingNumberPrefab.Instantiate<FlyingIndicator>();
|
||||
AddChild(flyingNumberInstance);
|
||||
flyingNumberInstance.Initialize(number);
|
||||
flyingNumberInstance.Initialize(text);
|
||||
}
|
||||
}
|
||||
@@ -99,6 +99,23 @@ public class FighterTurn : IEnumerable<FightWorld.Fighter>
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sets the current one back
|
||||
/// This is an expensive operation, because the entire data structure needs to be circled
|
||||
/// </summary>
|
||||
public void SpinBack()
|
||||
{
|
||||
if (_currentNode == null) return;
|
||||
|
||||
var node = _currentNode;
|
||||
while (node.next != _currentNode)
|
||||
{
|
||||
node = node.next;
|
||||
}
|
||||
|
||||
_currentNode = node;
|
||||
}
|
||||
|
||||
public IEnumerator<FightWorld.Fighter> GetEnumerator()
|
||||
{
|
||||
if (_currentNode == null) return Enumerable.Empty<FightWorld.Fighter>().GetEnumerator();
|
||||
|
||||
@@ -42,7 +42,12 @@ public partial class FighterVisual : Node2D
|
||||
_boundFighter.IsInFormation(HappeningData.enemyFighterFormation) ? -1 : 1,
|
||||
_boundFighter.IsDead() ? .3f : 1);
|
||||
|
||||
healthBarVisual.UpdateHealth(_boundFighter.GetHealth(), _boundFighter.maxHealth);
|
||||
UpdateHealthBarVisuals();
|
||||
}
|
||||
|
||||
private void UpdateHealthBarVisuals()
|
||||
{
|
||||
healthBarVisual.UpdateHealth(_boundFighter.Health, _boundFighter.maxHealth);
|
||||
}
|
||||
|
||||
public void SetTargetSelectionActive(bool value)
|
||||
@@ -78,24 +83,26 @@ public partial class FighterVisual : Node2D
|
||||
|
||||
public async Task AnimateHit()
|
||||
{
|
||||
UpdateHealthBarVisuals();
|
||||
var tween = GetTree().CreateTween();
|
||||
tween.TweenProperty(_squashParent, "scale", new Vector2(1.4f, 0.6f), 0.15);
|
||||
tween.TweenProperty(_squashParent, "scale", new Vector2(1, 1), 0.4)
|
||||
.SetTrans(Tween.TransitionType.Cubic).SetEase(Tween.EaseType.Out);
|
||||
await ToSignal(tween, "finished");
|
||||
}
|
||||
|
||||
// Keep for reference for new Heal animation
|
||||
//public void HealAnimation()
|
||||
//{
|
||||
// EmitSignalHealed();
|
||||
// var tween = GetTree().CreateTween();
|
||||
// tween.TweenProperty(this, "scale", new Vector2(0.6f, 1.4f), 0.15);
|
||||
// tween.TweenProperty(this, "scale", new Vector2(1, 1), 0.4)
|
||||
// .SetTrans(Tween.TransitionType.Cubic).SetEase(Tween.EaseType.Out);
|
||||
//}
|
||||
public void SpawnDamageIndicatorNumber(int number)
|
||||
|
||||
public async Task AnimateHeal()
|
||||
{
|
||||
_fighterDamageIndicatorVisual.SpawnFlyingNumber(number);
|
||||
UpdateHealthBarVisuals();
|
||||
var tween = GetTree().CreateTween();
|
||||
tween.TweenProperty(_squashParent, "scale", new Vector2(0.6f, 1.4f), 0.15);
|
||||
tween.TweenProperty(_squashParent, "scale", new Vector2(1, 1), 0.4)
|
||||
.SetTrans(Tween.TransitionType.Cubic).SetEase(Tween.EaseType.Out);
|
||||
await ToSignal(tween, "finished");
|
||||
}
|
||||
|
||||
public void SpawnDamageIndicatorNumber(string text)
|
||||
{
|
||||
_fighterDamageIndicatorVisual.SpawnFlyingNumber(text);
|
||||
}
|
||||
}
|
||||
+11
-5
@@ -3,13 +3,19 @@ using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight;
|
||||
|
||||
public partial class FighterDamageIndicatorFlyingNumber : Node2D
|
||||
public partial class FlyingIndicator : Node2D
|
||||
{
|
||||
[Export] private Label _label;
|
||||
|
||||
public void Initialize(int number)
|
||||
[Export] private Label _label = null!;
|
||||
[Export] private TextureRect _sprite = null!;
|
||||
|
||||
|
||||
public void Initialize(string? text = null, Texture2D? icon = null)
|
||||
{
|
||||
_label.Text = number.ToString();
|
||||
_label.Visible = text != null;
|
||||
_sprite.Visible = icon != null;
|
||||
|
||||
if (text != null) _label.Text = text;
|
||||
if (icon != null) _sprite.Texture = icon;
|
||||
|
||||
var tween = CreateTween();
|
||||
var xMovement = GD.RandRange(-150, 150);
|
||||
@@ -9,9 +9,15 @@ public partial class SwitchSceneOnFightEnd : Node
|
||||
|
||||
public void OnFightStateEnter(FightHappening.FightState to)
|
||||
{
|
||||
if (to is FightHappening.FightState.PlayerWin
|
||||
or FightHappening.FightState.EnemyWin)
|
||||
if (to is FightHappening.FightState.PlayerWin )
|
||||
_ = SwitchSceneAfterTime(2.0f);
|
||||
|
||||
if (to is FightHappening.FightState.EnemyWin)
|
||||
{
|
||||
_fightSceneSwitcher.ExitFight();
|
||||
_fightSceneSwitcher.ExitFightWorld();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private async Task SwitchSceneAfterTime(float seconds)
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
using Babushka.scripts.CSharp.Common.Inventory;
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight.UI;
|
||||
|
||||
public partial class HealButtonVisual : Button
|
||||
{
|
||||
[Export] private ItemResource _healItemBlueprint = null!;
|
||||
|
||||
public void UpdateText()
|
||||
{
|
||||
var healItemsLeft = InventoryManager.Instance.playerInventory!.TotalItemsOfBlueprint(_healItemBlueprint);
|
||||
Text = $"x{healItemsLeft} - Heal";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://71mdwp2m4rta
|
||||
@@ -0,0 +1,17 @@
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Fight;
|
||||
|
||||
public partial class UsedItemIndicatorVisual : Node2D
|
||||
{
|
||||
[Export] private PackedScene _flyingIndicatorPrefab = null!;
|
||||
[Export] private Texture2D _itemTexture = null!;
|
||||
|
||||
|
||||
public void SpawnIndicator()
|
||||
{
|
||||
var flyingNumberInstance = _flyingIndicatorPrefab.Instantiate<FlyingIndicator>();
|
||||
AddChild(flyingNumberInstance);
|
||||
flyingNumberInstance.Initialize(icon: _itemTexture);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
uid://6nniwfxye8ss
|
||||
@@ -17,7 +17,7 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
|
||||
[Signal]
|
||||
public delegate void InventoryContentsChangedEventHandler();
|
||||
|
||||
|
||||
public static string ID = "inventoryInstance";
|
||||
|
||||
/// <summary>
|
||||
@@ -52,7 +52,7 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
SlotAmountChanged += UpdateSaveData;
|
||||
SavegameService.OnSaveGameReset += SaveGameReset;
|
||||
}
|
||||
|
||||
|
||||
public override void _ExitTree()
|
||||
{
|
||||
InventoryContentsChanged -= UpdateSaveData;
|
||||
@@ -101,7 +101,8 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
return InventoryActionResult.DestinationFull;
|
||||
}
|
||||
|
||||
var itemInstance = _slots[slotIndex].itemInstance ?? new ItemInstance { blueprint = newItem.blueprint, amount = 0 };
|
||||
var itemInstance = _slots[slotIndex].itemInstance ??
|
||||
new ItemInstance { blueprint = newItem.blueprint, amount = 0 };
|
||||
var maxStack = itemInstance!.blueprint.maxStack;
|
||||
var freeOnStack = maxStack - itemInstance.amount;
|
||||
var moveAmount = Math.Min(freeOnStack, newItem.amount);
|
||||
@@ -130,12 +131,12 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
itemInstance = _slots[inventorySlot].itemInstance;
|
||||
if (itemInstance == null)
|
||||
return InventoryActionResult.SourceDoesNotExist;
|
||||
|
||||
|
||||
itemInstance.amount -= 1;
|
||||
|
||||
if(itemInstance.amount == 0)
|
||||
|
||||
if (itemInstance.amount == 0)
|
||||
_slots[inventorySlot].itemInstance = null;
|
||||
|
||||
|
||||
EmitSignal(SignalName.InventoryContentsChanged);
|
||||
return InventoryActionResult.Success;
|
||||
}
|
||||
@@ -145,6 +146,38 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
return RemoveItem(inventorySlot, out _);
|
||||
}
|
||||
|
||||
public InventoryActionResult TryRemoveAllItems(ItemInstance items)
|
||||
{
|
||||
var hasItemsCount = TotalItemsOfBlueprint(items.blueprint);
|
||||
if (hasItemsCount < items.amount)
|
||||
return InventoryActionResult.SourceDoesNotExist;
|
||||
|
||||
var amountToRemove = items.amount;
|
||||
foreach (var s in _slots)
|
||||
{
|
||||
if (s.IsEmpty() || s.itemInstance!.blueprint != items.blueprint)
|
||||
continue;
|
||||
|
||||
var slotItem = s.itemInstance!;
|
||||
if (slotItem.amount <= amountToRemove)
|
||||
{
|
||||
amountToRemove -= slotItem.amount;
|
||||
s.itemInstance = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
slotItem.amount -= amountToRemove;
|
||||
amountToRemove = 0;
|
||||
}
|
||||
|
||||
if (amountToRemove == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
EmitSignal(SignalName.InventoryContentsChanged);
|
||||
return InventoryActionResult.Success;
|
||||
}
|
||||
|
||||
public InventoryActionResult AddItemToSlot(ItemInstance itemInstance, int destinationSlot)
|
||||
{
|
||||
if (destinationSlot < 0 || destinationSlot >= _slots.Count)
|
||||
@@ -174,8 +207,8 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
{
|
||||
return items.All(HasItems);
|
||||
}
|
||||
|
||||
#region SAVE AND LOAD
|
||||
|
||||
#region SAVE AND LOAD
|
||||
|
||||
public void UpdateSaveData()
|
||||
{
|
||||
@@ -189,17 +222,17 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
string[] value = new string[2];
|
||||
value[0] = _slots[i].itemInstance.blueprint.ResourcePath;
|
||||
value[1] = _slots[i].itemInstance.amount.ToString();
|
||||
payloadData.Add(key,value);
|
||||
payloadData.Add(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SavegameService.AppendDataToSave(ID, payloadData);
|
||||
}
|
||||
|
||||
public void LoadFromSaveData()
|
||||
{
|
||||
var id = ID;
|
||||
|
||||
|
||||
Godot.Collections.Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
|
||||
|
||||
if (save.Count > 0)
|
||||
@@ -210,15 +243,15 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
{
|
||||
string[] savePayload = inventoryItemData.AsStringArray();
|
||||
ItemResource resource = ResourceLoader.Load<ItemResource>(savePayload[0]);
|
||||
int _amount = int.Parse(savePayload[1]);
|
||||
|
||||
int _amount = int.Parse(savePayload[1]);
|
||||
|
||||
ItemInstance instance = new ItemInstance { blueprint = resource, amount = _amount };
|
||||
AddItem(instance);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called when a new save is created.
|
||||
/// Needs to do a runtime check because the InventoryInstance is already in existence at the beginning of the first scene.
|
||||
@@ -230,5 +263,6 @@ public partial class InventoryInstance : Node, ISaveable
|
||||
slot.itemInstance = null;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ namespace Babushka.scripts.CSharp.Common.Inventory;
|
||||
[GlobalClass]
|
||||
public partial class ItemInstance: Resource
|
||||
{
|
||||
[Export] public ItemResource blueprint;
|
||||
[Export] public required ItemResource blueprint;
|
||||
[Export] public int amount = 1;
|
||||
|
||||
public ItemInstance Clone()
|
||||
|
||||
Reference in New Issue
Block a user