Skip to content

Commit

Permalink
Merge pull request #8 from UndeadZeratul/main
Browse files Browse the repository at this point in the history
Boss Rifle Logic Update
UndeadZeratul authored Jul 16, 2023
2 parents 8d0f884 + 9b38c1d commit d48552f
Showing 16 changed files with 680 additions and 839 deletions.
17 changes: 17 additions & 0 deletions LANGUAGE
Original file line number Diff line number Diff line change
@@ -21,6 +21,23 @@ TAG_7MMSPEEDLOADER = "7.76mm Speed-Reloader Prototype";
TAG_DMS = "Medical Scanner";
TAG_GARANDCLIP = "M1 Garand clip";

// Pickup Messages
PICKUP_9MMBOSS = "You got the Boss Rifle! It's a bit greasy...";
PICKUP_4MMBOSS = "You got the Boss Rifle! Surprisingly light.";
PICKUP_BOSSMERG = "You got the Bossmerg 12 gauge Shotgun!";
PICKUP_5MMBOSS = "You got Hexadoken's Personal Boss Rifle!";
PICKUP_OMGBOSS = "You got the Boss bolt-action anti-materiel rifle!";
PICKUP_WORSTBOSS = "You found a... Boss Rifle, but it's the worst. Oh no...";

PICKUP_50OMGCLIP = "Picked up a .50 OMG clip.";

// Obituaries
OB_OMGBOSS = "%o sure showed %k who was the big boss!";

// Weapon Help Text
WEPHELP_WORSTBOSS = "You are beyond help.";
WEPHELP_WORSTBOSS_CC = "\cfMAN IS ONLY SEPARATED FROM THE HEAVENS\nBY THAT WHICH HE WILL NOT GUN.";

// Menu Titles
TITLE_9MMBOSSMENU = "------ 9mm Boss Rifle Options ------";
TITLE_4MMBOSSMENU = "------ 4.26mm Boss Rifle Options ------";
64 changes: 38 additions & 26 deletions TEXTURES
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Texture definitions generated by SLADE3
// on Friday Nov 4 12:16:33 2022
// on Sat Jul 15 16:32:47 2023

Sprite "BARGL0", 64, 89
{
@@ -87,15 +87,20 @@ Sprite "OCLPE0", 10, 15
Patch "OGBLA3A7", 1, 14
}

Sprite "OCLPF0", 10, 15
Sprite "OCLPF0", 15, 10
{
YScale 2.000
Offset 2, 15
Patch "CLIPA0", -7, 8
Patch "CLIPA0", -7, -1
Patch "CLIPA0", 8, 8
{
Rotate -90
}
Patch "CLIPA0", -1, 8
{
Rotate -90
}
}

// Bossmerg
Sprite "BORPA0", 66, 15
{
Offset 26, 15
@@ -327,29 +332,36 @@ Sprite "GCLPI0", 6, 14
Patch "GCLPZ0", 0, 0
}

sprite BOJGU0,64,116{
offset -115,-73
xscale 0.9
yscale 0.94
patch BOJGA0,0,0{}
Sprite "BOJGU0", 64, 116
{
XScale 0.900
YScale 0.940
Offset -115, -73
Patch "BOJGA0", 0, 0
}
sprite BOJGV0,64,116{
offset -115,-73
xscale 0.9
yscale 0.94
patch BOJGF0,0,0{}

Sprite "BOJGV0", 64, 116
{
XScale 0.900
YScale 0.940
Offset -115, -73
Patch "BOJGF0", 0, 0
}
sprite BOJGW0,64,116{
offset -115,-73
xscale 0.9
yscale 0.94
patch BOJGK0,0,0{}

Sprite "BOJGW0", 64, 116
{
XScale 0.900
YScale 0.940
Offset -115, -73
Patch "BOJGK0", 0, 0
}
sprite BOJGX0,64,116{
offset -115,-73
xscale 0.9
yscale 0.94
patch BOJGP0,0,0{}

Sprite "BOJGX0", 64, 116
{
XScale 0.900
YScale 0.940
Offset -115, -73
Patch "BOJGP0", 0, 0
}

Sprite "MEDIZ0", 28, 16
@@ -361,4 +373,4 @@ Sprite "MEDIZ0", 28, 16
}
}

// End of texture definitions
// End of texture definitions
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
7 changes: 7 additions & 0 deletions zscript.zsc
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Version "4.10"

const HDLD_4MMBOSS = "";
const HDLD_9MMBOSS = "";
const HDLD_BOSSER = "bas";
const HDLD_OMGBOSS = "bog";
const HDLD_5MMBOSS = "";
const HDLD_WORSTBOSS = "";

#include "zscript/Hexadoken/SpawnHandler.zsc"

#include "zscript/Hexadoken/Items/SpeedReloader.zsc"
Loading

0 comments on commit d48552f

Please sign in to comment.