Updated the visuals with new ideas

akirbaes · Aug 25, 2019 · 7e0fc8b · 7e0fc8b
1 parent b319a4d
commit 7e0fc8b
Show file tree

Hide file tree

Showing 46 changed files with 29 additions and 17 deletions.
diff --git a/constants.py b/constants.py
@@ -51,4 +51,4 @@ def lc():
 font2=pygame.font.Font("freesansbold.ttf",12)
 
 
-colors=( (255,0,0),(255,255,0),(0,255,0),(0,255,255),(0,0,255),(255,0,255),(255,255,255) )
+colors=( (0,255,255),(0,180,0),(200,100,0),(150,100,50),(100,80,50),(80,50,20),(70,40,10) )
diff --git a/game_system.py b/game_system.py
@@ -148,11 +148,10 @@ def draw(self,screen):
 					color=(0,0,0)
 					pygame.draw.rect(screen, color,        (gx+ts*j,  gy+ts*i,   ts, ts))
 				else:
-					color=tuple(a*(j+1)/12 for a in colors[i]) 
+					color=tuple(a*(j+3)/14 for a in colors[i]) 
+					pygame.draw.rect(screen, color,        (gx+ts*j,  gy+ts*i,   ts, ts))
 					if(i==6):
 						screen.blit(gradtile, (gx+j*ts, gy+i*ts))
-					else:
-						pygame.draw.rect(screen, color,        (gx+ts*j,  gy+ts*i,   ts, ts))
 				if(data[i][j]=="D"):
 					screen.blit(boostdown, (gx+j*ts, gy+i*ts))
 				elif(data[i][j]=="U"):
@@ -200,14 +199,21 @@ def draw(self,screen):
 		#pygame.draw.rect(screen, (0,0,0), ((0,gy+ts*2.5),(ts*1.5,gy+gh)))
 
 		if(self.show):
-			if(self.jumpers>0):
-				for i in range(self.jumpers):
-					screen.blit(boostnote,(ts/2,wh+i*ts*1.5-5*ts))
+			if(self.jumpers>=0):
+				for i in range(3):
+					if(i<self.jumpers):
+						screen.blit(boostnote,(ts/2,wh+i*ts*1-5.5*ts))
+					else:
+						screen.blit(boost_socket,(ts/2,wh+i*ts*1-5.5*ts))
+
 			elif(self.jumpers==-1):
 				screen.blit(infinity,(ts/2,wh-5.5*ts))
 
-			for v in range(self.life):
-				screen.blit(heartsurf, (ts*v,ts))
+			for v in range(3):
+				if(v<self.life):
+					screen.blit(heartsurf, (ts*v,ts))
+				else:
+					screen.blit(emptyheartsurf, (ts*v,ts))
 			screen.blit(leveltitle,(ww/2,0))
 			screen.blit(scoretitle,(ww/2,ts))
 			screen.blit(boosttitle,(ts/2,4*ts))

diff --git a/graphics/bonus.png → graphics/bonus - Copie.png b/graphics/bonus.png → graphics/bonus - Copie.png
diff --git a/graphics/bonus_carrot.png b/graphics/bonus_carrot.png
diff --git a/graphics/boost_icon.png b/graphics/boost_icon.png
diff --git a/graphics/boost_new_design_2.gal b/graphics/boost_new_design_2.gal
diff --git a/graphics/boost_socket.png b/graphics/boost_socket.png
diff --git a/graphics/boosting.png b/graphics/boosting.png
diff --git a/graphics/boosting_up.png b/graphics/boosting_up.png
diff --git a/graphics/boostnote.png b/graphics/boostnote.png
diff --git a/graphics/boostup.png b/graphics/boostup.png
diff --git a/graphics/heart.png b/graphics/heart.png
diff --git a/graphics/heart_empty.png b/graphics/heart_empty.png
diff --git a/graphics/icon.ico b/graphics/icon.ico
diff --git a/graphics/infinity.png b/graphics/infinity.png
diff --git a/graphics/item_boost.png b/graphics/item_boost.png
diff --git a/graphics/mole0000.png b/graphics/mole0000.png
diff --git a/graphics/mole0001.png b/graphics/mole0001.png
diff --git a/graphics/mole0002.png b/graphics/mole0002.png
diff --git a/graphics/molechar.gif b/graphics/molechar.gif
diff --git a/graphics/natural_boostup.png b/graphics/natural_boostup.png
diff --git a/graphics/unused_boost.png b/graphics/unused_boost.png
diff --git a/graphics/work/bonus.png b/graphics/work/bonus.png
diff --git a/graphics/work/bonus_heart.png b/graphics/work/bonus_heart.png
diff --git a/graphics/work/boost_new_design.gal b/graphics/work/boost_new_design.gal
diff --git a/graphics/work/boosting.png b/graphics/work/boosting.png
diff --git a/graphics/work/heart - Copie (2).png b/graphics/work/heart - Copie (2).png
diff --git a/graphics/work/heart.png b/graphics/work/heart.png
diff --git a/graphics/work/heart__empty.png b/graphics/work/heart__empty.png
diff --git a/graphics/work/heart__empty_w.png b/graphics/work/heart__empty_w.png
diff --git a/graphics/work/icon.ico b/graphics/work/icon.ico
diff --git a/graphics/work/infiniboost.png b/graphics/work/infiniboost.png
diff --git a/graphics/work/infiniboost_slot.png b/graphics/work/infiniboost_slot.png
diff --git a/graphics/work/infinity.png b/graphics/work/infinity.png
diff --git a/graphics/work/new_boost0002.png b/graphics/work/new_boost0002.png
diff --git a/graphics/work/new_boost0005.png b/graphics/work/new_boost0005.png
diff --git a/graphics/work/new_boost0010.png b/graphics/work/new_boost0010.png
diff --git a/graphics/work/new_boost0012.png b/graphics/work/new_boost0012.png
diff --git a/graphics/work/new_boost0013.png b/graphics/work/new_boost0013.png
diff --git a/graphics/work/new_boost0014.png b/graphics/work/new_boost0014.png
diff --git a/graphics/work/orange_heart.png b/graphics/work/orange_heart.png
diff --git a/graphics/twodots.png → graphics/work/twodots.png b/graphics/twodots.png → graphics/work/twodots.png
diff --git a/levels/level0.rawdata b/levels/level0.rawdata
@@ -1,4 +1,4 @@
-0
+1
 abcdefghijk
 123456789GH
 0123456789G

diff --git a/levels/test.rawdata b/levels/test.rawdata
@@ -1,4 +1,4 @@
-0
+1
 Map has a name : Test
 11 7
 000000000D0

diff --git a/sprites_load.py b/sprites_load.py
@@ -25,15 +25,18 @@
 boostingsurf= pygame.image.load(os.path.join('graphics', 'boosting.png'))
 #boostingsurf.convert_alpha(screen)
 heartsurf= pygame.image.load(os.path.join("graphics", "heart.png"))
+emptyheartsurf= pygame.image.load(os.path.join("graphics", "heart_empty.png"))
 #heartsurf.convert_alpha(screen)
-lifevial=pygame.image.load(os.path.join("graphics","bonus.png"))
+lifevial=pygame.image.load(os.path.join("graphics","bonus_carrot.png"))
 #lifevial.convert_alpha(screen)
 starsurf=pygame.image.load(os.path.join("graphics", "star.png"))
 #starsurf.convert_alpha(screen)
 infinity=pygame.image.load(os.path.join("graphics", "infinity.png"))
 #infinity.convert_alpha(screen)
-boostnote=pygame.image.load(os.path.join("graphics", "boostnote.png"))
+boostnote=pygame.image.load(os.path.join("graphics", "boost_icon.png"))
 #boostnote.convert_alpha(screen)
+boost_socket=pygame.image.load(os.path.join("graphics", "boost_socket.png"))
+boost_icon=pygame.image.load(os.path.join("graphics", "boost_icon.png"))
 
 marker=pygame.image.load(os.path.join("graphics","marker.png"))
 #marker.convert_alpha(screen)
@@ -42,9 +45,11 @@
 scoretitle=myfont.render("Score :", False, (255,255,255))
 boosttitle=font2.render("Boost",False,(255,255,255))
 
-gradtile=pygame.Surface((ts,ts))
-for i in range(ts):
-	pygame.draw.line(gradtile, (128-i*128/ts,128-i*128/ts,128-i*128/ts), (0,i),(ts,i))
+gradtile=pygame.Surface((ts,ts), pygame.SRCALPHA)
+for j in range(ts):
+	for i in range(ts):
+		gradtile.set_at((i,j),(0,0,0,(j/ts)**1.5*260*(j%2)*(i%2)))
+		#pygame.draw.line(gradtile, (0,0,0,128-i*128/ts), (0,i),(ts,i))
 
 def reload_character():
 	datafile=open(os.path.join("levels","level0.rawdata"))

diff --git a/spt.py b/spt.py
@@ -181,10 +181,11 @@ def puzzle_loop(screen,clock):
 							mode="Puzzle"
 							loader._load(puzzle_list[current-1])
 							loader.init_level()
-							loader.jumpers=-1
+							loader.jumpers=-1 #for the initial frame
 							step=0
 		elif mode=="Puzzle":
 			loader.draw(screen)
+			loader.jumpers=-1
 			loader.life=3
 			screen.blit(quitmessage,(0,0))
 			screen.blit(startmessage,(0,ts/2))