Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 20:22:33 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://gitlab.com/ToontownUnited/src

Browse source
This commit is contained in:
John Cote 2015-05-12 17:02:50 -04:00
commit 044381e312
4 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
astron/dclass/united.dc
View file

@ -1379,6 +1379,7 @@ dclass DistributedHouseInterior : DistributedObject {
dclass DistributedGarden : DistributedObject { dclass DistributedGarden : DistributedObject {
sendNewProp(uint8, int16/10, int16/10, int16/10) broadcast; sendNewProp(uint8, int16/10, int16/10, int16/10) broadcast;
setProps(uint8[]) airecv clsend;
}; };
dclass DistributedParty : DistributedObject { dclass DistributedParty : DistributedObject {
@ -1960,7 +1961,7 @@ dclass DistributedNPCKartClerk : DistributedNPCToonBase {
dclass DistributedNPCLaffRestock : DistributedNPCToonBase { dclass DistributedNPCLaffRestock : DistributedNPCToonBase {
setMovie(uint8, uint32, uint32, uint32[], int16) broadcast ram; setMovie(uint8, uint32, uint32, uint32[], int16) broadcast ram;
restock(uint32, uint8, uint8) airecv clsend; restock(uint32, uint16, uint16) airecv clsend;
transactionDone() airecv clsend; transactionDone() airecv clsend;
}; };

2
otp/distributed/DCClassImports.py
View file

@ -2,7 +2,7 @@
from pandac.PandaModules import * from pandac.PandaModules import *
hashVal = 2639844855L hashVal = 30166307
from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot

26
toontown/catalog/CatalogGenerator.py
View file

@ -408,7 +408,7 @@ MonthlySchedule = ((7,
9, 9,
30, 30,
( (
# CatalogGardenItem(135, 1) CatalogGardenItem(135, 1)
) )
), ),
(1, (1,
@ -416,7 +416,7 @@ MonthlySchedule = ((7,
1, 1,
31, 31,
( (
# CatalogGardenItem(135, 1) CatalogGardenItem(135, 1)
) )
), ),
(4, (4,
@ -424,7 +424,7 @@ MonthlySchedule = ((7,
4, 4,
30, 30,
( (
# CatalogGardenItem(135, 1) CatalogGardenItem(135, 1)
) )
), ),
(6, (6,
@ -432,7 +432,7 @@ MonthlySchedule = ((7,
6, 6,
30, 30,
( (
# CatalogGardenItem(135, 1) CatalogGardenItem(135, 1)
) )
), ),
(6, (6,
@ -454,8 +454,8 @@ MonthlySchedule = ((7,
4, 4,
(CatalogFurnitureItem(680), (CatalogFurnitureItem(680),
CatalogFurnitureItem(681), CatalogFurnitureItem(681),
# CatalogGardenItem(130, 1), CatalogGardenItem(130, 1),
# CatalogGardenItem(131, 1), CatalogGardenItem(131, 1),
CatalogAnimatedFurnitureItem(10020), CatalogAnimatedFurnitureItem(10020),
CatalogFurnitureItem(10030, 0))), CatalogFurnitureItem(10030, 0))),
(12, (12,
@ -530,14 +530,14 @@ MonthlySchedule = ((7,
12, 12,
31, 31,
( (
#CatalogGardenItem(100, 1), #GARDENS CatalogGardenItem(100, 1),
#CatalogGardenItem(101, 1), CatalogGardenItem(101, 1),
#CatalogGardenItem(103, 1), CatalogGardenItem(103, 1),
#CatalogGardenItem(104, 1), CatalogGardenItem(104, 1),
CatalogToonStatueItem(105, endPoseIndex=108), CatalogToonStatueItem(105, endPoseIndex=108),
CatalogRentalItem(1, 2880, 1000), CatalogRentalItem(1, 2880, 1000),
CatalogRentalItem(2, 2890, 1000), CatalogRentalItem(2, 2890, 1000),
#CatalogGardenStarterItem(), # We don't want Gardens yet. CatalogGardenStarterItem(),
CatalogNametagItem(100), CatalogNametagItem(100),
CatalogNametagItem(0), CatalogNametagItem(0),
CatalogClothingItem(1608, 0, 90), CatalogClothingItem(1608, 0, 90),
@ -623,8 +623,8 @@ MonthlySchedule = ((7,
((3, 2910), ((3, 2910),
CatalogFurnitureItem(680), CatalogFurnitureItem(680),
CatalogFurnitureItem(681), CatalogFurnitureItem(681),
#CatalogGardenItem(130, 1), #MORE GARDEN STUFF CatalogGardenItem(130, 1),
#CatalogGardenItem(131, 1), CatalogGardenItem(131, 1),
CatalogAnimatedFurnitureItem(10020), CatalogAnimatedFurnitureItem(10020),
CatalogFurnitureItem(10030, 0), CatalogFurnitureItem(10030, 0),
CatalogWallpaperItem(11000), CatalogWallpaperItem(11000),

20
toontown/estate/DistributedGardenAI.py
View file

@ -5,8 +5,24 @@ class DistributedGardenAI(DistributedObjectAI):
notify = DirectNotifyGlobal.directNotify.newCategory("DistributedGardenAI") notify = DirectNotifyGlobal.directNotify.newCategory("DistributedGardenAI")
def __init__(self, air): def __init__(self, air):
DistributedObjectAI.__init__(self, air)
self.air = air self.air = air
self.props = [] self.props = []
def sendNewProp(self, prop, x, y, z): def generate(self):
self.props.append([prop, x, y, z]) DistributedObjectAI.generate(self)
def announceGenerate(self):
DistributedObjectAI.announceGenerate(self)
def disable(self):
DistributedObjectAI.disable(self)
def delete(self):
DistributedObjectAI.delete(self)
def setProps(self, props):
self.props = props
def d_sendNewProp(self, prop, x, y, z):
self.sendUpdate('sendNewProp', [prop, x, y, z])