Skip to content
This repository has been archived by the owner on May 8, 2023. It is now read-only.

Commit

Permalink
Update to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
domikuss committed Oct 18, 2022
1 parent 83a3af5 commit ea4dad4
Show file tree
Hide file tree
Showing 12 changed files with 1,663 additions and 213 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@ jobs:
uses: rumblefrog/setup-sp@master
with:
version: "1.10.x"
version-file: ./scripting/Kill-Screen.sp
version-file: ./scripting/killscreen.sp

- name: Shop support
- name: Multicolors support
run: |
mkdir scripting/include
mkdir scripting/include/multicolors
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors.inc" -O scripting/include/multicolors.inc
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors/colors.inc" -O scripting/include/multicolors/colors.inc
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors/morecolors.inc" -O scripting/include/multicolors/morecolors.inc
- name: Shop support
run: |
mkdir scripting/include/shop
wget "https://raw.githubusercontent.com/FD-Forks/Shop-Core/master/addons/sourcemod/scripting/include/shop.inc" -O scripting/include/shop.inc
wget "https://raw.githubusercontent.com/FD-Forks/Shop-Core/master/addons/sourcemod/scripting/include/shop/admin.inc" -O scripting/include/shop/admin.inc
Expand All @@ -42,7 +49,7 @@ jobs:
run: |
mkdir plugins
cd scripting
spcomp -E -w234 -O2 -v2 -i"include" -o"../plugins/Kill-Screen.smx" Kill-Screen.sp
spcomp -E -w234 -O2 -v2 -i"include" -o"../plugins/killscreen.smx" killscreen.sp
echo "===OUT FILES==="
cd ../plugins
ls
Expand All @@ -59,7 +66,7 @@ jobs:

- name: Zip output
run: |
zip -qq -r Kill-Screen-${{ steps.setup_sp.outputs.plugin-version }}.zip plugins
zip -qq -r killscreen-${{ steps.setup_sp.outputs.plugin-version }}.zip configs plugins translations
working-directory: ${{ env.SCRIPTS_PATH }}

- name: Create Release
Expand All @@ -69,7 +76,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag: v${{ steps.setup_sp.outputs.plugin-version }}
artifacts: "Kill-Screen-${{ steps.setup_sp.outputs.plugin-version }}.zip"
artifacts: "killscreen-${{ steps.setup_sp.outputs.plugin-version }}.zip"
body: ${{ steps.changelog.outputs.changes }}
draft: false
allowUpdates: true
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@ jobs:
uses: rumblefrog/setup-sp@master
with:
version: "1.10.x"
version-file: ./scripting/Kill-Screen.sp
version-file: ./scripting/killscreen.sp

- name: Shop support
- name: Multicolors support
run: |
mkdir scripting/include
mkdir scripting/include/multicolors
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors.inc" -O scripting/include/multicolors.inc
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors/colors.inc" -O scripting/include/multicolors/colors.inc
wget "https://raw.githubusercontent.com/Bara/Multi-Colors/master/addons/sourcemod/scripting/include/multicolors/morecolors.inc" -O scripting/include/multicolors/morecolors.inc
- name: Shop support
run: |
mkdir scripting/include/shop
wget "https://raw.githubusercontent.com/FD-Forks/Shop-Core/master/addons/sourcemod/scripting/include/shop.inc" -O scripting/include/shop.inc
wget "https://raw.githubusercontent.com/FD-Forks/Shop-Core/master/addons/sourcemod/scripting/include/shop/admin.inc" -O scripting/include/shop/admin.inc
Expand All @@ -42,7 +49,7 @@ jobs:
run: |
mkdir plugins
cd scripting
spcomp -E -w234 -O2 -v2 -i"include" -o"../plugins/Kill-Screen.smx" Kill-Screen.sp
spcomp -E -w234 -O2 -v2 -i"include" -o"../plugins/killscreen.smx" killscreen.sp
echo "===OUT FILES==="
cd ../plugins
ls
Expand Down
37 changes: 34 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,40 @@
## Release Notes

## [1.0.1]
## [2.0.0]

### Fixed
- **Invalid client index**
### Innovations:
- Added possibility to select a fading effect with adjustable color.
- Added possibility to set FOV.
- Shop:
- Added possibility to set product description.
- Added possibility to set luck chance.
- Added possibility to hide items. (To give via admin menu, or to receive by testing your luck.)
- Shop category changed to "killscreen_effects".
- Added support for translation of category names and descriptions.

- Added possibility to add several effects using configuration file.
- Reworked VIP and Shop menu.
- Renamed plugin file name from "Kill-Screen" to "killscreen". (The old one must be removed.)
- Added separate translation file. (No need to add translation to "vip_modules.phrases.txt" now.)
- A plugin can now compile if one of the libraries is missing: VIP or Shop. (If both libraries are unavailable, the plugin will not compile.)
- Added option to ignore VIP or Shop code by commenting out lines with INCLUDE_VIP or INCLUDE_SHOP. (The code will not be added to the compiled plugin.)

### Configuration file:
- The name of the effect and has support for translations. If a section with the name of the effect is added to the translation file, the effect will be translated, otherwise the value from the configuration file will be used.
- Keys "add_to_vip_by_default", "add_to_shop_by_default" determine whether to add all effects to VIP/Shop by default or not. (1 = yes, 0 = no)
- Key "fade_rgba" allows to set the color of the fade effect.
- Key "fade_modulate" allows you to set the type to make the effect colors softer. (Noticed incorrect operation in CS:S.)
- Key "healthshot_effect" key allows you to enable the healthshot effect. (Only works in CS:GO.)
- Key "fov" allows you to change effect's FOV. (Default value: 90)
- Key "duration" allows you to set the duration of the effect.
- Key "vip" determines whether to add the effect to VIP. (Explanation: if "add_to_vip_by_default" is 1 and "vip" is 0, the effect will not be added).
- Key "shop" determines whether to add the effect to Shop. (Explanation: if "add_to_shop_by_default" is 1 and "shop" is 0, the effect will not be added.)
- Key "shop_description" key allows you to set the product description. (There is support for translations, you can see an example with already added effects and translations).
- Key "shop_price" key allows you to set the price of the product in Shop.
- Key "shop_sellprice" key allows you to set the selling price of the item.
- Key "shop_duration" key allows you to set the duration of the item.
- Key "shop_luckchance" key allows you to set the chance of falling out when testing luck.
- Key "shop_hide" allows you to hide item. (To give via admin menu, or to receive by testing your luck.)

## [1.0.0]

Expand Down
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<h1><code>Kill-Screen</code></h1>
<h1><code>Kill Screen</code></h1>
<p>
<strong>Color screen when killing another player</strong>
<strong>Screen effects when killing another player</strong>
</p>
<p style="margin-bottom: 0.5ex;">
<img
Expand Down Expand Up @@ -33,15 +33,14 @@

## Installation ##
1. Grab the latest release from the release page and unzip it in your sourcemod folder.
2. Restart the server or type `sm plugins load Kill-Screen` in the console to load the plugin.
3. The config file will be automatically generated in cfg/sourcemod/
2. Configure the killscreen.ini in configs to your needs
3. Restart the server or type `sm plugins load killscreen` in the console to load the plugin.

## Configuration ##
- Once the plugin has been loaded, you can modify the cvars in cfg/sourcemod/plugin.Kill-Screen.cfg.

- The plugin is configured in addons/sourcemod/configs/killscreen.ini

## Usage ##
- Write the key for VIP in groups.ini - **KillScreen**, restart the server, go to your server, write in the chat !vip, and turn on this function.

OR
- Write in the chat !shop, select the category - Effects, the item with the name Kill Screen = Buy.
- Write in the chat !shop, select the category - Kill screen effects, items with the names of your effects from the configuration file, select the desired = Buy.
118 changes: 118 additions & 0 deletions configs/killscreen.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
"Killscreens"
{
"add_to_vip_by_default" "1" // Если 1, то все эффекты будут добавляться по умолчанию. If 1, all effects will be added by default.
"add_to_shop_by_default" "0" // Если 0, то все эффекты не будут добавлены по умолчанию. If 0, all effects will not be added by default.

"dark_blink"
{
"fade_rgba" "0 0 0 255" // Цвет эффекта затухания. Fade color.
"fade_modulate" "1" // Тип Modulate, при включении, цвета эффекта более мягкие. Type Modulate, when turned on, the effect colors are softer.

"healthshot_effect" "1" // Эффект хилшота. (РАБОТАЕТ ТОЛЬКО В CSGO)
// Healthshot effect. (WORKS ONLY IN CSGO)

"fov" "155" // FOV (Стандартное значение: 90)
// FOV (Standard value: 90)

"duration" "0.3" // Длительность эффекта. Duration of effect

"vip" "0" // Добавлять в VIP. Add to VIP.

"shop" "1" // Добавлять в Shop. Add to Shop.
"shop_description" "dark_blink_description" // Описание товара в Shop. Description in Shop.
"shop_price" "1000" // Цена в Shop. Price at Shop.
"shop_sellprice" "500" // Цена для продажи. Price for sale
"shop_duration" "86400" // Длительность товара. Product Duration.
"shop_luckchance" "50" // Шанс выпадения. Chance of falling out.
"shop_hide" "0" // Сделать недоступным для покупки. (Можно выдать через меню администратора, или получить, испытав удачу)
// Make it unavailable for purchase. (Can be given out through the admin menu, or obtained by trying your luck)
}

"pretty_red"
{
"fade_rgba" "255 0 0 120"
"fade_modulate" "1"

"healthshot_effect" "1"

"fov" "20"

"duration" "1.0"

"vip" "1"

"shop" "1"
"shop_description" "pretty_red_description"
"shop_price" "1000"
"shop_sellprice" "500"
"shop_duration" "86400"
"shop_luckchance" "50"
"shop_hide" "0"
}

"healthshot"
{
"fade_rgba" "0 0 0 0"
"fade_modulate" "0"

"healthshot_effect" "1"

"fov" "90"

"duration" "1.0"

"vip" "1"

"shop" "1"
"shop_description" "healthshot_description"
"shop_price" "1000"
"shop_sellprice" "500"
"shop_duration" "86400"
"shop_luckchance" "50"
"shop_hide" "0"
}

"simple_blue"
{
"fade_rgba" "0 0 255 120"
"fade_modulate" "1"

"healthshot_effect" "1"

"fov" "50"

"duration" "1.0"

"vip" "1"

"shop" "1"
"shop_description" "simple_blue_description"
"shop_price" "1000"
"shop_sellprice" "500"
"shop_duration" "86400"
"shop_luckchance" "50"
"shop_hide" "0"
}

"typical_grey"
{
"fade_rgba" "110 110 110 255"
"fade_modulate" "0"

"healthshot_effect" "0"

"fov" "150"

"duration" "1.0"

"vip" "1"

"shop" "1"
"shop_description" "typical_grey_description"
"shop_price" "1000"
"shop_sellprice" "500"
"shop_duration" "86400"
"shop_luckchance" "50"
"shop_hide" "0"
}
}
Loading

0 comments on commit ea4dad4

Please sign in to comment.