Skip to content

Commit f57a190

Browse files
GuardianDllGuardianDll
authored
Merge pull request #82687 from andrei8l/templates-on-the-brain
eoc: migrate x_or_var helper structs to generic_factory
2 parents b3c2bb2 + e292565 commit f57a190

29 files changed

+697
-1220
lines changed

‎data/mods/MindOverMatter/powers/teleportation_eoc.json‎

Lines changed: 10 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -515,12 +515,7 @@
515515
"effect": [
516516
{
517517
"set_string_var": "Destination 1",
518-
"string_input": {
519-
"title": { "i18n": true, "str": "Input a destination name:" },
520-
"description": { "i18n": true, "str": "Destination Name:" },
521-
"width": 35,
522-
"identifier": ""
523-
},
518+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
524519
"target_var": { "u_val": "gateway_destination_name_1" }
525520
},
526521
{ "u_location_variable": { "u_val": "gateway_destination_1" }, "min_radius": 0, "max_radius": 0 },
@@ -584,12 +579,7 @@
584579
"effect": [
585580
{
586581
"set_string_var": "Destination 2",
587-
"string_input": {
588-
"title": { "i18n": true, "str": "Input a destination name:" },
589-
"description": { "i18n": true, "str": "Destination Name:" },
590-
"width": 35,
591-
"identifier": ""
592-
},
582+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
593583
"target_var": { "u_val": "gateway_destination_name_2" }
594584
},
595585
{ "u_location_variable": { "u_val": "gateway_destination_2" }, "min_radius": 0, "max_radius": 0 },
@@ -649,12 +639,7 @@
649639
"effect": [
650640
{
651641
"set_string_var": "Destination 3",
652-
"string_input": {
653-
"title": { "i18n": true, "str": "Input a destination name:" },
654-
"description": { "i18n": true, "str": "Destination Name:" },
655-
"width": 35,
656-
"identifier": ""
657-
},
642+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
658643
"target_var": { "u_val": "gateway_destination_name_3" }
659644
},
660645
{ "u_location_variable": { "u_val": "gateway_destination_3" }, "min_radius": 0, "max_radius": 0 },
@@ -714,12 +699,7 @@
714699
"effect": [
715700
{
716701
"set_string_var": "Destination 4",
717-
"string_input": {
718-
"title": { "i18n": true, "str": "Input a destination name:" },
719-
"description": { "i18n": true, "str": "Destination Name:" },
720-
"width": 35,
721-
"identifier": ""
722-
},
702+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
723703
"target_var": { "u_val": "gateway_destination_name_4" }
724704
},
725705
{ "u_location_variable": { "u_val": "gateway_destination_4" }, "min_radius": 0, "max_radius": 0 },
@@ -779,12 +759,7 @@
779759
"effect": [
780760
{
781761
"set_string_var": "Destination 5",
782-
"string_input": {
783-
"title": { "i18n": true, "str": "Input a destination name:" },
784-
"description": { "i18n": true, "str": "Destination Name:" },
785-
"width": 35,
786-
"identifier": ""
787-
},
762+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
788763
"target_var": { "u_val": "gateway_destination_name_5" }
789764
},
790765
{ "u_location_variable": { "u_val": "gateway_destination_5" }, "min_radius": 0, "max_radius": 0 },
@@ -844,12 +819,7 @@
844819
"effect": [
845820
{
846821
"set_string_var": "Destination 6",
847-
"string_input": {
848-
"title": { "i18n": true, "str": "Input a destination name:" },
849-
"description": { "i18n": true, "str": "Destination Name:" },
850-
"width": 35,
851-
"identifier": ""
852-
},
822+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
853823
"target_var": { "u_val": "gateway_destination_name_6" }
854824
},
855825
{ "u_location_variable": { "u_val": "gateway_destination_6" }, "min_radius": 0, "max_radius": 0 },
@@ -909,12 +879,7 @@
909879
"effect": [
910880
{
911881
"set_string_var": "Destination 7",
912-
"string_input": {
913-
"title": { "i18n": true, "str": "Input a destination name:" },
914-
"description": { "i18n": true, "str": "Destination Name:" },
915-
"width": 35,
916-
"identifier": ""
917-
},
882+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
918883
"target_var": { "u_val": "gateway_destination_name_7" }
919884
},
920885
{ "u_location_variable": { "u_val": "gateway_destination_7" }, "min_radius": 0, "max_radius": 0 },
@@ -974,12 +939,7 @@
974939
"effect": [
975940
{
976941
"set_string_var": "Destination 8",
977-
"string_input": {
978-
"title": { "i18n": true, "str": "Input a destination name:" },
979-
"description": { "i18n": true, "str": "Destination Name:" },
980-
"width": 35,
981-
"identifier": ""
982-
},
942+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
983943
"target_var": { "u_val": "gateway_destination_name_8" }
984944
},
985945
{ "u_location_variable": { "u_val": "gateway_destination_8" }, "min_radius": 0, "max_radius": 0 },
@@ -1039,12 +999,7 @@
1039999
"effect": [
10401000
{
10411001
"set_string_var": "Destination 9",
1042-
"string_input": {
1043-
"title": { "i18n": true, "str": "Input a destination name:" },
1044-
"description": { "i18n": true, "str": "Destination Name:" },
1045-
"width": 35,
1046-
"identifier": ""
1047-
},
1002+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
10481003
"target_var": { "u_val": "gateway_destination_name_9" }
10491004
},
10501005
{ "u_location_variable": { "u_val": "gateway_destination_9" }, "min_radius": 0, "max_radius": 0 },
@@ -1104,12 +1059,7 @@
11041059
"effect": [
11051060
{
11061061
"set_string_var": "Destination 10",
1107-
"string_input": {
1108-
"title": { "i18n": true, "str": "Input a destination name:" },
1109-
"description": { "i18n": true, "str": "Destination Name:" },
1110-
"width": 35,
1111-
"identifier": ""
1112-
},
1062+
"string_input": { "title": "Input a destination name:", "description": "Destination Name:", "width": 35 },
11131063
"target_var": { "u_val": "gateway_destination_name_10" }
11141064
},
11151065
{ "u_location_variable": { "u_val": "gateway_destination_10" }, "min_radius": 0, "max_radius": 0 },

‎data/mods/Sky_Island/EOCs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
{ "u_teleport": { "global_val": "OM_HQ_origin_npc" }, "force": true },
123123
{
124124
"location_variable_adjust": { "global_val": "OM_HQ_origin_npc" },
125-
"x_adjust": [ -2, -1, 1, 2 ],
126-
"y_adjust": [ -2, -1, 1, 2 ]
125+
"x_adjust": [ -2, 2 ],
126+
"y_adjust": [ -2, 2 ]
127127
}
128128
]
129129
}

‎doc/JSON/EFFECT_ON_CONDITION.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3531,8 +3531,8 @@ Get the user input
35313531
{
35323532
"set_string_var": "",
35333533
"string_input": {
3534-
"title": { "i18n": true, "str": "Input a value:" },
3535-
"description": { "i18n": true, "str": "Just say something" },
3534+
"title": "Input a value:",
3535+
"description": "Just say something",
35363536
"width": 30
35373537
},
35383538
"target_var": { "context_val": "str" }

0 commit comments

Comments
 (0)