Merge branch 'master' of https://github.com/EliasVincent/godot-wild-j…

…am-22-game
EliasVincent · Jun 21, 2020 · 7e6a7d2 · 7e6a7d2
2 parents 517ec06 + 940af99
commit 7e6a7d2
Show file tree

Hide file tree

Showing 14 changed files with 253 additions and 120 deletions.
diff --git a/project.godot b/project.godot
@@ -15,7 +15,8 @@ _global_script_class_icons={
 
 [application]
 
-config/name="Godot Wild Jam 22 Game"
+config/name="Perestroika"
+config/description="Godot Wild Jam #22 Game by SoulPixel an Riesyeti"
 run/main_scene="res://scenes/UI/Main Menu.tscn"
 boot_splash/image="res://sprites/Splash_Screen.png"
 config/icon="res://unit2.png"
@@ -110,6 +111,12 @@ start_button={
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
+reset_button={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+ ]
+}
 
 [rendering]
 

diff --git a/readme.md b/readme.md
@@ -1,21 +1,17 @@
-# Godot Wild Jam 22 Game
+# Perestroika - Godot Wild Jam 22 Game
 
 This is our entry for the Godot Wild Jam, together with [SoulPixel](https://github.com/SoulPixelIV) 
 ***
 ## SoulPixel
  [SoulPixel's Itch.io](https://soulpixel.itch.io/)
 
- [SoulPixel's Steam](https://store.steampowered.com/app/847570/How_About_Spikes/)
-
- [SoulPixel's Twitter](https://twitter.com/SoulPixelX)
-
- [SoulPixel's YouTube](https://www.youtube.com/user/SeelenPixel)
+ [SoulPixel's Twitter](https://twitter.com/SoulPixelIV)
 
 ***
 ## Riesyeti
  [Riesyeti's Itch.io Page](https://riesyeti.itch.io/)
 
- [Riesyeti's Tiwtter](https://twitter.com/riesereti)
+ [Riesyeti's Twitter](https://twitter.com/riesereti)
 
  [Riesyeti's YouTube](https://www.youtube.com/channel/UCqHdyJTEdBcqa2J4EvLi5gA)
 

diff --git a/scenes/UI/AbilityLabel.gd b/scenes/UI/AbilityLabel.gd
@@ -4,4 +4,4 @@ onready var playerNode = get_node("/root/Main/Player")
 
 func _process(delta):
 	text = ""
-	text += "Q: JOIN (" + str(playerNode.JoinCost) + ")  " + "E: CHEER (" + str(playerNode.CheerCost) + ")"
+	text += "Q: RECRUIT (" + str(playerNode.JoinCost) + ")  " + "E: CHEER (" + str(playerNode.CheerCost) + ")"
diff --git a/scenes/UI/AbilityLabel.tscn b/scenes/UI/AbilityLabel.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://Pixeled.ttf" type="DynamicFontData" id=1]
+[ext_resource path="res://kremlin.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://scenes/UI/AbilityLabel.gd" type="Script" id=2]
 
 [sub_resource type="DynamicFont" id=1]
-size = 13
+size = 18
 outline_size = 1
 outline_color = Color( 0, 0, 0, 1 )
 font_data = ExtResource( 1 )

diff --git a/scenes/UI/GameOverPanel.tscn b/scenes/UI/GameOverPanel.tscn
@@ -1,37 +1,35 @@
 [gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://sprites/placeholders/black_to_red_gradient.png" type="Texture" id=1]
-[ext_resource path="res://Pixeled.ttf" type="DynamicFontData" id=2]
 [ext_resource path="res://scenes/UI/GameOverPanel.gd" type="Script" id=3]
 [ext_resource path="res://scenes/tests/Main.tscn" type="PackedScene" id=4]
 [ext_resource path="res://scenes/UI/Score Label.gd" type="Script" id=5]
 [ext_resource path="res://scenes/UI/Main Menu.tscn" type="PackedScene" id=6]
+[ext_resource path="res://kremlin.ttf" type="DynamicFontData" id=7]
 
 [sub_resource type="DynamicFont" id=1]
-size = 33
-outline_size = 1
+size = 51
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-font_data = ExtResource( 2 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=2]
-size = 22
+size = 34
 outline_size = 1
 outline_color = Color( 0, 0, 0, 1 )
-font_data = ExtResource( 2 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=3]
-size = 21
-outline_size = 1
+size = 32
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_top = -7
-font_data = ExtResource( 2 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=4]
-size = 12
-outline_size = 1
+size = 17
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_top = -5
-font_data = ExtResource( 2 )
+font_data = ExtResource( 7 )
 
 [node name="GameOverPanel" type="Control"]
 script = ExtResource( 3 )
@@ -87,5 +85,8 @@ margin_bottom = 295.586
 custom_fonts/font = SubResource( 4 )
 text = "RETURN TO TITLE"
 clip_text = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [connection signal="pressed" from="RetryButton" to="." method="_on_RetryButton_pressed"]
 [connection signal="pressed" from="MenuButton" to="." method="_on_MenuButton_pressed"]
diff --git a/scenes/UI/Main Menu.tscn b/scenes/UI/Main Menu.tscn
@@ -1,8 +1,7 @@
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://scenes/UI/Main Menu.gd" type="Script" id=1]
 [ext_resource path="res://scenes/tests/Main.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Pixeled.ttf" type="DynamicFontData" id=3]
 [ext_resource path="res://scenes/UI/AboutDialog.gd" type="Script" id=4]
 [ext_resource path="res://tilesets/streetsv2_tileset.tres" type="TileSet" id=5]
 [ext_resource path="res://scenes/objects/MenuPerson.tscn" type="PackedScene" id=6]
@@ -15,10 +14,10 @@ outline_color = Color( 0, 0, 0, 1 )
 font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=2]
-size = 9
+size = 12
 outline_size = 1
 outline_color = Color( 0, 0, 0, 1 )
-font_data = ExtResource( 3 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="Animation" id=3]
 length = 2.0
@@ -48,32 +47,29 @@ tracks/1/keys = {
 }
 
 [sub_resource type="DynamicFont" id=4]
-outline_size = 1
+size = 24
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_top = -6
-font_data = ExtResource( 3 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=5]
-size = 14
-outline_size = 1
+size = 21
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_top = -3
-font_data = ExtResource( 3 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=6]
-size = 14
-outline_size = 1
+size = 21
+outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_top = -4
-font_data = ExtResource( 3 )
+font_data = ExtResource( 7 )
 
 [sub_resource type="DynamicFont" id=7]
-size = 22
-outline_size = 1
+size = 34
+outline_size = 3
 outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 5
 extra_spacing_char = 4
-font_data = ExtResource( 3 )
+font_data = ExtResource( 7 )
 
 [node name="Main Menu" type="Control"]
 anchor_right = 1.0
@@ -138,9 +134,9 @@ tile_data = PoolIntArray( -131063, 0, 0, -65536, 3, 0, -65535, 3, 0, -65534, 3,
 [node name="Title" type="RichTextLabel" parent="."]
 modulate = Color( 0.847059, 0.847059, 0.847059, 1 )
 margin_left = 128.0
-margin_top = 16.0
+margin_top = 32.0
 margin_right = 538.0
-margin_bottom = 158.0
+margin_bottom = 174.0
 custom_fonts/normal_font = SubResource( 1 )
 custom_colors/default_color = Color( 1, 0, 0, 1 )
 bbcode_enabled = true
@@ -158,12 +154,13 @@ margin_bottom = 357.851
 text = "(C) SoulPixel, Riesyeti"
 
 [node name="Label2" type="Label" parent="."]
-margin_left = 168.0
-margin_top = 354.0
-margin_right = 412.0
-margin_bottom = 380.0
+margin_left = 488.0
+margin_top = 272.0
+margin_right = 630.0
+margin_bottom = 321.0
 custom_fonts/font = SubResource( 2 )
-text = "PRESS F11 TO TOGGLE FULLSCREEN"
+text = "PRESS F11 TO TOGGLE
+FULLSCREEN"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -218,10 +215,10 @@ __meta__ = {
 modulate = Color( 1, 1, 1, 0.890196 )
 
 [node name="Tutorial Button" type="Button" parent="Buttons"]
-margin_left = 212.303
-margin_top = 184.0
-margin_right = 389.303
-margin_bottom = 230.0
+margin_left = 208.874
+margin_top = 184.857
+margin_right = 385.874
+margin_bottom = 230.857
 custom_fonts/font = SubResource( 4 )
 text = "HOW TO PLAY"
 __meta__ = {
@@ -230,9 +227,9 @@ __meta__ = {
 
 [node name="Source Link Button" type="Button" parent="Buttons"]
 margin_left = 128.0
-margin_top = 304.0
+margin_top = 288.0
 margin_right = 464.0
-margin_bottom = 347.0
+margin_bottom = 331.0
 custom_fonts/font = SubResource( 5 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 text = "CHECK OUT THE SOURCE CODE"
@@ -241,10 +238,10 @@ __meta__ = {
 }
 
 [node name="Jam Link Button" type="Button" parent="Buttons"]
-margin_left = 144.984
-margin_top = 245.289
-margin_right = 452.984
-margin_bottom = 291.289
+margin_left = 152.0
+margin_top = 240.0
+margin_right = 457.0
+margin_bottom = 277.0
 custom_fonts/font = SubResource( 6 )
 custom_colors/font_color = Color( 0.776471, 0.537255, 0.317647, 1 )
 text = "CHECK OUT THE GAME JAM"
@@ -253,10 +250,10 @@ __meta__ = {
 }
 
 [node name="Play Button" type="Button" parent="Buttons"]
-margin_left = 240.0
-margin_top = 96.0
-margin_right = 370.0
-margin_bottom = 170.0
+margin_left = 232.0
+margin_top = 128.0
+margin_right = 362.0
+margin_bottom = 176.0
 custom_fonts/font = SubResource( 7 )
 text = "PLAY"
 __meta__ = {

diff --git a/scenes/UI/MenuTower.tscn b/scenes/UI/MenuTower.tscn
@@ -0,0 +1,60 @@
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://sprites/tower-Sheet.png" type="Texture" id=1]
+[ext_resource path="res://sprites/greenCircle.png" type="Texture" id=3]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 100, 200 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 1 )
+region = Rect2( 100, 0, 100, 200 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 1 )
+region = Rect2( 200, 0, 100, 200 )
+
+[sub_resource type="SpriteFrames" id=4]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+} ]
+
+[sub_resource type="Gradient" id=5]
+colors = PoolColorArray( 1, 0, 0, 1, 1, 1, 1, 0 )
+
+[node name="Node2D" type="StaticBody2D" groups=[
+"towers",
+]]
+z_index = 2
+
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( -24, -8 )
+scale = Vector2( 2, 2 )
+texture = ExtResource( 3 )
+offset = Vector2( -2, 0 )
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
+frames = SubResource( 4 )
+playing = true
+
+[node name="CPUParticles2D" type="CPUParticles2D" parent="."]
+position = Vector2( -20.813, -94.669 )
+emitting = false
+amount = 70
+explosiveness = 0.68
+randomness = 0.41
+emission_shape = 1
+emission_sphere_radius = 1.0
+direction = Vector2( 0, 0 )
+spread = 180.0
+gravity = Vector2( 0, 0 )
+initial_velocity = 157.31
+initial_velocity_random = 0.49
+linear_accel = -47.19
+linear_accel_random = 0.27
+scale_amount = 2.0
+color_ramp = SubResource( 5 )