kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added new bullet texture

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-14 20:48:21 +02:00
parent 438cfab840
commit 261e63b7f3
9 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/assets/scripts/server_handlers/network_processors/network_setup.gd
View File

@ -1,6 +1,6 @@
extends Control
var player_amount = 1
var player_amount = 0
var player = load("res://source/entities/player/player_node.tscn")

1
source/assets/scripts/server_handlers/trinity_site_level.gd
View File

@ -36,4 +36,3 @@ func _process(delta):
globalActivePhase = Global.get_current_phase()
if globalActivePhase["active"] != null:
phase.text = str(globalActivePhase["active"]["phase_name"])
print(time)

2
source/assets/scripts/ui_element_handlers/game_UI.gd
View File

@ -1,7 +1,7 @@
extends CanvasLayer
# if 0, then singleplayer will work, if 1, then multiplayer only
var winner_amount = 1
var winner_amount = 0
onready var win_timer = $winner/win_timer
onready var winner = $winner

14
source/assets/sprites/bullet/player_character_bullet.svg
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="100"
height="25.635"
viewBox="0 0 100 25.635001"
width="75"
height="19.24"
viewBox="0 0 75 19.24"
version="1.1"
id="svg18"
sodipodi:docname="player_character_bullet.svg"
@ -21,9 +21,9 @@
inkscape:pagecheckerboard="1"
showgrid="false"
height="25.635px"
inkscape:zoom="16"
inkscape:cx="44.0625"
inkscape:cy="22.125"
inkscape:zoom="11.313709"
inkscape:cx="38.714096"
inkscape:cy="21.743533"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="1920"
@ -45,7 +45,7 @@
<g
id="Player-character-bullet"
clip-path="url(#clip-Player-character-bullet)"
transform="matrix(0.73224636,0,0,0.73224636,-7.3224197,-9.5184704)">
transform="matrix(-0.54918477,0,0,0.54918477,80.491815,-7.1388534)">
<path
id="Path_4"
data-name="Path 4"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

13
source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn
View File

@ -1,17 +1,24 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1]
[ext_resource path="res://source/assets/sprites/bullet/player_character_bullet.svg" type="Texture" id=1]
[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 9.85811
height = 35.0082
[node name="playert_bullet" type="Sprite" groups=["Net"]]
[node name="player_character_bullet" type="Sprite" groups=[
"Net",
]]
texture = ExtResource( 1 )
script = ExtResource( 2 )
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
[node name="hitbox" type="Area2D" parent="." groups=[
"Player_damager",
]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
position = Vector2( 10.8253, -0.381073 )
rotation = 1.5708
shape = SubResource( 1 )

8
source/entities/shooting/Line_Trajectory/Line_Bullet.tscn
View File

@ -4,8 +4,8 @@
[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Bullet.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 12.2565
height = 48.3215
radius = 9.85811
height = 35.0082
[node name="player_character_bullet" type="Sprite" groups=[
"Net",
@ -18,6 +18,8 @@ script = ExtResource( 2 )
]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
position = Vector2( -14.0379, 0.26487 )
position = Vector2( 10.8253, -0.381073 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"]

13
source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn
View File

@ -1,17 +1,24 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1]
[ext_resource path="res://source/assets/sprites/bullet/player_character_bullet.svg" type="Texture" id=1]
[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 9.85811
height = 35.0082
[node name="player_bullet2" type="Sprite" groups=["Net"]]
[node name="player_character_bullet" type="Sprite" groups=[
"Net",
]]
texture = ExtResource( 1 )
script = ExtResource( 2 )
[node name="hitbox" type="Area2D" parent="." groups=["Player_damager"]]
[node name="hitbox" type="Area2D" parent="." groups=[
"Player_damager",
]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
position = Vector2( 10.8253, -0.381073 )
rotation = 1.5708
shape = SubResource( 1 )

7
source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1]
[ext_resource path="res://source/assets/sprites/bullet/player_character_bullet.svg" type="Texture" id=1]
[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Bullet.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 9.85811
height = 35.0082
[node name="player_bullet2" type="Sprite" groups=[
[node name="player_character_bullet" type="Sprite" groups=[
"Net",
]]
texture = ExtResource( 1 )
@ -16,6 +18,7 @@ script = ExtResource( 2 )
]]
[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"]
position = Vector2( 10.8253, -0.381073 )
rotation = 1.5708
shape = SubResource( 1 )

22
source/scenes/OVERLAY/elements/user_input.tscn
View File

@ -13,7 +13,7 @@
[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg" type="Texture" id=11]
[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg" type="Texture" id=12]
[sub_resource type="StyleBoxTexture" id=1]
[sub_resource type="StyleBoxTexture" id=9]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 480, 156 )
@ -51,12 +51,6 @@ font_data = ExtResource( 2 )
texture = ExtResource( 6 )
region_rect = Rect2( 0, 0, 100, 100 )
[sub_resource type="DynamicFont" id=9]
size = 22
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=10]
size = 22
use_mipmaps = true
@ -69,10 +63,16 @@ use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=12]
size = 22
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
[node name="user_input" type="Panel"]
margin_right = 480.0
margin_bottom = 156.0
custom_styles/panel = SubResource( 1 )
custom_styles/panel = SubResource( 9 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
@ -240,7 +240,7 @@ __meta__ = {
[node name="Label" type="Label" parent="controls"]
anchor_right = 1.0
margin_bottom = 29.0
custom_fonts/font = SubResource( 9 )
custom_fonts/font = SubResource( 10 )
text = "Active formula"
align = 1
valign = 1
@ -264,7 +264,7 @@ __meta__ = {
[node name="Label" type="Label" parent="controls/ready_button"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 10 )
custom_fonts/font = SubResource( 11 )
text = "Ready"
align = 1
valign = 1
@ -288,7 +288,7 @@ __meta__ = {
[node name="Label" type="Label" parent="controls/skip_button"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = SubResource( 11 )
custom_fonts/font = SubResource( 12 )
text = "Skip"
align = 1
valign = 1