diff --git a/edge_base/blasphemer/scripts/attacks.ddf b/edge_base/blasphemer/scripts/attacks.ddf index d8306a81d..892f9fe71 100644 --- a/edge_base/blasphemer/scripts/attacks.ddf +++ b/edge_base/blasphemer/scripts/attacks.ddf @@ -292,11 +292,11 @@ STATES(DEATH)=FX03:A:0:BRIGHT:DLIGHT_SET(200), #REMOVE; [PLAYER_TOMED_CROSSBOW_L] -TEMPLATE=PLAYER_CROSSBOW; +TEMPLATE=PLAYER_TOMED_CROSSBOW; ANGLE_OFFSET=5; [PLAYER_TOMED_CROSSBOW_R] -TEMPLATE=PLAYER_CROSSBOW; +TEMPLATE=PLAYER_TOMED_CROSSBOW; ANGLE_OFFSET=-5; [PLAYER_TOMED_ARROW_R] diff --git a/edge_base/blasphemer/scripts/weapons.ddf b/edge_base/blasphemer/scripts/weapons.ddf index ec3cbf284..771063ba5 100644 --- a/edge_base/blasphemer/scripts/weapons.ddf +++ b/edge_base/blasphemer/scripts/weapons.ddf @@ -15,7 +15,7 @@ FREE=TRUE; BINDKEY=1; PRIORITY=0; ATTACK=PLAYER_STAFF; -//HIT_SOUND=STFHIT; +Y_ADJUST=-10; STATES(UP)=STFF:A:1:NORMAL:RAISE; STATES(DOWN)=STFF:A:1:NORMAL:LOWER; STATES(READY)=STFF:A:1:NORMAL:READY; @@ -31,7 +31,7 @@ NO_CHEAT=TRUE; BINDKEY=1; PRIORITY=0; ATTACK=PLAYER_STAFF_TOMED; - +Y_ADJUST=-10; STATES(UP)=STFF:D:1:BRIGHT:RAISE; STATES(DOWN)=STFF:D:1:BRIGHT:LOWER; STATES(READY)= @@ -60,15 +60,17 @@ START_SOUND=GNTACT; ENGAGED_SOUND=GNTFUL; HIT_SOUND=GNTHIT; FEEDBACK=TRUE; +Y_ADJUST=-15; STATES(UP)=GAUN:A:1:NORMAL:RAISE; STATES(DOWN)=GAUN:A:1:NORMAL:LOWER; STATES(READY)=GAUN:A:4:NORMAL:READY, GAUN:A:4:NORMAL:READY; -STATES(ATTACK)=GAUN:D:0:NORMAL:KILLSOUND, + +STATES(ATTACK)=GAUN:D:0:NORMAL:PLAYSOUND(GNTUSE), //only played once on initial keypress... GAUN:D:0:NORMAL:NOTHING, GAUN:D:4:BRIGHT:SHOOT, GAUN:E:4:NORMAL:SHOOT, - GAUN:F:4:BRIGHT:REFIRE; + GAUN:F:4:BRIGHT:REFIRE_TO(ATTACK:2); //Here we loop back, but not to the GNTUSE sfx ;) [GAUNTLETS_TOMED] @@ -83,17 +85,18 @@ START_SOUND=GNTACT; ENGAGED_SOUND=GNTFUL; HIT_SOUND=GNTPOW; FEEDBACK=TRUE; +Y_ADJUST=-15; STATES(UP)=GAUN:G:1:NORMAL:RAISE; STATES(DOWN)=GAUN:G:1:NORMAL:LOWER; STATES(READY)= GAUN:G:4:NORMAL:READY, GAUN:H:4:NORMAL:READY, GAUN:I:4:NORMAL:READY; -STATES(ATTACK)=GAUN:L:0:NORMAL:KILLSOUND, +STATES(ATTACK)=GAUN:L:0:NORMAL:PLAYSOUND(GNTUSE), GAUN:L:0:NORMAL:NOTHING, GAUN:L:4:BRIGHT:SHOOT, GAUN:M:4:NORMAL:SHOOT, - GAUN:N:4:BRIGHT:REFIRE; + GAUN:N:4:BRIGHT:REFIRE_TO(ATTACK:2); [ELF_WAND] @@ -105,6 +108,7 @@ PRIORITY=3; KICK=0.005; FREE=TRUE; ATTACK=PLAYER_WAND; +Y_ADJUST=-10; STATES(UP)=GWND:A:1:NORMAL:RAISE; STATES(DOWN)=GWND:A:1:NORMAL:LOWER; STATES(READY)=GWND:A:1:NORMAL:READY; @@ -125,6 +129,7 @@ NO_CHEAT=TRUE; BINDKEY=2; PRIORITY=3; KICK=0.005; +Y_ADJUST=-10; STATES(UP)=GWND:A:1:NORMAL:RAISE; STATES(DOWN)=GWND:A:1:NORMAL:LOWER; STATES(READY)=GWND:A:1:NORMAL:READY; @@ -152,7 +157,7 @@ BINDKEY=3; PRIORITY=4; KICK=0.05; ATTACK=PLAYER_CROSSBOW; - +Y_ADJUST=-14; STATES(UP)=CRBW:A:1:NORMAL:RAISE; STATES(DOWN)=CRBW:A:1:NORMAL:LOWER; STATES(READY)=CRBW:A:4:NORMAL:READY, @@ -180,7 +185,7 @@ BINDKEY=3; PRIORITY=4; KICK=0.05; ATTACK=PLAYER_TOMED_CROSSBOW; - +Y_ADJUST=-14; STATES(UP)=CRBW:A:1:NORMAL:RAISE; STATES(DOWN)=CRBW:A:1:NORMAL:LOWER; STATES(READY)=CRBW:A:4:NORMAL:READY, @@ -212,6 +217,7 @@ BINDKEY=4; PRIORITY=5; ATTACK=PLAYER_CLAW; KICK=0.02; +Y_ADJUST=-9; STATES(UP)=BLSR:A:1:NORMAL:RAISE; STATES(DOWN)=BLSR:A:1:NORMAL:LOWER; STATES(READY)=BLSR:A:1:NORMAL:READY; @@ -241,6 +247,7 @@ BINDKEY=4; PRIORITY=5; ATTACK=PLAYER_TOMED_CLAWBALL; KICK=0.02; +Y_ADJUST=-9; STATES(UP)=BLSR:A:1:NORMAL:RAISE; STATES(DOWN)=BLSR:A:1:NORMAL:LOWER; STATES(READY)=BLSR:A:1:NORMAL:READY; @@ -266,6 +273,7 @@ AUTOMATIC=TRUE; BINDKEY=5; PRIORITY=6; ATTACK=PLAYER_HELLSTAFF; +Y_ADJUST=-14; STATES(UP)=HROD:A:1:NORMAL:RAISE; STATES(DOWN)=HROD:A:1:NORMAL:LOWER; STATES(READY)=HROD:A:1:NORMAL:READY; @@ -282,6 +290,7 @@ NO_CHEAT=TRUE; BINDKEY=5; PRIORITY=6; ATTACK=PLAYER_HELLSTAFF_TOMED; +Y_ADJUST=-15; STATES(UP)=HROD:A:1:NORMAL:RAISE; STATES(DOWN)=HROD:A:1:NORMAL:LOWER; STATES(READY)=HROD:A:1:NORMAL:READY; @@ -306,6 +315,7 @@ PRIORITY=7; DANGEROUS=TRUE; ATTACK=PLAYER_PHOENIX; KICK=0.2; +Y_ADJUST=-14; STATES(UP)=PHNX:A:1:NORMAL:RAISE; STATES(DOWN)=PHNX:A:1:NORMAL:LOWER; STATES(READY)=PHNX:A:1:NORMAL:READY; @@ -324,6 +334,7 @@ BINDKEY=6; PRIORITY=7; ATTACK=PLAYER_PHOENIX_TOMED; KICK=0.2; +Y_ADJUST=-14; STATES(UP)=PHNX:A:1:NORMAL:RAISE; STATES(DOWN)=PHNX:A:1:NORMAL:LOWER; STATES(READY)=PHNX:A:1:NORMAL:READY; @@ -341,7 +352,7 @@ PRIORITY=8; DANGEROUS=TRUE; ATTACK=PLAYER_MACE; KICK=0.2; - +Y_ADJUST=-15; STATES(UP)=MACE:A:1:NORMAL:RAISE; STATES(DOWN)=MACE:A:1:NORMAL:LOWER; STATES(READY)=MACE:A:1:NORMAL:READY; @@ -370,7 +381,7 @@ PRIORITY=8; DANGEROUS=TRUE; ATTACK=PLAYER_MACE_TOMED; KICK=0.2; - +Y_ADJUST=-15; STATES(UP)=MACE:A:1:NORMAL:RAISE; STATES(DOWN)=MACE:A:1:NORMAL:LOWER; STATES(READY)=MACE:A:1:NORMAL:READY;