Skip to content

Commit

Permalink
Consolidated v2.2.0!
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustavo R. 'Gustavo6046' Rehermann committed Nov 8, 2018
1 parent 1ad49b7 commit f7dd7cf
Show file tree
Hide file tree
Showing 5 changed files with 505 additions and 492 deletions.
9 changes: 9 additions & 0 deletions changelog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
"changes": [
"Slight patch: changed 'Stop' in function without returnable calls into 'TNT1 A -1'. Suggested by Blzut3."
]
},

{
"name": "2.2.0",
"changes": [
"Added 'sometimes' statement.",
"Added 'else' statement.",
"Fixed if/repeat statement jump offsets."
]
}
]
}
58 changes: 29 additions & 29 deletions examples/JumpZombie.dec
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_0 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_1 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_2 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_3 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_4 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_5 : Inventory {Inventory.MaxAmount 1}
Actor _Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_6 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_0 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_1 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_2 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_3 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_4 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_5 : Inventory {Inventory.MaxAmount 1}
Actor _Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_6 : Inventory {Inventory.MaxAmount 1}


Actor RunZombie : ZombieMan replaces ZombieMan 2055
Expand All @@ -19,17 +19,17 @@ Actor RunZombie : ZombieMan replaces ZombieMan 2055
F_SeeCheck:
TNT1 A 0 A_Chase
POSS A 0 A_FaceTarget
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_0", 1, "_CLabel0")
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_1", 1, "_CLabel1")
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_2", 1, "_CLabel2")
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_3", 1, "_CLabel3")
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_4", 1, "_CLabel4")
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_5", 1, "_CLabel5")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_0", 1, "_CLabel0")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_1", 1, "_CLabel1")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_2", 1, "_CLabel2")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_3", 1, "_CLabel3")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_4", 1, "_CLabel4")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_5", 1, "_CLabel5")
TNT1 A -1

F_ZombieJump:
TNT1 A 0 A_JumpIf(!(health > 5), 2)
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_6", 1, "_CLabel6")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_6", 1, "_CLabel6")
Stop
TNT1 A 0
_WhileBlock0:
Expand All @@ -40,57 +40,57 @@ Actor RunZombie : ZombieMan replaces ZombieMan 2055
TNT1 A 0
POSS A 2 A_Chase
POSS B 2 A_Chase
TNT1 A 0 A_JumpIfInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_6", 1, "_CLabel6")
TNT1 A 0 A_JumpIfInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_6", 1, "_CLabel6")
TNT1 A -1

See:
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_0")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_0")
Goto F_SeeCheck
_CLabel0:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_0")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_0")
POSS A 5 A_Recoil(-0.7)
POSS B 5 A_Recoil(-0.7)
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_1")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_1")
Goto F_SeeCheck
_CLabel1:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_1")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_1")
POSS A 4 A_Recoil(-0.7)
POSS B 4 A_Recoil(-0.7)
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_2")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_2")
Goto F_SeeCheck
_CLabel2:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_2")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_2")
POSS A 3 A_Recoil(-0.7)
POSS B 3 A_Recoil(-0.7)
POSS C 3 A_Recoil(-0.7)
POSS D 3 A_Recoil(-0.7)
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_3")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_3")
Goto F_SeeCheck
_CLabel3:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_3")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_3")
goto RunLoop

RunLoop:
POSS A 2 A_Recoil(-0.7)
POSS B 2 A_Recoil(-0.7)
POSS C 2 A_Recoil(-0.7)
POSS D 2 A_Recoil(-0.7)
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_4")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_4")
Goto F_SeeCheck
_CLabel4:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_4")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_4")
POSS A 2 A_Recoil(-0.7)
POSS B 2 A_Recoil(-0.7)
POSS C 2 A_Recoil(-0.7)
POSS D 2 A_Recoil(-0.7)
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_5")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_5")
Goto F_SeeCheck
_CLabel5:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_5")
TNT1 A 0 A_GiveInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_6")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_5")
TNT1 A 0 A_GiveInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_6")
Goto F_ZombieJump
_CLabel6:
TNT1 A 0 A_TakeInventory("_Call_LV9EVfumGpZzssp4F6VTZ60Cb9xEtKQxQQM_6")
TNT1 A 0 A_TakeInventory("_Call_M0hhCEFATFucMa9SKQR9ZnScv3H4YZ7YZxj_6")
Goto RunLoop
}
}
Loading

0 comments on commit f7dd7cf

Please sign in to comment.