Skip to content

Commit

Permalink
various bug fixes (randovania#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SchwartzGandhi
SchwartzGandhi committed Feb 16, 2024
1 parent 3fa1eda commit 2ecbf81
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 95 deletions.
196 changes: 155 additions & 41 deletions randovania/games/fusion/logic_database/Sector 2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,15 @@
{
"type": "template",
"data": "Can climb High Jump Wall"
},
{
"type": "resource",
"data": {
"type": "tricks",
"name": "WallJump",
"amount": 1,
"negate": false
}
}
]
}
Expand Down Expand Up @@ -2468,15 +2477,10 @@
"override_default_lock_requirement": null,
"connections": {
"Door to Owtch Office": {
"type": "or",
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "template",
"data": "Can climb High Jump Wall"
}
]
"items": []
}
}
}
Expand Down Expand Up @@ -2728,8 +2732,47 @@
}
},
{
"type": "template",
"data": "Can climb High Jump Wall"
"type": "or",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"data": {
"type": "items",
"name": "SpaceJump",
"amount": 1,
"negate": false
}
},
{
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"data": {
"type": "items",
"name": "HighJump",
"amount": 1,
"negate": false
}
},
{
"type": "resource",
"data": {
"type": "tricks",
"name": "Movement",
"amount": 3,
"negate": false
}
}
]
}
}
]
}
}
]
}
Expand Down Expand Up @@ -6470,6 +6513,13 @@
"pickup_index": 36,
"location_category": "minor",
"connections": {
"Pickup (Hidden Power Bomb Tank)": {
"type": "and",
"data": {
"comment": null,
"items": []
}
},
"Door to Central Shaft": {
"type": "and",
"data": {
Expand Down Expand Up @@ -6565,27 +6615,6 @@
}
]
}
},
"Pickup (Hidden Power Bomb Tank)": {
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"data": {
"type": "items",
"name": "MorphBall",
"amount": 1,
"negate": false
}
},
{
"type": "template",
"data": "Can Freeze Enemies"
}
]
}
}
}
}
Expand Down Expand Up @@ -6801,26 +6830,50 @@
"location_category": "minor",
"connections": {
"Door to Level 1 Security Room": {
"type": "or",
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"type": "or",
"data": {
"type": "items",
"name": "SpaceJump",
"amount": 1,
"negate": false
"comment": null,
"items": [
{
"type": "template",
"data": "Can climb High Jump Wall"
},
{
"type": "resource",
"data": {
"type": "tricks",
"name": "WallJump",
"amount": 1,
"negate": false
}
}
]
}
},
{
"type": "resource",
"type": "or",
"data": {
"type": "items",
"name": "HighJump",
"amount": 1,
"negate": false
"comment": null,
"items": [
{
"type": "template",
"data": "Can Use Any Bombs"
},
{
"type": "resource",
"data": {
"type": "tricks",
"name": "Movement",
"amount": 2,
"negate": false
}
}
]
}
}
]
Expand Down Expand Up @@ -6872,6 +6925,15 @@
"amount": 1,
"negate": false
}
},
{
"type": "resource",
"data": {
"type": "tricks",
"name": "WallJump",
"amount": 1,
"negate": false
}
}
]
}
Expand Down Expand Up @@ -6921,6 +6983,32 @@
"amount": 1,
"negate": false
}
},
{
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"data": {
"type": "tricks",
"name": "ShinesparkTrick",
"amount": 3,
"negate": false
}
},
{
"type": "resource",
"data": {
"type": "items",
"name": "SpeedBooster",
"amount": 1,
"negate": false
}
}
]
}
}
]
}
Expand All @@ -6938,6 +7026,32 @@
"amount": 1,
"negate": false
}
},
{
"type": "and",
"data": {
"comment": null,
"items": [
{
"type": "resource",
"data": {
"type": "tricks",
"name": "ShinesparkTrick",
"amount": 3,
"negate": false
}
},
{
"type": "resource",
"data": {
"type": "items",
"name": "SpeedBooster",
"amount": 1,
"negate": false
}
}
]
}
}
]
}
Expand Down
28 changes: 19 additions & 9 deletions randovania/games/fusion/logic_database/Sector 2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ Extra - room_id: [13, 46]
* L0 Hatch to Dessgeega Dormitory/Door to Central Shaft
* Extra - door_idx: (30,)
> Door to Puyo Corridor
Can climb High Jump Wall
Wall Jump (Beginner) or Can climb High Jump Wall

> Door to Oasis; Heals? False
* Layers: default
Expand Down Expand Up @@ -460,7 +460,7 @@ Extra - room_id: [17]
* L0 Hatch to Zazabi Arena/Door to Zazabi Access
* Extra - door_idx: (39,)
> Door to Owtch Office
Can climb High Jump Wall
Trivial

> Door to Owtch Office; Heals? False
* Layers: default
Expand Down Expand Up @@ -509,7 +509,11 @@ Extra - room_id: [18]
> Door to Zazabi Access
Can climb High Jump Wall
> Door to Zazabi Speedway
Screw Attack and Can climb High Jump Wall
All of the following:
Screw Attack
Any of the following:
Space Jump
High Jump and Movement (Advanced)
> Event - Zazabi
All of the following:
# Weapons Requirements
Expand Down Expand Up @@ -1178,6 +1182,8 @@ Extra - room_id: [50]
* Extra - room: 50
* Extra - blockx: 3
* Extra - blocky: 7
> Pickup (Hidden Power Bomb Tank)
Trivial
> Door to Central Shaft
Trivial

Expand All @@ -1197,8 +1203,6 @@ Extra - room_id: [50]
* Extra - door_idx: (114,)
> Pickup (Power Bomb Tank)
Morph Ball and Can Freeze Enemies
> Pickup (Hidden Power Bomb Tank)
Morph Ball and Can Freeze Enemies

----------------
Connection to Sector 1 (SRX)
Expand Down Expand Up @@ -1248,7 +1252,9 @@ Extra - room_id: [54]
* Extra - blockx: 4
* Extra - blocky: 5
> Door to Level 1 Security Room
High Jump or Space Jump
All of the following:
Wall Jump (Beginner) or Can climb High Jump Wall
Movement (Intermediate) or Can Use Any Bombs

> Pickup (Power Bomb Tank); Heals? False
* Layers: default
Expand All @@ -1258,16 +1264,20 @@ Extra - room_id: [54]
* Extra - blockx: 9
* Extra - blocky: 14
> Door to Level 1 Security Room
High Jump or Space Jump
High Jump or Space Jump or Wall Jump (Beginner)

> Door to Level 1 Security Room; Heals? False
* Layers: default
* L0 Hatch to Level 1 Security Room/Door to Crumble City
* Extra - door_idx: (132,)
> Pickup (Energy Tank)
Space Jump
Any of the following:
Space Jump
Speed Booster and Shinespark Tricks (Advanced)
> Pickup (Power Bomb Tank)
Space Jump
Any of the following:
Space Jump
Speed Booster and Shinespark Tricks (Advanced)

----------------
Zazabi Speedway
Expand Down
20 changes: 14 additions & 6 deletions randovania/games/fusion/logic_database/Sector 3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3236,12 +3236,20 @@
}
},
{
"type": "template",
"data": "Can Use Springball"
},
{
"type": "template",
"data": "Can Use Bombs"
"type": "or",
"data": {
"comment": null,
"items": [
{
"type": "template",
"data": "Can Use Bombs"
},
{
"type": "template",
"data": "Can Use Springball"
}
]
}
},
{
"type": "or",
Expand Down
3 changes: 2 additions & 1 deletion randovania/games/fusion/logic_database/Sector 3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,8 @@ Extra - room_id: [19]
Space Jump or Can Freeze Enemies
> Pickup (Missile Tank)
All of the following:
Morph Ball and Can Use Bombs and Can Use Springball
Morph Ball
Can Use Bombs or Can Use Springball
Space Jump or Can Freeze Enemies
> Door to Processing Access (Lower)
Trivial
Expand Down
Loading

0 comments on commit 2ecbf81

Please sign in to comment.