Kanto fixes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

M1L4 wants to merge 95 commits into WiWi33:master from M1L4:KantoFixes

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,3 +39,5 @@ luac.out @@
     *.x86_64
     *.hex
+    /test_pclib_retrieveFirstById.lua
+    /.idea/

Classes/Pokemon.lua

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ function Pokemon:newFromPC(boxIndex, boxPokemonIndex) @@
     	o.totalXp     = getPokemonTotalExperienceFromPC    (boxIndex, boxPokemonIndex)
     	o.remainingXP = getPokemonRemainingExperienceFromPC(boxIndex, boxPokemonIndex)
     	o.uniqueId    = getPokemonUniqueIdFromPC           (boxIndex, boxPokemonIndex)
+    	o.id 		  = getPokemonIdFromPC				   (boxIndex, boxPokemonIndex)
     	o.isShiny     = isPokemonFromPCShiny               (boxIndex, boxPokemonIndex)
     	o.item        = getPokemonHeldItemFromPC           (boxIndex, boxPokemonIndex)
     	o.level       = getPokemonLevelFromPC              (boxIndex, boxPokemonIndex)
@@ Expand Down @@

Classes/Set.lua

-Original file line number
+Diff line change
@@ -0,0 +1,68 @@
+    --@author m1l4
+    --inspired from: https://www.lua.org/pil/13.1.html
+    local gen = require "libs.genlib"
+    Set = {}
+    --object methods
+    function Set:new(t)
+        local set = {}
+        setmetatable(set, self)
+        self.__index = self
+        self.__len = gen.size
+        self.__class = "Set"
+        for _, e in pairs(t) do set[e] = true end
+        return set
+    end
+    function Set:contains(a)
+        return self[a]
+    end
+    function Set:tostring()
+        local s = "{"
+        local sep = ""
+        for e in pairs(self) do
+            s = s .. sep .. tostring(e)
+            sep = ", "
+        end
+        return s .. "}"
+    end
+    function Set:print()
+        print(self:tostring())
+    end
+    function Set.union (a,b)
+        local res = Set:new{}
+        for k in pairs(a) do res[k] = true end
+        for k in pairs(b) do res[k] = true end
+        return res
+    end
+    function Set.intersection (a,b)
+        if not a.__class or not a.__class == "Set" then a = Set:new(a) end
+        if not b.__class or not b.__class == "Set" then b = Set:new(b) end
+        local res = Set:new{}
+        for k in pairs(a) do
+            res[k] = b[k]
+        end
+        if #res == 0 then return nil end
+        return res
+    end
+    --Tests
+    --a = Set:new{1,3,5,7,8,9 }
+    --b = Set:new{8,2,4,10}
+    --s = Set.intersection(a,b)
+    --s:print()
+    --print(a[10])
+    --print(#s)
+    --print(s:contains())
+    return Set

Data/cutTargets.lua

-Original file line number
+Diff line change
@@ -0,0 +1,272 @@
+    ---@author: m1l4
+    ---@summary: A dictionary, containing all pokemon that are able to cut (HM01)
+    ---@attention: Autogenerated using following as source: https://bulbapedia.bulbagarden.net/wiki/Cut_(move)
+    ---so there might be variations to PRO's implementation. Those have to be adressed on the flow.
+    ---@comment: copied from my own project and reduced
+    ---@param dictKey: the pkm index of the pkm to be tested for cut ability
+    ---@type dictKey: integer
+    ---@return: true, if pkm has the ability to learn cut | false, otherwise
+    ---@type: boolean
+    local CutTargets = {
+        [1] = true,
+        [2] = true,
+        [3] = true,
+        [4] = true,
+        [5] = true,
+        [6] = true,
+        [15] = true,
+        [19] = true,
+        [20] = true,
+        [27] = true,
+        [28] = true,
+        [29] = true,
+        [30] = true,
+        [31] = true,
+        [32] = true,
+        [33] = true,
+        [34] = true,
+        [43] = true,
+        [44] = true,
+        [45] = true,
+        [46] = true,
+        [47] = true,
+        [50] = true,
+        [51] = true,
+        [52] = true,
+        [53] = true,
+        [69] = true,
+        [70] = true,
+        [71] = true,
+        [72] = true,
+        [73] = true,
+        [83] = true,
+        [98] = true,
+        [99] = true,
+        [108] = true,
+        [112] = true,
+        [114] = true,
+        [115] = true,
+        [123] = true,
+        [127] = true,
+        [141] = true,
+        [149] = true,
+        [151] = true,
+        [152] = true,
+        [153] = true,
+        [154] = true,
+        [155] = true,
+        [156] = true,
+        [157] = true,
+        [158] = true,
+        [159] = true,
+        [160] = true,
+        [161] = true,
+        [162] = true,
+        [182] = true,
+        [190] = true,
+        [191] = true,
+        [192] = true,
+        [196] = true,
+        [197] = true,
+        [207] = true,
+        [208] = true,
+        [212] = true,
+        [214] = true,
+        [215] = true,
+        [216] = true,
+        [217] = true,
+        [227] = true,
+        [243] = true,
+        [244] = true,
+        [245] = true,
+        [248] = true,
+        [251] = true,
+        [252] = true,
+        [253] = true,
+        [254] = true,
+        [255] = true,
+        [256] = true,
+        [257] = true,
+        [263] = true,
+        [264] = true,
+        [274] = true,
+        [275] = true,
+        [286] = true,
+        [287] = true,
+        [288] = true,
+        [289] = true,
+        [290] = true,
+        [291] = true,
+        [292] = true,
+        [302] = true,
+        [304] = true,
+        [305] = true,
+        [306] = true,
+        [315] = true,
+        [331] = true,
+        [332] = true,
+        [341] = true,
+        [342] = true,
+        [347] = true,
+        [348] = true,
+        [352] = true,
+        [357] = true,
+        [359] = true,
+        [371] = true,
+        [372] = true,
+        [373] = true,
+        [375] = true,
+        [376] = true,
+        [380] = true,
+        [381] = true,
+        [383] = true,
+        [386] = true,
+        [387] = true,
+        [388] = true,
+        [389] = true,
+        [390] = true,
+        [391] = true,
+        [392] = true,
+        [393] = true,
+        [394] = true,
+        [395] = true,
+        [399] = true,
+        [400] = true,
+        [402] = true,
+        [406] = true,
+        [407] = true,
+        [409] = true,
+        [416] = true,
+        [417] = true,
+        [424] = true,
+        [425] = true,
+        [426] = true,
+        [427] = true,
+        [428] = true,
+        [431] = true,
+        [432] = true,
+        [434] = true,
+        [435] = true,
+        [443] = true,
+        [444] = true,
+        [445] = true,
+        [451] = true,
+        [452] = true,
+        [454] = true,
+        [455] = true,
+        [461] = true,
+        [463] = true,
+        [464] = true,
+        [465] = true,
+        [472] = true,
+        [475] = true,
+        [483] = true,
+        [484] = true,
+        [487] = true,
+        [491] = true,
+        [493] = true,
+        [495] = true,
+        [496] = true,
+        [497] = true,
+        [501] = true,
+        [502] = true,
+        [503] = true,
+        [504] = true,
+        [505] = true,
+        [509] = true,
+        [510] = true,
+        [511] = true,
+        [512] = true,
+        [513] = true,
+        [514] = true,
+        [515] = true,
+        [516] = true,
+        [529] = true,
+        [530] = true,
+        [540] = true,
+        [541] = true,
+        [542] = true,
+        [545] = true,
+        [548] = true,
+        [549] = true,
+        [550] = true,
+        [551] = true,
+        [552] = true,
+        [553] = true,
+        [557] = true,
+        [558] = true,
+        [566] = true,
+        [567] = true,
+        [570] = true,
+        [571] = true,
+        [586] = true,
+        [587] = true,
+        [588] = true,
+        [589] = true,
+        [595] = true,
+        [596] = true,
+        [598] = true,
+        [604] = true,
+        [610] = true,
+        [611] = true,
+        [612] = true,
+        [613] = true,
+        [614] = true,
+        [621] = true,
+        [624] = true,
+        [625] = true,
+        [626] = true,
+        [627] = true,
+        [628] = true,
+        [629] = true,
+        [630] = true,
+        [631] = true,
+        [632] = true,
+        [638] = true,
+        [639] = true,
+        [640] = true,
+        [643] = true,
+        [644] = true,
+        [646] = true,
+        [647] = true,
+        [650] = true,
+        [651] = true,
+        [652] = true,
+        [653] = true,
+        [654] = true,
+        [655] = true,
+        [656] = true,
+        [657] = true,
+        [658] = true,
+        [659] = true,
+        [660] = true,
+        [674] = true,
+        [675] = true,
+        [677] = true,
+        [678] = true,
+        [679] = true,
+        [680] = true,
+        [681] = true,
+        [686] = true,
+        [687] = true,
+        [688] = true,
+        [689] = true,
+        [692] = true,
+        [693] = true,
+        [694] = true,
+        [695] = true,
+        [700] = true,
+        [701] = true,
+        [702] = true,
+        [707] = true,
+        [708] = true,
+        [709] = true,
+        [714] = true,
+        [715] = true,
+        [716] = true,
+        [717] = true,
+        [721] = true,
+        [798] = true,
+    }
+    return CutTargets

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kanto fixes #9

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Kanto fixes #9

Are you sure you want to change the base?

Uh oh!

Kanto fixes #9

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!