creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-12 05:22:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bos_testing' into devRefactor

Browse Source
This commit is contained in:
Jan Schuffenhauer
2020-04-19 18:01:14 +02:00
parent 4f20e43e52 78af384563
commit f94e474228
26 changed files with 638 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Objects/Banana/Banana.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2]
[ext_resource path="res://testSprites/bannane.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.54726
@@ -11,6 +12,10 @@ height = 12.1493
[node name="Banana" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 2
kind = 10
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 1.54256, -4.73786 )
texture = ExtResource( 3 )

7
src/Objects/Barrel/Barrel.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Barrel/Barrel.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Fass.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 10.7634
@@ -15,6 +16,10 @@ height = 8.78242
[node name="Barrel" type="StaticBody2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 1
kind = 9
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.244171, -10.0111 )
texture = ExtResource( 3 )

7
src/Objects/Bonfire/Bonfire.tscn
View File

@@ -1,9 +1,10 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Bonfire/Bonfire.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Bonfire.png" type="Texture" id=3]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=5]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.76762
@@ -19,6 +20,10 @@ radius = 32.0
[node name="Bonfire" type="StaticBody2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 5 )]
general = 1
kind = 8
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )

7
src/Objects/Heart/Heart.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Heart/Heart.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Herz.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
@@ -11,6 +12,10 @@ height = 2.89399
[node name="Heart" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 1
kind = 7
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )

7
src/Objects/Rubies/Blue.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2]
[ext_resource path="res://testSprites/blue_Rubi.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
@@ -11,6 +12,10 @@ height = 2.89399
[node name="Blue" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 1
kind = 5
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )

7
src/Objects/Rubies/Green.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2]
[ext_resource path="res://testSprites/green_Rubi.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
@@ -11,6 +12,10 @@ height = 2.89399
[node name="Green" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 1
kind = 6
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )

7
src/Objects/Rubies/Red.tscn
View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2]
[ext_resource path="res://testSprites/red_Rubi.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
@@ -11,6 +12,10 @@ height = 2.89399
[node name="Red" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
general = 1
kind = 4
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )

7
src/Objects/Slime/Slime.tscn
View File

@@ -1,13 +1,18 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://testSprites/slime.png" type="Texture" id=1]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=2]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 16, 16 )
[node name="Slime" type="Node2D"]
[node name="Kind" parent="." instance=ExtResource( 3 )]
general = 2
kind = 10
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )

17
src/Objects/Torch/Torch.gd
View File

@@ -1,4 +1,4 @@
extends StaticBody2D
extends Node2D
export(int, 1, 5) var lifePoints = 3
export(int, 1, 30) var spawnRate = 5
@@ -7,13 +7,14 @@ var elapsedTime = 0.0
func _physics_process(delta):
elapsedTime += delta
if(elapsedTime>=spawnRate):
elapsedTime-=spawnRate
var Minion = load("")
var world = get_tree().current_scene.get_child(2)
var minion = Minion.instance()
world.add_child(minion)
minion.global_position = global_position
#if(elapsedTime>=spawnRate):
# elapsedTime-=spawnRate
# var Minion = load("")
# var world = get_tree().current_scene.get_child(2)
# #TODO minions
# var minion = Minion.instance()
# world.add_child(minion)
# minion.global_position = global_position
func _on_Hurtbox_area_entered(area):

6
src/Objects/Torch/Torch.tscn
View File

@@ -4,16 +4,20 @@
[ext_resource path="res://testSprites/fackel.png" type="Texture" id=2]
[ext_resource path="res://Objects/Torch/Torch.gd" type="Script" id=3]
[ext_resource path="res://Effects/Fire/FireEffect.tscn" type="PackedScene" id=4]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=5]
[sub_resource type="CapsuleShape2D" id=1]
radius = 8.0
height = 12.0
[node name="Torch" type="StaticBody2D"]
[node name="Torch" type="Node2D"]
script = ExtResource( 3 )
[node name="FireEffect" parent="." instance=ExtResource( 4 )]
position = Vector2( 1.88936, -12.4698 )
[node name="Kind" parent="." instance=ExtResource( 5 )]
general = 4
kind = 2
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0, -8 )

6
src/Objects/Traps/Flame.tscn
View File

@@ -1,6 +1,7 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=2]
[ext_resource path="res://testSprites/flame.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -8,6 +9,9 @@ height = 6.36237
[node name="Flame" type="Node2D"]
[node name="Kind" parent="." instance=ExtResource( 2 )]
kind = 10
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.44072, -6.06005 )
texture = ExtResource( 3 )

8
src/Objects/Traps/Spike.tscn
View File

@@ -1,10 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Spike.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
height = 6.36237
@@ -12,6 +11,9 @@ height = 6.36237
[node name="Spike" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
kind = 10
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.220352, -3.63603 )
texture = ExtResource( 3 )

8
src/Objects/Traps/Sting.tscn
View File

@@ -1,10 +1,9 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Sting.png" type="Texture" id=3]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 6.77597
@@ -13,6 +12,9 @@ height = 6.36237
[node name="Sting" type="Node2D"]
script = ExtResource( 2 )
[node name="Kind" parent="." instance=ExtResource( 4 )]
kind = 10
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.44072, -9.03499 )
texture = ExtResource( 3 )

22
src/Objects/Traps/bear.tscn
View File

@@ -1,9 +1,10 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Traps/Bear.gd" type="Script" id=2]
[ext_resource path="res://testSprites/falle.png" type="Texture" id=3]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=4]
[ext_resource path="res://Objects/Traps/Bear.gd" type="Script" id=1]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=2]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=3]
[ext_resource path="res://testSprites/falle.png" type="Texture" id=4]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=5]
[sub_resource type="CapsuleShape2D" id=1]
height = 9.0
@@ -12,20 +13,23 @@ height = 9.0
height = 9.0
[node name="Bear_trap" type="Node2D"]
script = ExtResource( 2 )
script = ExtResource( 1 )
[node name="Kind" parent="." instance=ExtResource( 3 )]
kind = 10
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( -7.62939e-06, 0 )
texture = ExtResource( 3 )
texture = ExtResource( 4 )
[node name="Hitbox" parent="." instance=ExtResource( 1 )]
[node name="Hitbox" parent="." instance=ExtResource( 2 )]
collision_layer = 16
[node name="CollisionShape2D" parent="Hitbox" index="0"]
rotation = 1.5708
shape = SubResource( 1 )
[node name="Hurtbox" parent="." instance=ExtResource( 4 )]
[node name="Hurtbox" parent="." instance=ExtResource( 5 )]
collision_layer = 32
collision_mask = 0