Subject: [ PATCH] Increase max weapon count to 8
---
LIB/ GameState.py | 2 +-
LIB/ Scorer.py | 8 +++++---
SCRIPTS/ GotoMapVars.py | 4 ++--
3 files changed, 8 insertions( +) , 6 deletions( -)
diff --git a/ LIB/ GameState.py b/ LIB/ GameState.py
index 4af27c2..3c02030 100644
--- a/ LIB/ GameState.py
+++ b/ LIB/ GameState.py
@@ -340 ,7 +340 ,7 @@ class EntityPersonState( EntityBipedState) :
for name in Actions.GetListOfObjectsAt( inv,i) :
self.Inventory[ "Objects" ] .append( name)
- self.Inventory[ "maxWeapons" ] =inv.maxWeapons
+ self.Inventory[ "maxWeapons" ] =inv.maxWeapons=8
self.Inventory[ "Weapons" ] =[ ]
for i in range( inv.nWeapons) :
self.Inventory[ "Weapons" ] .append( inv.GetWeapon( i) )
diff --git a/ LIB/ Scorer.py b/ LIB/ Scorer.py
index 22a69ae..cae5062 100644
--- a/ LIB/ Scorer.py
+++ b/ LIB/ Scorer.py
@@ -192 ,6 +192 ,8 @@ def SetEnemiesData( pj) :
__wNULL =BUIx.CreateNULLWidget( )
char =Bladex.GetEntity( "Player1" )
+inv =char.GetInventory( )
+inv.maxWeapons=8
@@ -616 ,9 +618 ,9 @@ wEnemiesFrame.AddWidget( wEnemyRight,E_ICON_DISTANCE* 5 +2 * E_CENTRAL_DISTANCE+E_ARR
wEnemyRight.SetAlpha( 1.0 )
wEnemyRight.SetColor( 255 ,255 ,255 )
-
-RInitAlpha =[ 1.0 ,0.3 ,0.2 ,0.1 ,0.05 ]
-RInitPositions =[ ( 5 ,10 ) ,( 35 ,20 ) ,( 75 ,30 ) ,( 110 ,40 ) ,( 140 ,50 ) ]
+# Add enough right hand slots
+RInitAlpha =[ 1.0 ,0.3 ,0.2 ,0.1 ,0.05 ] + [ 0.05 ] * 10
+RInitPositions =[ ( 5 ,10 ) ,( 35 ,20 ) ,( 75 ,30 ) ,( 110 ,40 ) ,( 140 ,50 ) ] + [ ( 140 ,50 ) ] * 10
wRightHand =ScorerWidgets.B_HandWidget( wFrame,"RightHand" ,150 ,150 ,"Right" ,
RInitAlpha,RInitPositions)
LInitAlpha =[ 1.0 ,0.3 ,0.2 ,0.1 ]
diff --git a/ SCRIPTS/ GotoMapVars.py b/ SCRIPTS/ GotoMapVars.py
index c482982..b6732bd 100644
--- a/ SCRIPTS/ GotoMapVars.py
+++ b/ SCRIPTS/ GotoMapVars.py
@@ -42 ,7 +42 ,7 @@ class MainCharState( GameState.EntityPersonState) :
for name in Actions.GetListOfObjectsAt( inv,i) :
self.Inventory[ "Objects" ] .append( self.__GetObjAux( name) )
- self.Inventory[ "maxWeapons" ] =inv.maxWeapons
+ self.Inventory[ "maxWeapons" ] =inv.maxWeapons=8
self.Inventory[ "Weapons" ] =[ ]
for i in range( inv.nWeapons) :
self.Inventory[ "Weapons" ] .append( self.__GetObjAux( inv.GetWeapon( i) ) )
@@ -246 ,7 +246 ,7 @@ def RestoreMainCharState( key) :
props[ 2 ] [ "InvRight" ] = None
props[ 2 ] [ "InvRightBack" ] = None
props[ 2 ] [ "InvLeftBack" ] = None
-
+
CreateMainCharWithProps( props)
return 1
return 0
--
2.21.0.windows.1
U3ViamVjdDogW1BBVENIXSBJbmNyZWFzZSBtYXggd2VhcG9uIGNvdW50IHRvIDgKCi0tLQogTElCL0dhbWVTdGF0ZS5weSAgICAgICB8IDIgKy0KIExJQi9TY29yZXIucHkgICAgICAgICAgfCA4ICsrKysrLS0tCiBTQ1JJUFRTL0dvdG9NYXBWYXJzLnB5IHwgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MSUIvR2FtZVN0YXRlLnB5IGIvTElCL0dhbWVTdGF0ZS5weQppbmRleCA0YWYyN2MyLi4zYzAyMDMwIDEwMDY0NAotLS0gYS9MSUIvR2FtZVN0YXRlLnB5CisrKyBiL0xJQi9HYW1lU3RhdGUucHkKQEAgLTM0MCw3ICszNDAsNyBAQCBjbGFzcyBFbnRpdHlQZXJzb25TdGF0ZShFbnRpdHlCaXBlZFN0YXRlKToKICAgICAgICAgICAgIGZvciBuYW1lIGluIEFjdGlvbnMuR2V0TGlzdE9mT2JqZWN0c0F0KGludixpKToKICAgICAgICAgICAgICAgICBzZWxmLkludmVudG9yeVsiT2JqZWN0cyJdLmFwcGVuZChuYW1lKQogCi0gICAgICAgIHNlbGYuSW52ZW50b3J5WyJtYXhXZWFwb25zIl09aW52Lm1heFdlYXBvbnMKKyAgICAgICAgc2VsZi5JbnZlbnRvcnlbIm1heFdlYXBvbnMiXT1pbnYubWF4V2VhcG9ucz04CiAgICAgICAgIHNlbGYuSW52ZW50b3J5WyJXZWFwb25zIl09W10KICAgICAgICAgZm9yIGkgaW4gcmFuZ2UoaW52Lm5XZWFwb25zKToKICAgICAgICAgICAgIHNlbGYuSW52ZW50b3J5WyJXZWFwb25zIl0uYXBwZW5kKGludi5HZXRXZWFwb24oaSkpCmRpZmYgLS1naXQgYS9MSUIvU2NvcmVyLnB5IGIvTElCL1Njb3Jlci5weQppbmRleCAyMmE2OWFlLi5jYWU1MDYyIDEwMDY0NAotLS0gYS9MSUIvU2NvcmVyLnB5CisrKyBiL0xJQi9TY29yZXIucHkKQEAgLTE5Miw2ICsxOTIsOCBAQCBkZWYgU2V0RW5lbWllc0RhdGEocGopOgogCiBfX3dOVUxMPUJVSXguQ3JlYXRlTlVMTFdpZGdldCgpCiBjaGFyPUJsYWRleC5HZXRFbnRpdHkoIlBsYXllcjEiKQoraW52PWNoYXIuR2V0SW52ZW50b3J5KCkKK2ludi5tYXhXZWFwb25zPTgKIAogCiAKQEAgLTYxNiw5ICs2MTgsOSBAQCB3RW5lbWllc0ZyYW1lLkFkZFdpZGdldCh3RW5lbXlSaWdodCxFX0lDT05fRElTVEFOQ0UqNSsyKkVfQ0VOVFJBTF9ESVNUQU5DRStFX0FSUgogd0VuZW15UmlnaHQuU2V0QWxwaGEoMS4wKQogd0VuZW15UmlnaHQuU2V0Q29sb3IoMjU1LDI1NSwyNTUpCiAKLQotUkluaXRBbHBoYT1bMS4wLDAuMywwLjIsMC4xLDAuMDVdCi1SSW5pdFBvc2l0aW9ucz1bKDUsMTApLCgzNSwyMCksKDc1LDMwKSwoMTEwLDQwKSwoMTQwLDUwKV0KKyMgQWRkIGVub3VnaCByaWdodCBoYW5kIHNsb3RzCitSSW5pdEFscGhhPVsxLjAsMC4zLDAuMiwwLjEsMC4wNV0gKyBbMC4wNV0gKiAxMAorUkluaXRQb3NpdGlvbnM9Wyg1LDEwKSwoMzUsMjApLCg3NSwzMCksKDExMCw0MCksKDE0MCw1MCldICsgWygxNDAsNTApXSAqIDEwCiB3UmlnaHRIYW5kPVNjb3JlcldpZGdldHMuQl9IYW5kV2lkZ2V0KHdGcmFtZSwiUmlnaHRIYW5kIiwxNTAsMTUwLCJSaWdodCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJJbml0QWxwaGEsUkluaXRQb3NpdGlvbnMpCiBMSW5pdEFscGhhPVsxLjAsMC4zLDAuMiwwLjFdCmRpZmYgLS1naXQgYS9TQ1JJUFRTL0dvdG9NYXBWYXJzLnB5IGIvU0NSSVBUUy9Hb3RvTWFwVmFycy5weQppbmRleCBjNDgyOTgyLi5iNjczMmJkIDEwMDY0NAotLS0gYS9TQ1JJUFRTL0dvdG9NYXBWYXJzLnB5CisrKyBiL1NDUklQVFMvR290b01hcFZhcnMucHkKQEAgLTQyLDcgKzQyLDcgQEAgY2xhc3MgTWFpbkNoYXJTdGF0ZShHYW1lU3RhdGUuRW50aXR5UGVyc29uU3RhdGUpOgogCQkJZm9yIG5hbWUgaW4gQWN0aW9ucy5HZXRMaXN0T2ZPYmplY3RzQXQoaW52LGkpOgogCQkJCXNlbGYuSW52ZW50b3J5WyJPYmplY3RzIl0uYXBwZW5kKHNlbGYuX19HZXRPYmpBdXgobmFtZSkpCiAKLQkJc2VsZi5JbnZlbnRvcnlbIm1heFdlYXBvbnMiXT1pbnYubWF4V2VhcG9ucworCQlzZWxmLkludmVudG9yeVsibWF4V2VhcG9ucyJdPWludi5tYXhXZWFwb25zPTgKIAkJc2VsZi5JbnZlbnRvcnlbIldlYXBvbnMiXT1bXQogCQlmb3IgaSBpbiByYW5nZShpbnYubldlYXBvbnMpOgogCQkJc2VsZi5JbnZlbnRvcnlbIldlYXBvbnMiXS5hcHBlbmQoc2VsZi5fX0dldE9iakF1eChpbnYuR2V0V2VhcG9uKGkpKSkKQEAgLTI0Niw3ICsyNDYsNyBAQCBkZWYgUmVzdG9yZU1haW5DaGFyU3RhdGUoa2V5KToKICAgICAgIHByb3BzWzJdWyJJbnZSaWdodCJdICAgICA9IE5vbmUKICAgICAgIHByb3BzWzJdWyJJbnZSaWdodEJhY2siXSA9IE5vbmUKICAgICAgIHByb3BzWzJdWyJJbnZMZWZ0QmFjayJdICA9IE5vbmUKLSAgICAgIAorCiAgICAgQ3JlYXRlTWFpbkNoYXJXaXRoUHJvcHMocHJvcHMpCiAgICAgcmV0dXJuIDEKICAgcmV0dXJuIDAKLS0gCjIuMjEuMC53aW5kb3dzLjEKCg==