Skip to content

Commit

Permalink
Merge pull request #10 from softbie/some-fixes
Browse files Browse the repository at this point in the history
Фиксы
  • Loading branch information
13Hz authored Oct 21, 2023
2 parents d5f13be + 06ada00 commit b2c58e2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions Anims.bb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Function Animations(cyc)
If pWeapon(cyc)>0 And pPromoState(cyc)=>2 And pPromoState(cyc)=<3 Then anim=121 : speeder#=Rnd(0.25,0.5)
EndIf
If pWeapon(cyc)>0 And weapStyle(weapType(pWeapon(cyc)))=4 Then anim=60 : speeder#=Rnd(0.1,0.3)
If pWeapon(cyc)>0 And weapName$(weapType(pWeapon(cyc)))="Ball" Then anim=5 : speeder#=Rnd(0.1,0.3)
If pWeapon(cyc)>0 And weapName$(weapType(pWeapon(cyc)))=translate("Ball") Then anim=5 : speeder#=Rnd(0.1,0.3)
If pInjured(cyc)>0 Or pHealth(cyc)<10 Then anim=3
If pDazed(cyc)>0 Then anim=4 : speeder#=Rnd(0.3,0.6)
If pPhone(cyc)>0 Then anim=120 : speeder#=Rnd(0.1,0.3)
Expand All @@ -141,13 +141,13 @@ Function Animations(cyc)
pState(cyc)=anim
EndIf
If gotim>50 And pAnimTim(cyc)>30 And pWeapon(cyc)>0 And pPhone(cyc)=0 And cyc<>promoActor(1) And cyc<>promoActor(2)
If weapName$(weapType(pWeapon(cyc)))="Broom" Then ChangeAnim(cyc,92) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))="Cigarette" Then ChangeAnim(cyc,93) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))="Syringe" Then ChangeAnim(cyc,94) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))="Bottle" Then ChangeAnim(cyc,95) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))="Comb" Then ChangeAnim(cyc,97) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))="Mirror" Then ChangeAnim(cyc,98) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))="Dumbbell" Then ChangeAnim(cyc,132) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))=translate("Broom") Then ChangeAnim(cyc,92) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))=translate("Cigarette") Then ChangeAnim(cyc,93) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))=translate("Syringe") Then ChangeAnim(cyc,94) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If charRole(pChar(cyc))=0 And weapName$(weapType(pWeapon(cyc)))=translate("Bottle") Then ChangeAnim(cyc,95) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))=translate("Comb") Then ChangeAnim(cyc,97) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))=translate("Mirror") Then ChangeAnim(cyc,98) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
If weapName$(weapType(pWeapon(cyc)))=translate("Dumbbell") Then ChangeAnim(cyc,132) : pAgenda(cyc)=0 : pTA#(cyc)=pA#(cyc)
EndIf
EndIf
;kneeling
Expand Down
6 changes: 3 additions & 3 deletions Menus.bb
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ Function DrawMainLogo(x#,y#)
;version ID
SetFont font(1)
Outline(translate("Version #FIRST#", "1." + version),x#+310,y#+60,200,200,200,200,200,200)
Outline(translate("Translate #FIRST#", "1.0.2"),x#+310,y#+80,200,200,200,200,200,200)
Outline(translate("Translate #FIRST#", "1.0.3"),x#+310,y#+80,200,200,200,200,200,200)
End Function

;DRAW MENU ITEM
Expand Down Expand Up @@ -727,6 +727,6 @@ Function Screenshot()
GrabImage screenshot,GraphicsWidth()/2,GraphicsHeight()/2
;title & save
temp=MilliSecs()/10
namer$=translate("Screenshot") + " - "+temp+".bmp"
SaveImage(screenshot,translate("Photo Album") + "/" + namer$)
namer$="Screenshot - "+temp+".bmp"
SaveImage(screenshot,"Photo Album/" + namer$)
End Function

0 comments on commit b2c58e2

Please sign in to comment.