Redo of orb plants

outfrost · Apr 26, 2021 · 6a7ca44 · 6a7ca44
1 parent 7614a54
commit 6a7ca44
Show file tree

Hide file tree

Showing 14 changed files with 253 additions and 92 deletions.
diff --git a/character/PlayerCharacter.gd b/character/PlayerCharacter.gd
@@ -78,6 +78,9 @@ func _input(event: InputEvent) -> void:
 			if !inventory.has(current_lootable.loot2):
 				inventory[current_lootable.loot2] = 0
 			inventory[current_lootable.loot2] += current_lootable.loot2_amount
+			if !inventory.has(current_lootable.loot3):
+				inventory[current_lootable.loot3] = 0
+			inventory[current_lootable.loot3] += current_lootable.loot3_amount
 #			print("%s (%d)" % [Item.type_str(current_lootable.loot1), current_lootable.loot1_amount])
 #			print("%s (%d)" % [Item.type_str(current_lootable.loot2), current_lootable.loot2_amount])
 			current_lootable.queue_free()

diff --git a/environment/Tree2.tscn b/environment/Tree2.tscn
@@ -10,6 +10,9 @@ extents = Vector2( 22, 24 )
 [node name="Sprite" type="Sprite" parent="."]
 position = Vector2( 0, -67.005 )
 texture = ExtResource( 1 )
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 position = Vector2( 0, -3.005 )

diff --git a/environment/orbflower_Top.png b/environment/orbflower_Top.png
diff --git a/environment/orbflower_Top.png.import b/environment/orbflower_Top.png.import
diff --git a/environment/orbflower_base.png b/environment/orbflower_base.png
diff --git a/environment/orbflower_base.png.import b/environment/orbflower_base.png.import
diff --git a/level/Item.gd b/level/Item.gd
@@ -5,6 +5,7 @@ enum ItemType {
 	NONE,
 	FLOWER1,
 	FLOWER2,
+	FLOWER3,
 }
 
 static func type_str(item_type):