-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #122 from cyb3rpsych0s1s/fix/blacklace-loots
Add more loots
- Loading branch information
Showing
5 changed files
with
290 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
module Addicted | ||
|
||
public class NoCorpoDistricts extends IScriptablePrereq { | ||
protected func Initialize(recordID: TweakDBID) -> Void {} | ||
public const func IsFulfilled(game: GameInstance, context: ref<IScriptable>) -> Bool { | ||
let ps: ref<PreventionSystem> = GameInstance.GetScriptableSystemsContainer(game).Get(n"PreventionSystem") as PreventionSystem; | ||
let district = ps.GetCurrentDistrict().GetDistrictID(); | ||
let corpos = [ | ||
t"Districts.ArasakaTowerSaburoOffice", | ||
t"Districts.ArasakaTowerAtrium", | ||
t"Districts.ArasakaTowerNest", | ||
t"Districts.CharterHill", | ||
t"Districts.ArasakaTowerJenkins", | ||
t"Districts.ArasakaWarehouse", | ||
t"Districts.Arasaka_Estate", | ||
t"Districts.q110Cyberspace", | ||
t"Districts.CorpoPlaza", | ||
t"Districts.ArasakaTowerUpperAtrium", | ||
t"Districts.q201Cyberspace", | ||
t"Districts.ArasakaTowerCEOFloor", | ||
t"Districts.q201SpaceStation", | ||
t"Districts.CityCenter", | ||
t"Districts.ArasakaTowerLobby", | ||
t"Districts.ArasakaTowerJungle", | ||
t"Districts.ArasakaWaterfront" | ||
]; | ||
return !ArrayContains(corpos, district); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
LootPrereqs.StartedThePickupDeal: | ||
$type: gamedataIPrereq_Record | ||
prereqClassName: FactValuePrereq | ||
fact: q003_deal_started | ||
comparisonType: Greater | ||
value: 0 | ||
|
||
LootPrereqs.PastThePickup: | ||
$type: gamedataIPrereq_Record | ||
prereqClassName: FactValuePrereq | ||
fact: q003_done | ||
comparisonType: Greater | ||
value: 0 | ||
|
||
LootPrereqs.IntroducedBlackLace: | ||
$type: gamedataMultiPrereq_Record | ||
aggregationType: OR | ||
prereqClassName: gameMultiPrereq | ||
nestedPrereqs: | ||
- LootPrereqs.StartedThePickupDeal | ||
- LootPrereqs.PastThePickup | ||
|
||
LootPrereqs.NoCorpoDistricts: | ||
$type: gamedataIPrereq_Record | ||
prereqClassName: Addicted.NoCorpoDistricts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
LootPrereqs.BlackLaceFor$(level)Player: | ||
$instances: | ||
- { level: Trash, prereq: LootPrereqs.PlayerLevelTrashTierPrereq } | ||
- { level: Rookie, prereq: LootPrereqs.PlayerLevel_Tier_2_Start_Prereq } | ||
- { level: Weak, prereq: LootPrereqs.PlayerLevelWeakTierPrereq } | ||
- { level: Advanced, prereq: LootPrereqs.PlayerLevel_Tier_3_Start_Prereq } | ||
$type: gamedataMultiPrereq_Record | ||
aggregationType: AND | ||
prereqClassName: gameMultiPrereq | ||
nestedPrereqs: | ||
- LootPrereqs.IntroducedBlackLace | ||
- $(prereq) | ||
|
||
LootPrereqs.BlackLaceOutsideCorpoDistricts: | ||
$type: gamedataMultiPrereq_Record | ||
aggregationType: AND | ||
prereqClassName: gameMultiPrereq | ||
nestedPrereqs: | ||
- LootPrereqs.BlackLaceForRookiePlayer | ||
- LootPrereqs.NoCorpoDistricts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,148 @@ | ||
Loot.$(gang)$(likeliness)Drop_BlackLace$(version): | ||
$instances: | ||
# maelstrom | ||
- { gang: Maelstrom, version: V0, likeliness: Rarely, max: 1, chance: 0.05, prereq: LootPrereqs.BlackLaceForTrashPlayer } | ||
- { gang: Maelstrom, version: V0, likeliness: Occasionally, max: 2, chance: 0.2, prereq: LootPrereqs.BlackLaceForWeakPlayer } | ||
- { gang: Maelstrom, version: V0, likeliness: Sometimes, max: 1, chance: 0.3, prereq: LootPrereqs.BlackLaceForAdvancedPlayer } | ||
- { gang: Maelstrom, version: V1, likeliness: Rarely, max: 1, chance: 0.05, prereq: LootPrereqs.BlackLaceForTrashPlayer } | ||
- { gang: Maelstrom, version: V1, likeliness: Occasionally, max: 2, chance: 0.2, prereq: LootPrereqs.BlackLaceForWeakPlayer } | ||
- { gang: Maelstrom, version: V1, likeliness: Sometimes, max: 1, chance: 0.3, prereq: LootPrereqs.BlackLaceForAdvancedPlayer } | ||
# scavengers | ||
- { gang: Scavengers, version: V0, likeliness: Rarely, max: 1, chance: 0.05, prereq: LootPrereqs.BlackLaceForTrashPlayer } | ||
- { gang: Scavengers, version: V0, likeliness: Occasionally, max: 1, chance: 0.1, prereq: LootPrereqs.BlackLaceForAdvancedPlayer } | ||
# wraiths | ||
- { gang: Wraiths, version: V0, likeliness: Rarely, max: 1, chance: 0.1, prereq: LootPrereqs.BlackLaceForTrashPlayer } | ||
- { gang: Wraiths, version: V0, likeliness: Occasionally, max: 1, chance: 0.15, prereq: LootPrereqs.BlackLaceForAdvancedPlayer } | ||
# 6th street | ||
- { gang: SixthStreet,version: V0, likeliness: Sometimes, max: 1, chance: 0.25, prereq: LootPrereqs.BlackLaceForRookiePlayer } | ||
# animals | ||
- { gang: Animals, version: V0, likeliness: Rarely, max: 1, chance: 0.05, prereq: LootPrereqs.BlackLaceForRookiePlayer } | ||
# creepy follower | ||
- { gang: CreepyFollower, version: V0, likeliness: Sometimes, max: 1, chance: 0.2, prereq: LootPrereqs.BlackLaceForRookiePlayer } | ||
$type: gamedataLootItem_Record | ||
itemID: Items.BlackLace$(version) | ||
dropChance: $(chance) | ||
dropCountMax: $(max) | ||
dropCountMin: 1 | ||
playerPrereqID: $(prereq) | ||
dropChanceModifiers: [] | ||
quantityModifiers: [] | ||
statModifiers: [] | ||
|
||
Loot.MaelstromDrop.lootItems: &AdditionalBlackLaceLootMaelstrom | ||
- !append-once Loot.MaelstromRarelyDrop_BlackLaceV0 | ||
- !append-once Loot.MaelstromOccasionallyDrop_BlackLaceV0 | ||
- !append-once Loot.MaelstromSometimesDrop_BlackLaceV0 | ||
- !append-once Loot.MaelstromRarelyDrop_BlackLaceV1 | ||
- !append-once Loot.MaelstromOccasionallyDrop_BlackLaceV1 | ||
- !append-once Loot.MaelstromSometimesDrop_BlackLaceV1 | ||
Loot.MaelstromShotgunStrongT2.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericRangedGruntT1_copperhead.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericMeleeGruntT1.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromNetrunnerNetrunnerT2.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericRangedGruntT2_rifle.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromSniperT2.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericRangedGruntT1_lexington.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericMeleeGruntT2_blade.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromFastMeleeFastT3.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGenericMeleeGruntT2_axe.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromFastMeleeFastT2.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
Loot.MaelstromGunnerStrongT2.lootItems: *AdditionalBlackLaceLootMaelstrom | ||
|
||
Loot.ScavengersGenericMeleeGruntT2_blunt.lootItems: &AdditionalBlackLaceLootScavengers | ||
- !append-once Loot.ScavengersRarelyDrop_BlackLaceV0 | ||
- !append-once Loot.ScavengersOccasionallyDrop_BlackLaceV0 | ||
Loot.ScavengersGenericMeleeGruntT2_knife.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersHeavyMeleeButcherT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersFastMeleeFastT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericRangedGruntT2_rifle.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericMeleeGruntT1_blunt.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersShotgunEliteT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersNetrunnerGruntT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersDrop.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersFastMeleeFastT3.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersNetrunnerNetrunnerT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericRangedGruntT2_sniper.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGunnerStrongT2.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericRangedGruntT1_smg.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericMeleeGruntT1_fists.lootItems: *AdditionalBlackLaceLootScavengers | ||
Loot.ScavengersGenericRangedGruntT1_handgun.lootItems: *AdditionalBlackLaceLootScavengers | ||
|
||
Loot.WraithsDrop.lootItems: &AdditionalBlackLaceLootWraiths | ||
- !append-once Loot.WraithsRarelyDrop_BlackLaceV0 | ||
- !append-once Loot.WraithsOccasionallyDrop_BlackLaceV0 | ||
Loot.WraithsGenericRangedWarriorT3.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsSniperGhostT2.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsFastMeleePrisonerT3.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericMeleeWarriorT3.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericRangedGruntT2.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericRangedGruntT1_pulsar.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericMeleeGruntT1.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGunnerStrongT3.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericRangedGruntT1_nova.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsShotgunOperatorT2.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsGenericMeleeGruntT2.lootItems: *AdditionalBlackLaceLootWraiths | ||
Loot.WraithsShotgunWarriorT3.lootItems: *AdditionalBlackLaceLootWraiths | ||
|
||
Loot.SixthStreetDrop.lootItems: &AdditionalBlackLaceLootSixthStreet | ||
- !append-once Loot.SixthStreetSometimesDrop_BlackLaceV0 | ||
Loot.SixthStreetGenericRangedPatrolT2.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetShotgunMenaceT2.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericMeleeHooliganT1_blunt.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericRangedHooliganT1_saratoga.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericRangedVeteranT2.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetShotgunPatrolT3.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetFastMeleeMenaceT2.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericMeleeHooliganT1_blade.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetSniperSniperT2.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericMeleePatrolT2_blunt.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericMeleePatrolT2_knife.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
Loot.SixthStreetGenericRangedHooliganT1_nova.lootItems: *AdditionalBlackLaceLootSixthStreet | ||
|
||
Loot.AnimalsDrop.lootItems: &AdditionalBlackLaceLootAnimals | ||
- !append-once Loot.AnimalsRarelyDrop_BlackLaceV0 | ||
Loot.AnimalsGenericMeleeGruntT2_blade.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedBouncerT2_handgunTech.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericMeleeBouncerT1.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedBouncerT1.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeBouncerT2_blunt.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeEliteT2_fist.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsShotgunGruntT2.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeBouncerT3.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeGruntT2_blunt.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsShotgunEliteT3.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedGruntT1_nova.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericMeleeGruntT2_blunt.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedEliteT3.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericMeleeBouncerT2.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGunnerEliteT3.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeGruntT2_fist.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeBouncerT2_fist.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericMeleeGruntT1_fist.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericMeleeGruntT1_blunt.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeEliteT3.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGunnerGruntT2.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedGruntT2.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedGruntT1_pulsar.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsGenericRangedBouncerT2_handgun.lootItems: *AdditionalBlackLaceLootAnimals | ||
Loot.AnimalsHeavyMeleeEliteT2_blunt.lootItems: *AdditionalBlackLaceLootAnimals | ||
|
||
Loot.CreepyFollower_Loot.lootItems: | ||
- !append-once Loot.CreepyFollowerSometimesDrop_BlackLaceV0 | ||
|
||
# if more needed: | ||
## | ||
# Character.lizzies_customer_XYZ | ||
# Character.CitizenBikerXYZ | ||
# Character.CreoleXYZ | ||
# Character.DumDum | ||
# Character.LowlifeXYZ | ||
# Loot.TygerClawsXYZ | ||
# Loot.ValentinosXYZ | ||
# Loot.KurtzXYZ | ||
|
||
# in vanilla DogTown, junkies already carries some | ||
# but there's also NPC like: | ||
## | ||
# Character.ep1_combat_zone_citizen_XYZ | ||
# Character.ep1_combat_service_sexworker_XYZ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
LootTables.$(likeliness)BlacklaceTable_For$(level)Player: | ||
$instances: | ||
- { level: Weak, likeliness: '', version: V0, chance: 0.1, prereq: LootPrereqs.BlackLaceForWeakPlayer } | ||
- { level: Advanced, likeliness: '', version: V1, chance: 0.1, prereq: LootPrereqs.BlackLaceForAdvancedPlayer } | ||
- { level: Rookie, likeliness: Seldom, version: V0, chance: 0.05, prereq: LootPrereqs.BlackLaceOutsideCorpoDistricts } | ||
- { level: Rookie, likeliness: Rare, version: V0, chance: 0.02, prereq: LootPrereqs.BlackLaceOutsideCorpoDistricts } | ||
$type: gamedataLootItem_Record | ||
itemID: Items.BlackLace$(version) | ||
dropChance: $(chance) | ||
dropCountMax: 1 | ||
dropCountMin: 1 | ||
playerPrereqID: $(prereq) | ||
dropChanceModifiers: [] | ||
quantityModifiers: [] | ||
statModifiers: [] | ||
|
||
LootTables.RandomBlacklaceTable: | ||
$type: gamedataLootTable_Record | ||
lootGenerationType: dropChance | ||
maxItemsToLoot: 1 | ||
minItemsToLoot: 1 | ||
lootItems: | ||
- LootTables.BlacklaceTable_ForWeakPlayer | ||
- LootTables.BlacklaceTable_ForAdvancedPlayer | ||
lootTableInclusions: [] | ||
queries: [] | ||
|
||
LootTables.SeldomBlacklaceTable: | ||
$base: LootTables.RandomBlacklaceTable | ||
lootItems: | ||
- LootTables.SeldomBlacklaceTable_ForRookiePlayer | ||
|
||
LootTables.RareBlacklaceTable: | ||
$base: LootTables.RandomBlacklaceTable | ||
lootItems: | ||
- LootTables.RareBlacklaceTable_ForRookiePlayer | ||
|
||
LootTables.Maelstrom_LGM_locker.lootTableInclusions: &AdditionalBlackLaceInclusion | ||
- !append-once LootTables.RandomBlacklaceTable | ||
LootTables.Maelstrom_LGS_gadgets.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_LGS_valuable.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_LGM_safe.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_LGS_suitcase.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_MGM_safe.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_MGM_locker.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_MGS_crate.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
LootTables.Maelstrom_MGS_gadgets.lootTableInclusions: *AdditionalBlackLaceInclusion | ||
# LootTables.Maelstrom_LGM_chemicals already contains LootTables.BlacklaceTable | ||
|
||
LootTables.FirstAidKits.lootTableInclusions: | ||
- !append-once LootTables.SeldomBlacklaceTable | ||
|
||
Character.JunkieFemale: &AdditionalBlackLaceLootJunkies | ||
lootDrop: LootTables.SeldomBlacklaceTable | ||
Character.JunkieFemaleDE: *AdditionalBlackLaceLootJunkies | ||
Character.JunkieMale: *AdditionalBlackLaceLootJunkies | ||
Character.JunkieMaleDE: *AdditionalBlackLaceLootJunkies | ||
Character.junkie_no_reaction: *AdditionalBlackLaceLootJunkies | ||
|
||
Character.HomelessFemale: &AdditionalBlackLaceLootHomeless | ||
lootDrop: LootTables.RareBlacklaceTable | ||
Character.HomelessFemaleDE: *AdditionalBlackLaceLootHomeless | ||
Character.HomelessMan: *AdditionalBlackLaceLootHomeless | ||
Character.HomelessManDE: *AdditionalBlackLaceLootHomeless | ||
Character.HomelessManBig: *AdditionalBlackLaceLootHomeless | ||
Character.HomelessManBackpack: *AdditionalBlackLaceLootHomeless |