first version of the shooter fork

Author: solodeveloping

.gitignore

@@ -1,6 +1,17 @@
 # Godot 4+ specific ignores
 .godot/
+.nomedia
 
-# Common
-.DS_Store
+# Godot-specific ignores
+.import/
+export.cfg
+export_credentials.cfg
+*.tmp
 
+# Imported translations (automatically generated from CSV files)
+*.translation
+
+# Mono-specific ignores
+.mono/
+data_*/
+mono_crash.*.json

CONTRIBUTING.md

@@ -25,8 +25,8 @@ Before you submit your pull request, though, I would kindly ask you to revisit y
 
 Therefore, I would again kindly ask you to stick to the following stylistic choices:
 - Use `4 spaces` instead of tabs
-    - When you submit your PR, if it shows a lot more changes than what you thought there would be, this is most likely the cause as your editor might be changing the indentations in changed lines automatically
-    - To fix individual files or lines without changing your editor settings, you can simply select the lines with tabs instead of spaces, and hit `Ctrl+i` (`Cmd+i` on Mac) to convert the indetations to spaces
+	- When you submit your PR, if it shows a lot more changes than what you thought there would be, this is most likely the cause as your editor might be changing the indentations in changed lines automatically
+	- To fix individual files or lines without changing your editor settings, you can simply select the lines with tabs instead of spaces, and hit `Ctrl+i` (`Cmd+i` on Mac) to convert the indetations to spaces
 - Don't over-comment the code. Most of the existing code admittedly have a lot of comments but that wasn't a good decision
 - Name your variables, classes and files according to the [Naming Conventions](#Naming_Conventions)
 - Always add type hints to exported and/or public class/script fields even if it's obvious (e.g. `@export var move_speed: float = 1.0` instead of `@export var move_speed = 1.0`)

CREDITS.md

@@ -0,0 +1,23 @@
+# Credits
+
+Credits to the original project, it was an awesome project.
+
+## Shooter
+
+Some of the design is inspired by [Johnny Rouddro's tutorial series](https://www.youtube.com/watch?v=DPTsTr9Fi_Q&list=PLqbBeBobXe08DLRMDMyY2YXLx-Q4R9Ujl&index=1), his code is available on [Github](https://github.com/JohnnyRouddro/Godot_Third_Person_Shooter) under the MIT license.
+
+The icons are provided by [game-icons.net](https://game-icons.net/) under the CC BY 3.0 license.
+Links to the original providers and credits:
+- [glock icon](https://game-icons.net/1x1/john-colburn/pistol-gun.html)
+- [revolver icon](https://game-icons.net/1x1/skoll/revolver.html)
+- [fist icon](https://game-icons.net/1x1/john-redman/rock.html)
+
+The animations, new model and weapons were provided by [quaternius.com](https://quaternius.com/) under the CC0 license.
+
+The energy field effect for the loots was provided by [godotshaders.com](https://godotshaders.com/shader/simple-energy-shield/) under the CC0 license.
+
+The Bungee font used was provided under the SIL OPEN FONT LICENSE.
+
+The pistol reload sound was provided by [MaximBomba](https://freesound.org/people/MaximBomba/sounds/432139/) under the CC0 license.
+
+The gunshot sounds were provided by [rubberduck](https://opengameart.org/content/25-cc0-bang-firework-sfx) under the CC0 license.

Main.tscn

@@ -1,10 +1,20 @@
-[gd_scene load_steps=13 format=3 uid="uid://duugmnauemcc7"]
+[gd_scene load_steps=25 format=3 uid="uid://duugmnauemcc7"]
 
 [ext_resource type="PackedScene" uid="uid://c0vnqt6uyxaoa" path="res://player/Player.tscn" id="1"]
+[ext_resource type="Script" uid="uid://cn2j8ijo5la1w" path="res://MainScene.gd" id="1_20pc6"]
 [ext_resource type="Material" uid="uid://cb6br3g0cy6c1" path="res://assets/materials/Grass.tres" id="1_ugafu"]
 [ext_resource type="Material" uid="uid://c560kh0cq42t2" path="res://assets/materials/Concrete.tres" id="2_4xuie"]
 [ext_resource type="Material" uid="uid://cotjsbb4imdui" path="res://assets/materials/Wood.tres" id="3_tqk2n"]
 [ext_resource type="Texture2D" uid="uid://btrceayvxka1y" path="res://assets/textures/dirt256x256.png" id="4_54p8n"]
+[ext_resource type="PackedScene" uid="uid://cu8sxhbwx8es6" path="res://ui/GunHUD.tscn" id="6_3dxm6"]
+[ext_resource type="Script" uid="uid://cmgy6q26hxec" path="res://ui/GUI.gd" id="7_5vvyt"]
+[ext_resource type="Script" uid="uid://bjhndfs2qk583" path="res://scripts/ThirdPersonControllerEventBus.gd" id="7_lgr22"]
+[ext_resource type="Script" uid="uid://dyfxhxgpjuulb" path="res://weapons/WeaponDropContainer.gd" id="8_03owx"]
+[ext_resource type="FontFile" uid="uid://iq1865kgwkev" path="res://assets/Fonts/Bungee/Bungee-Regular.ttf" id="8_5vvyt"]
+[ext_resource type="PackedScene" uid="uid://b432p6oj3ys6v" path="res://weapons/WeaponDrop.tscn" id="8_trn2v"]
+[ext_resource type="Script" uid="uid://vmrj2qeky63q" path="res://weapons/WeaponItem.gd" id="13_c2ibq"]
+[ext_resource type="Resource" uid="uid://b55xhpttah1lq" path="res://weapons/resources/revolver_weapon_resource.tres" id="14_j4qnp"]
+[ext_resource type="Resource" uid="uid://7iuj6150gurm" path="res://weapons/resources/glock_weapon_resource.tres" id="15_j4qnp"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ukb2j"]
 
@@ -31,7 +41,48 @@ size = Vector3(25, 11, 19)
 [sub_resource type="BoxShape3D" id="8"]
 size = Vector3(25.7228, 10, 17.671)
 
+[sub_resource type="Resource" id="Resource_fpfj3"]
+script = ExtResource("13_c2ibq")
+current_mag = 20
+weapon = ExtResource("14_j4qnp")
+metadata/_custom_type_script = "uid://vmrj2qeky63q"
+
+[sub_resource type="Resource" id="Resource_sc1dx"]
+script = ExtResource("13_c2ibq")
+current_mag = 20
+weapon = ExtResource("15_j4qnp")
+metadata/_custom_type_script = "uid://vmrj2qeky63q"
+
 [node name="Main" type="Node3D"]
+script = ExtResource("1_20pc6")
+
+[node name="ThirdPersonControllerEventBus" type="Node" parent="."]
+script = ExtResource("7_lgr22")
+
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+script = ExtResource("7_5vvyt")
+
+[node name="GunHud" parent="CanvasLayer" instance=ExtResource("6_3dxm6")]
+
+[node name="PickWeaponButtonParent" type="Control" parent="CanvasLayer"]
+layout_mode = 3
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -20.0
+offset_top = -40.0
+offset_right = 20.0
+grow_horizontal = 2
+grow_vertical = 0
+
+[node name="PickupWeaponButton" type="Button" parent="CanvasLayer/PickWeaponButtonParent"]
+layout_mode = 0
+offset_right = 8.0
+offset_bottom = 8.0
+theme_override_fonts/font = ExtResource("8_5vvyt")
+text = "Pick up"
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("2")
@@ -91,3 +142,19 @@ skeleton = NodePath("../..")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Water"]
 shape = SubResource("8")
+
+[node name="WeaponDropContainer" type="Node3D" parent="."]
+script = ExtResource("8_03owx")
+
+[node name="WeaponDrop" parent="WeaponDropContainer" instance=ExtResource("8_trn2v")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, 0)
+weapon_item = SubResource("Resource_fpfj3")
+
+[node name="WeaponDrop2" parent="WeaponDropContainer" instance=ExtResource("8_trn2v")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1, -11.4024)
+weapon_item = SubResource("Resource_sc1dx")
+auto_loot = true
+
+[connection signal="button_up" from="CanvasLayer/PickWeaponButtonParent/PickupWeaponButton" to="." method="_on_pickup_weapon_button_button_up"]
+[connection signal="player_entered_weapon_drop" from="WeaponDropContainer" to="." method="_on_weapon_drop_container_player_entered_weapon_drop"]
+[connection signal="player_exited_weapon_drop" from="WeaponDropContainer" to="." method="_on_weapon_drop_container_player_exited_weapon_drop"]

MainScene.gd

@@ -0,0 +1,32 @@
+extends Node3D
+
+@onready var third_person_controller_event_bus: ThirdPersonControllerEventBus = $ThirdPersonControllerEventBus
+
+@onready var pick_weapon_button_parent: Control = $CanvasLayer/PickWeaponButtonParent
+
+var current_weapon_drop: WeaponDrop
+
+func _ready() -> void:
+	pick_weapon_button_parent.hide()
+
+func _on_weapon_drop_container_player_entered_weapon_drop(weapon_drop: WeaponDrop) -> void:
+	current_weapon_drop = weapon_drop
+	pick_weapon_button_parent.show()
+	
+	# we are sending the event manually as ane example
+	third_person_controller_event_bus.send_player_entered_weapon_drop.emit(
+		weapon_drop
+	)
+
+func _on_weapon_drop_container_player_exited_weapon_drop(weapon_drop: WeaponDrop) -> void:
+	current_weapon_drop = null
+	pick_weapon_button_parent.hide()
+	
+	# we are sending the event manually as ane example
+	third_person_controller_event_bus.send_player_exited_weapon_drop.emit(
+		weapon_drop
+	)
+
+func _on_pickup_weapon_button_button_up() -> void:
+	# it cant happen because of the third person view
+	pass

MainScene.gd.uid

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

assets/Fonts/Bungee/Bungee-Regular.ttf

@@ -0,0 +1,35 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://iq1865kgwkev"
+path="res://.godot/imported/Bungee-Regular.ttf-5bee3d0ebbe5bc3843f41e8eaf33f2bc.fontdata"
+
+[deps]
+
+source_file="res://assets/Fonts/Bungee/Bungee-Regular.ttf"
+dest_files=["res://.godot/imported/Bungee-Regular.ttf-5bee3d0ebbe5bc3843f41e8eaf33f2bc.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+disable_embedded_bitmaps=true
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=4
+keep_rounding_remainders=true
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

assets/Fonts/Bungee/Bungee-Regular.ttf.import

@@ -0,0 +1,93 @@
+Copyright 2023 The Bungee Project Authors (https://github.com/djrrb/Bungee)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.