mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
*** empty log message ***
This commit is contained in:
parent
ad314b4dbd
commit
afe1e1c278
@ -39,9 +39,9 @@ DNA_TYPES = ['wall', 'window', 'sign', 'door_double', 'door_single', 'cornice',
|
|||||||
'prop', 'street']
|
'prop', 'street']
|
||||||
BUILDING_TYPES = ['10_10', '20', '10_20', '20_10', '10_10_10',
|
BUILDING_TYPES = ['10_10', '20', '10_20', '20_10', '10_10_10',
|
||||||
'4_21', '3_22', '4_13_8', '3_13_9', '10',
|
'4_21', '3_22', '4_13_8', '3_13_9', '10',
|
||||||
'12_8', '13_9_8'
|
'12_8', '13_9_8', '4_10_10', '4_10', '4_20',
|
||||||
]
|
]
|
||||||
BUILDING_HEIGHTS = [10, 20, 25, 30]
|
BUILDING_HEIGHTS = [10, 14, 20, 24, 25, 30]
|
||||||
NUM_WALLS = [1,2,3]
|
NUM_WALLS = [1,2,3]
|
||||||
LANDMARK_SPECIAL_TYPES = ['', 'hq', 'gagshop', 'clotheshop']
|
LANDMARK_SPECIAL_TYPES = ['', 'hq', 'gagshop', 'clotheshop']
|
||||||
|
|
||||||
@ -1308,6 +1308,8 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
chance = randint(0,100)
|
chance = randint(0,100)
|
||||||
if buildingHeight <= 10:
|
if buildingHeight <= 10:
|
||||||
return [buildingHeight]
|
return [buildingHeight]
|
||||||
|
elif buildingHeight <= 14:
|
||||||
|
return [4, 10]
|
||||||
elif buildingHeight <= 20:
|
elif buildingHeight <= 20:
|
||||||
if chance <= 30:
|
if chance <= 30:
|
||||||
return [20]
|
return [20]
|
||||||
@ -1315,6 +1317,11 @@ class LevelEditor(NodePath, PandaObject):
|
|||||||
return [10, 10]
|
return [10, 10]
|
||||||
else:
|
else:
|
||||||
return [12, 8]
|
return [12, 8]
|
||||||
|
elif buildingHeight <= 24:
|
||||||
|
if chance <= 50:
|
||||||
|
return [4, 10, 10]
|
||||||
|
else:
|
||||||
|
return [4, 20]
|
||||||
elif buildingHeight <= 25:
|
elif buildingHeight <= 25:
|
||||||
if chance <= 25:
|
if chance <= 25:
|
||||||
return [3, 22]
|
return [3, 22]
|
||||||
@ -4032,7 +4039,7 @@ class LevelStyleManager:
|
|||||||
# Building types
|
# Building types
|
||||||
self.createMiscAttribute('building_type', BUILDING_TYPES)
|
self.createMiscAttribute('building_type', BUILDING_TYPES)
|
||||||
# Building heights
|
# Building heights
|
||||||
self.createMiscAttribute('building_height', [10,20,25,30])
|
self.createMiscAttribute('building_height', [10,14,20,24,25,30])
|
||||||
# MRM: Need offset on these menus
|
# MRM: Need offset on these menus
|
||||||
# Wall orientation menu
|
# Wall orientation menu
|
||||||
self.createMiscAttribute('wall_orientation', ['ur','ul','dl','dr'])
|
self.createMiscAttribute('wall_orientation', ['ur','ul','dl','dr'])
|
||||||
@ -4660,6 +4667,13 @@ class LevelEditorPanel(Pmw.MegaToplevel):
|
|||||||
variable = self.heightMode,
|
variable = self.heightMode,
|
||||||
command = self.setFlatBuildingHeight)
|
command = self.setFlatBuildingHeight)
|
||||||
self.tenFootButton.pack(side = LEFT, expand = 1, fill = X)
|
self.tenFootButton.pack(side = LEFT, expand = 1, fill = X)
|
||||||
|
self.fourteenFootButton = Radiobutton(
|
||||||
|
bf,
|
||||||
|
text = '14 ft',
|
||||||
|
value = 14,
|
||||||
|
variable = self.heightMode,
|
||||||
|
command = self.setFlatBuildingHeight)
|
||||||
|
self.fourteenFootButton.pack(side = LEFT, expand = 1, fill = X)
|
||||||
self.twentyFootButton = Radiobutton(
|
self.twentyFootButton = Radiobutton(
|
||||||
bf,
|
bf,
|
||||||
text = '20 ft',
|
text = '20 ft',
|
||||||
@ -4667,6 +4681,13 @@ class LevelEditorPanel(Pmw.MegaToplevel):
|
|||||||
variable = self.heightMode,
|
variable = self.heightMode,
|
||||||
command = self.setFlatBuildingHeight)
|
command = self.setFlatBuildingHeight)
|
||||||
self.twentyFootButton.pack(side = LEFT, expand = 1, fill = X)
|
self.twentyFootButton.pack(side = LEFT, expand = 1, fill = X)
|
||||||
|
self.twentyFourFootButton = Radiobutton(
|
||||||
|
bf,
|
||||||
|
text = '24 ft',
|
||||||
|
value = 24,
|
||||||
|
variable = self.heightMode,
|
||||||
|
command = self.setFlatBuildingHeight)
|
||||||
|
self.twentyFourFootButton.pack(side = LEFT, expand = 1, fill = X)
|
||||||
self.twentyFiveFootButton = Radiobutton(
|
self.twentyFiveFootButton = Radiobutton(
|
||||||
bf,
|
bf,
|
||||||
text = '25 ft',
|
text = '25 ft',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user