Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
szapp committed Oct 12, 2019
2 parents e8375a4 + 870f64c commit 3302ac3
Show file tree
Hide file tree
Showing 66 changed files with 203 additions and 101 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2018 mud-freak (@szapp)
Copyright (c) 2016-2019 mud-freak (@szapp)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOWT2_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOWT2_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: third iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOWT2_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOWT2_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOW_AIM_HURT.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOW_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOW_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: fourth iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOW_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_BOW_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOWT2_AIM_HURT.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOWT2_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOWT2_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: third iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOWT2_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOWT2_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOW_AIM_HURT.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOW_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOW_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOW_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_CBOW_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGFRZ_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGFRZ_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGFRZ_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGFRZ_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGLIN_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGLIN_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGLIN_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGLIN_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGWND_AIM_HURT.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGWND_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGWND_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGWND_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAGWND_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAG_AIM_HURT.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAG_AIM_MOVEF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAG_AIM_MOVEL.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: second iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAG_AIM_MOVELF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
2 changes: 1 addition & 1 deletion _work/data/Anims/GFA/HUM_MAG_AIM_MOVERF.ASC
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*3DSMAX_ASCIIEXPORT 110
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2018 mud-freak (@szapp)"
*COMMENT "This file is part of Gothic Free Aim Copyright (C) 2016-2019 mud-freak (@szapp)"
*COMMENT "<http://github.com/szapp/GothicFreeAim>"
*COMMENT "Animations: first iteration"
*SCENE {
Expand Down
4 changes: 2 additions & 2 deletions _work/data/Scripts/Content/GFA/_intern/activate.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Activate free aiming and set internal settings
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down
6 changes: 3 additions & 3 deletions _work/data/Scripts/Content/GFA/_intern/aimRay.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Aim-specific trace ray and focus collection
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down Expand Up @@ -64,7 +64,7 @@ func void GFA_AllowSoftSkinTraceRay(var int on) {
func int GFA_AimRayHead(var int npcPtr, var int fromPosPtr, var int dirPosPtr, var int vecPtr) {
var int hit; hit = FALSE;
var oCNpc npc; npc = _^(npcPtr);
if (!Hlp_StrCmp(npc.head_visualName, "") && (npc.anictrl)) {
if (!Hlp_StrCmp(npc.head_visualName, "") && (npc.anictrl) && (npc._zCVob_homeWorld)) {
// Perform a lot of safety checks, to prevent crashes
var zCAIPlayer playerAI; playerAI = _^(npc.anictrl);
if (playerAI.modelHeadNode) {
Expand Down
4 changes: 2 additions & 2 deletions _work/data/Scripts/Content/GFA/_intern/aimVob.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Definition and manipulation of aim vob (targeting system)
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down
4 changes: 2 additions & 2 deletions _work/data/Scripts/Content/GFA/_intern/auxiliary.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Auxiliary functions including finding the active spell instance and ranged weapon and offering animated reticles
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down
6 changes: 3 additions & 3 deletions _work/data/Scripts/Content/GFA/_intern/ccommands.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Definition of all console commands
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down Expand Up @@ -203,7 +203,7 @@ func string GFA_GetLicense(var string _) {
SB(GFA_VERSION);
SB(", Copyright ");
SBc(169 /* (C) */);
SB(" 2016-2018 mud-freak (@szapp)");
SB(" 2016-2019 mud-freak (@szapp)");
SBc(13); SBc(10);

SB("<http://github.com/szapp/GothicFreeAim>");
Expand Down
4 changes: 2 additions & 2 deletions _work/data/Scripts/Content/GFA/_intern/classes.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* GFA Classes
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down
11 changes: 8 additions & 3 deletions _work/data/Scripts/Content/GFA/_intern/collectable.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Collectable projectiles feature
*
* Gothic Free Aim (GFA) v1.1.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2018 mud-freak (@szapp)
* Gothic Free Aim (GFA) v1.2.0 - Free aiming for the video games Gothic 1 and Gothic 2 by Piranha Bytes
* Copyright (C) 2016-2019 mud-freak (@szapp)
*
* This file is part of Gothic Free Aim.
* <http://github.com/szapp/GothicFreeAim>
Expand Down Expand Up @@ -69,7 +69,9 @@ func void GFA_RP_KeepProjectileInWorld() {
// Replace the projectile if desired, retrieve new projectile instance from config
var C_Npc emptyNpc; emptyNpc = MEM_NullToInst(); // No NPC was hit, so pass an empty instance as argument
var C_Npc shooter; shooter = _^(MEM_ReadInt(arrowAI+oCAIArrow_origin_offset));
GFA_ProjectilePtr = projectilePtr; // Temporarily provide projectile
var int projInst; projInst = GFA_GetUsedProjectileInstance(projectile.instanz, shooter, emptyNpc);
GFA_ProjectilePtr = 0;

// Check if the new projectile instance is valid, -1 for invalid instance, 0 for empty
if (projInst > 0) {
Expand Down Expand Up @@ -121,7 +123,8 @@ func void GFA_RP_PutProjectileIntoInventory() {
return;
};

var oCItem projectile; projectile = _^(MEM_ReadInt(arrowAI+oCAIArrowBase_hostVob_offset));
var int projectilePtr; projectilePtr = MEM_ReadInt(arrowAI+oCAIArrowBase_hostVob_offset);
var oCItem projectile; projectile = _^(projectilePtr);

// Differentiate between positive hit and collision without damage (in case of auto aim hit registration)
var int positiveHit; positiveHit = MEMINT_SwitchG1G2(
Expand All @@ -133,7 +136,9 @@ func void GFA_RP_PutProjectileIntoInventory() {
var C_Npc shooter; shooter = _^(MEM_ReadInt(arrowAI+oCAIArrow_origin_offset));

// Replace the projectile if desired, retrieve new projectile instance from config
GFA_ProjectilePtr = projectilePtr; // Temporarily provide projectile
var int projInst; projInst = GFA_GetUsedProjectileInstance(projectile.instanz, shooter, victim);
GFA_ProjectilePtr = 0;
if (projInst > 0) {
CreateInvItem(victim, projInst); // Put respective instance in inventory
};
Expand Down

0 comments on commit 3302ac3

Please sign in to comment.