diff options
-rw-r--r-- | nautslist.lua | 57 | ||||
-rw-r--r-- | selector.lua | 8 |
2 files changed, 35 insertions, 30 deletions
diff --git a/nautslist.lua b/nautslist.lua index 01c489a..c8df0e1 100644 --- a/nautslist.lua +++ b/nautslist.lua @@ -1,31 +1,32 @@ -- List of characters with empty character included return { - "empty", - "frog", - "lonestar", - "leon", - "scoop", - "gnaw", - "raelynn", - "ayla", - "clunk", - "voltar", - "coco", - "skolldir", - "yuri", - "derpl", - --"vinnie", - --"genji", - "swiggins", - --"rocco", - "ksenia", - "ted", - --"penny", - --"sentry", - "skree", - --"nibbs", - --"yoolip", - "chucho", - --"lux", - --"ix" + "empty", -- empty + "frog", -- froggy + "lonestar", -- lonestar + "leon", -- leon + "scoop", -- scoop + "gnaw", -- gnaw + "raelynn", -- raelynn + "ayla", -- ayla + "clunk", -- clunk + "voltar", -- voltar + "coco", -- coco + "skolldir", -- skolldir + "yuri", -- yuri + "derpl", -- derpl + --"vinnie", -- vinnie + --"spike", -- spike + --"genji", -- genji + "swiggins", -- swiggins + --"rocco", -- rocco + "ksenia", -- ksenia + "ted", -- ted + --"penny", -- penny + --"sentry", -- sentry + "skree", -- skree + --"nibbs", -- nibbs + --"yoolip", -- yoolip + "chucho", -- chucho + --"lux", -- lux + --"ix" -- ix }
\ No newline at end of file diff --git a/selector.lua b/selector.lua index 778c6cc..b3ab5c4 100644 --- a/selector.lua +++ b/selector.lua @@ -66,13 +66,17 @@ end function Selector:controllerPressed(control, controller) local n = #self.parent.nauts if control == "left" and not self.state then - if self.naut == 1 then + if self.naut == 2 or self.naut == 1 then self.naut = n else self.naut = self.naut - 1 end elseif control == "right" and not self.state then - self.naut = (self.naut % n) + 1 + if self.naut == n then + self.naut = 2 + else + self.naut = self.naut + 1 + end elseif control == "attack" then if self.naut ~= 1 then self.state = true |