Compare commits

..

41 Commits

Author SHA1 Message Date
ab48db0206
Merge pull request #49 from zeno0207/master
fix Ext_TraitDemoProfessional
2024-09-14 18:14:38 +03:00
zeno0207
eaa67d7c97
Update Ext_TraitDemoProfessional.uc
fix error
2024-08-21 22:59:18 +08:00
8d8a20b755
fix ServerExt.chn encoding (utf8 -> utf16le) 2024-07-22 16:14:05 +03:00
0273fa9520
Merge pull request #47 from zeno0207/master
Update ServerExt.chn
2024-07-21 23:10:13 +03:00
zeno0207
873c9a37ee
Update ServerExt.chn
Update translation
2024-07-14 15:58:02 +08:00
b5597ce5f8
update ci/cd 2023-12-31 23:21:19 +03:00
55b82bbc3a
update dead links 2023-12-31 20:58:21 +03:00
84c5673b76
update ci/cd 2023-12-31 20:57:45 +03:00
d0e38b6ec8
update github gist link to make steam happy 2023-09-10 00:56:55 +03:00
58ec5f101e
fix code style 2023-09-10 00:06:06 +03:00
d5673b1887
Update README.md 2023-09-10 00:04:08 +03:00
ef199d64dd
add translations of new firebug perks for languages: chn, cht, esn, jpn, rus 2023-09-09 23:54:30 +03:00
b7468d4f7e
remove fake changes from ServerExt.int 2023-09-09 23:34:03 +03:00
fe47ba73e4
update KFServerExt.ini template 2023-09-09 23:23:22 +03:00
62e0ed28ee
Merge pull request #45 from GenZmeY/i18n-chn
add Simplified Chinese translation
2023-09-09 23:21:06 +03:00
e7916876d0
Merge pull request #42 from GenZmeY/group-names
add mutator group name
2023-09-09 23:20:56 +03:00
55567f1933
Merge pull request #40 from GenZmeY/v1137-bugsplat-fix
client-side "Access None" fixes
2023-09-09 23:20:46 +03:00
53b8933952
Merge pull request #44 from secretagentjr/master
Update Recoil / Spread to be flat reduction, capping out at 100%, allow knockback to go above 100%
2023-09-09 23:20:34 +03:00
f30a7fcf2a
fix EOL 2023-09-09 21:16:24 +03:00
99dacdf004
add Simplified Chinese translation 2023-09-09 19:28:17 +03:00
secretagentjr
1e7bcd732c Remove Function 2023-07-29 18:27:35 -07:00
secretagentjr
d38f165464 Revert Health back to regular 2023-07-29 17:24:31 -07:00
secretagentjr
daa0bd72e9 Add Some Firebug Traits 2023-07-23 17:43:50 -07:00
secretagentjr
53f63934b1 Fix Health Not Displaying Properly past 255 2023-07-20 12:18:08 -07:00
secretagentjr
b2d0d28946 Allow Knockdown "Knockback" to go above 100% 2023-07-18 18:06:15 -07:00
secretagentjr
0a8d4bb38c Update Recoil / Spread to be flat 2023-07-17 19:11:20 -07:00
6da2b47013 add mutator group name 2023-06-03 17:09:10 +03:00
06c326507e
Update README.md 2023-05-14 09:19:44 +03:00
64a4edf178
Merge pull request #41 from GenZmeY/MegaLinter
add Mega linter
2023-05-14 06:45:50 +03:00
67baea9f2c exclude upk 2023-05-14 06:37:40 +03:00
fbca6b98f5 fix indent 2023-05-14 06:08:37 +03:00
9c72778720 more style fixes 2023-05-14 06:01:17 +03:00
bababdc366 rm issue_template 2023-05-14 05:52:55 +03:00
2aad26f273 add MegaLinter badge 2023-05-14 05:51:51 +03:00
7175a6c7b6 fix style 2023-05-14 05:49:12 +03:00
47ed596664 upd mega-linter.yml 2023-05-14 05:26:15 +03:00
a57d5781d6 update README.md 2023-05-14 05:25:08 +03:00
6ccd5381fc add MegaLinter 2023-05-14 05:16:54 +03:00
97928b1d47 add .editorconfig 2023-05-14 05:15:46 +03:00
6df0b69568 update build tools to v1.9.2-1-gfb458ac 2023-05-14 05:14:52 +03:00
84ce5f6804 client-side "Access None" fixes 2022-12-25 01:31:24 +03:00
200 changed files with 1474 additions and 2031 deletions

33
.editorconfig Normal file
View File

@ -0,0 +1,33 @@
root = true
# Global
[*]
indent_style = unset
indent_size = 4
tab_width = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = unset
# Unreal Engine 3 / Source
[*.uc]
indent_style = tab
[*.{uci,upkg}]
# Unreal Engine 3 / i18n
[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
charset = utf-16le
# Other
[*.md]
indent_style = space
trim_trailing_whitespace = false
[*.yml]
indent_style = space
indent_size = 2
[*.{txt,cfg,conf}]
indent_style = tab

View File

@ -1,8 +0,0 @@
### Details
Tell us exactly what happens, every single detail that you can think of
### Screenshots
Provide a screenshot of the issue so we can debug it's not a user issue
### Steps to reproduce
Tell us how to reproduce the problem, step by step

116
.github/workflows/mega-linter.yml vendored Normal file
View File

@ -0,0 +1,116 @@
---
name: MegaLinter
permissions: read-all
on:
push:
pull_request:
branches:
- master
env:
APPLY_FIXES: none
APPLY_FIXES_EVENT: pull_request
APPLY_FIXES_MODE: commit
FILTER_REGEX_EXCLUDE: (mega-linter.yml)
DISABLE: SPELL
DISABLE_ERRORS_LINTERS: MARKDOWN_MARKDOWN_LINK_CHECK
EDITORCONFIG_EDITORCONFIG_CHECKER_FILTER_REGEX_EXCLUDE: 'xVoteAnnouncer.upk'
concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true
jobs:
megalinter:
name: MegaLinter
runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
steps:
- name: Checkout Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
fetch-depth: 0
- name: MegaLinter
uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
id: ml
env:
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Archive production artifacts
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
if: success() || failure()
with:
name: MegaLinter reports
path: |
megalinter-reports
mega-linter.log
- name: Set APPLY_FIXES_IF var
run: |
printf 'APPLY_FIXES_IF=%s\n' "${{
steps.ml.outputs.has_updated_sources == 1 &&
(
env.APPLY_FIXES_EVENT == 'all' ||
env.APPLY_FIXES_EVENT == github.event_name
) &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
)
}}" >> "${GITHUB_ENV}"
- name: Set APPLY_FIXES_IF_* vars
run: |
printf 'APPLY_FIXES_IF_PR=%s\n' "${{
env.APPLY_FIXES_IF == 'true' &&
env.APPLY_FIXES_MODE == 'pull_request'
}}" >> "${GITHUB_ENV}"
printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
env.APPLY_FIXES_IF == 'true' &&
env.APPLY_FIXES_MODE == 'commit' &&
(!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
}}" >> "${GITHUB_ENV}"
- name: Create Pull Request with applied fixes
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
id: cpr
if: env.APPLY_FIXES_IF_PR == 'true'
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
commit-message: "[MegaLinter] Apply linters automatic fixes"
title: "[MegaLinter] Apply linters automatic fixes"
labels: bot
- name: Create PR output
if: env.APPLY_FIXES_IF_PR == 'true'
run: |
echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: Prepare commit
if: env.APPLY_FIXES_IF_COMMIT == 'true'
run: sudo chown -Rc $UID .git/
- name: Commit and push applied linter fixes
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
if: env.APPLY_FIXES_IF_COMMIT == 'true'
with:
branch: >-
${{
github.event.pull_request.head.ref ||
github.head_ref ||
github.ref
}}
commit_message: "[MegaLinter] Apply linters fixes"
commit_user_name: "github-actions"
commit_user_email: "github-actions[bot]@users.noreply.github.com"

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -88,7 +88,7 @@ SettingsInit=0[/b]
[b][ServerExtMut.xVotingHandler] [b][ServerExtMut.xVotingHandler]
ConfigVersion=0[/b] ConfigVersion=0[/b]
[*]Put in [b]KFServerExt.ini[/b] this: [url=https://pastebin.com/raw/Wx3HYjkj]<PasteBin>[/url] [b](*)[/b] [*]Put in [b]KFServerExt.ini[/b] this: [url=https://gist.githubusercontent.com/GenZmeY/616b6f845f9829c93976f42f6c48505a/raw/1a8c8409d61a2908d5c854ced0932b8ed43a7f51/KFServerExt-Default.ini]<github gist>[/url] [b](*)[/b]
[*]Start the game/server along with the ServerExt, then check the configs - content should be generated. [*]Start the game/server along with the ServerExt, then check the configs - content should be generated.
[/olist] [/olist]
@ -120,6 +120,7 @@ If you have a desire to help translate ServerExt into other languages, you can r
[url=https://steamcommunity.com/profiles/76561197967822972]MilkTeaFox[/url] - Traditional Chinese [CHT]; [url=https://steamcommunity.com/profiles/76561197967822972]MilkTeaFox[/url] - Traditional Chinese [CHT];
[url=https://steamcommunity.com/profiles/76561198930643117]あさぴっぴ1020[/url] - Japanese [JPN]; [url=https://steamcommunity.com/profiles/76561198930643117]あさぴっぴ1020[/url] - Japanese [JPN];
[url=https://steamcommunity.com/profiles/76561198080866131]Jason Voorehes [/url] - Spanish [ESN]; [url=https://steamcommunity.com/profiles/76561198080866131]Jason Voorehes [/url] - Spanish [ESN];
[url=https://steamcommunity.com/profiles/76561198200630473/]小曦曦[/url] - Simplified Chinese [CHN];
[h1]Sources[/h1] [h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-Server-Extension]https://github.com/GenZmeY/KF2-Server-Extension[/url] [b](GNU GPLv3)[/b] [url=https://github.com/GenZmeY/KF2-Server-Extension]https://github.com/GenZmeY/KF2-Server-Extension[/url] [b](GNU GPLv3)[/b]

View File

@ -1,22 +1,22 @@
[![](PublicationContent/mutbanner.png)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) # Server Extension
[![Banner](PublicationContent/mutbanner.png)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
[![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) [![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
[![Steam Subscriptions](https://img.shields.io/steam/subscriptions/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) [![Steam Downloads](https://img.shields.io/steam/downloads/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
[![Steam Favorites](https://img.shields.io/steam/favorites/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) [![Steam Favorites](https://img.shields.io/steam/favorites/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712)
[![Steam Update Date](https://img.shields.io/steam/update-date/2085786712)](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) [![MegaLinter](https://github.com/GenZmeY/KF2-Server-Extension/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-Server-Extension/actions/workflows/mega-linter.yml)
[![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/tags) [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/tags)
[![GitHub top language](https://img.shields.io/github/languages/top/GenZmeY/KF2-Server-Extension)](https://docs.unrealengine.com/udk/Three/WebHome.html) [![GitHub top language](https://img.shields.io/github/languages/top/GenZmeY/KF2-Server-Extension)](https://docs.unrealengine.com/udk/Three/WebHome.html)
[![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-Server-Extension)](LICENSE) [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-Server-Extension)](LICENSE)
[![ServerExt Contributors](https://contrib.rocks/image?repo=GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/graphs/contributors)
*** ***
*This mod replaces current perk system in [Killing Floor 2](https://en.wikipedia.org/wiki/Killing_Floor_2) with a serverside perk progression with RPG elements, which let you buy individual stats and traits.* *This mod replaces current perk system in [Killing Floor 2](https://en.wikipedia.org/wiki/Killing_Floor_2) with a serverside perk progression with RPG elements, which let you buy individual stats and traits.*
*This is a further development of the ServerExt mutator from [Marco](https://forums.tripwireinteractive.com/index.php?threads/mutator-server-extension-mod.109463) and [Forrest Mark X](https://github.com/ForrestMarkX/KF2-Server-Extension).* *This is a further development of the ServerExt mutator from [Marco](https://forums.tripwireinteractive.com/index.php?threads/mutator-server-extension-mod.109463) and [Forrest Mark X](https://github.com/ForrestMarkX/KF2-Server-Extension).*
# Features ## Features
- RPG elements (traits and stats); - RPG elements (traits and stats);
- New menu system; - New menu system;
- Scoreboard that supports unlimited playercount on server; - Scoreboard that supports unlimited playercount on server;
@ -33,7 +33,7 @@ The full changelog is available on [steam workshop](https://steamcommunity.com/s
**Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here. **Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.
# Build ## Build
1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win); 1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
2. open git-bash and go to any folder where you want to store ServerExt sources: 2. open git-bash and go to any folder where you want to store ServerExt sources:
`cd <ANY_FOLDER_YOU_WANT>` `cd <ANY_FOLDER_YOU_WANT>`
@ -46,43 +46,27 @@ The full changelog is available on [steam workshop](https://steamcommunity.com/s
5. The compiled files will be here: 5. The compiled files will be here:
`C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\` `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
# Testing ## Using and configuring ServerExt
Open git-bash in the ServerExt source folder and run command:
`./tools/builder -t`
(or `./tools/builder -ct` if you haven't compiled the mutator yet)
A local single-user test will be launched with parameters from `builder.cfg` (edit this file if you want to test mutator with different parameters).
# Using and configuring ServerExt
A detailed manual is available on the [mod page](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) in the steam workshop. A detailed manual is available on the [mod page](https://steamcommunity.com/sharedfiles/filedetails/?id=2085786712) in the steam workshop.
# Publication in steam workshop ## Contributing
1. Modify the publish files if necessary, they are in the `PublicationContent`:
> description.txt
> preview.png
> tags.txt
> title.txt
2. Run this command in the source folder: `./tools/builder -cbu`
# Contributing
**Participation is welcome!** **Participation is welcome!**
## Bug reports ### Bug reports
If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-Server-Extension/issues) and check if there is a description of your bug. If not, create a new issue. If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-Server-Extension/issues) and check if there is a description of your bug. If not, create a new issue.
Describe what the bug looks like and how we can reproduce it. Describe what the bug looks like and how we can reproduce it.
Attach screenshots if you think it might help. Attach screenshots if you think it might help.
If it's a crash issue, be sure to include the `Launch.log` and `Launch_2.log` files. You can find them here: If it's a crash issue, be sure to include the `Launch.log` file. You can find them here:
`C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Logs\` `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Logs\`
Please note that these files are overwritten every time you start the game/server. Therefore, you must take these files immediately after the game crashes in order not to lose information. Please note that these files are overwritten every time you start the game/server. Therefore, you must take these files immediately after the game crashes in order not to lose information.
## Localization ### Localization
The mutator supports localization and you can help translate it into other languages. The mutator supports localization and you can help translate it into other languages.
It does not require any special knowledge or programming skills, so you just need to know the language into which you will translate. It does not require any special knowledge or programming skills, so you just need to know the language into which you will translate.
Here's a quick guide on how to do it: [localization guide](https://steamcommunity.com/workshop/filedetails/discussion/2085786712/2942494909176752884) Here's a quick guide on how to do it: [localization guide](https://steamcommunity.com/workshop/filedetails/discussion/2085786712/2942494909176752884)
## Contribute code ### Contribute code
You can help improve ServerExt by fixing bugs and adding new features. You can help improve ServerExt by fixing bugs and adding new features.
Before making a pull request, make sure that: Before making a pull request, make sure that:
1. Your code is working correctly. 1. Your code is working correctly.
@ -91,10 +75,27 @@ Before making a pull request, make sure that:
In the description of the pull request, describe the changes you made. In the description of the pull request, describe the changes you made.
# License ## Contributors
[GNU GPLv3](LICENSE) [![ServerExt Contributors](https://contrib.rocks/image?repo=GenZmeY/KF2-Server-Extension)](https://github.com/GenZmeY/KF2-Server-Extension/graphs/contributors)
[Marco](https://steamcommunity.com/profiles/76561197975509070)
[ForrestMarkX](https://steamcommunity.com/profiles/76561197997881512)
[inklesspen](https://steamcommunity.com/profiles/76561198143883210)
[GenZmeY](https://steamcommunity.com/profiles/76561198001617867)
[secret](https://steamcommunity.com/profiles/76561198042219365)
[Scaredkid93](https://steamcommunity.com/profiles/76561198004271210)
**Translators:**
[GenZmeY](https://steamcommunity.com/profiles/76561198001617867) - Russian [RUS];
[MilkTeaFox](https://steamcommunity.com/profiles/76561197967822972) - Traditional Chinese [CHT];
[あさぴっぴ1020](https://steamcommunity.com/profiles/76561198930643117) - Japanese [JPN];
[Jason Voorehes ](https://steamcommunity.com/profiles/76561198080866131) - Spanish [ESN];
[小曦曦](https://steamcommunity.com/profiles/76561198200630473) - Simplified Chinese [CHN].
## License
[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)
*** ***
**Note about the banner:** **Note about the banner:**
The cat in the picture is [meowbin](https://www.deviantart.com/cottonvalent/gallery/48815375/creepy-cat). And [Cotton Valent](https://www.deviantart.com/cottonvalent) is the artist who designed and painted this magnificent cat. The cat in the picture is [meowbin](https://twitter.com/meawbinneko). And [Cotton Valent](https://twitter.com/horrormove) is the artist who designed and painted this magnificent cat.

View File

@ -46,4 +46,5 @@ final function SaveData(FMyCustomChar R)
defaultproperties defaultproperties
{ {
} }

View File

@ -7,4 +7,5 @@ protected function SpecialCringeEffectsfor (Actor Victim, float VictimDist)
defaultproperties defaultproperties
{ {
} }

View File

@ -0,0 +1,28 @@
class ExtHUD_ObjectiveConatiner extends KFGFxHUD_ObjectiveConatiner;
simulated function SetActive(bool bActive)
{
if (bActive)
{
Super.SetActive(bActive);
}
else
{
SetVisible(bActive);
CurrentObjectiveInterface = none;
// Fix:
// ScriptWarning: Accessed None
// KFGFxHUD_ObjectiveConatiner Transient.ExtMoviePlayer_HUD_0:KFGFxHUD_ObjectiveConatiner_0
// Function KFGame.KFGFxHUD_ObjectiveConatiner:SetActive:01D9
if (GetObject("objectiveNumberMC") != None)
{
GetObject("objectiveNumberMC").SetVisible(false);
}
}
}
DefaultProperties
{
}

View File

@ -31,4 +31,5 @@ function UpdateGrenades()
defaultproperties defaultproperties
{ {
} }

View File

@ -44,4 +44,5 @@ function UpdatePlayerInfo(optional bool bForceUpdate)
defaultproperties defaultproperties
{ {
} }

View File

@ -88,4 +88,5 @@ simulated function SetWeaponGroupList(out array<KFWeapon> WeaponList, byte Group
defaultproperties defaultproperties
{ {
} }

View File

@ -62,4 +62,5 @@ function Callback_Equip(int ItemDefinition)
defaultproperties defaultproperties
{ {
} }

View File

@ -93,6 +93,20 @@ final function ShowKillMessageX(PlayerReplicationInfo PRI1, PlayerReplicationInf
} }
} }
function UpdateObjectiveActive()
{
// Fix:
// ScriptWarning: Accessed None 'KFGRI'
// ExtMoviePlayer_HUD Transient.ExtMoviePlayer_HUD_0
// Function KFGame.KFGFxMoviePlayer_HUD:UpdateObjectiveActive:00B7
if (GetPC() == None || KFGameReplicationInfo(GetPC().WorldInfo.GRI) == None)
{
return;
}
Super.UpdateObjectiveActive();
}
defaultproperties defaultproperties
{ {
WidgetBindings.Remove((WidgetName="SpectatorInfoWidget",WidgetClass=class'KFGFxHUD_SpectatorInfo')) WidgetBindings.Remove((WidgetName="SpectatorInfoWidget",WidgetClass=class'KFGFxHUD_SpectatorInfo'))
@ -103,4 +117,6 @@ defaultproperties
WidgetBindings.Add((WidgetName="PlayerBackpackWidget",WidgetClass=class'ExtHUD_PlayerBackpack')) WidgetBindings.Add((WidgetName="PlayerBackpackWidget",WidgetClass=class'ExtHUD_PlayerBackpack'))
WidgetBindings.Remove((WidgetName="WeaponSelectContainer",WidgetClass=class'KFGFxHUD_WeaponSelectWidget')) WidgetBindings.Remove((WidgetName="WeaponSelectContainer",WidgetClass=class'KFGFxHUD_WeaponSelectWidget'))
WidgetBindings.Add((WidgetName="WeaponSelectContainer",WidgetClass=class'ExtHUD_WeaponSelectWidget')) WidgetBindings.Add((WidgetName="WeaponSelectContainer",WidgetClass=class'ExtHUD_WeaponSelectWidget'))
WidgetBindings.Remove((WidgetName="ObjectiveContainer",WidgetClass=class'KFGFxHUD_ObjectiveConatiner'))
WidgetBindings.Add((WidgetName="ObjectiveContainer",WidgetClass=class'ExtHUD_ObjectiveConatiner'))
} }

View File

@ -111,6 +111,22 @@ function OnMenuOpen(name WidgetPath, KFGFxObject_Menu Widget)
PerksMenu.ActionScriptVoid("closeContainer"); PerksMenu.ActionScriptVoid("closeContainer");
} }
event OnClose()
{
// Fix:
// ScriptWarning: Accessed None 'CurrentBackgroundMovie'
// ExtMoviePlayer_Manager KF-BIOTICSLAB.TheWorld:PersistentLevel.ExtPlayerController_0.ExtMoviePlayer_Manager_0
// Function KFGame.KFGFxMoviePlayer_Manager:OnClose:0039
if (CurrentBackgroundMovie != None)
{
Super.OnClose();
}
else
{
CloseMenus();
}
}
defaultproperties defaultproperties
{ {
InGamePartyWidgetClass=class'ExtWidget_PartyInGame' InGamePartyWidgetClass=class'ExtWidget_PartyInGame'

View File

@ -98,7 +98,6 @@ function AttachWeaponByItemDefinition(int ItemDefinition)
//setweapon skin //setweapon skin
WeaponAttachment.SetWeaponSkin(ItemDefinition); WeaponAttachment.SetWeaponSkin(ItemDefinition);
} }
defaultproperties defaultproperties

View File

@ -7,4 +7,5 @@ static simulated event bool IsABoss()
defaultproperties defaultproperties
{ {
} }

View File

@ -47,4 +47,5 @@ function PlayAnimation()
defaultproperties defaultproperties
{ {
} }

View File

@ -52,4 +52,5 @@ function SetPerkList()
defaultproperties defaultproperties
{ {
} }

View File

@ -1347,5 +1347,4 @@ defaultproperties
Skins.Add((Id=5303, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC")) Skins.Add((Id=5303, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_Mint_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Mint_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
Skins.Add((Id=5302, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC")) Skins.Add((Id=5302, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_FieldTested_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_FieldTested_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
Skins.Add((Id=5301, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC")) Skins.Add((Id=5301, Weapondef=class'KFWeapDef_AA12', MIC_1P=("WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_1P_BattleScarred_MIC"), MIC_3P="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_BattleScarred_MIC", MIC_Pickup="WEP_SkinSet17_MAT.sports_aa12.Vault_Sports_AA12_3P_Pickup_MIC"))
} }

View File

@ -7,6 +7,7 @@ function SpecialMoveStarted(bool bForced, Name PrevMove)
function SpecialMoveEnded(Name PrevMove, Name NextMove) function SpecialMoveEnded(Name PrevMove, Name NextMove)
{ {
} }
defaultproperties defaultproperties

View File

@ -1171,10 +1171,10 @@ simulated function float ApplyEffect(name Type, float Value, float Progress)
Modifiers[1] = 1.f + (Value*Progress); Modifiers[1] = 1.f + (Value*Progress);
break; break;
case 'Recoil': case 'Recoil':
Modifiers[2] = 1.f / (1.f+Value*Progress); Modifiers[2] = 1.f - (Value*Progress);
break; break;
case 'Spread': case 'Spread':
Modifiers[3] = 1.f / (1.f+Value*Progress); Modifiers[3] = 1.f - (Value*Progress);
break; break;
case 'Rate': case 'Rate':
Modifiers[4] = 1.f / (1.f+Value*Progress); Modifiers[4] = 1.f / (1.f+Value*Progress);
@ -1191,8 +1191,8 @@ simulated function float ApplyEffect(name Type, float Value, float Progress)
} }
break; break;
case 'KnockDown': case 'KnockDown':
Modifiers[7] = FMin(1.f + (Value*Progress),2.f); Modifiers[7] = 1.f + (Value*Progress);
return (Modifiers[7]-1.f); break;
case 'Welder': case 'Welder':
Modifiers[8] = 1.f + (Value*Progress); Modifiers[8] = 1.f + (Value*Progress);
break; break;
@ -1556,8 +1556,8 @@ defaultproperties
DefPerkStats(0)=(MaxValue=50,CostPerValue=1,StatType="Speed",Progress=0.4) DefPerkStats(0)=(MaxValue=50,CostPerValue=1,StatType="Speed",Progress=0.4)
DefPerkStats(1)=(MaxValue=1000,CostPerValue=1,StatType="Damage",Progress=0.5) DefPerkStats(1)=(MaxValue=1000,CostPerValue=1,StatType="Damage",Progress=0.5)
DefPerkStats(2)=(MaxValue=90,CostPerValue=1,StatType="Recoil",Progress=1) DefPerkStats(2)=(MaxValue=100,CostPerValue=1,StatType="Recoil",Progress=1)
DefPerkStats(3)=(MaxValue=80,CostPerValue=1,StatType="Spread",Progress=0.75) DefPerkStats(3)=(MaxValue=100,CostPerValue=1,StatType="Spread",Progress=1)
DefPerkStats(4)=(MaxValue=1000,CostPerValue=1,StatType="Rate",Progress=0.5) DefPerkStats(4)=(MaxValue=1000,CostPerValue=1,StatType="Rate",Progress=0.5)
DefPerkStats(5)=(MaxValue=1000,CostPerValue=1,StatType="Reload",Progress=0.5) DefPerkStats(5)=(MaxValue=1000,CostPerValue=1,StatType="Reload",Progress=0.5)
DefPerkStats(6)=(MaxValue=150,CostPerValue=1,StatType="Health",Progress=1) DefPerkStats(6)=(MaxValue=150,CostPerValue=1,StatType="Health",Progress=1)

View File

@ -1,5 +1,48 @@
Class Ext_PerkFirebug extends Ext_PerkBase; Class Ext_PerkFirebug extends Ext_PerkBase;
var bool bUseInferno,bUsePyromaniac,bUseGroundFire,bUseHeatWave;
replication
{
// Things the server should send to the client.
if (true)
bUseInferno,bUsePyromaniac,bUseGroundFire,bUseHeatWave;
}
simulated final private function bool IsInfernoActive()
{
return bUseInferno && WorldInfo.TimeDilation < 1.f;
}
simulated function bool GetIsUberAmmoActive(KFWeapon KFW)
{
return bUsePyromaniac && IsWeaponOnPerk(KFW) && WorldInfo.TimeDilation < 1.f;
}
simulated function float GetZedTimeModifier(KFWeapon W)
{
local name StateName;
if (bUsePyromaniac && IsWeaponOnPerk(W))
{
StateName = W.GetStateName();
if (BasePerk.Default.ZedTimeModifyingStates.Find(StateName) != INDEX_NONE || StateName == 'Reloading')
return 1.f;
}
return 0.f;
}
simulated final private function bool IsGroundFireActive()
{
return bUseGroundFire;
}
simulated final private function bool IsHeatWaveActive()
{
return bUseHeatWave;
}
defaultproperties defaultproperties
{ {
PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_Firebug' PerkIcon=Texture2D'UI_PerkIcons_TEX.UI_PerkIcon_Firebug'
@ -7,6 +50,10 @@ defaultproperties
DefTraitList.Add(class'Ext_TraitNapalm') DefTraitList.Add(class'Ext_TraitNapalm')
DefTraitList.Add(class'Ext_TraitFireExplode') DefTraitList.Add(class'Ext_TraitFireExplode')
DefTraitList.Add(class'Ext_TraitFireRange') DefTraitList.Add(class'Ext_TraitFireRange')
DefTraitList.Add(class'Ext_TraitInferno')
DefTraitList.Add(class'Ext_TraitPyromaniac')
DefTraitList.Add(class'Ext_TraitGroundFire')
DefTraitList.Add(class'Ext_TraitHeatWave')
BasePerk=class'KFPerk_Firebug' BasePerk=class'KFPerk_Firebug'
PrimaryMelee=class'KFWeap_Knife_Firebug' PrimaryMelee=class'KFWeap_Knife_Firebug'

View File

@ -2,4 +2,5 @@ class Ext_TGroupMonster extends Ext_TGroupBase;
defaultproperties defaultproperties
{ {
} }

View File

@ -33,4 +33,5 @@ static final function byte GetMaxLimit(Ext_PerkBase Perk)
defaultproperties defaultproperties
{ {
} }

View File

@ -2,4 +2,5 @@ class Ext_TGroupZEDTime extends Ext_TGroupBase;
defaultproperties defaultproperties
{ {
} }

View File

@ -24,4 +24,5 @@ function Timer()
defaultproperties defaultproperties
{ {
} }

View File

@ -8,4 +8,5 @@ var class<Ext_TraitBase> TraitClass;
defaultproperties defaultproperties
{ {
} }

View File

@ -15,7 +15,7 @@ static function bool MeetsRequirements(byte Lvl, Ext_PerkBase Perk)
{ {
local int i; local int i;
if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<3) if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<1)
return false; return false;
if (Lvl==0) if (Lvl==0)

View File

@ -0,0 +1,16 @@
Class Ext_TraitGroundFire extends Ext_TraitBase;
static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseGroundFire = true;
}
static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseGroundFire = false;
}
defaultproperties
{
DefLevelCosts(0)=50
}

View File

@ -0,0 +1,16 @@
Class Ext_TraitHeatWave extends Ext_TraitBase;
static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseHeatWave = true;
}
static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseHeatWave = false;
}
defaultproperties
{
DefLevelCosts(0)=50
}

View File

@ -0,0 +1,31 @@
Class Ext_TraitInferno extends Ext_TraitBase;
var localized string GroupDescription;
function string GetPerkDescription()
{
local string S;
S = Super.GetPerkDescription();
S $= "|"$GroupDescription;
return S;
}
static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseInferno = true;
}
static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUseInferno = false;
}
defaultproperties
{
SupportedPerk=class'Ext_PerkFirebug'
TraitGroup=class'Ext_TGroupZEDTime'
NumLevels=1
DefLevelCosts(0)=50
//DefMinLevel=65
}

View File

@ -0,0 +1,31 @@
Class Ext_TraitPyromaniac extends Ext_TraitBase;
var localized string GroupDescription;
function string GetPerkDescription()
{
local string S;
S = Super.GetPerkDescription();
S $= "|"$GroupDescription;
return S;
}
static function TraitActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUsePyromaniac = true;
}
static function TraitDeActivate(Ext_PerkBase Perk, byte Level, optional Ext_TraitDataStore Data)
{
Ext_PerkFirebug(Perk).bUsePyromaniac = false;
}
defaultproperties
{
SupportedPerk=class'Ext_PerkFirebug'
TraitGroup=class'Ext_TGroupZEDTime'
NumLevels=1
DefLevelCosts(0)=50
//DefMinLevel=65
}

View File

@ -59,4 +59,5 @@ function PreClientTravel(string PendingURL, ETravelType TravelType, bool bIsSeam
defaultproperties defaultproperties
{ {
} }

View File

@ -53,4 +53,5 @@ function DrawMenu()
defaultproperties defaultproperties
{ {
} }

View File

@ -90,4 +90,5 @@ function HandleMouseClick(bool bRight);
defaultproperties defaultproperties
{ {
} }

View File

@ -56,4 +56,5 @@ function PreDraw()
defaultproperties defaultproperties
{ {
} }

View File

@ -1,928 +0,0 @@
//====================================================================
// HTML Text box, written by Marco
// Simply call SetContents to change window contents.
// Only callback available is for LaunchKFURL.
// ====================================================================
class KFGUI_HTMLTextBox extends KFGUI_MultiComponent;
struct FTextLine
{
var string Text,URL;
var color Color,ALColor;
var Font Font;
var float FontScale;
var byte Align,FontSize;
var int X,Y,XS,YS,Tab,TOffset;
var byte LineSkips;
var array<int> ImgList;
var bool bHasURL,bSplit;
};
var array<FTextLine> Lines;
struct FImageEntry
{
var Surface Img;
var int X,Y,XS,YS,YOffset,XOffset;
var byte Align,Style;
};
var array<FImageEntry> Images;
var FImageEntry BgImage;
var float OldXSize,OldYSize;
var int YSize,HoverOverLinkLine,OldHoverLine;
var() Color BGColor,WhiteColor,BlueColor,RedColor;
var KFGUI_ScrollBarV MyScrollBar;
var string TitleString;
var int CurTab;
var byte DefaultFontSize;
var bool bNeedsInit,bHasSplitLines,bNeedScrollbar;
function InitMenu()
{
Super.InitMenu();
MyScrollBar = KFGUI_ScrollBarV(FindComponentID('Scrollbar'));
}
final function int AddText( string Input, color TextColor, byte TextAlign, byte FontSize, out byte NumSkips )
{
local int i;
i = Lines.Length;
Lines.Length = i+1;
Lines[i].Text = Input;
Lines[i].Color = TextColor;
Lines[i].Align = TextAlign;
Lines[i].FontSize = FontSize;
Lines[i].LineSkips = NumSkips;
Lines[i].Tab = CurTab;
NumSkips = 0;
return i;
}
final function string ParseLinkType( string URL )
{
if( InStr(URL,"//")>0 )
return URL;
if( Left(URL,4)~="ftp." )
return "ftp://"$URL;
return "http://"$URL;
}
final function AddImage( string Input )
{
local string Temp;
local byte Align,Sty;
local Material M;
local int X,Y,XS,YS,i,j,z;
Align = 3;
Temp = GetOption(Input, "ALIGN=");
if (Temp != "")
{
switch( Caps(Temp) )
{
case "LEFT":
case "0":
Align = 0;
break;
case "CENTER":
case "1":
Align = 1;
break;
case "RIGHT":
case "2":
Align = 2;
break;
}
}
Temp = GetOption(Input, "STYLE=");
if (Temp != "")
{
switch( Caps(Temp) )
{
case "NORMAL":
case "0":
Sty = 0;
break;
case "STRETCH":
case "1":
Sty = 1;
break;
case "TILEDX":
case "2":
Sty = 2;
break;
case "TILEDY":
case "3":
Sty = 3;
break;
case "TILED":
case "4":
Sty = 4;
break;
}
}
Temp = GetOption(Input, "SRC=");
if (Temp != "")
M = Surface(DynamicLoadObject(Temp,Class'Surface'));
if( M==None )
M = class'Canvas'.Default.DefaultTexture;
X = int(GetOption(Input, "VSPACE="));
Y = int(GetOption(Input, "HSPACE="));
XS = int(GetOption(Input, "WIDTH="));
YS = int(GetOption(Input, "HEIGHT="));
if( XS==0 )
XS = M.GetSurfaceWidth();
if( YS==0 )
YS = M.GetSurfaceHeight();
i = Images.Length;
Images.Length = i+1;
Images[i].Img = M;
Images[i].XOffset = X;
Images[i].YOffset = Y;
Images[i].XS = XS;
Images[i].YS = YS;
Images[i].Style = Sty;
Images[i].Align = Align;
j = Lines.Length-1;
z = Lines[j].ImgList.Length;
Lines[j].ImgList.Length = z+1;
Lines[j].ImgList[z] = i;
}
final function SetContents( string Input )
{
local string LeftText,HTML,RightText,Output,Temp,Link;
local int Index;
local color TextColor,LinkColor,ALinkColor,OrgTextColor;
local byte Alignment,FontScaler,NextLineSkips;
CurTab = 0;
BGColor.A = 0;
BgImage.Img = None;
Lines.Length = 0;
Images.Length = 0;
TitleString = "";
bHasSplitLines = false;
bNeedsInit = true;
// First remove new liners
Input = Repl(Input, Chr(13)$Chr(10), "");
Input = Repl(Input, Chr(13), "");
Input = Repl(Input, Chr(10), "");
Input = Repl(Input, Chr(9), " ");
Input = Repl(Input, "\\n", "<BR>");
TextColor = WhiteColor;
OrgTextColor = WhiteColor;
LinkColor = BlueColor;
ALinkColor = RedColor;
FontScaler = 3;
DefaultFontSize = 3;
Index = -1;
while (Input != "")
{
ParseHTML(Input, LeftText, HTML, RightText);
switch (GetTag(HTML))
{
// multiline HTML tags
case "P":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
NextLineSkips = 2;
Output = "";
}
else ++NextLineSkips;
break;
case "BR":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
NextLineSkips = 1;
Output = "";
}
else ++NextLineSkips;
break;
case "BODY":
Temp = GetOption(HTML, "BGCOLOR=");
if (Temp != "")
BGColor = ParseColor(Temp);
Temp = GetOption(HTML, "LINK=");
if (Temp != "")
LinkColor = ParseColor(Temp);
Temp = GetOption(HTML, "ALINK=");
if (Temp != "")
ALinkColor = ParseColor(Temp);
Temp = GetOption(HTML, "TEXT=");
if (Temp != "")
{
TextColor = ParseColor(Temp);
OrgTextColor = TextColor;
}
Temp = GetOption(HTML, "SIZE=");
if (Temp != "")
{
FontScaler = int(Temp);
DefaultFontSize = FontScaler;
}
Temp = GetOption(Input, "IMG=");
if (Temp != "")
{
if( BGColor.A==0 )
BGColor = Class'Hud'.Default.WhiteColor;
BgImage.Img = Surface(DynamicLoadObject(Temp,Class'Surface'));
if( BgImage.Img==None )
BgImage.Img = Class'Canvas'.Default.DefaultTexture;
BgImage.X = BgImage.Img.GetSurfaceWidth();
BgImage.Y = BgImage.Img.GetSurfaceHeight();
switch( Caps(GetOption(Input, "IMGSTYLE=")) )
{
case "TILED":
BgImage.XS = BgImage.X;
BgImage.YS = BgImage.Y;
BgImage.Style = 1;
Temp = GetOption(Input, "TILEX=");
if (Temp != "")
BgImage.XS = int(Temp);
Temp = GetOption(Input, "TILEY=");
if (Temp != "")
BgImage.YS = int(Temp);
break;
case "FITX":
BgImage.Style = 2;
break;
case "FITY":
BgImage.Style = 3;
break;
default: // FIT
BgImage.Style = 0;
}
BgImage.Align = 0;
if( GetOption(Input, "IMGLOCK=")=="0" )
BgImage.Align = 1;
}
Output $= LeftText;
break;
case "CENTER":
Output $= LeftText;
if ( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
NextLineSkips = Max(NextLineSkips,1);
Alignment = 1;
break;
case "RIGHT":
Output $= LeftText;
if ( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
NextLineSkips = Max(NextLineSkips,1);
Alignment = 2;
break;
case "/CENTER":
case "/RIGHT":
Index = AddText(Output $ LeftText,TextColor,Alignment,FontScaler,NextLineSkips);
++NextLineSkips;
Alignment = 0;
Output = "";
break;
// Inline HTML tags
case "H1":
Output $= LeftText;
if ( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
NextLineSkips = Max(NextLineSkips,1);
FontScaler = 5;
Alignment = 1;
break;
case "/H1":
Index = AddText(Output $ LeftText,TextColor,Alignment,FontScaler,NextLineSkips);
++NextLineSkips;
Output = "";
FontScaler = DefaultFontSize;
Alignment = 0;
break;
case "FONT":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
Temp = GetOption(HTML, "COLOR=");
if (Temp != "")
TextColor = ParseColor(Temp);
Temp = GetOption(HTML, "SIZE=");
if (Temp != "")
FontScaler = int(Temp);
break;
case "/FONT":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
TextColor = OrgTextColor;
FontScaler = DefaultFontSize;
break;
case "TAB":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
CurTab = int(GetOption(HTML, "X="));
break;
case "/TAB":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
CurTab = 0;
break;
case "TITLE":
Output $= LeftText;
break;
case "/TITLE":
TitleString = LeftText;
break;
case "A":
Output $= LeftText;
if( Output!="" )
{
Index = AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
}
Link = GetOption(HTML, "HREF=");
break;
case "/A":
Output $= LeftText;
Index = AddText(Output,LinkColor,Alignment,FontScaler,NextLineSkips);
Lines[Index].ALColor = ALinkColor;
Lines[Index].bHasURL = true;
if( Link=="" )
Lines[Index].URL = ParseLinkType(Output);
else Lines[Index].URL = ParseLinkType(Link);
Output = "";
FontScaler = DefaultFontSize;
Alignment = 0;
break;
case "IMG":
Output $= LeftText;
if( Output!="" || NextLineSkips>0 )
AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
Output = "";
AddImage(HTML);
break;
default:
Output = Output $ LeftText;
break;
}
Input = RightText;
}
AddText(Output,TextColor,Alignment,FontScaler,NextLineSkips);
}
// Get the next HTML tag, the text before it and everthing after it.
final function ParseHTML(string Input, out string LeftText, out string HTML, out string RightText)
{
local int i;
i = InStr(Input, "<");
if (i == -1)
{
LeftText = Input;
HTML = "";
RightText = "";
return;
}
LeftText = Left(Input, i);
HTML = Mid(Input, i);
i = InStr(HTML, ">");
if (i == -1)
{
RightText = "";
return;
}
RightText = Mid(HTML, i+1);
HTML = Left(HTML, i+1);
}
final function string GetTag(string HTML)
{
local int i;
if (HTML == "")
return "";
HTML = Mid(HTML, 1); // lose <
i = FirstMatching(InStr(HTML, ">"), InStr(HTML, " "));
if (i == -1)
return Caps(HTML);
else
return Caps(Left(HTML, i));
}
final function string GetOption(string HTML, string Option)
{
local int i, j;
local string s;
i = InStr(Caps(HTML), Caps(Option));
if (i == 1 || Mid(HTML, i-1, 1) == " ")
{
s = Mid(HTML, i+Len(Option));
j = FirstMatching(InStr(s, ">"), InStr(s, " "));
s = Left(s, j);
if (Left(s, 1) == "\"")
s = Mid(s, 1);
if (Right(s, 1) == "\"")
s = Left(s, Len(s) - 1);
return s;
}
return "";
}
final function int FirstMatching(int i, int j)
{
if (i == -1)
return j;
if (j == -1)
return i;
return Min(i, j);
}
final function Color ParseColor(string S)
{
local Color C;
local int i;
S = Caps(S);
if (Left(S, 1) == "#")
{
C.R = (GetHexDigit(Mid(S, 1, 1)) << 4) + GetHexDigit(Mid(S, 2, 1));
C.G = (GetHexDigit(Mid(S, 3, 1)) << 4) + GetHexDigit(Mid(S, 4, 1));
C.B = (GetHexDigit(Mid(S, 5, 1)) << 4) + GetHexDigit(Mid(S, 6, 1));
}
else if (Left(S, 4) == "RGB(")
{
S = Mid(S, 4);
i = InStr(S,",");
C.R = int(Left(S,i));
S = Mid(S,i+1);
i = InStr(S,",");
C.G = int(Left(S,i));
C.B = int(Mid(S,i+1));
}
else
{
switch( S )
{
case "RED":
C.R = 255;
C.G = 0;
C.B = 0;
break;
case "BLUE":
C.R = 0;
C.G = 0;
C.B = 255;
break;
case "GREEN":
C.R = 0;
C.G = 255;
C.B = 0;
break;
case "YELLOW":
C.R = 255;
C.G = 255;
C.B = 0;
break;
case "BLACK":
C.R = 0;
C.G = 0;
C.B = 0;
break;
default: // WHITE
C.R = 255;
C.G = 255;
C.B = 255;
}
}
C.A = 255;
return C;
}
final function byte GetHexDigit(string D)
{
local byte i;
i = Asc(D);
if( i>=48 && i<=57 ) // i>='0' && i<='9'
return (i-48); // i-'0'
return Min(i-55,15); // i-('A'-10)
}
final function SplitLine( int iLine, int iOffset )
{
local int i;
local string S;
++iLine;
Lines.Insert(iLine,1);
S = Lines[iLine-1].Text;
for( i=iOffset; i<Len(S); ++i )
if( Mid(S,i,1)!=" " )
break;
Lines[iLine].Text = Mid(S,i);
Lines[iLine-1].Text = Left(S,iOffset);
Lines[iLine].URL = Lines[iLine-1].URL;
Lines[iLine].Color = Lines[iLine-1].Color;
Lines[iLine].ALColor = Lines[iLine-1].ALColor;
Lines[iLine].Align = Lines[iLine-1].Align;
Lines[iLine].FontSize = Lines[iLine-1].FontSize;
Lines[iLine].Tab = Lines[iLine-1].Tab;
Lines[iLine].LineSkips = 1;
Lines[iLine].bHasURL = Lines[iLine-1].bHasURL;
Lines[iLine].bSplit = true;
bHasSplitLines = true;
}
final protected function InitHTMLArea()
{
local float XS,YS;
local int i,j,X,Y,iStart,BestHeight,FontSize,PrevY,Remain,iLastWord,iLen,z,ImgHeight;
// Used to detect resolution changes when text needs realignment.
OldXSize = CompPos[2];
OldYSize = CompPos[3];
// Merge splitted lines again
if( bHasSplitLines )
{
bHasSplitLines = false;
for( i=1; i<Lines.Length; ++i )
{
if( Lines[i].bSplit )
{
Lines[i-1].Text @= Lines[i].Text;
Lines.Remove(i--,1);
}
}
}
// Setup background image scaling
if( BgImage.Img!=None )
{
switch( BgImage.Style )
{
case 1: // Tiled
if( BgImage.X==BgImage.XS )
BgImage.XOffset = Canvas.ClipX;
else
{
XS = Canvas.ClipX / float(BgImage.XS) * float(BgImage.X);
BgImage.XOffset = XS;
}
if( BgImage.Y==BgImage.YS )
BgImage.YOffset = Canvas.ClipY;
else
{
XS = Canvas.ClipY / float(BgImage.YS) * float(BgImage.Y);
BgImage.YOffset = XS;
}
break;
case 2: // Fit X
XS = Canvas.ClipY * (Canvas.ClipX / float(BgImage.X));
BgImage.YS = XS;
break;
case 3: // Fit Y
XS = Canvas.ClipX * (Canvas.ClipY / float(BgImage.Y));
BgImage.XS = XS;
break;
}
}
FontSize = Owner.CurrentStyle.DefaultFontSize;
Canvas.SetPos(0,0);
if( Lines.Length>0 )
{
while( true )
{
if( i>=Lines.Length || (i>0 && Lines[i].LineSkips>0) )
{
for( j=iStart; j<i; ++j )
{
switch( Lines[j].Align )
{
case 0: // Left
Lines[j].X = Lines[j].TOffset;
break;
case 1: // Center
Lines[j].X = (Canvas.ClipX-X+Lines[j].TOffset)/2;
break;
case 2: // Right
Lines[j].X = Canvas.ClipX-X+Lines[j].TOffset;
break;
}
}
if( i>=Lines.Length )
break;
X = 0;
iStart = i;
PrevY = BestHeight;
BestHeight = 0;
}
if( Lines[i].FontSize>=247 )
Lines[i].Font = Owner.CurrentStyle.PickFont(Max(Lines[i].FontSize-247,0),Lines[i].FontScale);
else Lines[i].Font = Owner.CurrentStyle.PickFont(Max(FontSize+Lines[i].FontSize,0),Lines[i].FontScale);
Canvas.Font = Lines[i].Font;
if( Lines[i].Text=="" )
{
Canvas.TextSize("ABC",XS,YS,Lines[i].FontScale,Lines[i].FontScale);
XS = 0;
}
else Canvas.TextSize(Lines[i].Text,XS,YS,Lines[i].FontScale,Lines[i].FontScale);
if( Lines[i].LineSkips>0 )
{
if( PrevY==0 )
PrevY = YS;
Y+=(PrevY*Lines[i].LineSkips);
}
X = Max(X,Lines[i].Tab);
Lines[i].TOffset = X;
Lines[i].Y = Y;
Lines[i].YS = YS;
BestHeight = Max(BestHeight,YS);
if( (X+XS)>Canvas.ClipX )
{
// Split to next row.
Remain = Canvas.ClipX-X;
iLastWord = 0;
iLen = Len(Lines[i].Text);
for( j=1; j<iLen; ++j )
{
Canvas.TextSize(Left(Lines[i].Text,j),XS,YS,Lines[i].FontScale,Lines[i].FontScale);
if( Remain<XS )
{
if( iLastWord==0 ) // Must cut off a word now.
SplitLine(i,Max(j-1,0));
else SplitLine(i,iLastWord);
break;
}
if( Mid(Lines[i].Text,j,1)==" " )
iLastWord = j+1;
}
Canvas.TextSize(Lines[i].Text,XS,YS,Lines[i].FontScale,Lines[i].FontScale);
}
Lines[i].XS = XS;
X+=XS;
for( j=0; j<Lines[i].ImgList.Length; ++j )
{
z = Lines[i].ImgList[j];
if( Images[z].Align==3 )
Images[z].X = X+Images[z].XOffset;
else Images[z].X = Images[z].XOffset;
Images[z].Y = Y+Images[z].YOffset;
ImgHeight = Max(ImgHeight,Images[z].Y+Images[z].YS);
}
++i;
}
YSize = Max(Y+BestHeight,ImgHeight);
}
else YSize = 0;
bNeedScrollbar = (YSize>Canvas.ClipY);
if( bNeedScrollbar )
{
MyScrollBar.SetDisabled(false);
MyScrollBar.UpdateScrollSize(0,YSize,Canvas.ClipY,512);
}
else MyScrollBar.SetDisabled(true);
}
simulated final function DrawTileStretchedClipped( Surface M, float XS, float YS )
{
Canvas.CurX += Canvas.OrgX;
Canvas.CurY += Canvas.OrgY;
if( Canvas.CurX<Canvas.OrgX )
{
XS-=(Canvas.OrgX-Canvas.CurX);
Canvas.CurX = Canvas.OrgX;
}
if( Canvas.CurY<Canvas.OrgY )
{
YS-=(Canvas.OrgY-Canvas.CurY);
Canvas.CurY = Canvas.OrgY;
}
if( (Canvas.CurX+XS)>Canvas.ClipX )
XS = (Canvas.ClipX-Canvas.CurX);
if( (Canvas.CurY+YS)>Canvas.ClipY )
YS = (Canvas.ClipY-Canvas.CurY);
if( Texture(M)!=None )
Canvas.DrawTileStretched(Texture(M),XS,YS);
}
function DrawMenu()
{
local float YS;
local int i,YOffset,MX,MY;
local bool bMouseOnClient;
if( bNeedsInit || OldXSize!=CompPos[2] || OldYSize!=CompPos[3] )
{
bNeedsInit = false;
InitHTMLArea();
}
if( bNeedScrollbar )
YOffset = MyScrollBar.CurrentScroll;
if( BGColor.A>0 )
{
C.SetPos(0,0);
C.DrawColor = BGColor;
if( BgImage.Img!=None )
{
if( BgImage.Align==1 ) // not locked on screen.
MX = YOffset;
switch( BgImage.Style )
{
case 0: // Stretched to fit
C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.X,BgImage.Y);
break;
case 1: // Tiled
C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.XOffset,BgImage.YOffset);
break;
case 2: // Fit X
C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.X,BgImage.YS);
break;
case 3: // Fit Y
C.DrawTileClipped(BgImage.Img,C.ClipX,C.ClipY,0,MX,BgImage.XS,BgImage.Y);
break;
}
}
else C.DrawTile(Texture'WhiteTexture',C.ClipX,C.ClipY,0,0,1,1);
}
MX = Controller.MouseX-C.OrgX;
MY = Controller.MouseY-C.OrgY;
bMouseOnClient = (MX>=0 && MX<=C.ClipX && MY>=0 && MY<=C.ClipY);
HoverOverLinkLine = -1;
MY+=YOffset;
C.DrawColor = Class'HUD'.Default.WhiteColor;
for( i=0; i<Images.Length; ++i )
{
C.CurY = Images[i].Y-YOffset;
if( (C.CurY+Images[i].YS)<0 || C.CurY>C.ClipY )
continue;
switch( Images[i].Align )
{
case 0: // Left
case 3: // Unaligned, postition after text.
C.CurX = 0;
break;
case 1: // Center
C.CurX = (C.ClipX-Images[i].XS)/2;
break;
case 1: // Right
C.CurX = C.ClipX-Images[i].XS;
break;
}
C.CurX += Images[i].X;
switch( Images[i].Style )
{
case 1: // Stretched
DrawTileStretchedClipped(C,Images[i].Img,Images[i].XS,Images[i].YS);
break;
case 2: // Tiled on X axis
C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].XS,Images[i].Img.MaterialVSize());
break;
case 3: // Tiled on Y axis
C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].Img.MaterialUSize(),Images[i].YS);
break;
case 4: // Fully tiled
C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].XS,Images[i].YS);
break;
default: // Normal
C.DrawTileClipped(Images[i].Img,Images[i].XS,Images[i].YS,0,0,Images[i].Img.MaterialUSize(),Images[i].Img.MaterialVSize());
}
}
for( i=0; i<Lines.Length; ++i )
{
C.SetPos(Lines[i].X,Lines[i].Y-YOffset);
if( (C.CurY+Lines[i].YS)<0 || Lines[i].Text=="" )
continue;
if( C.CurY>C.ClipY )
break;
// Check if mouse hovers over URL
if( bMouseOnClient && Lines[i].bHasURL && MX>=Lines[i].X && MX<=(Lines[i].X+Lines[i].XS)
&& MY>=Lines[i].Y && MY<=(Lines[i].Y+Lines[i].YS) )
{
HoverOverLinkLine = i;
bMouseOnClient = false; // No need to check on rest anymore.
C.DrawColor = Lines[i].ALColor;
}
else C.DrawColor = Lines[i].Color;
C.Font = Lines[i].Font;
C.DrawTextClipped(Lines[i].Text);
if( Lines[i].bHasURL )
{
YS = Max(Lines[i].YS/15,1);
C.SetPos(Lines[i].X,Lines[i].Y+Lines[i].YS-(YS*2)-YOffset);
if( C.CurY<C.ClipY )
C.DrawTileClipped(Texture'WhiteTexture',Lines[i].XS,YS,0,0,1,1);
}
}
if( OldHoverLine!=HoverOverLinkLine )
{
OldHoverLine = HoverOverLinkLine;
if( HoverOverLinkLine>=0 )
{
Controller.PlayInterfaceSound(CS_Hover);
SetToolTipText(Lines[HoverOverLinkLine].URL);
}
else SetToolTipText("");
}
}
function bool LaunchURL(GUIComponent Sender)
{
if( HoverOverLinkLine>=0 )
{
if( Left(Lines[HoverOverLinkLine].URL,8)~="kfurl://" )
LaunchKFURL(Mid(Lines[HoverOverLinkLine].URL,8));
else if( Left(Lines[HoverOverLinkLine].URL,5)~="kf://" )
ChangeGameURL(Mid(Lines[HoverOverLinkLine].URL,5));
else LaunchURLPage(Lines[HoverOverLinkLine].URL);
}
}
delegate LaunchKFURL( string URL );
delegate ChangeGameURL( string URL )
{
Class'SRLevelCleanup'.Static.AddSafeCleanup(PlayerOwner(),URL);
}
delegate LaunchURLPage( string URL )
{
PlayerOwner().Player.Console.DelayedConsoleCommand("START "$URL);
}
defaultproperties
{
bNeedsInit=true
PropagateVisibility=true
OnDraw=RenderHTMLText
OnClick=LaunchURL
Begin Object Class=GUIVertScrollBar Name=TheScrollbar
bBoundToParent=true
bScaleToParent=true
WinWidth=0.03
WinLeft=0.97
WinTop=0.0
WinHeight=1.0
bVisible=true
PropagateVisibility=true
OnPreDraw=TheScrollbar.GripPreDraw
End Object
MyScrollBar=TheScrollbar
StyleName="NoBackground"
bAcceptsInput=True
Begin Object Class=GUIToolTip Name=GUIListBoxBaseToolTip
ExpirationSeconds=0
End Object
ToolTip=GUIListBoxBaseToolTip
WhiteColor=(R=255,G=255,B=255,A=255)
BlueColor=(R=0,G=0,B=255,A=255)
RedColor=(R=255,G=0,B=0,A=255)
}

View File

@ -64,4 +64,5 @@ function DrawMenu()
defaultproperties defaultproperties
{ {
} }

View File

@ -2,4 +2,5 @@ Class KFGUI_ScrollBarH extends KFGUI_ScrollBarBase;
defaultproperties defaultproperties
{ {
} }

View File

@ -49,4 +49,5 @@ function DrawMenu()
defaultproperties defaultproperties
{ {
} }

View File

@ -64,4 +64,5 @@ function PreDraw()
defaultproperties defaultproperties
{ {
} }

View File

@ -68,4 +68,5 @@ final function RenderProgress()
defaultproperties defaultproperties
{ {
} }

View File

@ -2,4 +2,5 @@ Class SRPerkManager extends ExtPerkManager;
defaultproperties defaultproperties
{ {
} }

View File

@ -257,4 +257,5 @@ function SetSaveVersion(int Num)
defaultproperties defaultproperties
{ {
} }

View File

@ -1722,6 +1722,8 @@ function WebAdminSetValue(name PropName, int ElementIndex, string Value)
defaultproperties defaultproperties
{ {
GroupNames.Add("ServerExt")
// Main devs // Main devs
DevList.Add("0x0110000100E8984E") // Marco DevList.Add("0x0110000100E8984E") // Marco
DevList.Add("0x01100001023DF8A8") // ForrestMarkX DevList.Add("0x01100001023DF8A8") // ForrestMarkX

View File

@ -34,4 +34,5 @@ event AllowBroadcastLocalizedTeam(int TeamIndex, actor Sender, class<LocalMessag
defaultproperties defaultproperties
{ {
} }

2
tools

@ -1 +1 @@
Subproject commit d830a5ea169e230fa40d63319b838fde1e25f6c1 Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f