From 569ef037ecbc7877f0e54ef9c5d8fc87e99fc786 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 13 Jun 2018 13:24:57 +0200 Subject: [PATCH] Added lesser variants to shock core and biorifle ammo for balance. Added "dropped ammo" properties to all weapons, also for balance. Silence warnings about floating point truncation. --- brightmaps/JShockCore_2.png | Bin 0 -> 674 bytes gldefs.txt | 8 ++++++ modeldef.ges | 12 +++++++++ modeldef.shock | 10 ++++++++ models/JShockCore_2.png | Bin 0 -> 18342 bytes zscript/armoritems.zsc | 2 +- zscript/biorifle.zsc | 49 +++++++++++++++++++++++++----------- zscript/eightball.zsc | 1 + zscript/enforcer.zsc | 7 +++--- zscript/flakcannon.zsc | 13 +++++----- zscript/impacthammer.zsc | 12 ++++----- zscript/minigun.zsc | 1 + zscript/powerups.zsc | 12 ++++----- zscript/pulsegun.zsc | 15 +++++------ zscript/ripper.zsc | 7 +++--- zscript/shockrifle.zsc | 31 ++++++++++++++++++----- zscript/sniperrifle.zsc | 1 + zscript/utcommon.zsc | 18 ++++++++----- zscript/uthud.zsc | 18 ++++++------- zscript/warheadlauncher.zsc | 9 ++++--- 20 files changed, 154 insertions(+), 72 deletions(-) create mode 100644 brightmaps/JShockCore_2.png create mode 100644 models/JShockCore_2.png diff --git a/brightmaps/JShockCore_2.png b/brightmaps/JShockCore_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0a38d1ef3fae053b2b1e8c47d79e57c76c86d593 GIT binary patch literal 674 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4h9AWhG(I6;tUK-nVv3=Ar-gYM#bhIHsE-2 z=ih(%IZO80rc72l+jfp|j_zE!swkU9!rW3g-<>Vw)?`b-cA{MsGXLt!@yUu)j z(&$BcMeD<7ayzy%&d6c-WYbWoxPz7N!99zHm7X2-{mcf3n{S312(v$!)bu!X0=r8? z(k&mSM^l>fTNtw1lA?r`wKxRNZE9iI<;P~jWFW(|Bk@XbiFx_f11n|!#s<9-ZC<{X z=w}wcB33FnY63d(W5X(1tpWITD>m*|)^77p-F8QuUTNzfdueP4lfa z1E;4)-@+x*0&`1Gl*xN2s95~J7~ouZ>L9oGsvciWzf)JeSgLgS*%n6R3eU4}SRHs& zD&T_he~(+!COft0c^sP_A}}#1srW#Xqqxe3S%Qm~UpDIaa$@(6ls6T5pBSS8Ip+5) zo3`+Fb=<*5p{UkpDJ-?_lMN&n+RsS~VO(}^#*4)Zg(X(XEoe0BFtc)Ww!h3zB%dlOP>!19xq(u=e37% z2P0pCoc6Sv_XRnZn9EhCJ}jOwaiVAV_MBY}XA)epI0IPt)?Rwh;>9!P*NT1X+-rhE zZWk{7lCO8NMP@>|od$QV+p?w`r?a~jtUjb^AL16$qupJh@$CDx-=BL9rbfiaFTG%~ zI<#eL+qb4&6W83n7H}xJej@v~({dFnEH=moy)H9Zdz=5$)~l=89PF1coRwi{VM;vp fW&}<-5c4T;#sEl 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 0) && !DamageTypeDefinition.IgnoreArmor(damageType) ) { - saved = damage*absorb/100.; + saved = int(damage*absorb/100.); if ( amount <= saved ) saved = amount; newdamage -= saved; amount -= saved; diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index a1efc22..6a91cd8 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -2,8 +2,8 @@ Class Tier3Ammo : RandomSpawner2 replaces Shell { Default { - DropItem "BioAmmo", 255, 1; - DropItem "ShockAmmo", 255, 1; + DropItem "BioAmmo2", 255, 1; + DropItem "ShockAmmo2", 255, 1; } } Class Tier3Ammo2 : Tier3Ammo replaces ShellBox {} @@ -37,6 +37,24 @@ Class BioAmmo : Ammo } } +Class BioAmmo2 : BioAmmo // small variant +{ + Default + { + Tag "Biosludge Ammo"; + Inventory.PickupMessage "You picked up the Small Biosludge Ammo."; + Inventory.Amount 10; + Ammo.DropAmount 5; + Scale 0.5; + } + States + { + Spawn: + BIOA A -1; + Stop; + } +} + Class BioSpark : Actor { Default @@ -139,7 +157,7 @@ Class BioLight : DynamicLight Destroy(); return; } - args[LIGHT_INTENSITY] = 8*target.Scale.x; + args[LIGHT_INTENSITY] = int(8*target.Scale.x); } } @@ -161,9 +179,9 @@ Class BioXLight : DynamicLight { Super.Tick(); if ( globalfreeze || level.frozen ) return; - args[LIGHT_RED] = 64*lifetime; - args[LIGHT_GREEN] = 255*lifetime; - args[LIGHT_BLUE] = 48*lifetime; + args[LIGHT_RED] = int(64*lifetime); + args[LIGHT_GREEN] = int(255*lifetime); + args[LIGHT_BLUE] = int(48*lifetime); lifetime -= 0.05; if ( lifetime <= 0 ) Destroy(); } @@ -187,7 +205,7 @@ Class BioGel : Actor int atplane; Sector atsector; double atz; - int rollvel, pitchvel, yawvel; + double rollvel, pitchvel, yawvel; Vector3 normal; override void PostBeginPlay() @@ -252,7 +270,7 @@ Class BioGel : Actor } if ( !InStateSequence(CurState,FindState("XDeath")) && ((!bNOGRAVITY && !Random[GES](0,2)) || !Random[GES](0,10)) ) { - int numpt = Min(20,Scale.x*2)+Random[GES](-1,1); + int numpt = Min(20,int(Scale.x*2))+Random[GES](-1,1); for ( int i=0; i 0.22 ) { - t.Results.HitActor.DamageMobj(self,target,Random[Pulse](70,80)*accdamage,'zapped',DMG_USEANGLE,atan2(x.y,x.x)); + t.Results.HitActor.DamageMobj(self,target,int(Random[Pulse](70,80)*accdamage),'zapped',DMG_USEANGLE,atan2(x.y,x.x)); accdamage = 0; } } @@ -446,7 +446,7 @@ Class PulseBolt : Actor } else if ( damagedactor ) { - damagedactor.DamageMobj(self,target,Random[Pulse](65,75)*accdamage,'zapped'); + damagedactor.DamageMobj(self,target,int(Random[Pulse](65,75)*accdamage),'zapped'); accdamage = 0; damagedactor = null; } @@ -716,6 +716,7 @@ Class PulseGun : UTWeapon Weapon.AmmoUse2 1; Weapon.AmmoGive 60; PulseGun.ClipCount 50; + UTWeapon.DropAmmo 15; } States { diff --git a/zscript/ripper.zsc b/zscript/ripper.zsc index ef42152..f058cc2 100644 --- a/zscript/ripper.zsc +++ b/zscript/ripper.zsc @@ -171,9 +171,9 @@ Class Razor2AltLight : DynamicLight { Super.Tick(); if ( globalfreeze || level.frozen ) return; - args[LIGHT_RED] = 255*lifetime; - args[LIGHT_GREEN] = 240*lifetime; - args[LIGHT_BLUE] = 224*lifetime; + args[LIGHT_RED] = int(255*lifetime); + args[LIGHT_GREEN] = int(240*lifetime); + args[LIGHT_BLUE] = int(224*lifetime); lifetime -= 0.05; if ( lifetime <= 0 ) Destroy(); } @@ -258,6 +258,7 @@ Class Ripper2 : UTWeapon Weapon.AmmoType2 "RipperAmmo"; Weapon.AmmoUse2 1; Weapon.AmmoGive 15; + UTWeapon.DropAmmo 5; } action void A_RazorFire( bool alt = false ) { diff --git a/zscript/shockrifle.zsc b/zscript/shockrifle.zsc index b1aff62..2a903d6 100644 --- a/zscript/shockrifle.zsc +++ b/zscript/shockrifle.zsc @@ -18,6 +18,23 @@ Class ShockAmmo : Ammo } } +Class ShockAmmo2 : ShockAmmo +{ + Default + { + Tag "Used Shock Core"; + Inventory.PickupMessage "You picked up a used Shock Core."; + Inventory.Amount 3; + Ammo.DropAmount 3; + } + States + { + Spawn: + SHOA A -1; + Stop; + } +} + Class ShockBeamTracer : LineTracer { Actor owner, ignore, lasthit; @@ -728,9 +745,9 @@ Class ShockExplLight : DynamicLight { Super.Tick(); if ( globalfreeze || level.frozen ) return; - args[LIGHT_RED] = 160*lifetime; - args[LIGHT_GREEN] = 128*lifetime; - args[LIGHT_BLUE] = 255*lifetime; + args[LIGHT_RED] = int(160*lifetime); + args[LIGHT_GREEN] = int(128*lifetime); + args[LIGHT_BLUE] = int(255*lifetime); lifetime -= 1./ReactionTime; if ( lifetime <= 0 ) Destroy(); } @@ -754,9 +771,9 @@ Class SuperShockExplLight : DynamicLight { Super.Tick(); if ( globalfreeze || level.frozen ) return; - args[LIGHT_RED] = 255*lifetime; - args[LIGHT_GREEN] = 160*lifetime; - args[LIGHT_BLUE] = 128*lifetime; + args[LIGHT_RED] = int(255*lifetime); + args[LIGHT_GREEN] = int(160*lifetime); + args[LIGHT_BLUE] = int(128*lifetime); lifetime -= 1./ReactionTime; if ( lifetime <= 0 ) Destroy(); } @@ -1046,6 +1063,7 @@ Class ShockRifle : UTWeapon Weapon.AmmoType2 "ShockAmmo"; Weapon.AmmoUse2 1; Weapon.AmmoGive 20; + UTWeapon.DropAmmo 5; } States { @@ -1218,6 +1236,7 @@ Class EnhancedShockRifle : UTWeapon replaces InvulnerabilitySphere Weapon.AmmoType2 "EnhancedShockAmmo"; Weapon.AmmoUse2 1; Weapon.AmmoGive 25; + UTWeapon.DropAmmo 5; +WEAPON.AMMO_OPTIONAL; +WEAPON.ALT_AMMO_OPTIONAL; +WEAPON.CHEATNOTWEAPON; diff --git a/zscript/sniperrifle.zsc b/zscript/sniperrifle.zsc index 64345c9..35aa0ab 100644 --- a/zscript/sniperrifle.zsc +++ b/zscript/sniperrifle.zsc @@ -155,6 +155,7 @@ Class SniperRifle : UTWeapon Weapon.AmmoUse2 1; Weapon.AmmoGive 8; Weapon.Kickback 250; + UTWeapon.DropAmmo 2; } States { diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc index 0cfba37..54ede08 100644 --- a/zscript/utcommon.zsc +++ b/zscript/utcommon.zsc @@ -197,12 +197,18 @@ Class RandomSpawner2 : RandomSpawner { spawned.SetState(spawned.ResolveState("Spawn")+1); Inventory(spawned).bALWAYSPICKUP = true; + if ( UTWeapon(spawned).DropAmmo > 0 ) + Weapon(spawned).AmmoGive1 = min(UTWeapon(spawned).DropAmmo,Weapon(spawned).AmmoGive1); } } } Class UTWeapon : Weapon { + int DropAmmo; + + Property DropAmmo: DropAmmo; + // Drawstuffs under HUD virtual ui void PreRender( double lbottom ) {} // Drawstuffs over HUD @@ -272,9 +278,9 @@ Class UTTeleportLight : DynamicLight Destroy(); return; } - args[LIGHT_RED] = 128*alpha; - args[LIGHT_GREEN] = 160*alpha; - args[LIGHT_BLUE] = 255*alpha; + args[LIGHT_RED] = int(128*alpha); + args[LIGHT_GREEN] = int(160*alpha); + args[LIGHT_BLUE] = int(255*alpha); args[LIGHT_INTENSITY] = Random[Tele](10,14)*8; alpha -= 1./35; } @@ -295,9 +301,9 @@ Class UTItemLight : DynamicLight Destroy(); return; } - args[LIGHT_RED] = 255*alpha; - args[LIGHT_GREEN] = 224*alpha; - args[LIGHT_BLUE] = 160*alpha; + args[LIGHT_RED] = int(255*alpha); + args[LIGHT_GREEN] = int(224*alpha); + args[LIGHT_BLUE] = int(160*alpha); args[LIGHT_INTENSITY] = Random[Tele](6,8)*8; alpha -= 3./35; } diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc index 05fbeb0..3a478a5 100644 --- a/zscript/uthud.zsc +++ b/zscript/uthud.zsc @@ -300,18 +300,18 @@ Class UTHud : BaseStatusBar if ( CPlayer.GetGender() == 1 ) { UTDrawTintedTex(Woman[0],hudsize*statussize,min(opacity,15),dollcolor); - if ( a ) UTDrawTintedTex(Woman[1],hudsize*statussize,min(opacity,15)*(a.Amount/double(a.MaxAmount)),dollcolor); - if ( t ) UTDrawTintedTex(Woman[2],hudsize*statussize,min(opacity,15)*(t.Amount/double(t.MaxAmount)),dollcolor); - if ( j ) UTDrawTintedTex(Woman[3],hudsize*statussize,min(opacity,15)*(j.Amount/double(j.MaxAmount)),dollcolor); - if ( s ) UTDrawTintedTex(Woman[4],hudsize*statussize,min(opacity,15)*(s.Amount/double(s.MaxAmount)),GoldColor); + if ( a ) UTDrawTintedTex(Woman[1],hudsize*statussize,int(min(opacity,15)*(a.Amount/double(a.MaxAmount))),dollcolor); + if ( t ) UTDrawTintedTex(Woman[2],hudsize*statussize,int(min(opacity,15)*(t.Amount/double(t.MaxAmount))),dollcolor); + if ( j ) UTDrawTintedTex(Woman[3],hudsize*statussize,int(min(opacity,15)*(j.Amount/double(j.MaxAmount))),dollcolor); + if ( s ) UTDrawTintedTex(Woman[4],hudsize*statussize,int(min(opacity,15)*(s.Amount/double(s.MaxAmount))),GoldColor); } else { UTDrawTintedTex(Man[0],hudsize*statussize,min(opacity,15),dollcolor); - if ( a ) UTDrawTintedTex(Man[1],hudsize*statussize,min(opacity,15)*(a.Amount/double(a.MaxAmount)),dollcolor); - if ( t ) UTDrawTintedTex(Man[2],hudsize*statussize,min(opacity,15)*(t.Amount/double(t.MaxAmount)),dollcolor); - if ( j ) UTDrawTintedTex(Man[3],hudsize*statussize,min(opacity,15)*(j.Amount/double(j.MaxAmount)),dollcolor); - if ( s ) UTDrawTintedTex(Man[4],hudsize*statussize,min(opacity,15)*(s.Amount/double(s.MaxAmount)),GoldColor); + if ( a ) UTDrawTintedTex(Man[1],hudsize*statussize,int(min(opacity,15)*(a.Amount/double(a.MaxAmount))),dollcolor); + if ( t ) UTDrawTintedTex(Man[2],hudsize*statussize,int(min(opacity,15)*(t.Amount/double(t.MaxAmount))),dollcolor); + if ( j ) UTDrawTintedTex(Man[3],hudsize*statussize,int(min(opacity,15)*(j.Amount/double(j.MaxAmount))),dollcolor); + if ( s ) UTDrawTintedTex(Man[4],hudsize*statussize,int(min(opacity,15)*(s.Amount/double(s.MaxAmount))),GoldColor); } } DrawColor = WhiteColor; @@ -617,7 +617,7 @@ Class UTHud : BaseStatusBar } int protrusion = GetProtrusion(swidth/hres); [tmp,tmp,hres] = StatusbarToRealCoords(0,0,protrusion); - width += (swidth-hres)/scale.X; + width += int((swidth-hres)/scale.X); if ( am_showtime ) { printtext = level.TimeFormatted(); diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc index f86bdbc..2a14054 100644 --- a/zscript/warheadlauncher.zsc +++ b/zscript/warheadlauncher.zsc @@ -69,7 +69,7 @@ Class ShockWave : Actor if ( (dist > olddmgradius) || (dir dot a.vel < 0) ) { if ( !a.bDONTTHRUST ) a.vel += dir*((moscale+20)/a.mass); - a.DamageMobj(self,target,moscale,'RedeemerDeath',DMG_THRUSTLESS); + a.DamageMobj(self,target,int(moscale),'RedeemerDeath',DMG_THRUSTLESS); } } olddmgradius = dmgradius; @@ -163,9 +163,9 @@ Class WarheadExplodLight : DynamicLight { Super.Tick(); if ( globalfreeze || level.frozen ) return; - args[LIGHT_RED] = 255*lifetime; - args[LIGHT_GREEN] = 192*lifetime; - args[LIGHT_BLUE] = 128*lifetime; + args[LIGHT_RED] = int(255*lifetime); + args[LIGHT_GREEN] = int(192*lifetime); + args[LIGHT_BLUE] = int(128*lifetime); lifetime -= 1./ReactionTime; if ( lifetime <= 0 ) Destroy(); } @@ -663,6 +663,7 @@ Class WarheadLauncher : UTWeapon replaces BFG9000 Inventory.RespawnTics 2100; +INVENTORY.ALWAYSPICKUP; +WEAPON.NOAUTOFIRE; + UTWeapon.DropAmmo 1; } States {