Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2025-02-28 12:29:59 +00:00
Code Issues Projects Releases Wiki Activity

Improved auto-reload messaging to avoid printing when there's nothing to do.

Browse Source
This commit is contained in:
Martin Haye 2020-08-22 11:15:21 -07:00
parent 91be4d56bf
commit c81de67a6f
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Platform/Apple/virtual/src/plasma/combat.pla
View File

@ -758,8 +758,9 @@ def playerCombatChoose(pl)#0
is '#'
if global->b_godmode
forEach(global=>p_enemyGroups, &(g) forEach(g=>p_enemies, @killEnemy))
return
fin
return
break
wend
if !redisplayMenu; beep(); fin
loop

26
Platform/Apple/virtual/src/plasma/itemutil.pla
View File

@ -234,7 +234,7 @@ def _reloadWeapon(pl, pWeapon, echo)#1
// Find matching ammo
ctx = pWeapon; item = first(pl=>p_items, &(p) ammoMatches(p, ctx=>s_ammoKind))
if !item
if echo
if echo and (pWeapon->b_clipCurrent < pWeapon->b_clipSize or !pWeapon->b_clipSize)
displayf3("%s has no ammo to reload %s %s! ", pl=>s_name, hisHerTheir(pl->c_gender), pWeapon=>s_name))
fin
return 1
@ -246,18 +246,20 @@ def _reloadWeapon(pl, pWeapon, echo)#1
else
n = min(item=>w_count, 1) // clipSize=0 implies auto-reloading weapon
fin
pWeapon->b_clipCurrent = pWeapon->b_clipCurrent + n
item=>w_count = item=>w_count - n
if echo
displayf2("%s %sreloads ", pl=>s_name, pWeapon->b_clipCurrent < pWeapon->b_clipSize ?? "partially " :: "")
displayf2("%s %s", hisHerTheir(pl->c_gender), pWeapon=>s_name)
if item=>w_count == 0
displayStr(" and is now out")
if n > 0
pWeapon->b_clipCurrent = pWeapon->b_clipCurrent + n
item=>w_count = item=>w_count - n
if echo
displayf2("%s %sreloads ", pl=>s_name, pWeapon->b_clipCurrent < pWeapon->b_clipSize ?? "partially " :: "")
displayf2("%s %s", hisHerTheir(pl->c_gender), pWeapon=>s_name)
if item=>w_count == 0
displayStr(" and is now out")
fin
displayStr(". ")
fin
if item=>w_count == 0
removeFromList(@pl=>p_items, item)
fin
displayStr(". ")
fin
if item=>w_count == 0
removeFromList(@pl=>p_items, item)
fin
return 1
end