DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 21:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidied up, removed unused code

Browse Source
This commit is contained in:
Maruno17
2021-01-17 21:26:20 +00:00
parent cb684094be
commit 7f254c6434
17 changed files with 26 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/017_UI/013_PScreen_Load.rb
View File

@@ -262,9 +262,8 @@ class PokemonLoadScreen
$game_system = Game_System.new
$PokemonSystem = PokemonSystem.new if !$PokemonSystem
savefile = RTP.getSaveFileName("Game.rxdata")
data_system = pbLoadRxData("Data/System")
mapfile = sprintf("Data/Map%03d.rxdata",data_system.start_map_id)
if data_system.start_map_id==0 || !pbRgssExists?(mapfile)
mapfile = sprintf("Data/Map%03d.rxdata", $data_system.start_map_id)
if $data_system.start_map_id == 0 || !pbRgssExists?(mapfile)
pbMessage(_INTL("No starting position was set in the map editor.\1"))
pbMessage(_INTL("The game cannot continue."))
@scene.pbEndScene
@@ -431,7 +430,6 @@ class PokemonLoadScreen
$PokemonStorage = PokemonStorage.new
$PokemonEncounters = PokemonEncounters.new
$PokemonTemp.begunNewGame = true
$data_system = pbLoadRxData("Data/System")
$MapFactory = PokemonMapFactory.new($data_system.start_map_id) # calls setMapChanged
$game_player.moveto($data_system.start_x, $data_system.start_y)
$game_player.refresh

135
Data/Scripts/017_UI/025_PScreen_Mart.rb
View File

@@ -81,139 +81,6 @@ class PokemonMartAdapter
end
end
#===============================================================================
# Abstraction layer for RPG Maker XP
# Won't be used if $PokemonBag exists
#===============================================================================
class RpgxpMartAdapter
def getMoney
return $game_party.gold
end
def getMoneyString
return pbGetGoldString
end
def setMoney(value)
$game_party.gain_gold(-$game_party.gold)
$game_party.gain_gold(value)
end
def getPrice(item, _selling = false)
return item.price
end
def getItemIcon(item)
return nil if !item
if item == 0
return sprintf("Graphics/Items/back")
elsif item.respond_to?("icon_index")
return "Graphics/System/IconSet"
else
return sprintf("Graphics/Icons/%s", item.icon_name)
end
end
def getItemIconRect(item)
if item && item.respond_to?("icon_index")
ix = item.icon_index % 16 * 24
iy = item.icon_index / 16 * 24
return Rect.new(ix, iy, 24, 24)
end
return Rect.new(0, 0, 32, 32)
end
def getInventory
data = []
for i in 1...$data_items.size
data.push($data_items[i]) if getQuantity($data_items[i]) > 0
end
for i in 1...$data_weapons.size
data.push($data_weapons[i]) if getQuantity($data_weapons[i]) > 0
end
for i in 1...$data_armors.size
data.push($data_armors[i]) if getQuantity($data_armors[i]) > 0
end
return data
end
def canSell?(item)
return item ? item.price > 0 : false
end
def getName(item)
return item ? item.name : ""
end
def getDisplayName(item)
return item ? item.name : ""
end
def getDescription(item)
return item ? item.description : ""
end
def getDisplayPrice(item, _selling = false)
price = item.price
return price.to_s
end
def addItem(item)
ret = (getQuantity(item) < 99)
if $game_party.respond_to?("gain_weapon")
case item
when RPG::Item
$game_party.gain_item(item.id, 1) if ret
when RPG::Weapon
$game_party.gain_weapon(item.id, 1) if ret
when RPG::Armor
$game_party.gain_armor(item.id, 1) if ret
end
else
$game_party.gain_item(item, 1) if ret
end
return ret
end
def getQuantity(item)
ret = 0
if $game_party.respond_to?("weapon_number")
case item
when RPG::Item
ret = $game_party.item_number(item.id)
when RPG::Weapon
ret = ($game_party.weapon_number(item.id))
when RPG::Armor
ret = ($game_party.armor_number(item.id))
end
else
return $game_party.item_number(item)
end
return ret
end
def showQuantity?(_item)
return true
end
def removeItem(item)
ret = (getQuantity(item) > 0)
if $game_party.respond_to?("lose_weapon")
case item
when RPG::Item
$game_party.lose_item(item.id, 1) if ret
when RPG::Weapon
$game_party.lose_weapon(item.id, 1) if ret
when RPG::Armor
$game_party.lose_armor(item.id, 1) if ret
end
else
$game_party.lose_item(item, 1) if ret
end
return ret
end
end
#===============================================================================
# Buy and Sell adapters
#===============================================================================
@@ -661,7 +528,7 @@ class PokemonMartScreen
def initialize(scene,stock)
@scene=scene
@stock=stock
@adapter=$PokemonBag ? PokemonMartAdapter.new : RpgxpMartAdapter.new
@adapter=PokemonMartAdapter.new
end
def pbConfirm(msg)