Add files via upload

Author: JingShing

script/level.py

@@ -446,8 +446,8 @@ def camera_joystick_control(self, player):
             if player.joystick_camera:
                 if joystick.get_hat(0)[0]==-1:self.camera_rect.x -= self.keyboard_speed
                 if joystick.get_hat(0)[0]==1:self.camera_rect.x += self.keyboard_speed
-                if joystick.get_hat(0)[1]==-1:self.camera_rect.y -= self.keyboard_speed
-                if joystick.get_hat(0)[1]==1:self.camera_rect.y += self.keyboard_speed
+                if joystick.get_hat(0)[1]==1:self.camera_rect.y -= self.keyboard_speed
+                if joystick.get_hat(0)[1]==-1:self.camera_rect.y += self.keyboard_speed
         self.offset.x = self.camera_rect.left - self.camera_borders['left']
         self.offset.y = self.camera_rect.top - self.camera_borders['top']
 
@@ -486,7 +486,7 @@ def custom_draw(self, player):
             # screen.blit(sprite.image, offset_pos)
             if hasattr(sprite, 'type'):
                 if sprite.type == 'player':
-                    sprite.offset_pos = offset_pos
+                    sprite.offset_pos = sprite.rect.center - self.offset
             self.internal_surface.blit(sprite.image, offset_pos)
 
         scaled_surf  = pygame.transform.scale(self.internal_surface, self.internal_surface_size_vector * self.zoom_scale)

script/main.py

@@ -6,6 +6,13 @@ class Game:
     def __init__(self):
         # pygame setup
         pygame.init()
+        pygame.mouse.set_visible(False)
+
+        # cursor
+        self.cursor_image = pygame.image.load(resource_path('assets/graphics/UI/aim.png'))
+        self.cursor_image = pygame.transform.scale(self.cursor_image, (64, 64))
+        self.cursor_image_rect = self.cursor_image.get_rect()
+
         self.clock = pygame.time.Clock()
         # self.level = Level(level_data=no_enemy_level_map, surface=screen)
         self.level = Level(level_data=level_map, surface=screen)
@@ -51,7 +58,8 @@ def run(self):
                         # 5 - scroll down
 
             self.level.run()
-            
+            self.cursor_image_rect.center = pygame.mouse.get_pos()
+            screen.blit(self.cursor_image, self.cursor_image_rect)
             crt_shader()
             self.clock.tick(60)
 

script/weapon.py

@@ -1,6 +1,6 @@
 import pygame, numpy
 from random import randint
-from settings import resource_path, weapon_data, joystick
+from settings import resource_path, weapon_data, joystick, screen_height, screen_width
 import os
 
 class Weapon(pygame.sprite.Sprite):
@@ -82,6 +82,16 @@ def adjust_pos(self):
             if self.user.joystick_aim:
                 x = joystick.get_axis(2)
                 y = joystick.get_axis(3)
+                # aim pivot
+                aim_range = pygame.math.Vector2(x, y)
+                if aim_range.magnitude()!=0:
+                    aim_range.normalize()
+                aim_pos = user_pos + aim_range * 300
+                if aim_pos.x > screen_width: aim_pos.x = screen_width
+                elif aim_pos.x < 0: aim_pos.y = 0
+                if aim_pos.y > screen_height: aim_pos.y = screen_height
+                elif aim_pos.y < 0: aim_pos.y = 0
+                pygame.mouse.set_pos(aim_pos)
             else:
                 mouse_pos = pygame.mouse.get_pos()
                 x = mouse_pos[0] - user_pos[0]