Skip to content

Commit 7941adb

Browse files
committed
pasting tile data fix
#46 effects can be "renamed" with ctrl + b
1 parent 046bf84 commit 7941adb

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

FE.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,26 @@ def addeffect(self, text):
422422
self.renderfield()
423423
return
424424

425+
def changeeffect(self):
426+
if self.activeeffects.itemsnum == 0:
427+
print("no effects present")
428+
return
429+
mtrx = deepcopy(self.data["FE", "effects", self.selectedeffect, "mtrx"])
430+
inp = self.askstr("What this effect should be changed to(Case sensitive)", savelevel=False)
431+
foundeffect = self.effects[inp]
432+
if foundeffect is None:
433+
print("no effect found")
434+
return
435+
436+
self.deleteeffect()
437+
self.addeffect(inp)
438+
self.changedata(["FE", "effects", self.selectedeffect, "mtrx"], mtrx)
439+
440+
self.renderer.rerendereffect()
441+
self.renderfield()
442+
443+
self.updatehistory()
444+
425445
def paint(self, x, y, st):
426446
currenteffect = self.data["FE"]["effects"][self.selectedeffect]["nm"]
427447
strength = 10 + (90 * self.findparampressed("str100"))

TE.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ def cats(self):
498498

499499
def pastedata(self):
500500
try:
501+
print("pasting data")
501502
geodata = eval(pyperclip.paste())
502503
if type(geodata) != list or len(pyperclip.paste()) <= 2:
503504
print("Error pasting data!")
@@ -511,9 +512,9 @@ def pastedata(self):
511512
name = data["data"][1]
512513
cat = self.items[name]["category"]
513514
self.set(cat, name, False, usefavs=True)
514-
# w, h = self.tileimage["size"]
515-
# px = blockx - int((w * .5) + .5) - 1
516-
# py = blocky - int((h * .5) + .5) - 1
515+
w, h = self.tileimage["size"]
516+
blockx = blockx - int((w * .5) + .5) + 1
517+
blocky = blocky - int((h * .5) + .5) + 1
517518
pa = pg.Vector2(0, 0)
518519
if self.field.rect.collidepoint(self.mousepos):
519520
pa = self.pos

files.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def loadimage(filepath):
7777

7878
load_error_count = 0
7979

80-
tag = "2.6.1"
80+
tag = "2.6.2"
8181

8282
ofstop = 15
8383
ofsleft = 15

files/hotkeys/hotkeys.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@
289289

290290
"K_SPACE": "-addordeleteselectedeffect",
291291

292+
"K_b+": "-changeeffect",
292293
"K_r+": "-prevparam",
293294
"K_f+": "-nextparam",
294295

0 commit comments

Comments
 (0)