main.py

@@ -87,10 +87,6 @@ def play(screen, clock, running, background, isblack, WIDTH, HEIGHT):
             for npc in objects[2]:
                 npc.update(pygame.key.get_pressed(), objects)
                 npc.draw(screen)
-            
-            if objects[1] ==[]:
-                objects[0][0].book.addspell('windslash')
-
         
         else:
             objects[0][0].book.hidden = not freeze

viecher.py

@@ -202,8 +202,6 @@ class MainCharacter(Fighter):
             moveto = mouse- vec(self.x, self.y)
             if self.book.current_sp == 'fireball':
                 weapon = Fireball('fb1', 100, self.x, self.y, moveto, 5)
-            elif self.book.current_sp == 'windslash':
-                weapon = Windslash('ws1', 100, self.x, self.y, moveto, 5)
             else:
                 return
             obj[3].append(weapon)
@@ -315,7 +313,7 @@ class Book():
         if spell not in self.sp_list:
             self.sp_list.append(spell)
             self.current_sp = spell
-            self.buttons.append(Button(200, self.buttons_height, 58, 50, f'{spell}_icon.png', 'medieval', 23, attributes=[spell], onclickFunction=self.update_spell))
+            self.buttons.append(Button(200, self.buttons_height, 58, 50, f'{spell}.png', 'medieval', 23, attributes=[spell], onclickFunction=self.update_spell))
             self.buttons_height += 100
 
     def update_spell(self, spell):
@@ -359,12 +357,10 @@ class Skeleton(Mobs):
 
 
 class Weapons(Objects):
-    def __init__(self, name, ms, sprite, x, y, moveto, damage, life_ticks) -> None:
+    def __init__(self, name, ms, sprite, x, y, moveto, damage) -> None:
         super().__init__(name, ms, sprite, x, y)
         self.moveto = moveto
         self.damage = damage
-        self.life_ticks= life_ticks
-        self.spawn_tick = pg.time.get_ticks()
         pos = vec(1,0)
         angle = pos.angle_to(moveto)
         with open(f'art/images/{sprite}') as i:
@@ -376,39 +372,33 @@ class Weapons(Objects):
             touches.hurt(self.damage, objects)
             self.hidden = True
             objects[3].remove(self)
-            
-    def move(self, objects):
+
+class Spells(Weapons):
+    def __init__(self, name, ms, sprite, x, y, moveto, damage) -> None:
+        super().__init__(name, ms, sprite, x, y, moveto, damage)
+
+class Fireball(Spells):
+    def __init__(self, name, ms, x, y, moveto, damage, sprite = 'fireball.png') -> None:
+        super().__init__(name, ms, sprite, x, y, moveto, damage)
+    
+    def move(self):
         self.moveto.scale_to_length(self.speed)
         self.x += self.moveto[0] / fps
         self.y += self.moveto[1] / fps
-        if pg.time.get_ticks() - self.spawn_tick > self.life_ticks:
-            self.hidden = True
-            objects[3].remove(self)
-
-class Spells(Weapons):
-    def __init__(self, name, ms, sprite, x, y, moveto, damage, life_ticks) -> None:
-        super().__init__(name, ms, sprite, x, y, moveto, damage, life_ticks)
-
-class Fireball(Spells):
-    def __init__(self, name, ms, x, y, moveto, damage, sprite = 'fireball.png', life_ticks=5000) -> None:
-        super().__init__(name, ms, sprite, x, y, moveto, damage, life_ticks)
     
     def update(self, objects):
-        self.move(objects)
+        self.move()
         self.die(objects, Mobs)
-
-class Windslash(Spells):
-    def __init__(self, name, ms, x, y, moveto, damage, sprite = 'windslash.png', life_ticks=150) -> None:
-        super().__init__(name, ms, sprite, x, y, moveto, damage, life_ticks)
-    
-    def update(self, objects):
-        self.move(objects)
-        self.die(objects, Mobs)
-
+        
 class Arrow(Weapons):
-    def __init__(self, name, ms, x, y, moveto, damage, sprite = 'arrow.png', life_ticks=5000) -> None:
-        super().__init__(name, ms, sprite, x, y, moveto, damage, life_ticks)
+    def __init__(self, name, ms, x, y, moveto, damage, sprite = 'arrow.png') -> None:
+        super().__init__(name, ms, sprite, x, y, moveto, damage)
+
+    def move(self):
+        self.moveto.scale_to_length(self.speed)
+        self.x += self.moveto[0] / fps
+        self.y += self.moveto[1] / fps
     
     def update(self, objects):
-        self.move(objects)
+        self.move()
         self.die(objects, MainCharacter)