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

Moved item data constants into module ItemData

Browse Source
This commit is contained in:
Maruno17
2020-10-17 00:56:30 +01:00
parent 2b4f1e1aba
commit 7e627453da
10 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Data/Scripts/021_Debug/004_Editor_Screens.rb
View File

@@ -635,26 +635,26 @@ def pbItemEditor
else
data = [getConstantName(PBItems,selection)]
itemdata = pbLoadItemsData
data.push(itemdata[selection][ITEM_NAME])
data.push(itemdata[selection][ITEM_PLURAL])
data.push(itemdata[selection][ITEM_POCKET])
data.push(itemdata[selection][ITEM_PRICE])
data.push(itemdata[selection][ITEM_DESCRIPTION])
data.push(itemdata[selection][ITEM_FIELD_USE])
data.push(itemdata[selection][ITEM_BATTLE_USE])
data.push(itemdata[selection][ITEM_TYPE])
data.push(itemdata[selection][ITEM_MACHINE])
save = pbPropertyList(data[ITEM_NAME],data,items,true)
data.push(itemdata[selection][ItemData::NAME])
data.push(itemdata[selection][ItemData::NAME_PLURAL])
data.push(itemdata[selection][ItemData::POCKET])
data.push(itemdata[selection][ItemData::PRICE])
data.push(itemdata[selection][ItemData::DESCRIPTION])
data.push(itemdata[selection][ItemData::FIELD_USE])
data.push(itemdata[selection][ItemData::BATTLE_USE])
data.push(itemdata[selection][ItemData::TYPE])
data.push(itemdata[selection][ItemData::MOVE])
save = pbPropertyList(data[ItemData::NAME],data,items,true)
if save
itemdata[selection][ITEM_NAME] = data[ITEM_NAME]
itemdata[selection][ITEM_PLURAL] = data[ITEM_PLURAL]
itemdata[selection][ITEM_POCKET] = data[ITEM_POCKET]
itemdata[selection][ITEM_PRICE] = data[ITEM_PRICE]
itemdata[selection][ITEM_DESCRIPTION] = data[ITEM_DESCRIPTION]
itemdata[selection][ITEM_FIELD_USE] = data[ITEM_FIELD_USE]
itemdata[selection][ITEM_BATTLE_USE] = data[ITEM_BATTLE_USE]
itemdata[selection][ITEM_TYPE] = data[ITEM_TYPE]
itemdata[selection][ITEM_MACHINE] = data[ITEM_MACHINE]
itemdata[selection][ItemData::NAME] = data[ItemData::NAME]
itemdata[selection][ItemData::NAME_PLURAL] = data[ItemData::NAME_PLURAL]
itemdata[selection][ItemData::POCKET] = data[ItemData::POCKET]
itemdata[selection][ItemData::PRICE] = data[ItemData::PRICE]
itemdata[selection][ItemData::DESCRIPTION] = data[ItemData::DESCRIPTION]
itemdata[selection][ItemData::FIELD_USE] = data[ItemData::FIELD_USE]
itemdata[selection][ItemData::BATTLE_USE] = data[ItemData::BATTLE_USE]
itemdata[selection][ItemData::TYPE] = data[ItemData::TYPE]
itemdata[selection][ItemData::MOVE] = data[ItemData::MOVE]
save_data(itemdata,"Data/items.dat")
$PokemonTemp.itemsData = nil
pbSaveItems
@@ -711,15 +711,15 @@ def pbItemEditorNew(defaultname)
return -1 if price==-1
desc = StringProperty.set(_INTL("Description"),"")
# Item list will create record automatically
itemdata[index][ITEM_ID] = index
itemdata[index][ITEM_NAME] = itemname
itemdata[index][ITEM_POCKET] = pocket
itemdata[index][ITEM_PRICE] = price
itemdata[index][ITEM_DESCRIPTION] = desc
itemdata[index][ITEM_FIELD_USE] = 0
itemdata[index][ITEM_BATTLE_USE] = 0
itemdata[index][ITEM_TYPE] = 0
itemdata[index][ITEM_MACHINE] = 0
itemdata[index][ItemData::ID] = index
itemdata[index][ItemData::NAME] = itemname
itemdata[index][ItemData::POCKET] = pocket
itemdata[index][ItemData::PRICE] = price
itemdata[index][ItemData::DESCRIPTION] = desc
itemdata[index][ItemData::FIELD_USE] = 0
itemdata[index][ItemData::BATTLE_USE] = 0
itemdata[index][ItemData::TYPE] = 0
itemdata[index][ItemData::MOVE] = 0
PBItems.const_set(cname,index)
save_data(itemdata,"Data/items.dat")
$PokemonTemp.itemsData = nil

23
Data/Scripts/021_Debug/005_Editor_SaveData.rb
View File

@@ -242,19 +242,26 @@ def pbSaveItems
data = itemData[i]
cname = getConstantName(PBItems,i) rescue sprintf("ITEM%03d",i)
next if !cname || cname=="" || data[0]==0
if curpocket!=data[ITEM_POCKET]
curpocket = data[ITEM_POCKET]
if curpocket!=data[ItemData::POCKET]
curpocket = data[ItemData::POCKET]
f.write("\#-------------------------------\r\n")
end
machine = ""
if data[ITEM_MACHINE]>0
machine = getConstantName(PBMoves,data[ITEM_MACHINE]) rescue pbGetMoveConst(data[ITEM_MACHINE]) rescue ""
if data[ItemData::MOVE]>0
machine = getConstantName(PBMoves,data[ItemData::MOVE]) rescue pbGetMoveConst(data[ItemData::MOVE]) rescue ""
end
f.write(sprintf("%d,%s,%s,%s,%d,%d,%s,%d,%d,%d,%s",
data[ITEM_ID],csvQuote(cname),csvQuote(data[ITEM_NAME]),
csvQuote(data[ITEM_PLURAL]),data[ITEM_POCKET],data[ITEM_PRICE],
csvQuoteAlways(data[ITEM_DESCRIPTION]),data[ITEM_FIELD_USE],
data[ITEM_BATTLE_USE],data[ITEM_TYPE],csvQuote(machine)))
data[ItemData::ID],
csvQuote(cname),
csvQuote(data[ItemData::NAME]),
csvQuote(data[ItemData::NAME_PLURAL]),
data[ItemData::POCKET],
data[ItemData::PRICE],
csvQuoteAlways(data[ItemData::DESCRIPTION]),
data[ItemData::FIELD_USE],
data[ItemData::BATTLE_USE],
data[ItemData::TYPE],
csvQuote(machine)))
f.write("\r\n")
end
}

4
Data/Scripts/021_Debug/007_Editor_Listers.rb
View File

@@ -408,8 +408,8 @@ class ItemLister
cmds = []
for i in 1..PBItems.maxValue
next if !@itemdata[i]
name = @itemdata[i][ITEM_NAME]
if name && name!="" && @itemdata[i][ITEM_POCKET]!=0
name = @itemdata[i][ItemData::NAME]
if name && name!="" && @itemdata[i][ItemData::POCKET]!=0
cmds.push([i,name])
end
end