Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Majestic #6

Merged
merged 1 commit into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CREDITS.majestic
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Sounds:
- Magmacow
+ https://gamebanana.com/sounds/54036 (Hammer)
+ https://gamebanana.com/sounds/35140 (Battery Reload)
- Navaro
+ https://gamebanana.com/sounds/19952 (Everything else but the firing)
- Firing sound is taken from Bullet-Eye's Assassin Vulcan weapon.
- Charging is from Bullet-Eye's Triple Wyvern.

Sprites:
- Ibrahim Aysan (https://www.artstation.com/artwork/3orQlD), sprited by Mor'ladim.
11 changes: 11 additions & 0 deletions CVARINFO.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ server bool hammerhead_persistent_spawning = false;
server int jackdaw_vulcanette_spawn_bias = 49;
server bool jackdaw_persistent_spawning = false;

// Majestic
server int majestic_pistol_spawn_bias = 49;
server int majestic_hunter_spawn_bias = 9;
server int majestic_slayer_spawn_bias = 4;
server bool majestic_persistent_spawning = false;


//------------
// Ammunition
Expand All @@ -47,3 +53,8 @@ server bool blackjack355mag_persistent_spawning = false;
// Blackjack Shell Mag
server int blackjackshellmag_shell_spawn_bias = 14;
server bool blackjackshellmag_persistent_spawning = false;

// Majestic Magazine
server int majesticmag_clipmag_spawn_bias = 24;
server bool majesticmag_persistent_spawning = false;

56 changes: 56 additions & 0 deletions DECALDEF.majestic
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
decal MajesticBackScorch1
{
pic BFGSCRC1
shade "00 00 00"
randomflipx
randomflipy
x-scale 0.3
y-scale 0.3
}

decal MajesticBackScorch2
{
pic BFGSCRC2
shade "00 00 00"
randomflipx
randomflipy
x-scale 0.3
y-scale 0.3
}

decalgroup MajesticBackScorch
{
MajesticBackScorch1 1
MajesticBackScorch2 1
}


decal MajesticScorch1
{
pic BFGLITE1
shade "20 90 e0"
fullbright
randomflipx
x-scale 0.2
y-scale 0.2
animator BrontoAway
lowerdecal MajesticBackScorch
}

decal MajesticScorch2
{
pic BFGLITE2
shade "20 90 e0"
fullbright
randomflipy
x-scale 0.2
y-scale 0.2
animator BrontoAway
lowerdecal MajesticBackScorch
}

decalgroup MajesticScorch
{
MajesticScorch1 1
MajesticScorch2 1
}
7 changes: 4 additions & 3 deletions KEYCONF.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
alias blackhawk_reset_cvars "resetcvar blackhawk_launcher_spawn_bias; resetcvar blackhawkBolts_rocket_spawn_bias; resetcvar blackhawk_persistent_spawning; resetcvar blackhawkBolts_persistent_spawning;"
alias blackjack_reset_cvars "resetcvar blackjack_clipbox_spawn_bias; resetcvar blackjack355mag_clip_spawn_bias; blackjackshellmag_shell_spawn_bias; resetcvar blackjack_persistent_spawning; resetcvar blackjack355mag_persistent_spawning; resetcvar blackjackshellmag_persistent_spawning;"
alias gungnir_reset_cvars "resetcvar gungnir_bfg_spawn_bias; resetcvar blackhawkBolts_rocket_spawn_bias; resetcvar gungnir_persistent_spawning;"
alias blackhawk_reset_cvars "resetcvar blackhawk_launcher_spawn_bias; resetcvar blackhawkBolts_rocket_spawn_bias; resetcvar blackhawk_persistent_spawning; resetcvar blackhawkBolts_persistent_spawning;"
alias blackjack_reset_cvars "resetcvar blackjack_clipbox_spawn_bias; resetcvar blackjack355mag_clip_spawn_bias; blackjackshellmag_shell_spawn_bias; resetcvar blackjack_persistent_spawning; resetcvar blackjack355mag_persistent_spawning; resetcvar blackjackshellmag_persistent_spawning;"
alias gungnir_reset_cvars "resetcvar gungnir_bfg_spawn_bias; resetcvar blackhawkBolts_rocket_spawn_bias; resetcvar gungnir_persistent_spawning;"
alias hammerhead_reset_cvars "resetcvar hammerhead_chaingun_spawn_bias; resetcvar hammerhead_persistent_spawning;"
alias jackdaw_reset_cvars "resetcvar jackdaw_vulcanette_spawn_bias; resetcvar jackdaw_persistent_spawning;"
alias majestic_reset_cvars "resetcvar majestic_pistol_spawn_bias; resetcvar majestic_hunter_spawn_bias; resetcvar majestic_slayer_spawn_bias; resetcvar majesticmag_clipmag_spawn_bias; resetcvar majestic_persistent_spawning; resetcvar majesticmag_persistent_spawning;"
35 changes: 35 additions & 0 deletions MENUDEF.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,39 @@ OptionValue "SpawnBias" {

// Pistols

OptionMenu "majesticSpawning" {
Title "------ 'Majestic' .500 S&W Railgun Options ------"
StaticText "Notice:", "cyan"
StaticText "Setting 'spawn rate' to Replace All will suppress", "white"
StaticText "spawns of that given type.", "white"
StaticText ""

StaticText "Spawn Options", "cyan"
StaticText "Control the spawn rate of the Majestic on:", "white"
Option "Pistols: ", "majestic_pistol_spawn_bias", "SpawnBias"
SafeCommand "Reset Pistol option", "resetcvar majestic_pistol_spawn_bias"
Option "Hunter shotguns: ", "majestic_hunter_spawn_bias", "SpawnBias"
SafeCommand "Reset Hunter option", "resetcvar majestic_hunter_spawn_bias"
Option "Slayer shotguns: ", "majestic_slayer_spawn_bias", "SpawnBias"
SafeCommand "Reset Slayer option", "resetcvar majestic_slayer_spawn_bias"
StaticText ""

StaticText "Control the spawn rate of the Majestic's Magazine on:", "white"
Option "Clip Magazines: ", "majesticmag_clipmag_spawn_bias", "SpawnBias"
SafeCommand "Reset Clip Magazine option", "resetcvar majesticmag_clipmag_spawn_bias"
StaticText ""

StaticText "Control whether replacements happen after a mapload.", "white"
Option "Persistent Spawns (Gun): ", "majestic_persistent_spawning", "OnOff"
Option "Persistent Spawns (Magazine): ", "majesticmag_persistent_spawning", "OnOff"
SafeCommand "Reset persistence options", "resetcvar majestic_persistent_spawning; majesticmag_persistent_spawning"
StaticText ""
StaticText ""

StaticText "Reset Options", "cyan"
SafeCommand "Reset all options", "majestic_reset_cvars"
}


// Shotguns

Expand Down Expand Up @@ -174,6 +207,8 @@ OptionMenu "AceCorpsMenu" {

StaticText "--- Pistols ---", "yellow"
StaticText ""
Submenu "'Majestic' .500 S&W Railgun", "majesticSpawning", 0, 1
StaticText ""

StaticText "--- Shotguns ---", "red"
StaticText ""
Expand Down
8 changes: 8 additions & 0 deletions SNDINFO.majestic
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Majestic/Fire "Sounds/MajesticFire.ogg"
Majestic/MagOut "Sounds/MajesticMagOut.wav"
Majestic/MagIn "Sounds/MajesticMagIn.wav"
Majestic/Eject "Sounds/MajesticMagEject.wav"
Majestic/Charge "Sounds/MajesticCharge.ogg"
Majestic/Hammer "Sounds/MajesticHammer.wav"
Majestic/BatteryOut "Sounds/MajesticBatteryOut.ogg"
Majestic/BatteryIn "Sounds/MajesticBatteryIn.wav"
171 changes: 171 additions & 0 deletions TEXTURES.majestic
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// Texture definitions generated by SLADE3
// on Sun Jul 4 03:06:28 2021

Sprite "MJMGA0", 15, 10
{
Offset 9, 10
Patch "MJTCRND", -1, 7
Patch "MJTCRND", -1, 0
Patch "MJTCRND", -1, 5
Patch "MJTCRND", -1, 2
Patch "MJTCMAGS", -21, 0
}

Sprite "MJMGB0", 14, 10
{
Offset 8, 10
Patch "MJTCMAGS", -22, 0
}

Graphic "MJMGC0", 21, 21
{
Patch "MJTCMAGS", 0, 0
}

Graphic "MJMGD0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
}

Graphic "MJMGE0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
Patch "MJTCRNDB", 3, 5
}

Graphic "MJMGF0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
Patch "MJTCRNDB", 3, 5
Patch "MJTCRNDB", 3, 11
}

Graphic "MJMGG0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
Patch "MJTCRNDB", 3, 5
Patch "MJTCRNDB", 3, 11
Patch "MJTCRNDB", 8, 14
}

Graphic "MJMGH0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
Patch "MJTCRNDB", 3, 5
Patch "MJTCRNDB", 3, 11
Patch "MJTCRNDB", 8, 14
Patch "MJTCRNDB", 13, 11
}

Graphic "MJMGI0", 21, 21
{
Patch "MJTCMAGS", 0, 0
Patch "MJTCRNDB", 8, 2
Patch "MJTCRNDB", 3, 5
Patch "MJTCRNDB", 3, 11
Patch "MJTCRNDB", 8, 14
Patch "MJTCRNDB", 13, 11
Patch "MJTCRNDB", 13, 5
}

Sprite "MJCGA0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -165, -128
Patch "MJSTCGA0", 0, 0
}

Sprite "MJCGB0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -165, -128
Patch "MJSTCGB0", 0, 0
}

Sprite "MJCGC0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -165, -128
Patch "MJSTCGC0", 0, 0
}

Sprite "MJCGD0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -165, -128
Patch "MJSTCGD0", 0, 0
}

Sprite "MJCGE0", 110, 156
{
XScale 1.200
YScale 1.400
Offset -144, -91
Patch "MJSTCGE0", 0, 0
}

Sprite "MJ2GA0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -130, -128
Patch "MJSTCGA0", 0, 0
{
FlipX
}
}

Sprite "MJ2GB0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -130, -128
Patch "MJSTCGB0", 0, 0
{
FlipX
}
}

Sprite "MJ2GC0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -130, -128
Patch "MJSTCGC0", 0, 0
{
FlipX
}
}

Sprite "MJ2GD0", 89, 119
{
XScale 1.200
YScale 1.400
Offset -130, -128
Patch "MJSTCGD0", 0, 0
{
FlipX
}
}

Sprite "MJ2GE0", 110, 156
{
XScale 1.200
YScale 1.400
Offset -130, -91
Patch "MJSTCGE0", 0, 0
{
FlipX
}
}

// End of texture definitions
Binary file added graphics/Majestic/MJTCBACK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/Majestic/MJTCFRNT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJSTCGA0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJSTCGB0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJSTCGC0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJSTCGD0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJSTCGE0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJTCMAGS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJTCRND.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patches/Majestic/MJTCRNDB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,12 @@ This mod aims to maintain and improve Accensus' Arsenal, by updating them to the
- Configuration codes are:
- `rapid`: Locks the weapon to hyperburst RoF, except it's full-auto.
- The weapon feeds ammo directly from any HDBackpack item (Backpacks, Ammo Pouches, Dimensional Storage Devices, etc.)

### Majestic
---
- The loadout codes are `maj` and `mjm` for the weapon and mag respectively.
- Configuration codes are:
- `accel`: Accelerator. Makes the gun charge a little faster.
#### Mechanics
- The weapon requires both a battery and a drum to fire a charged shot. Otherwise only a drum is required.
- Holding primary fire charges a shot. The higher the charge, the higher the projectile's velocity and explosion damage. Charging is not necessary and the gun can be quickfired in a pinch.
Binary file added sounds/Majestic/MajesticBatteryIn.wav
Binary file not shown.
Binary file added sounds/Majestic/MajesticBatteryOut.ogg
Binary file not shown.
Binary file added sounds/Majestic/MajesticCharge.ogg
Binary file not shown.
Binary file added sounds/Majestic/MajesticFire.ogg
Binary file not shown.
Binary file added sounds/Majestic/MajesticHammer.wav
Binary file not shown.
Binary file added sounds/Majestic/MajesticMagEject.wav
Binary file not shown.
Binary file added sounds/Majestic/MajesticMagIn.wav
Binary file not shown.
Binary file added sounds/Majestic/MajesticMagOut.wav
Binary file not shown.
Binary file added sprites/Majestic/MJCGY0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sprites/Majestic/MJCGZ0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions zscript.zs
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ version "4.10"
#include "zscript/accensus/weapons/Hammerhead/hammerhead.zs"

#include "zscript/accensus/weapons/Jackdaw/jackdaw.zs"

#include "zscript/accensus/weapons/Majestic/majestic.zs"
17 changes: 17 additions & 0 deletions zscript/accensus/SpawnHandler.zs
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ class AceCorpsWepsHandler : EventHandler {
wep_battery.push("HDHammerhead");
addAmmo('HDBattery', wep_battery);

// .500 S&W Light
Array<string> wep_500swl;
wep_500swl.push("HDMajestic");
addAmmo("HD500SWLightAmmo", wep_500swl);

// Blackhawk Bolts
Array<string> wep_bolts;
wep_bolts.push("HDBlackhawk");
Expand Down Expand Up @@ -210,6 +215,13 @@ class AceCorpsWepsHandler : EventHandler {
spawns_jackdaw.push(addItemEntry("Vulcanette", jackdaw_vulcanette_spawn_bias));
addItem("JackdawRandom", spawns_jackdaw, jackdaw_persistent_spawning);

// Majestic
Array<AceCorpsSpawnItemEntry> spawns_majestic;
spawns_majestic.push(addItemEntry("HDPistol", majestic_pistol_spawn_bias));
spawns_majestic.push(addItemEntry("Hunter", majestic_hunter_spawn_bias));
spawns_majestic.push(addItemEntry("Slayer", majestic_slayer_spawn_bias));
addItem("MajesticRandom", spawns_majestic, majestic_persistent_spawning);


//------------
// Ammunition
Expand All @@ -230,6 +242,11 @@ class AceCorpsWepsHandler : EventHandler {
spawns_blackjack_shellmag.push(addItemEntry("HDShellAmmo", blackjackshellmag_shell_spawn_bias));
addItem("HDBlackjackMagShells", spawns_blackjack_shellmag, blackjackshellmag_persistent_spawning);

// Majestic Magazine
Array<AceCorpsSpawnItemEntry> spawns_majesticmag;
spawns_majesticmag.push(addItemEntry("HD9mMag15", majesticmag_clipmag_spawn_bias));
addItem("HDMajesticMag", spawns_majesticmag, majesticmag_persistent_spawning);


// --------------------
// Item Spawns
Expand Down
Loading