several more fixes, now runs to the end but shot offset is wrong
This commit is contained in:
parent
7170552448
commit
907bd8318c
@ -713,7 +713,7 @@ blast = bullet_base.new{
|
|||||||
|
|
||||||
damage = 4,
|
damage = 4,
|
||||||
dx = 0, -- px/frame
|
dx = 0, -- px/frame
|
||||||
dy = 2,
|
dy = -2,
|
||||||
awaitcancel = false,
|
awaitcancel = false,
|
||||||
|
|
||||||
-- disable damage for 2 frames
|
-- disable damage for 2 frames
|
||||||
@ -807,7 +807,8 @@ function protron_gun_e:actually_shoot(x, y)
|
|||||||
b2:spawn_at(x,y)
|
b2:spawn_at(x,y)
|
||||||
end
|
end
|
||||||
local bup = self.munition.new{
|
local bup = self.munition.new{
|
||||||
dy=4*m
|
dx=0,
|
||||||
|
dy=4*m,
|
||||||
}
|
}
|
||||||
bup:spawn_at(x,y)
|
bup:spawn_at(x,y)
|
||||||
end
|
end
|
||||||
@ -1894,7 +1895,7 @@ powerup = bullet_base.new{
|
|||||||
-- easy to pick up
|
-- easy to pick up
|
||||||
dx = 0,
|
dx = 0,
|
||||||
dy = 1.5, -- 0.75 after enemyspd
|
dy = 1.5, -- 0.75 after enemyspd
|
||||||
enemy = true, -- collides with player ship
|
category = enemy_blt_cat, -- collides with player ship
|
||||||
damage = 0,
|
damage = 0,
|
||||||
|
|
||||||
anim_speed = 2,
|
anim_speed = 2,
|
||||||
@ -1927,9 +1928,8 @@ repair = powerup.new{
|
|||||||
width = 12,
|
width = 12,
|
||||||
height = 12
|
height = 12
|
||||||
},
|
},
|
||||||
center_x_off = 4,
|
x_off = 4,
|
||||||
top_y_off = 0,
|
y_off = 0,
|
||||||
bottom_y_off = 0,
|
|
||||||
sprites = sheen8x8,
|
sprites = sheen8x8,
|
||||||
hitship = function(self, ship)
|
hitship = function(self, ship)
|
||||||
if (ship ~= primary_ship) return false
|
if (ship ~= primary_ship) return false
|
||||||
@ -1955,9 +1955,8 @@ gun_swap = powerup.new{
|
|||||||
height = 16
|
height = 16
|
||||||
},
|
},
|
||||||
-- gun = gun_type.new{}
|
-- gun = gun_type.new{}
|
||||||
center_x_off = 6,
|
x_off = 6,
|
||||||
top_y_off = 0,
|
y_off = 0,
|
||||||
bottom_y_off = 4,
|
|
||||||
width = 2,
|
width = 2,
|
||||||
height = 2,
|
height = 2,
|
||||||
sprites = {64, 66, 68, 70, 72, 74, 76, 78},
|
sprites = {64, 66, 68, 70, 72, 74, 76, 78},
|
||||||
|
Loading…
Reference in New Issue
Block a user