-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #134 from Die4Ever/develop
v1.5.5 finalizing balance
- Loading branch information
Showing
15 changed files
with
183 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| class DXRDartFlare injects DartFlare; | ||
|
|
||
| defaultproperties | ||
| { | ||
| DamageType=FlareFlamed | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,70 @@ | ||
| class ScriptedPawn merges ScriptedPawn; | ||
| // doesn't work with injects due to use of Self | ||
|
|
||
| var int flareBurnTime; | ||
|
|
||
| function PlayDying(name damageType, vector hitLoc) | ||
| { | ||
| local DeusExPlayer p; | ||
| local Inventory item, nextItem; | ||
| local bool gibbed, drop, melee; | ||
|
|
||
| gibbed = (Health < -100) && !IsA('Robot'); | ||
|
|
||
| if( gibbed ) { | ||
| p = DeusExPlayer(GetPlayerPawn()); | ||
| class'DXRStats'.static.AddGibbedKill(p); | ||
| } | ||
|
|
||
| item = Inventory; | ||
| while( item != None ) { | ||
| nextItem = item.Inventory; | ||
| melee = item.IsA('WeaponProd') || item.IsA('WeaponBaton') || item.IsA('WeaponCombatKnife') || item.Isa('WeaponCrowbar') || item.IsA('WeaponNanoSword') || item.Isa('WeaponSword'); | ||
| drop = (item.IsA('NanoKey') && gibbed) || (melee && !gibbed);//don't give the melee weapon if we're getting gibbed, that would make the game easier and this is supposed to be a QoL change not a balance change | ||
| drop = (item.IsA('NanoKey') && gibbed) || (melee && !gibbed) || (gibbed && item.bDisplayableInv); | ||
| if( drop ) { | ||
| class'DXRActorsBase'.static.ThrowItem(self, item); | ||
| item.Velocity *= vect(-1, -1, 1.3); | ||
| if(gibbed) | ||
| item.Velocity *= vect(-2, -2, 2); | ||
| else | ||
| item.Velocity *= vect(-1.5, -1.5, 1.5); | ||
| } | ||
| item = nextItem; | ||
| } | ||
|
|
||
| _PlayDying(damageType, hitLoc); | ||
| } | ||
|
|
||
| function TakeDamageBase(int Damage, Pawn instigatedBy, Vector hitlocation, Vector momentum, name damageType, | ||
| bool bPlayAnim) | ||
| { | ||
| local name baseDamageType; | ||
| local DeusExPlayer p; | ||
|
|
||
| if (damageType == 'FlareFlamed') { | ||
| baseDamageType = 'Flamed'; | ||
| } else { | ||
| baseDamageType = damageType; | ||
| } | ||
|
|
||
| _TakeDamageBase(Damage,instigatedBy,hitLocation,momentum,baseDamageType,bPlayAnim); | ||
|
|
||
| if (bBurnedToDeath) { | ||
| p = DeusExPlayer(GetPlayerPawn()); | ||
| class'DXRStats'.static.AddBurnKill(p); | ||
| } | ||
|
|
||
| if (damageType == 'FlareFlamed') { | ||
| flareBurnTime = 3; | ||
| } | ||
| } | ||
|
|
||
| function UpdateFire() | ||
| { | ||
| _UpdateFire(); | ||
| if (flareBurnTime > 0) { | ||
| flareBurnTime -= 1; | ||
| if (flareBurnTime == 0) { | ||
| ExtinguishFire(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| class DXRHUDObjectBelt injects HUDObjectBelt; | ||
|
|
||
| function UpdateObjectText(int pos) | ||
| { | ||
| local int i; | ||
|
|
||
| //Update all belt texts (So that ammo counts are shown correctly) | ||
| for (i=0; i<ArrayCount(objects); i++) { | ||
| if(objects[i] != None) objects[i].UpdateItemText(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| class DXRHUDObjectSlot injects HUDObjectSlot; | ||
|
|
||
| var String ammoText; | ||
|
|
||
| event DrawWindow(GC gc) | ||
| { | ||
| Super.DrawWindow(gc); | ||
|
|
||
| // Don't draw any of this if we're dragging | ||
| if ((item != None) && (item.Icon != None) && (!bDragging)) | ||
| { | ||
| // Text defaults | ||
| gc.SetAlignments(HALIGN_Center, VALIGN_Center); | ||
| gc.EnableWordWrap(false); | ||
| gc.SetTextColor(colObjectNum); | ||
|
|
||
| if (ammoText!="") { | ||
| gc.SetAlignments(HALIGN_Left, VALIGN_Center); | ||
| gc.DrawText(slotIconX+2, itemTextPosY-8, slotFillWidth, 8, ammoText); | ||
| gc.SetAlignments(HALIGN_Center, VALIGN_Center); | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| function bool ShouldDisplayAmmo(DeusExWeapon weapon) | ||
| { | ||
| if ( weapon.AmmoType == None || weapon.AmmoName == class'AmmoNone' ) { | ||
| return False; | ||
| } | ||
|
|
||
| if (weapon.bHandToHand == True) { | ||
| return False; | ||
| } | ||
|
|
||
| if (weapon.IsA('WeaponNanoVirusGrenade') || | ||
| weapon.IsA('WeaponGasGrenade') || | ||
| weapon.IsA('WeaponEMPGrenade') || | ||
| weapon.IsA('WeaponLAM')) | ||
| { | ||
| return False; | ||
| } | ||
|
|
||
| return True; | ||
| } | ||
|
|
||
|
|
||
| function UpdateItemText() | ||
| { | ||
| local DeusExWeapon weapon; | ||
|
|
||
| super.UpdateItemText(); | ||
|
|
||
| ammoText = ""; | ||
| // If this is a weapon, show the number of remaining rounds | ||
| weapon = DeusExWeapon(item); | ||
| if (weapon != None) | ||
| { | ||
| if (weapon.IsA('WeaponShuriken')) | ||
| { | ||
| if (weapon.AmmoType.AmmoAmount > 1) | ||
| itemText = CountLabel @ weapon.AmmoType.AmmoAmount; | ||
| } else { | ||
| if (ShouldDisplayAmmo(weapon)) | ||
| ammoText = string(weapon.AmmoType.AmmoAmount); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters