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

More item portion name tweaks

Browse Source
This commit is contained in:
Maruno17
2023-01-04 18:21:08 +00:00
parent 2e8329f70b
commit ae0d193bba
6 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/013_Items/001_Item_Utilities.rb
View File

@@ -672,7 +672,7 @@ def pbUseItem(bag, item, bagscene = nil)
max_at_once = [max_at_once, $bag.quantity(item)].min max_at_once = [max_at_once, $bag.quantity(item)].min
if max_at_once > 1 if max_at_once > 1
qty = screen.scene.pbChooseNumber( qty = screen.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", GameData::Item.get(item).name), max_at_once _INTL("How many {1} do you want to use?", GameData::Item.get(item).portion_name_plural), max_at_once
) )
screen.scene.pbSetHelpText("") if screen.is_a?(PokemonPartyScreen) screen.scene.pbSetHelpText("") if screen.is_a?(PokemonPartyScreen)
end end
@@ -715,7 +715,7 @@ def pbUseItemOnPokemon(item, pkmn, scene)
elsif !pkmn.compatible_with_move?(machine) elsif !pkmn.compatible_with_move?(machine)
pbMessage(_INTL("{1} can't learn {2}.", pkmn.name, movename)) { scene.pbUpdate } pbMessage(_INTL("{1} can't learn {2}.", pkmn.name, movename)) { scene.pbUpdate }
else else
pbMessage(_INTL("\\se[PC access]You booted up the {1}.\1", itm.potion_name)) { scene.pbUpdate } pbMessage(_INTL("\\se[PC access]You booted up the {1}.\1", itm.portion_name)) { scene.pbUpdate }
if pbConfirmMessage(_INTL("Do you want to teach {1} to {2}?", movename, pkmn.name)) { scene.pbUpdate } if pbConfirmMessage(_INTL("Do you want to teach {1} to {2}?", movename, pkmn.name)) { scene.pbUpdate }
if pbLearnMove(pkmn, machine, false, true) { scene.pbUpdate } if pbLearnMove(pkmn, machine, false, true) { scene.pbUpdate }
$bag.remove(item) if itm.consumed_after_use? $bag.remove(item) if itm.consumed_after_use?
@@ -731,7 +731,7 @@ def pbUseItemOnPokemon(item, pkmn, scene)
max_at_once = [max_at_once, $bag.quantity(item)].min max_at_once = [max_at_once, $bag.quantity(item)].min
if max_at_once > 1 if max_at_once > 1
qty = scene.scene.pbChooseNumber( qty = scene.scene.pbChooseNumber(
_INTL("How many {1} do you want to use?", itm.potion_name_plural), max_at_once _INTL("How many {1} do you want to use?", itm.portion_name_plural), max_at_once
) )
scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen) scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
end end
@@ -742,7 +742,7 @@ def pbUseItemOnPokemon(item, pkmn, scene)
if ret && itm.consumed_after_use? if ret && itm.consumed_after_use?
$bag.remove(item, qty) $bag.remove(item, qty)
if !$bag.has?(item) if !$bag.has?(item)
pbMessage(_INTL("You used your last {1}.", itm.potion_name)) { scene.pbUpdate } pbMessage(_INTL("You used your last {1}.", itm.portion_name)) { scene.pbUpdate }
end end
end end
return ret return ret
@@ -759,7 +759,7 @@ def pbUseKeyItemInField(item)
end end
def pbUseItemMessage(item) def pbUseItemMessage(item)
itemname = GameData::Item.get(item).name itemname = GameData::Item.get(item).portion_name
if itemname.starts_with_vowel? if itemname.starts_with_vowel?
pbMessage(_INTL("You used an {1}.", itemname)) pbMessage(_INTL("You used an {1}.", itemname))
else else

6
PBS/Gen 5/items.txt
View File

@@ -441,6 +441,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can
[RELICCOPPER] [RELICCOPPER]
Name = Relic Copper Name = Relic Copper
NamePlural = Relic Coppers NamePlural = Relic Coppers
PortionName = Relic Copper coin
PortionNamePlural = Relic Copper coins
Pocket = 1 Pocket = 1
Price = 2000 Price = 2000
Flags = Fling_30 Flags = Fling_30
@@ -449,6 +451,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani
[RELICSILVER] [RELICSILVER]
Name = Relic Silver Name = Relic Silver
NamePlural = Relic Silvers NamePlural = Relic Silvers
PortionName = Relic Silver coin
PortionNamePlural = Relic Silver coins
Pocket = 1 Pocket = 1
Price = 10000 Price = 10000
Flags = Fling_30 Flags = Fling_30
@@ -457,6 +461,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani
[RELICGOLD] [RELICGOLD]
Name = Relic Gold Name = Relic Gold
NamePlural = Relic Golds NamePlural = Relic Golds
PortionName = Relic Gold coin
PortionNamePlural = Relic Gold coins
Pocket = 1 Pocket = 1
Price = 20000 Price = 20000
Flags = Fling_30 Flags = Fling_30

6
PBS/Gen 6/items.txt
View File

@@ -457,6 +457,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can
[RELICCOPPER] [RELICCOPPER]
Name = Relic Copper Name = Relic Copper
NamePlural = Relic Coppers NamePlural = Relic Coppers
PortionName = Relic Copper coin
PortionNamePlural = Relic Copper coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -465,6 +467,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani
[RELICSILVER] [RELICSILVER]
Name = Relic Silver Name = Relic Silver
NamePlural = Relic Silvers NamePlural = Relic Silvers
PortionName = Relic Silver coin
PortionNamePlural = Relic Silver coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -473,6 +477,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani
[RELICGOLD] [RELICGOLD]
Name = Relic Gold Name = Relic Gold
NamePlural = Relic Golds NamePlural = Relic Golds
PortionName = Relic Gold coin
PortionNamePlural = Relic Gold coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30

6
PBS/Gen 7/items.txt
View File

@@ -467,6 +467,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can
[RELICCOPPER] [RELICCOPPER]
Name = Relic Copper Name = Relic Copper
NamePlural = Relic Coppers NamePlural = Relic Coppers
PortionName = Relic Copper coin
PortionNamePlural = Relic Copper coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -475,6 +477,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani
[RELICSILVER] [RELICSILVER]
Name = Relic Silver Name = Relic Silver
NamePlural = Relic Silvers NamePlural = Relic Silvers
PortionName = Relic Silver coin
PortionNamePlural = Relic Silver coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -483,6 +487,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani
[RELICGOLD] [RELICGOLD]
Name = Relic Gold Name = Relic Gold
NamePlural = Relic Golds NamePlural = Relic Golds
PortionName = Relic Gold coin
PortionNamePlural = Relic Gold coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30

6
PBS/Gen 8/items.txt
View File

@@ -552,6 +552,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can
[RELICCOPPER] [RELICCOPPER]
Name = Relic Copper Name = Relic Copper
NamePlural = Relic Coppers NamePlural = Relic Coppers
PortionName = Relic Copper coin
PortionNamePlural = Relic Copper coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -560,6 +562,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani
[RELICSILVER] [RELICSILVER]
Name = Relic Silver Name = Relic Silver
NamePlural = Relic Silvers NamePlural = Relic Silvers
PortionName = Relic Silver coin
PortionNamePlural = Relic Silver coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -568,6 +572,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani
[RELICGOLD] [RELICGOLD]
Name = Relic Gold Name = Relic Gold
NamePlural = Relic Golds NamePlural = Relic Golds
PortionName = Relic Gold coin
PortionNamePlural = Relic Gold coins
Pocket = 1 Pocket = 1
Price = 60000 Price = 60000
Flags = Fling_30 Flags = Fling_30

6
PBS/items.txt
View File

@@ -552,6 +552,8 @@ Description = A bone that is extremely valuable for Pokémon archaeology. It can
[RELICCOPPER] [RELICCOPPER]
Name = Relic Copper Name = Relic Copper
NamePlural = Relic Coppers NamePlural = Relic Coppers
PortionName = Relic Copper coin
PortionNamePlural = Relic Copper coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -560,6 +562,8 @@ Description = A copper coin used in a civilization about 3,000 years ago. A mani
[RELICSILVER] [RELICSILVER]
Name = Relic Silver Name = Relic Silver
NamePlural = Relic Silvers NamePlural = Relic Silvers
PortionName = Relic Silver coin
PortionNamePlural = Relic Silver coins
Pocket = 1 Pocket = 1
Price = 0 Price = 0
Flags = Fling_30 Flags = Fling_30
@@ -568,6 +572,8 @@ Description = A silver coin used in a civilization about 3,000 years ago. A mani
[RELICGOLD] [RELICGOLD]
Name = Relic Gold Name = Relic Gold
NamePlural = Relic Golds NamePlural = Relic Golds
PortionName = Relic Gold coin
PortionNamePlural = Relic Gold coins
Pocket = 1 Pocket = 1
Price = 60000 Price = 60000
Flags = Fling_30 Flags = Fling_30