Writing moves.txt now calls power "Power" instead of "BaseDamage", other minor tidying

This commit is contained in:
Maruno17
2022-06-13 20:17:16 +01:00
parent aec0215442
commit 732c167ad5
4 changed files with 4 additions and 10 deletions

View File

@@ -292,7 +292,7 @@ module Settings
31 => [2, 21, 69], 31 => [2, 21, 69],
69 => [ 21, 31 ] 69 => [ 21, 31 ]
}], }],
[:ENTEI, 40, 55, 1, nil] [:ENTEI, 40, 55, 1]
] ]
#============================================================================= #=============================================================================

View File

@@ -14,7 +14,6 @@ module Console
echoln "" echoln ""
echoln "Closing this window will close the game. If you want to get rid of this window," echoln "Closing this window will close the game. If you want to get rid of this window,"
echoln "run the program from the Shell, or download a release version of the game." echoln "run the program from the Shell, or download a release version of the game."
echoln ""
echoln "-------------------------------------------------------------------------------" echoln "-------------------------------------------------------------------------------"
echoln "Debug Output:" echoln "Debug Output:"
echoln "-------------------------------------------------------------------------------" echoln "-------------------------------------------------------------------------------"

View File

@@ -77,14 +77,9 @@ def pbRoamPokemonOne(idxRoamer)
newMapChoices = [] newMapChoices = []
nextMaps = pbRoamingAreas(idxRoamer)[currentMap] nextMaps = pbRoamingAreas(idxRoamer)[currentMap]
return if !nextMaps return if !nextMaps
nextMaps.each do |map| nextMaps.each { |map| newMapChoices.push(map) }
# Only add map as a choice if the player hasn't been there recently
newMapChoices.push(map)
end
# Rarely, add a random possible map into the mix # Rarely, add a random possible map into the mix
if rand(32) == 0 newMapChoices.push(mapIDs[rand(mapIDs.length)]) if rand(32) == 0
newMapChoices.push(mapIDs[rand(mapIDs.length)])
end
# Choose a random new map to roam to # Choose a random new map to roam to
if newMapChoices.length > 0 if newMapChoices.length > 0
$PokemonGlobal.roamPosition[idxRoamer] = newMapChoices[rand(newMapChoices.length)] $PokemonGlobal.roamPosition[idxRoamer] = newMapChoices[rand(newMapChoices.length)]

View File

@@ -195,7 +195,7 @@ module Compiler
f.write("Type = #{move.type}\r\n") f.write("Type = #{move.type}\r\n")
category = GameData::Move::SCHEMA["Category"][2][move.category] category = GameData::Move::SCHEMA["Category"][2][move.category]
f.write("Category = #{category}\r\n") f.write("Category = #{category}\r\n")
f.write("BaseDamage = #{move.base_damage}\r\n") if move.base_damage > 0 f.write("Power = #{move.base_damage}\r\n") if move.base_damage > 0
f.write("Accuracy = #{move.accuracy}\r\n") f.write("Accuracy = #{move.accuracy}\r\n")
f.write("TotalPP = #{move.total_pp}\r\n") f.write("TotalPP = #{move.total_pp}\r\n")
f.write("Target = #{move.target}\r\n") f.write("Target = #{move.target}\r\n")