More DECORATE problems ahead

[FireSeraphim]

For the most part everything about the weapon (the new version of the Marksman Rifle in my TEOTPC mod) works correctly now except the scope crosshair that's supposed to appear when zoomed.
Zooming, firing while zooming and unzooming work fine right except for the distinct lack of the aforementioned scope. I deeply suspect that it's something deeper than a unforeseen problem with my DECORATE code. please PM me or ping me on discord for the latest bleeding edge dev revision of my mod if you are interested in helping me resolve this conundrum.

[Matt]

Maybe just upload it?

[FireSeraphim]

@Matt: I already have it uploaded to my dropbox, I just want to keep this somewhat confidential since the next public version of my mod is going to be huge in that I will be (hopefully) exiting the alpha phase (where I am satisfied enough with the gameplay aspect of it that I can focus more work on the maps) and entering the beta phase (which involves further refining existing elements, polishing existing maps and focusing more on making new maps overall)

Edit: I may as well share the dev build

[Apeirogon]

I deeply suspect that it's something deeper than a unforeseen problem with my DECORATE code.

And you suspect wrong.

You use MSPC A sprite name in decorate, but image of scope have MSPC B name.

And change its offset to (351,444), so it fit screen correctly.

And change ready state to

Code: Select all

  Ready:
	MRIF A 0
	MRIF A 0 A_JumpIfInventory ("ZoomCheck", 1, "Unzoom")
    MRIF A 1 A_WeaponReady (WRF_ALLOWZOOM)
    Loop

because mad twitching rifle not the one I, player, want to see.

And, desirable, change zoom state to altfire, because most players bind altfire to second mouse button, not zoom.

[FireSeraphim]

Thank you Apeirogon! You too shall appear in the credits

[FireSeraphim]

Once again I am stumped on another decorate thing, namely fixing a problem where the pistol in my mod continues to fire after running out of ammo instead of just autoswapping to another weapon, and this is in light of me working on adding a reloading system to my pistol. Here's the DECORATE code: https://hastebin.com/ilifajeqag.php I am literally at a lost to what the hell I could possibly be doing wrong.
Could someone go over my pistol code and maybe point out where I'm blundering? I am simply not seeing where I'm fracking up?

Also just discovered that I can hold down the reload key and drain my ammo that way.

[FireSeraphim]

One step forward, two steps back.

There's no winning for losing, is there? even with going as far as swapping ammo1 and ammo2 It still will not deselect the weapon. and if I try the other way or any other tweak I run into the opposite problem of the weapon deselecting right away instead of going to the reload state when there's still ammo to load into the clip

My Pistol Code as it stands right: https://hastebin.com/wuqotinovi.php
Ideally I want the pistol to not fire and deselect when there's absolutely no ammo in both the clip and main ammo pool the clip reloads from. The real problem is that with Weapon.Ammo_Optional, the weapon works right for the most part but WILL NOT deselect when there is no clip2 or officerpistolloaded left. If I remove Weapon.Ammo_Optional, the weapon deselects the moment I press the fire key, consequences be damned (this applies even when I give 12 officerpistolloaded via the playerpawn).

[Apeirogon]

You mod should work with zandronum or no?

Anyway, here. Just change name of sprite and ammo.

---

Code: Select all

ACTOR PISG : Weapon// replaces PISGol 565
{
//$Category Weapons
//$Title "Officer's PISGol"
Inventory.pickupmessage "You got the Officer's PISGol! (+12 Bullets)"
Tag "Heavy_PISGol"
Decal "BulletChip"

Weapon.SlotNumber 2
Weapon.SelectionOrder 3785
Weapon.SlotPriority 0.1


Weapon.BobSpeed 1.6
Weapon.BobStyle Smooth
Weapon.UpSound "weapon/genericswap"

Weapon.AmmoType1 "ammo_pool"
Weapon.AmmoGive1 12
Weapon.Ammouse1 1

Weapon.AmmoType2 "actual_ammo"
Weapon.AmmoUse2 1
Weapon.AmmoGive2 12  


+Weapon.Ammo_Checkboth
States
  {
Spawn:
  PIST A -1
  Loop
Ready:
  PISG A 1 A_WeaponReady (WRF_ALLOWRELOAD)
  Loop  
Deselect:
  PISG AAAAAAAAAAAAAAAAAAAA 0 A_Lower	
  PISG A 1 A_Lower 
  loop
Select:
  PISG AAAAAAAAAAAAAAAAAAAA 0 A_Raise
  PISG A 1 A_Raise
  loop
Fire:
  PISG A 0 A_JumpIf(countinv("actual_ammo", aaptr_default) >= 1, "ActuallyFire") 
  PISG A 0 A_JumpIf(countinv("ammo_pool", aaptr_default) >= 1, "Reload") 
  PISG A 1 
  Goto Deselect 
ActuallyFire:
  PISG A 0 A_JumpIfNoAmmo ("Reload")
  PISG A 4
  PISG B 0 A_FireBullets (1.9, 1.5, 1, 6, "BulletPuff", 0)
  PISG B 0 A_TakeInventory ("actual_ammo", 1)
  PISG B 0 A_PlaySound("weapons/hpfire", CHAN_WEAPON)
  PISG B 5 Bright A_GunFlash
  PISG C 4
  PISG BA 3 A_ReFire
  Goto Ready
Reload:
  PISG A 0 A_JumpIf(countinv("actual_ammo", aaptr_default) == 12, 2)
  PISG A 0 A_JumpIf(countinv("ammo_pool", aaptr_default) >= 1, "ReloadWork")  
  PISG A 1
  Goto Ready
ReloadWork:
  PISG A 1 Offset(0,35) A_PlaySound("weapons/hpload", CHAN_WEAPON)
  PISG A 1 Offset(0,38)
  PISG A 1 Offset(0,44)
  PISG A 1 Offset(0,52)
  PISG A 1 Offset(0,62)
  PISG A 1 Offset(0,72)
  PISG A 1 Offset(0,82)
  TNT1 A 8
ReloadClip:
  TNT1 A 0 A_GiveInventory("actual_ammo", 1)
  TNT1 A 0 A_TakeInventory("ammo_pool", 1)
  TNT1 A 0 A_JumpIfInventory("actual_ammo", 12, "ReloadFinish") // If it's full, finish up.
  TNT1 A 0 A_JumpIfInventory("ammo_pool", 1, "ReloadClip") // If it's NOT full, keep it rolling.
  Goto ReloadFinish
ReloadFinish:
  TNT1 A 8
  PISG A 1 Offset(0,82)
  PISG A 1 Offset(0,72)
  PISG A 1 Offset(0,62)
  PISG A 1 Offset(0,52)
  PISG A 1 Offset(0,44)
  PISG A 1 Offset(0,38)
  PISG A 1 Offset(0,35)
  PISG A 1 Offset(0,32)
  Goto Ready	
//misc
Flash:
  PISF A 5 Bright A_Light1
  Goto LightDone
  PISF A 5 Bright A_Light1
  Goto LightDone
  }
}

ACTOR actual_ammo : Ammo
{
 Inventory.MaxAmount 12
 +IGNORESKILL
}

actor ammo_pool : ammo
{
  Inventory.PickupMessage "picked new clip" // "Picked up a clip."
  Inventory.Amount 10
  Inventory.MaxAmount 200
  Ammo.BackpackAmount 10
  Ammo.BackpackMaxAmount 400
  Inventory.Icon "CLIPA0"
  States
  {
  Spawn:
    CLIP A -1
    Stop
  }
}

[FireSeraphim]

Thank you!