Skip to content

Commit

Permalink
Merge pull request #1 from UndeadZeratul/develop
Browse files Browse the repository at this point in the history 
Merge latest changes into main
  • Loading branch information
@UndeadZeratul
UndeadZeratul authored Jul 14, 2023
2 parents 8708883 + 611855c commit c376094
Show file tree
Hide file tree
Showing 214 changed files with 6,120 additions and 1,107 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Release PK3s

on:
push:
tags:
- "v*.*.*"

jobs:
buildAndRelease:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: build PK3
uses: montudor/action-zip@v1
with:
args: zip -r "icarus-innovations-improved-${{ github.ref_name }}.pk3" . -i graphics/* patches/* sounds/* sprites/* zscript/* CVARINFO DECALDEF.* GLDEFS.* KEYCONF LANGUAGE.* LICENSE MAPINFO MENUDEF README.* SNDINFO.* TEXTURES.* zscript.zs
- name: Release PK3
uses: softprops/action-gh-release@v0.1.7
with:
generate_release_notes: true
discussion_category_name: 'Releases'
files: ./*.pk3
5 changes: 0 additions & 5 deletions CREDITS.barracuda.txt
View file

This file was deleted.

11 changes: 0 additions & 11 deletions CREDITS.flamenwerfer77.txt
View file

This file was deleted.

13 changes: 0 additions & 13 deletions CREDITS.pd42.txt
View file

This file was deleted.

11 changes: 0 additions & 11 deletions CREDITS.six12.txt
View file

This file was deleted.

130 changes: 130 additions & 0 deletions CVARINFO
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
// Most of these are server variables so in a multiplayer session they can be synced to other players.
// Every weapon has a comment before its cvars based on its name in-game for organization. - [Ted]

// NOTE: Values need to either be -1, 0, 2, 4, 9, 14, 19, 24, 49, 99, 149 or 199 to work for the spawners!
// Anything else would require remaking the option values in the menus.
// They'll still function in-game correctly, but the menus won't properly display them.
// Stick to it please and have less bug reports to explain for pls. - [Ted]

server bool Flamer_PrettyLights = false;

// --------------------
// Weapons
// --------------------

// Barracuda
server bool barracuda_allowBackpacks = true;
server int barracuda_hunter_spawn_bias = 49;
server int barracuda_slayer_spawn_bias = 19;
server bool barracuda_persistent_spawning = false;

// Bitch LMG
server bool bitch_allowBackpacks = true;
server int bitch_chaingun_spawn_bias = 19;
server bool bitch_persistent_spawning = false;

// Fenris
server bool fenris_allowBackpacks = true;
server int fenris_thunderbuster_spawn_bias = 9;
server bool fenris_persistent_spawning = false;

// Flamenwerfer-77
server bool flamenwerfer_allowBackpacks = true;
server int flamenwerfer_launcher_spawn_bias = 9;
server int flamenwerfer_bfg_spawn_bias = 19;
server bool flamenwerfer_persistent_spawning = false;

// Frontiersman
server bool frontiersman_allowBackpacks = true;
server int frontiersman_hunter_spawn_bias = 24;
server int frontiersman_slayer_spawn_bias = 49;
server bool frontiersman_persistent_spawning = false;

// GFBlaster
server bool gfb9_allowBackpacks = true;
server int gfb9_pistol_spawn_bias = 9;
server bool gfb9_persistent_spawning = false;

// NCT
server bool nct_allowBackpacks = true;
server int nct_bfg_spawn_bias = 24;
server bool nct_persistent_spawning = false;

// Nyx
server bool nyx_allowBackpacks = true;
server int nyx_pistol_spawn_bias = 19;
server int nyx_hunter_spawn_bias = 49;
server bool nyx_persistent_spawning = false;

// PD-42
server bool pd42_allowBackpacks = true;
server int pd42_clipbox_spawn_bias = 14;
server bool pd42_persistent_spawning = false;

// Six-12
server bool six12_allowBackpacks = true;
server int six12_hunter_spawn_bias = 19;
server int six12_slayer_spawn_bias = 49;
server bool six12_persistent_spawning = false;

// UMP
server bool ump45_allowBackpacks = true;
server int ump45_clipbox_spawn_bias = 9;
server bool ump45_persistent_spawning = false;

// USP
server bool usp45_allowBackpacks = true;
server int usp45_pistol_spawn_bias = 9;
server bool usp45_persistent_spawning = false;


//------------
// Ammunition
//------------

// Flamenwerfer Gas Tank
server bool gastank_allowBackpacks = true;
server int gastank_rocket_spawn_bias = 14;
server int gastank_rocketbox_spawn_bias = 19;
server int gastank_battery_spawn_bias = 24;
server bool gastank_persistent_spawning = false;

// Nyx Magazine
server bool nyxmag_allowBackpacks = true;
server int nyxmag_shellbox_spawn_bias = 24;
server int nyxmag_clipmag_spawn_bias = 14;
server bool nyxmag_persistent_spawning = false;

// PD-42 Magazine
server bool pd42mag_allowBackpacks = true;
server int pd42mag_clipmag_spawn_bias = 9;
server bool pd42mag_persistent_spawning = false;

// Six-12 Shell Magazine
server bool six12shellmag_allowBackpacks = true;
server int six12shellmag_shell_spawn_bias = 9;
server bool six12shellmag_persistent_spawning = false;

// Six-12 Slug Magazine
server bool six12slugmag_allowBackpacks = true;
server int six12slugmag_slug_spawn_bias = 9;
server bool six12slugmag_persistent_spawning = false;

// UMP Magazine
server bool ump45mag_allowBackpacks = true;
server int ump45mag_clipmag_spawn_bias = 14;
server bool ump45mag_persistent_spawning = false;

// USP Magazine
server bool usp45mag_allowBackpacks = true;
server int usp45mag_clipmag_spawn_bias = 14;
server bool usp45mag_persistent_spawning = false;


//------------
// Items
//------------

// HEV Armour
server int hevarmour_spawn_bias = 19;
server bool hevarmour_persistent_spawning = false;
1 change: 0 additions & 1 deletion CVARINFO.txt
View file

This file was deleted.

22 changes: 22 additions & 0 deletions DECALDEF.fenris
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
decal FenrisScorchBlack
{
pic FNRSCR1
shade "00 00 00"
x-scale 0.02
y-scale 0.02
randomflipx
randomflipy
}

decal FenrisScorch
{
pic FNRSCR1
shade "93 D3 FF"
x-scale 0.025
y-scale 0.025
randomflipx
randomflipy
Fullbright
animator GoAway
LowerDecal "FenrisScorchBlack"
}
22 changes: 22 additions & 0 deletions DECALDEF.gfb9
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
decal GFBScorchBlack
{
pic GFBSCR1
shade "00 00 00"
x-scale 0.04
y-scale 0.04
randomflipx
randomflipy
}

decal GFBScorch
{
pic FNRSCR1
shade "44 D6 1D"
x-scale 0.05
y-scale 0.05
randomflipx
randomflipy
Fullbright
animator GoAway
LowerDecal "GFBScorchBlack"
}
7 changes: 7 additions & 0 deletions GLDEFS.fenris
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
PointLight ImpactBlueSmall
{
color 0.1 0.1 0.8
size 24
}

Object FenrisRayImpact { Frame TNT1 { Light ImpactBlueSmall } }
14 changes: 14 additions & 0 deletions KEYCONF
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
alias barracuda_reset_cvars "resetcvar barracuda_hunter_spawn_bias; resetcvar barracuda_slayer_spawn_bias; resetcvar barracuda_allowBackpacks; resetcvar barracuda_persistent_spawning;"
alias bitch_reset_cvars "resetcvar bitch_chaingun_spawn_bias; resetcvar bitch_allowBackpacks; resetcvar bitch_persistent_spawning;"
alias fenris_reset_cvars "resetcvar fenris_thunderbuster_spawn_bias; resetcvar fenris_allowBackpacks; resetcvar fenris_persistent_spawning;"
alias flamenwerfer_reset_cvars "resetcvar flamenwerfer_launcher_spawn_bias; resetcvar flamenwerfer_bfg_spawn_bias; resetcvar gastank_rocket_spawn_bias; resetcvar gastank_rocketbox_spawn_bias; resetcvar gastank_battery_spawn_bias; resetcvar flamenwerfer_allowBackpacks; resetcvar gastank_allowBackpacks; resetcvar flamenwerfer_persistent_spawning; resetcvar gastank_persistent_spawning;"
alias frontiersman_reset_cvars "resetcvar frontiersman_hunter_spawn_bias; resetcvar frontiersman_slayer_spawn_bias; resetcvar frontiersman_allowBackpacks; resetcvar frontiersman_persistent_spawning;"
alias gfb9_reset_cvars "resetcvar gfb9_pistol_spawn_bias; resetcvar gfb9_allowBackpacks; resetcvar gfb9_persistent_spawning;"
alias nct_reset_cvars "resetcvar nct_bfg_spawn_bias; resetcvar nct_allowBackpacks; resetcvar nct_persistent_spawning;"
alias nyx_reset_cvars "resetcvar nyx_pistol_spawn_bias; resetcvar nyxmag_clipmag_spawn_bias; resetcvar nyxmag_shellbox_spawn_bias; resetcvar nyx_allowBackpacks; resetcvar nyxmag_allowBackpacks; resetcvar nyx_persistent_spawning; resetcvar nyxmag_persistent_spawning;"
alias pd42_reset_cvars "resetcvar pd42_clipbox_spawn_bias; resetcvar pd42mag_clipmag_spawn_bias; resetcvar pd42_allowBackpacks; resetcvar pd42mag_allowBackpacks; resetcvar pd42_persistent_spawning; resetcvar pd42mag_persistent_spawning;"
alias six12_reset_cvars "resetcvar six12_hunter_spawn_bias; resetcvar six12_slayer_spawn_bias; resetcvar six12shellmag_shell_spawn_bias; resetcvar six12slugmag_slug_spawn_bias; resetcvar six12_allowBackpacks; resetcvar six12shellmag_allowBackpacks; resetcvar six12slugmag_allowBackpacks; resetcvar six12_persistent_spawning; resetcvar six12shellmag_persistent_spawning; resetcvar six12slugmag_persistent_spawning;"
alias ump45_reset_cvars "resetcvar ump45_clipbox_spawn_bias; resetcvar ump45mag_clipmag_spawn_bias; resetcvar ump45_allowBackpacks; resetcvar ump45mag_allowBackpacks; resetcvar ump45_persistent_spawning; resetcvar ump45mag_persistent_spawning;"
alias usp45_reset_cvars "resetcvar usp45_pistol_spawn_bias; resetcvar usp45mag_clipmag_spawn_bias; resetcvar usp45_allowBackpacks; resetcvar usp45mag_allowBackpacks; resetcvar usp45_persistent_spawning; resetcvar usp45mag_persistent_spawning;"

alias Icarus_Reset_Cvars "barracuda_reset_cvars; bitch_reset_cvars; fenris_reset_cvars; flamenwerfer_reset_cvars; frontiersman_reset_cvars; gfb9_reset_cvars; nct_reset_cvars; nyx_reset_cvars; pd42_reset_cvars; six12_reset_cvars; ump45_reset_cvars; usp45_reset_cvars;"
Loading

0 comments on commit c376094

Please sign in to comment.