Skip to content

Adding to the transmogrifier for unit scaling on various blocks #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paragitadmin merged 2 commits into from
May 2, 2017
Merged

Adding to the transmogrifier for unit scaling on various blocks #1028

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92af81d
adding to the transmogrifier for unit scaling on various blocks
May 2, 2017
2ad6103
comment out transmogrifier line that is not ready
May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/com/parallax/server/blocklyprop/db/dao/impl/ProjectDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,8 @@ private String fixPropcProjectBlocks(String newCode) {

newCode = newCode.replaceAll("block type=\"logic_boolean_negate\"",
"block type=\"logic_negate\"");

newCode = newCode.replaceAll("_000 / ", "000 / ");

// Fix a small issue with calling the wrong project type.
newCode = newCode.replaceAll("block type=\"spin_integer\"",
Expand All @@ -783,6 +785,8 @@ private String fixPropcProjectBlocks(String newCode) {
// Change all math number blocks to the same kind
newCode = newCode.replaceAll("block type=\"math_int_angle\"",
"block type=\"math_number\"");
newCode = newCode.replaceAll("block type=\"math_integer\"",
"block type=\"math_number\"");
newCode = newCode.replaceAll("block type=\"scribbler_random_number\"",
"block type=\"math_random\"");
newCode = newCode.replaceAll("field name=\"INT_VALUE\"",
Expand All @@ -799,6 +803,10 @@ private String fixPropcProjectBlocks(String newCode) {
newCode = newCode.replaceAll("scribbler_if_line\" id=(.*)><mutation state=\"(.*)\"></mutation><field name=\"LINE_CONDITION\">(.*)</field><field name=\"LINE_POSITION\">(.*)</field><field name=\"LINE_COLOR\">(.*)</field><statement name=\"IF_LINE",
"controls_if\" id=$1><value name=\"IF0\"><block type=\"scribbler_simple_line\" id=\"" + randomString(20) + "\"><mutation state=\"$2\"></mutation><field name=\"LINE_CONDITION\">$3</field><field name=\"LINE_POSITION\">$4</field><field name=\"LINE_COLOR\">$5</field></block></value><statement name=\"DO0");

// Not sure if I need non-mutation replacers - if not included, they will likely get cleaned on the second save (first one adds them, second one replaces)
//newCode = newCode.replaceAll("scribbler_if_obstacle\" id=(.*)><field name=\"OBSTACLE_CONDITION\">(.*)</field><field name=\"OBSTACLE_POSITION\">(.*)</field><statement name=\"IF_OBSTACLE",
// "controls_if\" id=$1><value name=\"IF0\"><block type=\"scribbler_simple_obstacle\" id=\"" + randomString(20) + "\"><field name=\"OBSTACLE_CONDITION\">$2</field><field name=\"OBSTACLE_POSITION\">$3</field></block></value><statement name=\"DO0");

newCode = newCode.replaceAll("scribbler_if_obstacle\" id=(.*)><mutation state=\"(.*)\"></mutation><field name=\"OBSTACLE_CONDITION\">(.*)</field><field name=\"OBSTACLE_POSITION\">(.*)</field><statement name=\"IF_OBSTACLE",
"controls_if\" id=$1><value name=\"IF0\"><block type=\"scribbler_simple_obstacle\" id=\"" + randomString(20) + "\"><mutation state=\"$2\"></mutation><field name=\"OBSTACLE_CONDITION\">$3</field><field name=\"OBSTACLE_POSITION\">$4</field></block></value><statement name=\"DO0");

Expand Down