Skip to content

Commit

Permalink
Merge pull request CleverRaven#70462 from Ramza13/remove-const-json
Browse files Browse the repository at this point in the history 
Fix json for weighted list EOC
  • Loading branch information
@Maleclypse
Maleclypse authored Dec 28, 2023
2 parents d1e85e0 + e61437e commit 8f6b2d4
Show file tree
Hide file tree
Showing 18 changed files with 543 additions and 573 deletions.
10 changes: 5 additions & 5 deletions data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"global": true,
"effect": {
"weighted_list_eocs": [
[ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, { "const": 1000 } ],
[ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, 1000 ],
[
{
"id": "three_cherries",
Expand All @@ -82,7 +82,7 @@
{ "run_eocs": "slot_machine_win_payout" }
]
},
{ "const": 200 }
200
],
[
{
Expand All @@ -93,7 +93,7 @@
{ "run_eocs": "slot_machine_win_payout" }
]
},
{ "const": 50 }
50
],
[
{
Expand All @@ -104,7 +104,7 @@
{ "run_eocs": "slot_machine_win_payout" }
]
},
{ "const": 20 }
20
],
[
{
Expand All @@ -115,7 +115,7 @@
{ "run_eocs": "slot_machine_win_payout" }
]
},
{ "const": 1 }
1
]
]
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/effects_on_condition/mutation_eocs/changing_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"deactivate_condition": { "u_has_flag": "CHANGING" },
"effect": [
{
"weighted_list_eocs": [ [ "changing_failed", { "const": 2500 } ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ]
"weighted_list_eocs": [ [ "changing_failed", 2500 ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ]
}
]
},
Expand Down
135 changes: 65 additions & 70 deletions data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"condition": { "math": [ "ps_str", ">", "4" ] },
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", { "const": 10 } ],
[ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
[ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 6 ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 3 ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", 1 ]
]
},
"false_effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", { "const": 10 } ],
[ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", { "const": 5 } ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", { "const": 2 } ]
[ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ],
[ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 5 ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 2 ]
]
}
}
Expand Down Expand Up @@ -81,15 +81,13 @@
"condition": { "days_since_cataclysm": 60 },
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", { "const": 4 } ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_3", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_4", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", 4 ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", 3 ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_3", 2 ],
[ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_4", 1 ]
]
},
"false_effect": {
"weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", { "const": 2 } ], [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", { "const": 1 } ] ]
}
"false_effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", 2 ], [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", 1 ] ] }
}
]
}
Expand Down Expand Up @@ -220,27 +218,27 @@
"condition": { "not": { "u_has_trait": "REALITY_GRASP" } },
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", { "const": 18 } ],
[ "EOC_PORTAL_DEPENDENT_MORALE_BAD", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", { "const": 5 } ],
[ "EOC_PORTAL_DEPENDENT_SHAKES", { "const": 4 } ],
[ "EOC_PORTAL_DEPENDENT_NAUSEA", { "const": 4 } ],
[ "EOC_PORTAL_DEPENDENT_STUN", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_DOWNED", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_STATS_BAD", { "const": 3 } ],
[ "EOC_PORTAL_TELEPORT_STUCK_START", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_PAIN", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 18 ],
[ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 6 ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 5 ],
[ "EOC_PORTAL_DEPENDENT_SHAKES", 4 ],
[ "EOC_PORTAL_DEPENDENT_NAUSEA", 4 ],
[ "EOC_PORTAL_DEPENDENT_STUN", 3 ],
[ "EOC_PORTAL_DEPENDENT_DOWNED", 3 ],
[ "EOC_PORTAL_DEPENDENT_STATS_BAD", 3 ],
[ "EOC_PORTAL_TELEPORT_STUCK_START", 3 ],
[ "EOC_PORTAL_DEPENDENT_PAIN", 2 ],
[ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", 1 ],
[ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", 1 ]
]
},
"false_effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", { "const": 10 } ],
[ "EOC_PORTAL_DEPENDENT_MORALE_BAD", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_SHAKES", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_NAUSEA", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 10 ],
[ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 3 ],
[ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 2 ],
[ "EOC_PORTAL_DEPENDENT_SHAKES", 1 ],
[ "EOC_PORTAL_DEPENDENT_NAUSEA", 1 ]
]
}
}
Expand Down Expand Up @@ -283,10 +281,10 @@
"id": "EOC_PORTAL_DEPENDENT_STATS_EFFECTS",
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_STR_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_DEX_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_PER_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_INT_BAD", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_STR_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_DEX_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_PER_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_INT_BAD", 1 ]
]
}
}
Expand Down Expand Up @@ -421,11 +419,11 @@
"condition": { "not": { "u_has_effect": "sleep" } },
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_MESSAGES_VARIED_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_MESSAGES_VARIED_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", 1 ],
[ "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", 1 ]
]
},
"false_effect": [ { "u_message": "PORTAL_DEPENDENT_MESSAGES_DREAMS", "snippet": true, "type": "mixed" } ]
Expand Down Expand Up @@ -479,51 +477,51 @@
"case": 0,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 16 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 3 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 16 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 3 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 1 ]
]
}
},
{
"case": 1,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 12 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 2 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 6 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 12 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 2 ]
]
}
},
{
"case": 2,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 5 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 12 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 2 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 1 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 5 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 12 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 2 ]
]
}
},
{
"case": 3,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 5 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 12 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 1 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 2 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 5 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 12 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 1 ]
]
}
},
{
"case": 4,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 12 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 2 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 6 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 12 ]
]
}
}
Expand Down Expand Up @@ -635,39 +633,36 @@
"case": 5,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 10 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 4 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 6 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 10 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 4 ]
]
}
},
{
"case": 6,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 4 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 8 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 8 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 4 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 8 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 8 ]
]
}
},
{
"case": 7,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 1 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 6 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 13 } ]
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 1 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 6 ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 13 ]
]
}
},
{
"case": 8,
"effect": {
"weighted_list_eocs": [
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 2 } ],
[ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 18 } ]
]
"weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 2 ], [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 18 ] ]
}
},
{ "case": 9, "effect": [ { "run_eocs": "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5" } ] }
Expand Down
Loading

0 comments on commit 8f6b2d4

Please sign in to comment.