Skip to content

Commit

Permalink
Update itens rotation (Southclaws#595)
Browse files Browse the repository at this point in the history 
* Update init.pwn

* Update init.pwn

* Update world_survivor.ltb

* Update weapon.pwn

* Update init.pwn
  • Loading branch information
@kolor4do
kolor4do authored Jun 10, 2021
1 parent 8cf3018 commit b8dcd21
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions gamemodes/sss/core/server/init.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ public OnScriptInit()
item_SignShot = DefineItemType("Sign", "SignShot", 3265, 3, 0.0, 0.0, 0.0, 0.0, 0.081356, 0.034642, -0.167247, 0.000000, 0.000000, 240.265777, .maxhitpoints = 3);
item_Mailbox = DefineItemType("Mailbox", "Mailbox", 3407, 3, 0.0, 0.0, 0.0, 0.0, 0.081356, 0.034642, -0.167247, 0.000000, 0.000000, 240.265777, .maxhitpoints = 3);
item_Pumpkin = DefineItemType("Pumpkin", "Pumpkin", 19320, 5, 0.0, 0.0, 0.0, 0.3, 0.105948, 0.279332, -0.253927, 246.858016, 0.000000, 0.000000, true, .maxhitpoints = 5);
item_Nailbat = DefineItemType("Nailbat", "Nailbat", 2045, 3, 0.0, 0.0, 0.0, 0.0, .maxhitpoints = 3);
item_Nailbat = DefineItemType("Nailbat", "Nailbat", 2045, 3, 0.0, 0.0, 0.0, 0.0, 0.071999,-0.025000,0.315999,99.899986,0.000000,0.199999, .maxhitpoints = 3);
// 110
item_ZorroMask = DefineItemType("Zorro Mask", "ZorroMask", 18974, 1, 0.0, 0.0, 0.0, 0.0, 0.193932, 0.050861, 0.017257, 90.000000, 0.000000, 0.000000, .maxhitpoints = 1);
item_Barbecue = DefineItemType("BBQ", "Barbecue", 19831, 6, 0.0, 0.0, 0.0, -0.0313,0.321000, -0.611000, 0.084999, 66.000007, -163.699981, 80.899917, true, .maxhitpoints = 6);
Expand All @@ -702,12 +702,12 @@ public OnScriptInit()
// 120
item_Door = DefineItemType("Metal Door", "Door", 18553, 9, 0.0, 90.0, 90.0, 0.0, 0.313428, -0.507642, -1.340901, 336.984893, 348.837493, 113.141563, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 2);
item_MetPanel = DefineItemType("Metal Panel", "MetPanel", 1965, 10, 0.0, 90.0, 0.0, 0.0, 0.070050, 0.008440, -0.180277, 338.515014, 349.801025, 33.250347, true, .buttonz = ITEM_FLOOR_OFFSET / 3, .maxhitpoints = 5);
item_MetalGate = DefineItemType("Metal Gate", "MetalGate", 19303, 10, 270.0, 0.0, 0.0, 0.0, 0.057177, 0.073761, -0.299014, -19.439863, -10.153647, 105.119079, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 4);
item_MetalGate = DefineItemType("Metal Gate", "MetalGate", 19303, 10, 270.0, 0.0, 0.0, 0.0, -0.128823,0.758761,-0.508013,-19.839876,-10.353648,105.119079, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 4);
item_CrateDoor = DefineItemType("Crate Door", "CrateDoor", 3062, 9, 90.0, 90.0, 0.0, 0.0, 0.150177, -0.097238, -0.299014, -19.439863, -10.153647, 105.119079, true, .buttonz = ITEM_FLOOR_OFFSET / 3, .maxhitpoints = 5);
item_CorPanel = DefineItemType("Corrugated Metal", "CorPanel", 2904, 10, 90.0, 90.0, 0.0, 0.0, -0.365094, 1.004213, -0.665850, 337.887634, 172.861953, 68.495330, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 6);
item_ShipDoor = DefineItemType("Ship Door", "ShipDoor", 2944, 10, 180.0, 90.0, 0.0, 0.0, 0.134831, -0.039784, -0.298796, 337.887634, 172.861953, 162.198867, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 9);
item_InsulDoor = DefineItemType("Insulated Doorway", "InsulDoor", 19398, 10, 0.0, 90.0, 0.0, 0.0, -0.087715, 0.483874, 1.109397, 337.887634, 172.861953, 162.198867, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 7);
item_InsulPanel = DefineItemType("Insulated Panel", "InsulPanel", 19371, 8, 0.0, 90.0, 0.0, 0.0, -0.087715, 0.5, -0.49, 337.887634, 172.861953, 162.198867, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 7);
item_InsulDoor = DefineItemType("Insulated Doorway", "InsulDoor", 19398, 10, 0.0, 90.0, 0.0, 0.0, -0.087714,1.606874,-0.771602,-111.012359,172.861953,-169.801147, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 7);
item_InsulPanel = DefineItemType("Insulated Panel", "InsulPanel", 19371, 8, 0.0, 90.0, 0.0, 0.0, -0.339715,1.431000,-0.739000,337.887634,170.962066,162.198867, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 7);
item_SmallPanel = DefineItemType("Small Metal Panel", "SmallPanel", 19843, 11, 0.0, 0.0, 0.0, 0.0, -0.068822, 0.989761, -0.620014, -114.639907, -10.153647, 170.419097, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 5);
item_WoodPanel = DefineItemType("Wood Ramp", "WoodPanel", 5153, 11, 360.0, 23.537, 0.0, 0.0, -0.342762, 0.908910, -0.453703, 296.326019, 46.126548, 226.118209, true, .buttonz = ITEM_FLOOR_OFFSET / 2, .maxhitpoints = 7);
// 130
Expand Down Expand Up @@ -1111,6 +1111,8 @@ public OnScriptInit()
DefineItemTypeWeapon(item_FryingPan, 0, -1, 0.01, _:1.06, 0, anim_Blunt);
DefineItemTypeWeapon(item_Fork, 0, -1, 0.17, 0, 0, anim_Stab);
DefineItemTypeWeapon(item_Broom, 0, -1, 0.11, _:1.1, 0, anim_Heavy);
DefineItemTypeWeapon(item_Nailbat, 0, -1, 0.30, _:3.0, 0, anim_Heavy);

// itemtype baseweapon calibre bleedrate koprob n/a animset
DefineItemTypeWeapon(item_Knuckles, WEAPON_BRASSKNUCKLE, -1, 0.05, 20, 0);
DefineItemTypeWeapon(item_GolfClub, WEAPON_GOLFCLUB, -1, 0.07, 35, 0);
Expand Down
2 changes: 1 addition & 1 deletion gamemodes/sss/core/weapon/weapon.pwn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <YSI_Coding\y_hooks>


#define MAX_ITEM_WEAPON (64)
#define MAX_ITEM_WEAPON (65)


enum (<<= 1)
Expand Down
1 change: 1 addition & 0 deletions scriptfiles/loot/world_survivor.ltb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ world_survivor, 1.0
0.01, BigSword
0.01, DogsBreath
0.01, LenKnocksRifle
0.10, Nailbat

0 comments on commit b8dcd21

Please sign in to comment.