Browse Source

bunch of fixes based on feedback, adding changelog

galo 1 year ago
parent
commit
5a517ebe03
5 changed files with 48 additions and 45 deletions
  1. 2 0
      Healthpickup.tscn
  2. 1 2
      main.tscn
  3. 1 0
      newdynamicfont.tres
  4. 41 41
      powerups.gd
  5. 3 2
      ui/Button.tscn

+ 2 - 0
Healthpickup.tscn

@@ -16,6 +16,8 @@ func _ready():
 	$hitbox/CollisionShape2D.call_deferred('set_disabled', true)
 	yield(get_tree().create_timer(1.0), 'timeout')
 	$hitbox/CollisionShape2D.call_deferred('set_disabled', false)
+	yield(get_tree().create_timer(30.0), 'timeout')
+	queue_free()
 "
 
 [sub_resource type="Shader" id=2]

+ 1 - 2
main.tscn

@@ -369,7 +369,6 @@ spawnspeed = 1.0
 [node name="spawner2" type="Node2D" parent="."]
 script = ExtResource( 1 )
 enemy_ = ExtResource( 4 )
-spawnspeed = 1.0
 
 [node name="restarter" type="CanvasLayer" parent="."]
 pause_mode = 2
@@ -694,7 +693,7 @@ position = Vector2( 434, 819 )
 rotation = -0.561978
 z_index = 20
 frames = SubResource( 17 )
-frame = 11
+frame = 1
 playing = true
 
 [node name="Play" type="TouchScreenButton" parent="PauseMenu/play"]

+ 1 - 0
newdynamicfont.tres

@@ -3,4 +3,5 @@
 [ext_resource path="res://font/ComfortaaRegular.ttf" type="DynamicFontData" id=1]
 
 [resource]
+size = 15
 font_data = ExtResource( 1 )

+ 41 - 41
powerups.gd

@@ -14,7 +14,7 @@ var menbros = {
 		'atkspeed':1.0,
 		'upgrade': {'dmg':0.15},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'braco_bruto',
+		'data' : [[1,2], [3,4], [5,3]] , 'name':'Brutish Arms',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/BracoBruto.png"),
 	},
@@ -25,7 +25,7 @@ var menbros = {
 		'atkspeed':1.25,
 		'upgrade': {'atkspeed':0.1,'range':0.05},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'menbro_chicote',
+		'data' : [[1,3], [3,2], [4,4]] , 'name':'Whippart',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/MembroChicote.png"),
 	},
@@ -35,7 +35,7 @@ var menbros = {
 		'speed':1.75,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'pernas_ligeiras',
+		'data' : [[0,2], [2,5], [4,3]] , 'name':'Sprinting Legs',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/PernasLigeiras.png"),
 	},
@@ -46,7 +46,7 @@ var menbros = {
 		'speed':2.0,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'o_corredor',
+		'data' : [[0,2], [2,7], [4,2]] , 'name':'The Runner',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/OCorredor.png"),
 	},
@@ -56,7 +56,7 @@ var menbros = {
 		'speed':1.25,
 		'upgrade': {'speed':0.1, 'hp':0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'coxas_robustas',
+		'data' : [[0,4], [2,4], [4,3]] , 'name':'Thick Thighs',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/CoxasRobustas.png"),
 	},
@@ -66,7 +66,7 @@ var menbros = {
 		'speed':0.75,
 		'upgrade': {'hp':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'patas_encourasadas',
+		'data' : [[0,6], [2,2], [4,0]] , 'name':'Armored Paws',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/PatasEncouracadas.png"),
 	},
@@ -77,7 +77,7 @@ var menbros = {
 		'speed':0.5,
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'tentaculos_espinhosos',
+		'data' : [[0,5], [2,2], [4,5]] , 'name':'Spiky Tentacles',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/TentaculoEspinhoso.png"),
 	},
@@ -86,7 +86,7 @@ var menbros = {
 		'dmg':1.5,
 		'upgrade': {'dmg':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'patas_perigosas',
+		'data' : [[0,3], [2,3], [4,5]] , 'name':'Fearsome Fingers',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/PatasPerigossas.png"),
 	},
@@ -96,7 +96,7 @@ var menbros = {
 		'dmg':1.25,
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'garras_galantes',
+		'data' : [[0,4], [2,3], [4,4]] , 'name':'Handsome Claws',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/GarrasGalantes.png"),
 	},
@@ -107,7 +107,7 @@ var menbros = {
 		'dmg':0.75,
 		'upgrade': {'atkspeed':0.15},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'cutucao_relampago',
+		'data' : [[1,3], [3,3], [5,5]] , 'name':'Lightning Poke',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/CutucaoRelampago.png"),
 	},
@@ -118,18 +118,18 @@ var menbros = {
 		'dmg':1.0,
 		'upgrade': {'dmg': 0.05, 'range': 0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'braco_arremesador',
+		'data' : [[1,4], [3,3], [5,2]] , 'name':'Throwing Arm',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/BracoArremssador.png"),
 	},
 	'membro_espigao':{
 		'img':load("res://sprite/menbros/MembroEspigao.png"),
-		'range': 1.0,
-		'atkspeed':1.0,
-		'dmg':1.0,
+		'range': 1.1,
+		'atkspeed':1.1,
+		'dmg':1.1,
 		'upgrade': {'atkspeed': 0.05, 'dmg': 0.05, 'range': 0.05},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'membro_espigao',
+		'data' : [[1,3], [3,3], [5,3]] , 'name':'Spear Hands',
 		'description':'',
 		'icone':load("res://sprite/IconesMembros/MembroEspigao.png"),
 	}
@@ -143,8 +143,8 @@ var corpo = {
 		'hp':1.5,
 		'upgrade': {'hp':0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'carapaca_firme',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Toguh Carapace',
+		'description':'Increases HP by 50%',
 		'icone':load("res://sprite/IconesCorpo/CarapacaFirme.png"),
 	},
 	'metabolismo_avancado':{
@@ -152,7 +152,7 @@ var corpo = {
 		'regen_time':7.0,
 		'upgrade': {'regen_time':-1.0},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'metabolismo_avancado',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Advanced Metabolism',
 		'description':'',
 		'icone':load("res://sprite/IconesCorpo/MetabolismoAvancado.png"),
 	},
@@ -160,16 +160,16 @@ var corpo = {
 		'xpmult':1.25,
 		'upgrade': {'xpmult':0.05},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'cerebro_avantajado',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Super Brain',
+		'description':'Increases your XP gained by 25%',
 		'icone':load("res://sprite/IconesCorpo/CerebroAvantajado.png"),
 	},
 	'escama_reflexiva':{
 		'react_dmg' : 1.0,
 		'upgrade': {'react_dmg':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'escama_reflexiva',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Mirrored Scales',
+		'description':'Reflect 10% of your damage when attacked',
 		'icone':load("res://sprite/IconesCorpo/EscudoReflexivo.png"),
 	},
 	'esqueleto_metalico':{
@@ -177,8 +177,8 @@ var corpo = {
 		'hp' : 2.0,
 		'upgrade': {'hp':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'esqueleto_metalico',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Metalic Skeleton',
+		'description':'Halves speed, doubles HP',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoMetalico.png"),
 	},
 	'esqueleto_oco':{
@@ -186,32 +186,32 @@ var corpo = {
 		'hp' : 0.5,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'esqueleto_oco',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Hollow Bones',
+		'description':'Halves HP, doubles speed',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoOco.png"),
 	},
 	'corpo_aerodinamico':{
 		'speed' : 1.5,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'corpo_aerodinamico',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Aerodynmic Body',
+		'description':'Increases speed by 50%',
 		'icone':load("res://sprite/IconesCorpo/CorpoAerodinamico.png"),
 	},
 	'pernas_farpadas':{
 		'atkspeed':1.2,
 		'upgrade': {'atkspeed':0.04},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'pernas_farpadas',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Barbed Arrows',
+		'description':'Adds 20% to your attack speed',
 		'icone':load("res://sprite/IconesCorpo/PenasEnfarpadas.png"),
 	},
 	'estomago_duplo':{
 		'hppickup' : 1.25,
 		'upgrade': {'hppickup':0.1},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'estomago_duplo',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Double Intestines',
+		'description':'Increases amount of HP restored when eating',
 		'icone':load("res://sprite/IconesCorpo/EstomagoDuplo.png"),
 	},
 	'carapa_instantanea':{
@@ -219,8 +219,8 @@ var corpo = {
 		'invunerabilitychance' : 1.15,
 		'upgrade': {'invunerabilitychance':0.3, 'invunerability':0.5},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'carapa_instantanea',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Instant Shell',
+		'description':'You have a 15% chance to ignore damage',
 		'icone':load("res://sprite/IconesCorpo/CarapacaInstantanea.png"),
 	},
 	'mordida_vampirica':{
@@ -228,23 +228,23 @@ var corpo = {
 		'stealhp' : 0.1,
 		'upgrade': {'stealhp': 0.02,'hpsteal' : 0.01,},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'mordida_vampirica',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Vampiric Bite',
+		'description':'You have a 10% chance to restore HP when hitting an enemy',
 		'icone':load("res://sprite/IconesCorpo/MordidaVampirica.png"),
 	},
 #	'olhos_admirantes':{
 #		'camzoom' : 1.5,
 #		'upgrade': {},
 #		'level':1,
-#		'data' : [[0,0], [0,0], [0,0]] , 'name':'olhos_admirantes',
+#		'data' : [[0,0], [0,0], [0,0]] , 'name':'Alluring Eyes',
 #		'icone':load(),
 #	},
 	'instinto_esquivador':{
 		'invunerabilitychancemult' : 1.01,
 		'upgrade': {},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'instinto_esquivador',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Dodging Instinct',
+		'description':'You have a chance, depending on your speed, to ignore damage',
 		'icone':load("res://sprite/IconesCorpo/InstintoEsquivador.png"),
 	},
 	'espora_critica':{
@@ -252,8 +252,8 @@ var corpo = {
 		'critical_dmg' : 2.0,
 		'upgrade': {},
 		'level':1,
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'espora_critica',
-		'description':'',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'Critical Spores',
+		'description':'Your attacks have a chance to deal double damage',
 		'icone':load("res://sprite/IconesCorpo/EsporaCritica.png"),
 	},
 }

+ 3 - 2
ui/Button.tscn

@@ -52,9 +52,9 @@ flat = true
 
 [node name="Label" type="Label" parent="."]
 margin_left = -275.0
-margin_top = -1.0
+margin_top = 2.0
 margin_right = -6.0
-margin_bottom = 63.0
+margin_bottom = 62.0
 custom_fonts/font = ExtResource( 4 )
 text = "stuff"
 align = 1
@@ -65,6 +65,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 custom_fonts/font = ExtResource( 4 )
 align = 1
+autowrap = true
 
 [node name="ColorRect" type="ColorRect" parent="Label"]
 show_behind_parent = true