diff --git a/go.mod b/go.mod index 4329650..a03e99d 100644 --- a/go.mod +++ b/go.mod @@ -11,16 +11,16 @@ require ( github.com/noxworld-dev/noxcrypt v0.0.0-20230831140413-02623e75408e github.com/noxworld-dev/noxscript/eud/v171 v171.3.1 github.com/noxworld-dev/noxscript/ns v1.0.2 - github.com/noxworld-dev/noxscript/ns/v3 v3.3.0 - github.com/noxworld-dev/noxscript/ns/v4 v4.9.0 + github.com/noxworld-dev/noxscript/ns/v3 v3.4.0 + github.com/noxworld-dev/noxscript/ns/v4 v4.14.0 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 github.com/traefik/yaegi v0.15.1 github.com/veandco/go-sdl2 v0.5.0-alpha.4 github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 - golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/image v0.11.0 - golang.org/x/sys v0.11.0 + golang.org/x/sys v0.14.0 golang.org/x/text v0.12.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index d243622..3d44008 100644 --- a/go.sum +++ b/go.sum @@ -21,10 +21,10 @@ github.com/noxworld-dev/noxscript/eud/v171 v171.3.1 h1:KRugWrwLY54qiRucyJn3iqvWr github.com/noxworld-dev/noxscript/eud/v171 v171.3.1/go.mod h1:Aigh/4MqsXvkPY/2JXXaNZghGK8mScpsip3Kdz6EUxE= github.com/noxworld-dev/noxscript/ns v1.0.2 h1:PMpKqRi3fEhwAfBM+PZVTopT6o2vL6AmCDQH8zV5QWU= github.com/noxworld-dev/noxscript/ns v1.0.2/go.mod h1:DobGfGPUycvh7D6hB5mW5gbL1QiRsw7QQiVPJz4wYZ0= -github.com/noxworld-dev/noxscript/ns/v3 v3.3.0 h1:EC5DA6ZnRLuNbd85TbMSTvnFlZXsNSsPZJsqBhmXfbg= -github.com/noxworld-dev/noxscript/ns/v3 v3.3.0/go.mod h1:YhSYNQ9BppuBMgL5L7h5744IPG2HKVI8HwZnzgwYlRE= -github.com/noxworld-dev/noxscript/ns/v4 v4.9.0 h1:SXy4atXtnCtUVyNFKyHHC4Qkl2zOyhBH3Emf/KN1CcM= -github.com/noxworld-dev/noxscript/ns/v4 v4.9.0/go.mod h1:jbdzICFf72mZjokCQGe8w5EjIn19Uf3DXxJYSyM/md4= +github.com/noxworld-dev/noxscript/ns/v3 v3.4.0 h1:YsKB7XCDH6e8MO1+YY+9kBgZAXAGhOaR8vwT1zdoVeA= +github.com/noxworld-dev/noxscript/ns/v3 v3.4.0/go.mod h1:rank2GpncRp/4Z8O2o/02N7dCavOIsq2XEMxZyhBT70= +github.com/noxworld-dev/noxscript/ns/v4 v4.14.0 h1:43GYbBgVfVjqVyPrOBwxsNYf25ZGNF08aIXEslsu6/U= +github.com/noxworld-dev/noxscript/ns/v4 v4.14.0/go.mod h1:l8sd8BvVo6LjzYjzAr7V/nbBkp0B/UMQRWbVTq0U67A= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -45,8 +45,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= @@ -65,8 +65,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= diff --git a/script/eval/vm.go b/script/eval/vm.go index 6c53e05..d0c130e 100644 --- a/script/eval/vm.go +++ b/script/eval/vm.go @@ -12,6 +12,7 @@ import ( eudeval "github.com/noxworld-dev/noxscript/eud/v171/eval" nseval3 "github.com/noxworld-dev/noxscript/ns/v3/eval" + ns3vm "github.com/noxworld-dev/noxscript/ns/v3/vm" ns4 "github.com/noxworld-dev/noxscript/ns/v4" nseval4 "github.com/noxworld-dev/noxscript/ns/v4/eval" @@ -171,6 +172,9 @@ func (vm *VM) initPackages(g script.Game) { }) // TODO: properly virtualize script.SetRuntime(g) + if v, ok := g.(ns3vm.Game); ok { + ns3vm.SetRuntime(v.NoxScriptVM()) + } if v, ok := g.(ns4.Game); ok { ns4.SetRuntime(v.NoxScript()) }