Skip to content

Commit 82e95db

Browse files
hedgefoghedgefog
authored
Merge pull request #63 from Hedgefog/master
Release 6.4.0
2 parents 579fbfe + 6d51fbd commit 82e95db

File tree

68 files changed

+8416
-1669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+8416
-1669
lines changed

‎.amxxpack.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"compiler": {
3+
"version": "1.8.2",
4+
"dev": false,
5+
"addons": ["cstrike"]
6+
},
7+
"thirdparty": {
8+
"dependencies": [
9+
{
10+
"name": "reapi",
11+
"url": "https://github.com/s1lentq/reapi/releases/download/5.12.0.192/reapi_5.12.0.192-dev.zip"
12+
},
13+
{
14+
"name": "round-control",
15+
"url": "https://forums.alliedmods.net/attachment.php?attachmentid=158323&d=1477933599"
16+
}
17+
]
18+
},
19+
"include": [
20+
"./.compiler/include"
21+
],
22+
"input": {
23+
"scripts": "./src/scripts",
24+
"include": "./src/include",
25+
"assets": "./assets"
26+
},
27+
"output": {},
28+
"rules": {
29+
"flatCompilation": true
30+
}
31+
}

‎.amxxpack.reapi.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = Object.assign(require('./.amxxpack.json'), {
2+
include: [
3+
'./.compiler/include',
4+
'./.thirdparty/reapi/addons/amxmodx/scripting/include'
5+
],
6+
output: {
7+
plugins: './dist/reapi/addons/amxmodx/plugins',
8+
scripts: './dist/reapi/addons/amxmodx/scripting',
9+
include: './dist/reapi/addons/amxmodx/scripting/include',
10+
assets: './dist/reapi'
11+
}
12+
});

‎.amxxpack.vanilla.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = Object.assign(require('./.amxxpack.json'), {
2+
include: [
3+
'./.compiler/include',
4+
'./.thirdparty/round-control/roundcontrol_2.2/addons/amxmodx/scripting/include'
5+
],
6+
output: {
7+
plugins: './dist/vanilla/addons/amxmodx/plugins',
8+
scripts: './dist/vanilla/addons/amxmodx/scripting',
9+
include: './dist/vanilla/addons/amxmodx/scripting/include',
10+
assets: './dist/vanilla'
11+
}
12+
});

‎.github/FUNDING.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# These are supported funding model platforms
2+
3+
github: hedgefog
4+
ko_fi: hedgefog
5+
liberapay: hedgefog
6+
issuehunt: hedgefog

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@
1717
uses: actions/setup-node@v1
1818
with:
1919
node-version: 12
20-
- name: Install Zip
21-
uses: montudor/action-zip@v0.1.0
22-
- name: Download thirdparty
23-
run: |
24-
mkdir downloads
25-
wget https://www.amxmodx.org/release/amxmodx-1.8.2-base-linux.tar.gz -P ./downloads
26-
wget https://www.amxmodx.org/release/amxmodx-1.8.2-cstrike-linux.tar.gz -P ./downloads
27-
wget https://github.com/s1lentq/reapi/releases/download/5.12.0.192/reapi_5.12.0.192-dev.zip -P ./downloads
28-
wget 'https://svn.aghl.ru:8443/svn/s1lentq/!svn/ver/415/AMXX%20modules/RoundControl/AMXX%20Pawn/include/roundcontrol.inc' --no-check-certificate -P ./downloads
29-
wget 'https://svn.aghl.ru:8443/svn/s1lentq/!svn/ver/416/AMXX%20modules/RoundControl/bin/roundcontrol_amxx.dll' --no-check-certificate -P ./downloads
30-
wget 'https://svn.aghl.ru:8443/svn/s1lentq/!svn/ver/412/AMXX%20modules/RoundControl/bin/roundcontrol_amxx_i386.so' --no-check-certificate -P ./downloads
3120
- name: Setup Build Variables
3221
id: buildvars
3322
uses: actions/github-script@v3
@@ -45,18 +34,6 @@
4534
} catch (err) {
4635
core.setFailed(err.message);
4736
}
48-
- name: Setup compiler
49-
run: |
50-
mkdir ./compiler
51-
tar --strip-components=3 -zxf ./downloads/amxmodx-1.8.2-base-linux.tar.gz -C ./compiler addons/amxmodx/scripting
52-
tar --strip-components=3 -zxf ./downloads/amxmodx-1.8.2-cstrike-linux.tar.gz -C ./compiler addons/amxmodx/scripting
53-
mkdir -p ./thirdparty/reapi
54-
unzip ./downloads/reapi_5.12.0.192-dev.zip -d ./thirdparty/reapi
55-
mkdir -p ./thirdparty/round-control/addons/amxmodx/modules
56-
cp ./downloads/roundcontrol_amxx.dll ./thirdparty/round-control/addons/amxmodx/modules/roundcontrol_amxx.dll
57-
cp ./downloads/roundcontrol_amxx_i386.so ./thirdparty/round-control/addons/amxmodx/modules/roundcontrol_amxx_i386.so
58-
mkdir -p ./thirdparty/round-control/addons/amxmodx/scripting/include
59-
cp ./downloads/roundcontrol.inc ./thirdparty/round-control/addons/amxmodx/scripting/include/roundcontrol.inc
6037
- name: Install Dependencies
6138
run: npm install
6239
- name: Build project
@@ -80,8 +57,8 @@
8057
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8158
with:
8259
upload_url: ${{ steps.create_release.outputs.upload_url }}
83-
asset_path: ./dist/bundles/alliedmods/hwn-${{ steps.buildvars.outputs.tagversion }}-addons.zip
84-
asset_name: hwn-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip
60+
asset_path: ./dist/bundles/alliedmods/halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip
61+
asset_name: halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons-src.zip
8562
asset_content_type: application/zip
8663
- name: Upload Release Addons
8764
id: upload-release-addons
@@ -90,8 +67,8 @@
9067
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9168
with:
9269
upload_url: ${{ steps.create_release.outputs.upload_url }}
93-
asset_path: ./dist/bundles/full/hwn-${{ steps.buildvars.outputs.tagversion }}-addons.zip
94-
asset_name: hwn-${{ steps.buildvars.outputs.tagversion }}-addons.zip
70+
asset_path: ./dist/bundles/halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons.zip
71+
asset_name: halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons.zip
9572
asset_content_type: application/zip
9673
- name: Upload Release Addons ReAPI
9774
id: upload-release-addons-reapi
@@ -100,8 +77,8 @@
10077
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10178
with:
10279
upload_url: ${{ steps.create_release.outputs.upload_url }}
103-
asset_path: ./dist/bundles/full/hwn-${{ steps.buildvars.outputs.tagversion }}-addons-reapi.zip
104-
asset_name: hwn-${{ steps.buildvars.outputs.tagversion }}-addons-reapi.zip
80+
asset_path: ./dist/bundles/halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons-reapi.zip
81+
asset_name: halloween-mod-${{ steps.buildvars.outputs.tagversion }}-addons-reapi.zip
10582
asset_content_type: application/zip
10683
- name: Upload Release Resources
10784
id: upload-release-resources
@@ -110,8 +87,8 @@
11087
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11188
with:
11289
upload_url: ${{ steps.create_release.outputs.upload_url }}
113-
asset_path: ./dist/bundles/full/hwn-${{ steps.buildvars.outputs.tagversion }}-resources.zip
114-
asset_name: hwn-${{ steps.buildvars.outputs.tagversion }}-resources.zip
90+
asset_path: ./dist/bundles/halloween-mod-${{ steps.buildvars.outputs.tagversion }}-resources.zip
91+
asset_name: halloween-mod-${{ steps.buildvars.outputs.tagversion }}-resources.zip
11592
asset_content_type: application/zip
11693
- name: Upload Release SDK
11794
id: upload-release-sdk
@@ -120,8 +97,8 @@
12097
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12198
with:
12299
upload_url: ${{ steps.create_release.outputs.upload_url }}
123-
asset_path: ./dist/bundles/sdk/hwn-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
124-
asset_name: hwn-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
100+
asset_path: ./dist/bundles/sdk/halloween-mod-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
101+
asset_name: halloween-mod-${{ steps.buildvars.outputs.tagversion }}-sdk.zip
125102
asset_content_type: application/zip
126103
- name: Cleanup
127104
run: |

‎.gitignore‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
*.amxx
22
*.max
33
*.log
4-
*.amxp
5-
6-
*.user.*
74

85
node_modules/
96

10-
compiler/
11-
thirdparty/*/**
12-
137
dist/
14-
dist_reapi/
15-
bundles/
8+
.compiler/
9+
.thirdparty/

‎.vscode/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"amxxpawn.compiler.executablePath": "${workspaceRoot}/compiler/amxxpc.exe",
33
"amxxpawn.compiler.includePaths": [
4-
"${workspaceRoot}/compiler/include",
4+
"${workspaceRoot}/.compiler/include",
5+
"${workspaceRoot}/.thirdparty/reapi/addons/amxmodx/scripting/include",
6+
"${workspaceRoot}/.thirdparty/round-control/roundcontrol_2.2/addons/amxmodx/scripting/include",
57
"${workspaceRoot}/src/include"
68
]
79
}

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![Alt Text](./images/demo.gif)
22
### Halloween Mod for Counter-Strike 1.6
3-
__Version:__ 6.2.0
3+
__Version:__ 6.4.0
44

55
### What is Halloween Mod?
66
Halloween mod is a powerful Halloween-themed core for your server with completely new game modes, NPCs, bosses, spells, cosmetics, and more.
@@ -17,12 +17,11 @@ Halloween mod is a powerful Halloween-themed core for your server with completel
1717
### Deployment
1818
- Clone repository.
1919
- Extract compiler executable and includes to _"compiler"_ folder of project.
20-
- Extract RoundControl module to _"thirdparty/round-control"_ folder of project (example: _"thirdparty/round-control/addons"_).
2120
- Extract ReAPI module to _"thirdparty/reapi"_ folder of project (example: _"thirdparty/reapi/addons"_).
2221
- Install dependencies `npm i`
2322

2423
#### Customize builder
25-
Use `config.user.js` file (Generated automatically on dependencies install)
24+
Use `.amxxpack.json` configuration file
2625

2726
#### Build project
2827

‎assets/addons/amxmodx/configs/hwn.cfg‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ hwn_npc_monoculus_jump_time_min 10.0
6969
// [Custom Entity] Hwn NPC Spooky Pumpkin
7070
hwn_pumpkin_mutate_chance 20
7171

72+
// [Hwn] Objective Marks
73+
hwn_objective_marks 1
74+
75+
// [Hwn] Player Highlight
76+
hwn_player_highlight 1
77+
hwn_player_highlight_primary_brightness 100
78+
hwn_player_highlight_secondary_brightness 20
79+
7280
// [Hwn] Gamemode Collector
7381
hwn_collector_npc_drop_chance_spell 7.5
7482
hwn_collector_roundtime 10.0

‎assets/addons/amxmodx/configs/plugins-hwn.ini‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ hwn_spell_moonjump.amxx
7777
hwn_spell_crits.amxx
7878
hwn_spell_powerup.amxx
7979
hwn_spell_dance.amxx
80-
hwn_spell_fortune.amxx
80+
hwn_spell_magic.amxx
81+
hwn_spell_skeletons_horde.amxx
82+
hwn_spell_intangibility.amxx
8183

8284
; Cosmetics
8385

@@ -96,3 +98,8 @@ hwn_boss_healthbar.amxx
9698

9799
hwn_bots_spells.amxx
98100
hwn_bots_cosmetic.amxx
101+
102+
; Extra
103+
104+
hwn_player_highlight.amxx
105+
hwn_objective_marks.amxx

0 commit comments

Comments
 (0)