From 38a93588a23853fa53e27093d29c0edc3f20a2da Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 24 Feb 2025 23:32:13 -0600 Subject: [PATCH] more hub tweaks --- GameModes/cookie_mode.tres | 6 +++++- scenes/Arena of Money.tscn | 19 ++----------------- scenes/HUBWORLD.tscn | 9 ++++++++- scenes/asset_checker.tscn | 15 ++++++++------- scripts/game_globals.gd | 2 +- scripts/hud.gd | 2 ++ 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/GameModes/cookie_mode.tres b/GameModes/cookie_mode.tres index e80802c..a864ee3 100644 --- a/GameModes/cookie_mode.tres +++ b/GameModes/cookie_mode.tres @@ -7,6 +7,10 @@ script = ExtResource("1_8tp85") gamemode_name = "Cookie Mode" win_conditions = 0 survival_time = 160.0 +money_lost_multiplier = 0.5 +weapon_penalty = 0 +weapon_drop_percentage = 0.5 +ammo_drop_percentage = 0.5 walk_speed = 5.0 jump_velocity = 5 dash_speed = 5 @@ -17,7 +21,7 @@ max_stamina = 100.0 stamina_drain = 20.0 air_dash_max = 1 load_save = true -money = 0 +money_multiplier = 1.0 start_health = 3 drop_chance_minimum = 0.1 random_drops = false diff --git a/scenes/Arena of Money.tscn b/scenes/Arena of Money.tscn index 1b6ed5b..57aefd5 100644 --- a/scenes/Arena of Money.tscn +++ b/scenes/Arena of Money.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=3 uid="uid://bs2iopee5f3bv"] +[gd_scene load_steps=30 format=3 uid="uid://bs2iopee5f3bv"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_wmpql"] [ext_resource type="Resource" uid="uid://llsqx2cby5in" path="res://GameModes/Arena of Money.tres" id="2_8jpxx"] @@ -19,7 +19,6 @@ [ext_resource type="PackedScene" uid="uid://hp4xn8oqdxnd" path="res://assets/machete_pickup.tscn" id="20_3482g"] [ext_resource type="Material" uid="uid://b6hhomp4kcjvb" path="res://assets/materials/prototype/tadaoando.tres" id="21_41y65"] [ext_resource type="PackedScene" uid="uid://dgapcuvg0gtmm" path="res://assets/scene_changer.tscn" id="22_e6msx"] -[ext_resource type="Script" path="res://scripts/level_bounds.gd" id="23_eo3iq"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_w6vpl"] sky_top_color = Color(0.623488, 0.812575, 0.900791, 1) @@ -85,9 +84,6 @@ polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1)] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6yrih"] albedo_color = Color(0.300579, 0.462784, 0.249767, 1) -[sub_resource type="BoxShape3D" id="BoxShape3D_5m8am"] -size = Vector3(526.157, 940.327, 500) - [node name="Money Gulag" type="Node3D" node_paths=PackedStringArray("player")] script = ExtResource("1_wmpql") map_name = "Money Gulag" @@ -231,16 +227,5 @@ transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 27.2325, -7.8068, -32.4933) jump_amount = 100 [node name="Scene Changer" parent="." instance=ExtResource("22_e6msx")] -transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, 29.1358, 544.113, -33.0379) +transform = Transform3D(15.1486, 0, 0, 0, 405.877, 0, 0, 0, 9.59561, 29.1358, 312.899, -33.0379) scene_path = "res://scenes/HUBWORLD.tscn" - -[node name="BOUNDS" type="Area3D" parent="."] -collision_layer = 2 -collision_mask = 2 -script = ExtResource("23_eo3iq") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="BOUNDS"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.0786, 327.699, -39.4503) -shape = SubResource("BoxShape3D_5m8am") - -[connection signal="body_exited" from="BOUNDS" to="BOUNDS" method="_on_body_exited"] diff --git a/scenes/HUBWORLD.tscn b/scenes/HUBWORLD.tscn index 8960fbe..4c60132 100644 --- a/scenes/HUBWORLD.tscn +++ b/scenes/HUBWORLD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://jdwpc622vmok"] +[gd_scene load_steps=18 format=3 uid="uid://jdwpc622vmok"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_1bnbi"] [ext_resource type="Resource" uid="uid://bxcxqt7rmfvdw" path="res://GameModes/hubworld.tres" id="2_62iy8"] @@ -13,6 +13,7 @@ [ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="9_nu6q5"] [ext_resource type="PackedScene" uid="uid://eujx0yilqqcp" path="res://assets/level_sign.tscn" id="11_p3sg0"] [ext_resource type="PackedScene" uid="uid://bji3bukudxlhm" path="res://assets/health_dispenser.tscn" id="13_h5xga"] +[ext_resource type="PackedScene" uid="uid://d4suhr3allsj" path="res://assets/revolver2_pickup.tscn" id="14_ak7yq"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_s7e4t"] sky_top_color = Color(0.623488, 0.812575, 0.900791, 1) @@ -194,3 +195,9 @@ portal_node = NodePath("../Gulag of Money") [node name="HealthDispenser" parent="." instance=ExtResource("13_h5xga")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 7.99763, 1.77484, -1.41809) + +[node name="vendingmachine2" parent="." instance=ExtResource("9_nu6q5")] +transform = Transform3D(-0.00572468, 0, -0.999984, 0, 1, 0, 0.999984, 0, -0.00572468, 7.8571, 0.0503511, 3.6909) +item = ExtResource("14_ak7yq") +item_name = "bullet sniper" +item_price = 5000 diff --git a/scenes/asset_checker.tscn b/scenes/asset_checker.tscn index 4bbec20..a7fe948 100644 --- a/scenes/asset_checker.tscn +++ b/scenes/asset_checker.tscn @@ -310,20 +310,21 @@ dof_blur_near_enabled = true [sub_resource type="Animation" id="Animation_slj52"] resource_name = "Menu" length = 40.0 +loop_mode = 1 tracks/0/type = "position_3d" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath("Camera3D") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 4.83154, 1.76087, 7.17499, 19.9333, 1, -4.96827, 1.76087, 6.32403, 40, 1, 4.83154, 1.76087, 7.17499) +tracks/0/interp = 1 +tracks/0/loop_wrap = false +tracks/0/keys = PackedFloat32Array(0, 1, 27.488, 7.93845, -0.672977, 20, 1, 25.7341, 7.93845, -1.42255, 20.0333, 1, 9.73562, 2.3287, 5.39941, 30, 1, 4.62892, 2.1615, 5.93688, 40, 1, 27.488, 7.93845, -0.672977) tracks/1/type = "rotation_3d" tracks/1/imported = false tracks/1/enabled = true tracks/1/path = NodePath("Camera3D") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 19.9, 1, 0, 0.254973, 0, 0.966948, 40, 1, 0, 0, 0, 1) +tracks/1/interp = 1 +tracks/1/loop_wrap = false +tracks/1/keys = PackedFloat32Array(0.0333333, 1, 0, 0.73086, 0, 0.682528, 20, 1, 0, 0.636758, 0, 0.771064, 20.0333, 1, 0, 0.341069, 0, 0.940038, 30, 1, 0, 0.45101, 0, 0.892519, 40, 1, 0, 0.636758, 0, 0.771064) [sub_resource type="Animation" id="Animation_6siip"] length = 0.001 @@ -590,7 +591,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 23.119 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -6.98721, 0.923517, 22.4057) [node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.83154, 1.76087, 7.17499) +transform = Transform3D(-0.0683113, 0, 0.997664, 0, 1, 0, -0.997664, 0, -0.0683113, 4.83154, 1.76087, 7.17499) attributes = SubResource("CameraAttributesPractical_6pck7") fov = 42.0 diff --git a/scripts/game_globals.gd b/scripts/game_globals.gd index d1c5278..70ca3d6 100644 --- a/scripts/game_globals.gd +++ b/scripts/game_globals.gd @@ -37,7 +37,7 @@ func money_penalty(): func weapon_penalty(): var level_control = get_tree().current_scene - + GameGlobals.ammo_reserve = {} match level_control.gamemode.weapon_penalty: 0: #Drop All GameGlobals.held_guns = [] diff --git a/scripts/hud.gd b/scripts/hud.gd index da3a890..3b2bbc1 100644 --- a/scripts/hud.gd +++ b/scripts/hud.gd @@ -50,6 +50,8 @@ func _ready() -> void: SignalBus.player_hit.connect(player_hit) SignalBus.shot_fired.connect(crosshair_size_change) + money_count = GameGlobals.money + health_bar.max_value = level_control.gamemode.start_health health_bar_start_pos = health_bar.position