Skip to content

Commit 6aba14a

Browse files
committed
Simplify LogicWiz using Hoikas' method
1 parent 59a3039 commit 6aba14a

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

korman/properties/modifiers/logic.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def requires_actor(self):
120120

121121

122122
# Let's set up the xSimpleImager.py scripting
123-
imager_pfms = {
123+
imager_pfm = {
124124
"filename": "xSimpleImager.py",
125125
"attribs": (
126126
{ 'id': 1, 'type': "ptAttribString", 'name': "ImagerName" },
@@ -232,80 +232,77 @@ def _poll_texture(self, value: bpy.types.Texture) -> bool:
232232
def logicwiz(self, bo, tree):
233233
nodes = tree.nodes
234234

235-
imager_pfm = imager_pfms
236-
imagernode = self._create_python_file_node(tree, imager_pfm["filename"], imager_pfm["attribs"])
237-
self._create_imager_nodes(bo, tree.nodes, imagernode)
235+
# Create Python File node
236+
imagerpynode = self._create_python_file_node(tree, imager_pfm["filename"], imager_pfm["attribs"])
238237

239-
240-
def _create_imager_nodes(self, imager_object, nodes, imagernode):
241238
#Imager Name
242239
imagername = nodes.new("PlasmaAttribStringNode")
243240
imagername.value = self.imager_name
244-
imagername.link_output(imagernode, "pfm", "ImagerName")
241+
imagername.link_output(imagerpynode, "pfm", "ImagerName")
245242

246243
# Texture
247244
imagertext = nodes.new("PlasmaAttribTextureNode")
248245
imagertext.target_object = self.imager_object
249246
imagertext.material = self.imager_material
250247
imagertext.texture = self.imager_texture
251-
imagertext.link_output(imagernode, "pfm", "ImagerMap")
248+
imagertext.link_output(imagerpynode, "pfm", "ImagerMap")
252249

253250
# Region Object if we want one
254251
if self.imager_region and self.imager_type == "POSTABLE":
255252
imagerregion = nodes.new("PlasmaVolumeSensorNode")
256253
imagerregion.region_object = self.imager_region
257254
for i in imagerregion.inputs:
258255
i.allow = True
259-
imagerregion.link_output(imagernode, "satisfies", "ImagerRegion")
256+
imagerregion.link_output(imagerpynode, "satisfies", "ImagerRegion")
260257

261258
# Seconds between posts
262259
imagersec = nodes.new("PlasmaAttribIntNode")
263260
imagersec.value_int = self.imager_time
264-
imagersec.link_output(imagernode, "pfm", "ImagerTime")
261+
imagersec.link_output(imagerpynode, "pfm", "ImagerTime")
265262

266263
# Members only?
267264
imagermember = nodes.new("PlasmaAttribBoolNode")
268265
if self.imager_type == "POSTABLE":
269266
imagermember.value = self.imager_membersonly
270267
else:
271268
imagermember.value = True
272-
imagermember.link_output(imagernode, "pfm", "ImagerMembersOnly")
269+
imagermember.link_output(imagerpynode, "pfm", "ImagerMembersOnly")
273270

274271
# Imager Mesh Object
275272
imagerobject = nodes.new("PlasmaAttribObjectNode")
276273
imagerobject.target_object = self.imager_object
277-
imagerobject.link_output(imagernode, "pfm", "ImagerObject")
274+
imagerobject.link_output(imagerpynode, "pfm", "ImagerObject")
278275

279276
# Maximum Images
280277
imagermax = nodes.new("PlasmaAttribIntNode")
281278
imagermax.value_int = self.imager_maximum
282-
imagermax.link_output(imagernode, "pfm", "ImagerMax")
279+
imagermax.link_output(imagerpynode, "pfm", "ImagerMax")
283280

284281
# Optional SDL placeholder (needed?)
285282
if self.imager_type == "POSTABLE":
286283
imagersdl = nodes.new("PlasmaAttribStringNode")
287-
imagersdl.link_output(imagernode, "pfm", "ImagerInboxVariable")
284+
imagersdl.link_output(imagerpynode, "pfm", "ImagerInboxVariable")
288285

289286
# Pellet Imager?
290287
imagerpellet = nodes.new("PlasmaAttribBoolNode")
291288
if self.imager_type == "POSTABLE":
292289
imagerpellet.value = self.imager_pellets
293290
else:
294291
imagerpellet.value = False
295-
imagerpellet.link_output(imagernode, "pfm", "ImagerPelletUpload")
292+
imagerpellet.link_output(imagerpynode, "pfm", "ImagerPelletUpload")
296293

297294
# Puzzle Imager Object if we have one
298295
if self.imager_clueobject and self.imager_type == "POSTABLE":
299296
imagerclueobj = nodes.new("PlasmaAttribObjectNode")
300297
imagerclueobj.target_object = self.imager_clueobject
301-
imagerclueobj.link_output(imagernode, "pfm", "ImagerClueObject")
298+
imagerclueobj.link_output(imagerpynode, "pfm", "ImagerClueObject")
302299

303300
# Clue Time
304301
imagercluetime = nodes.new("PlasmaAttribIntNode")
305302
imagercluetime.value_int = self.imager_cluetime
306-
imagercluetime.link_output(imagernode, "pfm", "ImagerClueTime")
303+
imagercluetime.link_output(imagerpynode, "pfm", "ImagerClueTime")
307304

308305
# Random Clue Time
309306
imagerrandomtime = nodes.new("PlasmaAttribIntNode")
310307
imagerrandomtime.value_int = self.imager_randomtime
311-
imagerrandomtime.link_output(imagernode, "pfm", "ImagerRandomTime")
308+
imagerrandomtime.link_output(imagerpynode, "pfm", "ImagerRandomTime")

0 commit comments

Comments
 (0)