forked from Mirrors/openclonk
remove unused Rebuy property from objects
parent
4a2643d432
commit
509bdac5bc
|
@ -3,4 +3,3 @@
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -69,4 +69,3 @@ private func Find_CableLine(object obj)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -140,5 +140,4 @@ func Definition(def)
|
|||
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Touchable = 1;
|
||||
local Rebuy = true;
|
||||
local Touchable = 1;
|
|
@ -22,6 +22,5 @@ public func IsPlanePart() { return true; }
|
|||
local Collectible = false;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Touchable = 1; // Later, this could be done with the lift tower. There is no working lift tower at the moment though :(
|
||||
local HitPoints = 20;
|
||||
|
|
|
@ -23,5 +23,4 @@ public func IsPlanePart() { return true; }
|
|||
local Collectible = true;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local HitPoints = 20;
|
||||
|
|
|
@ -21,5 +21,4 @@ public func IsPlanePart() { return true; }
|
|||
local Collectible = true;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local HitPoints = 20;
|
||||
|
|
|
@ -22,6 +22,5 @@ public func IsPlanePart() { return true; }
|
|||
local Collectible = false;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Touchable = 1;
|
||||
local HitPoints = 20;
|
||||
|
|
|
@ -22,6 +22,5 @@ public func IsPlanePart() { return true; }
|
|||
local Collectible = false;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Touchable = 1;
|
||||
local HitPoints = 20;
|
||||
|
|
|
@ -24,5 +24,4 @@ func GetGemColor()
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Plane = 510;
|
||||
|
|
|
@ -22,5 +22,4 @@ public func GetFuelNeed() { return 50; }
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Collectible = 1;
|
|
@ -27,5 +27,4 @@ public func GetFuelNeed() { return 50; }
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = true;
|
||||
local Rebuy = 1;
|
||||
local Collectible = true;
|
|
@ -9,5 +9,4 @@ public func IsWindmillProduct() { return true; }
|
|||
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Collectible = 1;
|
|
@ -24,7 +24,6 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = false;
|
||||
|
||||
|
||||
// sproutberries are extremely unstable and likely to grow a new plant if not carried
|
||||
|
|
|
@ -25,5 +25,4 @@ private func Definition(def)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Plane = 470;
|
|
@ -24,7 +24,6 @@ public func GetFuelAmount(bool get_partial)
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 5;
|
||||
local ContactIncinerate = 1;
|
||||
local Plane = 460;
|
|
@ -28,7 +28,6 @@ public func GetFuelAmount(bool get_partial)
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Plane = 460;
|
||||
local BlastIncinerate = 5;
|
||||
local ContactIncinerate = 2;
|
|
@ -17,4 +17,3 @@ public func IsValuable() { return true; }
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -31,5 +31,4 @@ public func HasExplosionOnImpact() { return true; }
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Plane = 530; // cause it's explosive, players should see it in a pile of stuff
|
|
@ -13,5 +13,4 @@ public func IsValuable(){ return true; }
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Plane = 480;
|
|
@ -199,6 +199,5 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
local BridgeLength = 37; // bridge length in pixels
|
||||
local Plane = 470;
|
|
@ -18,5 +18,4 @@ public func GetFuelNeed() { return 100; }
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Plane = 470;
|
|
@ -18,5 +18,4 @@ public func IsFoundryIngredient() { return true; }
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Plane = 460;
|
|
@ -16,5 +16,4 @@ protected func Hit(x, y)
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Plane = 450;
|
||||
|
|
|
@ -50,4 +50,3 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -15,5 +15,4 @@ protected func Hit()
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local Plane = 460;
|
|
@ -23,7 +23,6 @@ public func IsSawmillProduct() { return true; }
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 5;
|
||||
local ContactIncinerate = 1;
|
||||
local Plane = 470;
|
|
@ -400,7 +400,6 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
// Damage dealt to trees when chopping.
|
||||
local ChopStrength = 10;
|
||||
// Damage dealt to living beings when hit with an axe.
|
||||
|
|
|
@ -56,4 +56,3 @@ local Collectible = true;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -34,5 +34,4 @@ public func IsBarrelForMaterial(string sznMaterial)
|
|||
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local ContactIncinerate = 0;
|
|
@ -312,5 +312,4 @@ public func Definition(proplist def)
|
|||
local Collectible = true;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local ContactIncinerate = 2;
|
|
@ -292,6 +292,5 @@ local Collectible = true;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 1;
|
||||
local ContactIncinerate = 1;
|
||||
|
|
|
@ -202,6 +202,6 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
||||
local BlastIncinerate = 1;
|
||||
local ContactIncinerate = 1;
|
||||
|
|
|
@ -209,6 +209,5 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 1;
|
||||
local ContactIncinerate = 2;
|
||||
|
|
|
@ -268,6 +268,5 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 30;
|
||||
local ContactIncinerate = 0;
|
|
@ -27,4 +27,3 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -227,5 +227,4 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
local MaxPickDensity = 70; // can't pick granite
|
||||
|
|
|
@ -7,7 +7,6 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
||||
protected func Hit()
|
||||
{
|
||||
|
|
|
@ -145,7 +145,6 @@ func AlchemyProcessTime() { return 100; }
|
|||
local Collectible = true;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 1;
|
||||
local NoBurnDecay = 1;
|
||||
local ContactIncinerate = 2;
|
||||
|
|
|
@ -502,4 +502,3 @@ local Name = "$Name$";
|
|||
local UsageHelp = "$UsageHelp$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = true;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -208,4 +208,3 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -59,4 +59,3 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -280,4 +280,3 @@ local Name = "$Name$";
|
|||
local UsageHelp = "$UsageHelp$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -222,5 +222,4 @@ protected func Definition(def)
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
|
||||
|
|
|
@ -119,7 +119,6 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
local BridgeLength = 20;
|
||||
local BridgeThickness = 5;
|
||||
local BridgeMaterial = "Granite-granite";
|
||||
|
|
|
@ -246,5 +246,4 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local MaxIntake = 30;
|
||||
|
|
|
@ -232,6 +232,5 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 30;
|
||||
local ContactIncinerate = 5;
|
|
@ -244,4 +244,3 @@ local Collectible = 1;
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -201,5 +201,4 @@ func Definition(def)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Collectible = 1;
|
|
@ -98,6 +98,5 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 1;
|
||||
local ContactIncinerate = 1;
|
||||
|
|
|
@ -229,4 +229,3 @@ func Definition(def) {
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -130,5 +130,4 @@ local ActMap = {
|
|||
};
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
local Collectible = 1;
|
|
@ -192,4 +192,3 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -233,7 +233,7 @@ func FxShieldStopControlQueryCatchBlow(object target, effect, object obj)
|
|||
// angle difference: 0..180
|
||||
var angle_diff = Abs(Normalize(shield_angle-object_angle,-180));
|
||||
|
||||
// objects hits if the angle difference is greater than 45°
|
||||
// objects hits if the angle difference is greater than 45 degrees
|
||||
if (angle_diff > 45) return false;
|
||||
|
||||
// projectile bounces off
|
||||
|
@ -291,4 +291,3 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -346,4 +346,3 @@ local Name = "$Name$";
|
|||
local Description = "$Description$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Collectible = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -373,8 +373,6 @@ func DoSell(object pObj, int iPlr, bool bRight)
|
|||
// Give the player the cash
|
||||
DoWealth(iPlr, GetSellValue(pObj));
|
||||
Sound("UI::Cash", 0, 100, iPlr+1); // TODO: get sound
|
||||
if(pObj.Rebuy)
|
||||
ChangeBaseMaterial(pObj->GetID(), 1);
|
||||
// right clicked? then sell other objects too
|
||||
var pNewObj;
|
||||
var bFound;
|
||||
|
|
|
@ -136,7 +136,6 @@ protected func Hit(int dx, int dy)
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Rebuy = true;
|
||||
local BlastIncinerate = 8;
|
||||
local ContactIncinerate = 2;
|
||||
local Confinement;
|
|
@ -538,4 +538,3 @@ func Definition(def)
|
|||
|
||||
local Name="$Name$";
|
||||
local Description="$Description$";
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -348,6 +348,5 @@ func Definition(def)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Touchable = 2;
|
||||
local Rebuy = true;
|
||||
local Plane = 500;
|
||||
local SolidMaskPlane = 275;
|
||||
|
|
|
@ -285,4 +285,3 @@ Roll = {
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Touchable = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -271,7 +271,6 @@ func Definition(proplist def)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Touchable = 1;
|
||||
local Rebuy = true;
|
||||
|
||||
local ActMap = {
|
||||
Roll = {
|
||||
|
|
|
@ -300,4 +300,3 @@ public func Definition(proplist def)
|
|||
local Name = "$Name$";
|
||||
local Description = "$Description$";
|
||||
local Touchable = 1;
|
||||
local Rebuy = true;
|
||||
|
|
|
@ -102,4 +102,3 @@ func Definition(def) {
|
|||
local Collectible = 1;
|
||||
local Name = "$Name$";
|
||||
local UsageHelp = "$UsageHelp$";
|
||||
local Rebuy = true;
|
||||
|
|
Loading…
Reference in New Issue